From 09183c5f66c8656c5f9d3d422d6ec09fcbb93d9f Mon Sep 17 00:00:00 2001
From: Carsten Ziegeler <cziegeler@apache.org>
Date: Thu, 12 Jan 2017 06:57:30 +0000
Subject: [PATCH] Update scm info, update changelog

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1778387 13f79535-47bb-0310-9956-ffa450edef68
---
 osgi-r7/configadmin/pom.xml                   |  6 ++--
 osgi-r7/configurator/pom.xml                  |  6 ++--
 osgi-r7/scr/changelog.txt                     |  1 +
 osgi-r7/scr/pom.xml                           |  6 ++--
 .../felix/scr/impl/inject/Annotations.java    |  6 ++--
 .../felix/scr/impl/inject/BindParameters.java | 11 ++++++-
 .../impl/inject/ConstructorMethodImpl.java    | 33 ++-----------------
 .../scr/impl/inject/field/FieldHandler.java   |  4 +--
 .../scr/impl/inject/field/FieldUtils.java     | 28 ++++++++++++++++
 .../impl/inject/methods/ActivateMethod.java   |  1 -
 .../scr/impl/inject/methods/BaseMethod.java   |  1 -
 .../scr/impl/inject/methods/BindMethod.java   |  5 ++-
 .../SuitableMethodNotAccessibleException.java |  2 +-
 13 files changed, 59 insertions(+), 51 deletions(-)
 rename osgi-r7/scr/src/main/java/org/apache/felix/scr/impl/inject/{ => methods}/SuitableMethodNotAccessibleException.java (94%)

diff --git a/osgi-r7/configadmin/pom.xml b/osgi-r7/configadmin/pom.xml
index 2bb86d4cadb..5ea9424dcd4 100644
--- a/osgi-r7/configadmin/pom.xml
+++ b/osgi-r7/configadmin/pom.xml
@@ -36,9 +36,9 @@
     </description>
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/felix/trunk/configadmin</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/felix/trunk/configadmin</developerConnection>
-        <url>http://svn.apache.org/repos/asf/felix/configadmin</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/felix/trunk/osgi-r7/configadmin</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/felix/trunk/osgi-r7/configadmin</developerConnection>
+        <url>http://svn.apache.org/repos/asf/felix/osgi-r7/configadmin</url>
     </scm>
 
     <!--
diff --git a/osgi-r7/configurator/pom.xml b/osgi-r7/configurator/pom.xml
index 053a2e5c5e8..772c60fdfe5 100644
--- a/osgi-r7/configurator/pom.xml
+++ b/osgi-r7/configurator/pom.xml
@@ -36,9 +36,9 @@
     <version>0.0.1-SNAPSHOT</version>
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/felix/trunk/configurator</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/felix/trunk/configurator</developerConnection>
-        <url>http://svn.apache.org/viewvc/felix/trunk/configurator</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/felix/trunk/osgi-r7/configurator</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/felix/trunk/osgi-r7/configurator</developerConnection>
+        <url>http://svn.apache.org/viewvc/felix/trunk/osgi-r7/configurator</url>
     </scm>
 
     <properties>
diff --git a/osgi-r7/scr/changelog.txt b/osgi-r7/scr/changelog.txt
index c8084197403..b51ef2c210d 100644
--- a/osgi-r7/scr/changelog.txt
+++ b/osgi-r7/scr/changelog.txt
@@ -11,6 +11,7 @@ Changes from 2.0.6 to 2.0.8
     * [FELIX-5459] Use Java 6 as minimum version
     * [FELIX-5374] Reduce severity of log message from SCR when there is no metatype
     * [FELIX-5474] Do not call no-arg Bundle.getHeaders() method
+    * [FELIX-5360] Strange loading of org.apache.felix.service.command.Descriptor
 
 
 Changes from 2.0.4 to 2.0.6
diff --git a/osgi-r7/scr/pom.xml b/osgi-r7/scr/pom.xml
index 0e996b4fb7f..59b77408de2 100644
--- a/osgi-r7/scr/pom.xml
+++ b/osgi-r7/scr/pom.xml
@@ -32,9 +32,9 @@
     <artifactId>org.apache.felix.scr</artifactId>
     <version>2.1.0-SNAPSHOT</version>
     <scm>
-        <connection>scm:svn:https://svn.apache.org/repos/asf/felix/trunk/scr</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/felix/trunk/scr</developerConnection>
-        <url>scm:svn:https://svn.apache.org/repos/asf/felix/trunk/scr</url>
+        <connection>scm:svn:https://svn.apache.org/repos/asf/felix/trunk/osgi-r7/scr</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/felix/trunk/osgi-r7/scr</developerConnection>
+        <url>scm:svn:https://svn.apache.org/repos/asf/felix/trunk/osgi-r7/scr</url>
     </scm>
     
     <!--
diff --git a/osgi-r7/scr/src/main/java/org/apache/felix/scr/impl/inject/Annotations.java b/osgi-r7/scr/src/main/java/org/apache/felix/scr/impl/inject/Annotations.java
index 3443501a0f2..60cd8c372d9 100644
--- a/osgi-r7/scr/src/main/java/org/apache/felix/scr/impl/inject/Annotations.java
+++ b/osgi-r7/scr/src/main/java/org/apache/felix/scr/impl/inject/Annotations.java
@@ -38,7 +38,8 @@
 public class Annotations
 {
 
-    static public <T> T toObject(Class<T> clazz, Map<String, Object> props, Bundle b, boolean supportsInterfaces )
+    @SuppressWarnings("unchecked")
+	static public <T> T toObject(Class<T> clazz, Map<String, Object> props, Bundle b, boolean supportsInterfaces )
     {
         Map<String, Object> m = new HashMap<String, Object>();
 
@@ -188,7 +189,8 @@ private static Object coerceToArray(Class<?> componentType, Object raw, Bundle b
         }
         if (raw instanceof Collection)
         {
-            Collection raws = (Collection) raw;
+            @SuppressWarnings("rawtypes")
+			Collection raws = (Collection) raw;
             int size = raws.size();
             Object result = Array.newInstance(componentType, size);
             int i = 0;
diff --git a/osgi-r7/scr/src/main/java/org/apache/felix/scr/impl/inject/BindParameters.java b/osgi-r7/scr/src/main/java/org/apache/felix/scr/impl/inject/BindParameters.java
index 5c5772d07d4..ec8d0ffa34e 100644
--- a/osgi-r7/scr/src/main/java/org/apache/felix/scr/impl/inject/BindParameters.java
+++ b/osgi-r7/scr/src/main/java/org/apache/felix/scr/impl/inject/BindParameters.java
@@ -18,8 +18,10 @@
  */
 package org.apache.felix.scr.impl.inject;
 
+import org.apache.felix.scr.impl.helper.SimpleLogger;
 import org.apache.felix.scr.impl.manager.ComponentContextImpl;
 import org.apache.felix.scr.impl.manager.RefPair;
+import org.osgi.framework.BundleContext;
 
 public class BindParameters
 {
@@ -41,5 +43,12 @@ public RefPair getRefPair()
     {
         return refPair;
     }
-    
+ 
+    public Object getServiceObject() {
+    	return refPair.getServiceObject((ComponentContextImpl) componentContext);
+    }
+
+    public boolean getServiceObject(BundleContext context, SimpleLogger logger) {
+    	return refPair.getServiceObject((ComponentContextImpl) componentContext, context, logger);
+    }
 }
diff --git a/osgi-r7/scr/src/main/java/org/apache/felix/scr/impl/inject/ConstructorMethodImpl.java b/osgi-r7/scr/src/main/java/org/apache/felix/scr/impl/inject/ConstructorMethodImpl.java
index b1cbb3501ba..d6376836c7c 100644
--- a/osgi-r7/scr/src/main/java/org/apache/felix/scr/impl/inject/ConstructorMethodImpl.java
+++ b/osgi-r7/scr/src/main/java/org/apache/felix/scr/impl/inject/ConstructorMethodImpl.java
@@ -27,7 +27,6 @@
 import org.apache.felix.scr.impl.inject.field.FieldUtils;
 import org.apache.felix.scr.impl.manager.ComponentContextImpl;
 import org.apache.felix.scr.impl.metadata.ReferenceMetadata;
-import org.osgi.service.log.LogService;
 
 /**
  * This implementation is used to construct a component instance object,
@@ -169,38 +168,10 @@ public <S> T newInstance(Class<T> componentClass,
 		        		m_fields[i].getType(), 
 		        		(ComponentContextImpl<T>) componentContext, 
 		        		null);
-				this.setField(m_fields[i], component, value, logger);
+				FieldUtils.setField(m_fields[i], component, value, logger);
 	    	}
 		}
 		
 		return component;
-	}
-
-   
-    /**
-     * Set the field, type etc.
-     * @param f The field
-     * @param logger The logger
-     */
-	private void setField( final Field f, 
-    		final T component,
-    		final Object value,
-    		final SimpleLogger logger )
-    {
-        try
-        {
-            f.set(component, value);
-        }
-        catch ( final IllegalArgumentException iae )
-        {
-            logger.log( LogService.LOG_ERROR, "Field {0} in component {1} can't be set", new Object[]
-                    {f.getName(), component.getClass().getName()}, iae );
-        }
-        catch ( final IllegalAccessException iae )
-        {
-            logger.log( LogService.LOG_ERROR, "Field {0} in component {1} can't be set", new Object[]
-                    {f.getName(), component.getClass().getName()}, iae );
-        }
-    }
-    
+	}    
 }
diff --git a/osgi-r7/scr/src/main/java/org/apache/felix/scr/impl/inject/field/FieldHandler.java b/osgi-r7/scr/src/main/java/org/apache/felix/scr/impl/inject/field/FieldHandler.java
index eda1bd35671..8a4db7c9c28 100644
--- a/osgi-r7/scr/src/main/java/org/apache/felix/scr/impl/inject/field/FieldHandler.java
+++ b/osgi-r7/scr/src/main/java/org/apache/felix/scr/impl/inject/field/FieldHandler.java
@@ -519,11 +519,11 @@ public <S, T> boolean getServiceObject(
             if ( methodType != METHOD_TYPE.UNBIND )
             {
                 //??? this resolves which we need.... better way?
-                if ( rawParameter.getRefPair().getServiceObject(rawParameter.getComponentContext()) == null
+                if ( rawParameter.getServiceObject() == null
                   && handler.fieldExists( logger )
                   && (handler.valueType == ValueType.ref_serviceType || handler.valueType == ValueType.ref_tuple ) )
                 {
-                    return rawParameter.getRefPair().getServiceObject(rawParameter.getComponentContext(), context, logger);
+                    return rawParameter.getServiceObject(context, logger);
                 }
             }
             return true;
diff --git a/osgi-r7/scr/src/main/java/org/apache/felix/scr/impl/inject/field/FieldUtils.java b/osgi-r7/scr/src/main/java/org/apache/felix/scr/impl/inject/field/FieldUtils.java
index 288a2d96dac..4675f845537 100644
--- a/osgi-r7/scr/src/main/java/org/apache/felix/scr/impl/inject/field/FieldUtils.java
+++ b/osgi-r7/scr/src/main/java/org/apache/felix/scr/impl/inject/field/FieldUtils.java
@@ -285,4 +285,32 @@ public Object run()
             }
         } );
     }
+
+    /**
+     * Set the field, type etc.
+     * @param f The field
+     * @param component The component instance
+     * @param value The value to set
+     * @param logger The logger
+     */
+	public static void setField( final Field f, 
+    		final Object component,
+    		final Object value,
+    		final SimpleLogger logger )
+    {
+        try
+        {
+            f.set(component, value);
+        }
+        catch ( final IllegalArgumentException iae )
+        {
+            logger.log( LogService.LOG_ERROR, "Field {0} in component {1} can't be set", new Object[]
+                    {f.getName(), component.getClass().getName()}, iae );
+        }
+        catch ( final IllegalAccessException iae )
+        {
+            logger.log( LogService.LOG_ERROR, "Field {0} in component {1} can't be set", new Object[]
+                    {f.getName(), component.getClass().getName()}, iae );
+        }
+    }
 }
diff --git a/osgi-r7/scr/src/main/java/org/apache/felix/scr/impl/inject/methods/ActivateMethod.java b/osgi-r7/scr/src/main/java/org/apache/felix/scr/impl/inject/methods/ActivateMethod.java
index f2696e8dcf3..01147766d91 100644
--- a/osgi-r7/scr/src/main/java/org/apache/felix/scr/impl/inject/methods/ActivateMethod.java
+++ b/osgi-r7/scr/src/main/java/org/apache/felix/scr/impl/inject/methods/ActivateMethod.java
@@ -33,7 +33,6 @@
 import org.apache.felix.scr.impl.inject.ClassUtils;
 import org.apache.felix.scr.impl.inject.LifecycleMethod;
 import org.apache.felix.scr.impl.inject.MethodResult;
-import org.apache.felix.scr.impl.inject.SuitableMethodNotAccessibleException;
 import org.apache.felix.scr.impl.metadata.DSVersion;
 import org.osgi.service.component.ComponentContext;
 import org.osgi.service.log.LogService;
diff --git a/osgi-r7/scr/src/main/java/org/apache/felix/scr/impl/inject/methods/BaseMethod.java b/osgi-r7/scr/src/main/java/org/apache/felix/scr/impl/inject/methods/BaseMethod.java
index e7ee3d16a66..55e3f7b29aa 100644
--- a/osgi-r7/scr/src/main/java/org/apache/felix/scr/impl/inject/methods/BaseMethod.java
+++ b/osgi-r7/scr/src/main/java/org/apache/felix/scr/impl/inject/methods/BaseMethod.java
@@ -30,7 +30,6 @@
 import org.apache.felix.scr.impl.helper.SimpleLogger;
 import org.apache.felix.scr.impl.inject.ClassUtils;
 import org.apache.felix.scr.impl.inject.MethodResult;
-import org.apache.felix.scr.impl.inject.SuitableMethodNotAccessibleException;
 import org.apache.felix.scr.impl.metadata.DSVersion;
 import org.osgi.service.log.LogService;
 
diff --git a/osgi-r7/scr/src/main/java/org/apache/felix/scr/impl/inject/methods/BindMethod.java b/osgi-r7/scr/src/main/java/org/apache/felix/scr/impl/inject/methods/BindMethod.java
index 76aa49ea008..7c5ddb3cb6b 100644
--- a/osgi-r7/scr/src/main/java/org/apache/felix/scr/impl/inject/methods/BindMethod.java
+++ b/osgi-r7/scr/src/main/java/org/apache/felix/scr/impl/inject/methods/BindMethod.java
@@ -30,7 +30,6 @@
 import org.apache.felix.scr.impl.helper.SimpleLogger;
 import org.apache.felix.scr.impl.inject.BindParameters;
 import org.apache.felix.scr.impl.inject.ClassUtils;
-import org.apache.felix.scr.impl.inject.SuitableMethodNotAccessibleException;
 import org.apache.felix.scr.impl.manager.ComponentContextImpl;
 import org.apache.felix.scr.impl.manager.RefPair;
 import org.apache.felix.scr.impl.metadata.DSVersion;
@@ -644,10 +643,10 @@ private Method getMapMethod( final Class<?> targetClass, final Class<?> paramete
     public <S, T> boolean getServiceObject( final BindParameters parameters, BundleContext context, SimpleLogger logger )
     {
         //??? this resolves which we need.... better way?
-        if ( parameters.getRefPair().getServiceObject(parameters.getComponentContext()) == null && methodExists( logger ) )
+        if ( parameters.getServiceObject() == null && methodExists( logger ) )
         {
             if ( m_paramTypes.contains(ParamType.serviceType) ) {
-                return parameters.getRefPair().getServiceObject(parameters.getComponentContext(), context, logger);
+                return parameters.getServiceObject(context, logger);
             }
         }
         return true;
diff --git a/osgi-r7/scr/src/main/java/org/apache/felix/scr/impl/inject/SuitableMethodNotAccessibleException.java b/osgi-r7/scr/src/main/java/org/apache/felix/scr/impl/inject/methods/SuitableMethodNotAccessibleException.java
similarity index 94%
rename from osgi-r7/scr/src/main/java/org/apache/felix/scr/impl/inject/SuitableMethodNotAccessibleException.java
rename to osgi-r7/scr/src/main/java/org/apache/felix/scr/impl/inject/methods/SuitableMethodNotAccessibleException.java
index 5e23ecf063d..f48d69da8d6 100644
--- a/osgi-r7/scr/src/main/java/org/apache/felix/scr/impl/inject/SuitableMethodNotAccessibleException.java
+++ b/osgi-r7/scr/src/main/java/org/apache/felix/scr/impl/inject/methods/SuitableMethodNotAccessibleException.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.scr.impl.inject;
+package org.apache.felix.scr.impl.inject.methods;
 
 
 public class SuitableMethodNotAccessibleException extends Exception