You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by cz...@apache.org on 2017/01/12 06:57:30 UTC
svn commit: r1778387 - in /felix/trunk/osgi-r7: configadmin/ configurator/
scr/ scr/src/main/java/org/apache/felix/scr/impl/inject/
scr/src/main/java/org/apache/felix/scr/impl/inject/field/
scr/src/main/java/org/apache/felix/scr/impl/inject/methods/
Author: cziegeler
Date: Thu Jan 12 06:57:30 2017
New Revision: 1778387
URL: http://svn.apache.org/viewvc?rev=1778387&view=rev
Log:
Update scm info, update changelog
Added:
felix/trunk/osgi-r7/scr/src/main/java/org/apache/felix/scr/impl/inject/methods/SuitableMethodNotAccessibleException.java
- copied, changed from r1778386, felix/trunk/osgi-r7/scr/src/main/java/org/apache/felix/scr/impl/inject/SuitableMethodNotAccessibleException.java
Removed:
felix/trunk/osgi-r7/scr/src/main/java/org/apache/felix/scr/impl/inject/SuitableMethodNotAccessibleException.java
Modified:
felix/trunk/osgi-r7/configadmin/pom.xml
felix/trunk/osgi-r7/configurator/pom.xml
felix/trunk/osgi-r7/scr/changelog.txt
felix/trunk/osgi-r7/scr/pom.xml
felix/trunk/osgi-r7/scr/src/main/java/org/apache/felix/scr/impl/inject/Annotations.java
felix/trunk/osgi-r7/scr/src/main/java/org/apache/felix/scr/impl/inject/BindParameters.java
felix/trunk/osgi-r7/scr/src/main/java/org/apache/felix/scr/impl/inject/ConstructorMethodImpl.java
felix/trunk/osgi-r7/scr/src/main/java/org/apache/felix/scr/impl/inject/field/FieldHandler.java
felix/trunk/osgi-r7/scr/src/main/java/org/apache/felix/scr/impl/inject/field/FieldUtils.java
felix/trunk/osgi-r7/scr/src/main/java/org/apache/felix/scr/impl/inject/methods/ActivateMethod.java
felix/trunk/osgi-r7/scr/src/main/java/org/apache/felix/scr/impl/inject/methods/BaseMethod.java
felix/trunk/osgi-r7/scr/src/main/java/org/apache/felix/scr/impl/inject/methods/BindMethod.java
Modified: felix/trunk/osgi-r7/configadmin/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/osgi-r7/configadmin/pom.xml?rev=1778387&r1=1778386&r2=1778387&view=diff
==============================================================================
--- felix/trunk/osgi-r7/configadmin/pom.xml (original)
+++ felix/trunk/osgi-r7/configadmin/pom.xml Thu Jan 12 06:57:30 2017
@@ -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>
<!--
Modified: felix/trunk/osgi-r7/configurator/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/osgi-r7/configurator/pom.xml?rev=1778387&r1=1778386&r2=1778387&view=diff
==============================================================================
--- felix/trunk/osgi-r7/configurator/pom.xml (original)
+++ felix/trunk/osgi-r7/configurator/pom.xml Thu Jan 12 06:57:30 2017
@@ -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>
Modified: felix/trunk/osgi-r7/scr/changelog.txt
URL: http://svn.apache.org/viewvc/felix/trunk/osgi-r7/scr/changelog.txt?rev=1778387&r1=1778386&r2=1778387&view=diff
==============================================================================
--- felix/trunk/osgi-r7/scr/changelog.txt (original)
+++ felix/trunk/osgi-r7/scr/changelog.txt Thu Jan 12 06:57:30 2017
@@ -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
Modified: felix/trunk/osgi-r7/scr/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/osgi-r7/scr/pom.xml?rev=1778387&r1=1778386&r2=1778387&view=diff
==============================================================================
--- felix/trunk/osgi-r7/scr/pom.xml (original)
+++ felix/trunk/osgi-r7/scr/pom.xml Thu Jan 12 06:57:30 2017
@@ -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>
<!--
Modified: felix/trunk/osgi-r7/scr/src/main/java/org/apache/felix/scr/impl/inject/Annotations.java
URL: http://svn.apache.org/viewvc/felix/trunk/osgi-r7/scr/src/main/java/org/apache/felix/scr/impl/inject/Annotations.java?rev=1778387&r1=1778386&r2=1778387&view=diff
==============================================================================
--- felix/trunk/osgi-r7/scr/src/main/java/org/apache/felix/scr/impl/inject/Annotations.java (original)
+++ felix/trunk/osgi-r7/scr/src/main/java/org/apache/felix/scr/impl/inject/Annotations.java Thu Jan 12 06:57:30 2017
@@ -38,7 +38,8 @@ import org.osgi.service.component.Compon
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 @@ public class Annotations
}
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;
Modified: felix/trunk/osgi-r7/scr/src/main/java/org/apache/felix/scr/impl/inject/BindParameters.java
URL: http://svn.apache.org/viewvc/felix/trunk/osgi-r7/scr/src/main/java/org/apache/felix/scr/impl/inject/BindParameters.java?rev=1778387&r1=1778386&r2=1778387&view=diff
==============================================================================
--- felix/trunk/osgi-r7/scr/src/main/java/org/apache/felix/scr/impl/inject/BindParameters.java (original)
+++ felix/trunk/osgi-r7/scr/src/main/java/org/apache/felix/scr/impl/inject/BindParameters.java Thu Jan 12 06:57:30 2017
@@ -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 class BindParameters
{
return refPair;
}
-
+
+ public Object getServiceObject() {
+ return refPair.getServiceObject((ComponentContextImpl) componentContext);
+ }
+
+ public boolean getServiceObject(BundleContext context, SimpleLogger logger) {
+ return refPair.getServiceObject((ComponentContextImpl) componentContext, context, logger);
+ }
}
Modified: felix/trunk/osgi-r7/scr/src/main/java/org/apache/felix/scr/impl/inject/ConstructorMethodImpl.java
URL: http://svn.apache.org/viewvc/felix/trunk/osgi-r7/scr/src/main/java/org/apache/felix/scr/impl/inject/ConstructorMethodImpl.java?rev=1778387&r1=1778386&r2=1778387&view=diff
==============================================================================
--- felix/trunk/osgi-r7/scr/src/main/java/org/apache/felix/scr/impl/inject/ConstructorMethodImpl.java (original)
+++ felix/trunk/osgi-r7/scr/src/main/java/org/apache/felix/scr/impl/inject/ConstructorMethodImpl.java Thu Jan 12 06:57:30 2017
@@ -27,7 +27,6 @@ import org.apache.felix.scr.impl.inject.
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 class ConstructorMethodImpl<T> im
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 );
- }
- }
-
+ }
}
Modified: felix/trunk/osgi-r7/scr/src/main/java/org/apache/felix/scr/impl/inject/field/FieldHandler.java
URL: http://svn.apache.org/viewvc/felix/trunk/osgi-r7/scr/src/main/java/org/apache/felix/scr/impl/inject/field/FieldHandler.java?rev=1778387&r1=1778386&r2=1778387&view=diff
==============================================================================
--- felix/trunk/osgi-r7/scr/src/main/java/org/apache/felix/scr/impl/inject/field/FieldHandler.java (original)
+++ felix/trunk/osgi-r7/scr/src/main/java/org/apache/felix/scr/impl/inject/field/FieldHandler.java Thu Jan 12 06:57:30 2017
@@ -519,11 +519,11 @@ public class FieldHandler
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;
Modified: felix/trunk/osgi-r7/scr/src/main/java/org/apache/felix/scr/impl/inject/field/FieldUtils.java
URL: http://svn.apache.org/viewvc/felix/trunk/osgi-r7/scr/src/main/java/org/apache/felix/scr/impl/inject/field/FieldUtils.java?rev=1778387&r1=1778386&r2=1778387&view=diff
==============================================================================
--- felix/trunk/osgi-r7/scr/src/main/java/org/apache/felix/scr/impl/inject/field/FieldUtils.java (original)
+++ felix/trunk/osgi-r7/scr/src/main/java/org/apache/felix/scr/impl/inject/field/FieldUtils.java Thu Jan 12 06:57:30 2017
@@ -285,4 +285,32 @@ public class FieldUtils {
}
} );
}
+
+ /**
+ * 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 );
+ }
+ }
}
Modified: felix/trunk/osgi-r7/scr/src/main/java/org/apache/felix/scr/impl/inject/methods/ActivateMethod.java
URL: http://svn.apache.org/viewvc/felix/trunk/osgi-r7/scr/src/main/java/org/apache/felix/scr/impl/inject/methods/ActivateMethod.java?rev=1778387&r1=1778386&r2=1778387&view=diff
==============================================================================
--- felix/trunk/osgi-r7/scr/src/main/java/org/apache/felix/scr/impl/inject/methods/ActivateMethod.java (original)
+++ felix/trunk/osgi-r7/scr/src/main/java/org/apache/felix/scr/impl/inject/methods/ActivateMethod.java Thu Jan 12 06:57:30 2017
@@ -33,7 +33,6 @@ import org.apache.felix.scr.impl.inject.
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;
Modified: felix/trunk/osgi-r7/scr/src/main/java/org/apache/felix/scr/impl/inject/methods/BaseMethod.java
URL: http://svn.apache.org/viewvc/felix/trunk/osgi-r7/scr/src/main/java/org/apache/felix/scr/impl/inject/methods/BaseMethod.java?rev=1778387&r1=1778386&r2=1778387&view=diff
==============================================================================
--- felix/trunk/osgi-r7/scr/src/main/java/org/apache/felix/scr/impl/inject/methods/BaseMethod.java (original)
+++ felix/trunk/osgi-r7/scr/src/main/java/org/apache/felix/scr/impl/inject/methods/BaseMethod.java Thu Jan 12 06:57:30 2017
@@ -30,7 +30,6 @@ import java.util.Map;
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;
Modified: felix/trunk/osgi-r7/scr/src/main/java/org/apache/felix/scr/impl/inject/methods/BindMethod.java
URL: http://svn.apache.org/viewvc/felix/trunk/osgi-r7/scr/src/main/java/org/apache/felix/scr/impl/inject/methods/BindMethod.java?rev=1778387&r1=1778386&r2=1778387&view=diff
==============================================================================
--- felix/trunk/osgi-r7/scr/src/main/java/org/apache/felix/scr/impl/inject/methods/BindMethod.java (original)
+++ felix/trunk/osgi-r7/scr/src/main/java/org/apache/felix/scr/impl/inject/methods/BindMethod.java Thu Jan 12 06:57:30 2017
@@ -30,7 +30,6 @@ import org.apache.felix.scr.impl.helper.
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 @@ implements org.apache.felix.scr.impl.inj
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;
Copied: felix/trunk/osgi-r7/scr/src/main/java/org/apache/felix/scr/impl/inject/methods/SuitableMethodNotAccessibleException.java (from r1778386, felix/trunk/osgi-r7/scr/src/main/java/org/apache/felix/scr/impl/inject/SuitableMethodNotAccessibleException.java)
URL: http://svn.apache.org/viewvc/felix/trunk/osgi-r7/scr/src/main/java/org/apache/felix/scr/impl/inject/methods/SuitableMethodNotAccessibleException.java?p2=felix/trunk/osgi-r7/scr/src/main/java/org/apache/felix/scr/impl/inject/methods/SuitableMethodNotAccessibleException.java&p1=felix/trunk/osgi-r7/scr/src/main/java/org/apache/felix/scr/impl/inject/SuitableMethodNotAccessibleException.java&r1=1778386&r2=1778387&rev=1778387&view=diff
==============================================================================
--- felix/trunk/osgi-r7/scr/src/main/java/org/apache/felix/scr/impl/inject/SuitableMethodNotAccessibleException.java (original)
+++ felix/trunk/osgi-r7/scr/src/main/java/org/apache/felix/scr/impl/inject/methods/SuitableMethodNotAccessibleException.java Thu Jan 12 06:57:30 2017
@@ -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