svn commit: r1657558 - /felix/trunk/scr/src/test/java/org/apache/felix/scr/integration/MutablePropertiesTest.java
Author: davidb Date: Thu Feb 5 12:53:44 2015 New Revision: 1657558 URL: http://svn.apache.org/r1657558 Log: FELIX-4790 Make MutablePropertiesTest work with R6 Framework. Rewrote the logic in the test to not depend on the number of service properties present. R6 frameworks add more properties than R4/R5 frameworks. Modified: felix/trunk/scr/src/test/java/org/apache/felix/scr/integration/MutablePropertiesTest.java Modified: felix/trunk/scr/src/test/java/org/apache/felix/scr/integration/MutablePropertiesTest.java URL: http://svn.apache.org/viewvc/felix/trunk/scr/src/test/java/org/apache/felix/scr/integration/MutablePropertiesTest.java?rev=1657558r1=1657557r2=1657558view=diff == --- felix/trunk/scr/src/test/java/org/apache/felix/scr/integration/MutablePropertiesTest.java (original) +++ felix/trunk/scr/src/test/java/org/apache/felix/scr/integration/MutablePropertiesTest.java Thu Feb 5 12:53:44 2015 @@ -19,12 +19,14 @@ package org.apache.felix.scr.integration; +import java.util.Arrays; import java.util.Collections; import java.util.Dictionary; import java.util.Hashtable; import junit.framework.Assert; import junit.framework.TestCase; + import org.apache.felix.scr.integration.components.MutatingService; import org.apache.felix.scr.integration.components.SimpleServiceImpl; import org.junit.Test; @@ -57,7 +59,9 @@ public class MutablePropertiesTest exten ServiceReference[] serviceReferences = bundleContext.getServiceReferences( MutatingService.class.getName(), (service.pid= + componentName + ) ); TestCase.assertEquals( 1, serviceReferences.length ); ServiceReference serviceReference = serviceReferences[0]; -checkProperties( serviceReference, 8, otherValue, p1, p2 ); +Assert.assertEquals(otherValue, serviceReference.getProperty(PROP_NAME)); +Assert.assertEquals(p1, serviceReference.getProperty(p1)); +Assert.assertEquals(p2, serviceReference.getProperty(p2)); //update theValue MutatingService s = ( MutatingService ) bundleContext.getService(serviceReference ); @@ -65,17 +69,21 @@ public class MutablePropertiesTest exten findComponentConfigurationByName(componentName, ComponentConfigurationDTO.ACTIVE); Dictionary d = new Hashtable(Collections.singletonMap( PROP_NAME, anotherValue )); s.updateProperties(d); -checkProperties(serviceReference, 5, anotherValue, p1, p2); +Assert.assertEquals(anotherValue, serviceReference.getProperty(PROP_NAME)); +checkPropertiesNotPresent(serviceReference, p1, p2); //configure with configAdmin configure( componentName ); delay(); //no change -checkProperties(serviceReference, 5, anotherValue, p1, p2); +Assert.assertEquals(anotherValue, serviceReference.getProperty(PROP_NAME)); +checkPropertiesNotPresent(serviceReference, p1, p2); //check that removing config switches back to defaults modified by config admin s.updateProperties(null); -checkProperties( serviceReference, 8, theValue, p1, p2 ); +Assert.assertEquals(theValue, serviceReference.getProperty(PROP_NAME)); +Assert.assertEquals(p1, serviceReference.getProperty(p1)); +Assert.assertEquals(p2, serviceReference.getProperty(p2)); bundleContext.ungetService(serviceReference); } @@ -89,27 +97,36 @@ public class MutablePropertiesTest exten ServiceReference[] serviceReferences = bundleContext.getServiceReferences( MutatingService.class.getName(), (service.pid= + componentName + ) ); TestCase.assertEquals( 1, serviceReferences.length ); ServiceReference serviceReference = serviceReferences[0]; -checkProperties( serviceReference, 8, otherValue, p1, p2 ); +Assert.assertEquals(otherValue, serviceReference.getProperty(PROP_NAME)); +Assert.assertEquals(p1, serviceReference.getProperty(p1)); +Assert.assertEquals(p2, serviceReference.getProperty(p2)); //update theValue MutatingService s = ( MutatingService ) bundleContext.getService( serviceReference ); Assert.assertNotNull(s); -checkProperties( serviceReference, 8, anotherValue1, p1, p2 ); +Assert.assertEquals(anotherValue1, serviceReference.getProperty(PROP_NAME)); +Assert.assertEquals(p1, serviceReference.getProperty(p1)); +Assert.assertEquals(p2, serviceReference.getProperty(p2)); findComponentConfigurationByName(componentName, ComponentConfigurationDTO.ACTIVE); Dictionary d = new Hashtable(Collections.singletonMap( PROP_NAME, anotherValue )); s.updateProperties(d); -checkProperties(serviceReference, 5, anotherValue, p1, p2); +Assert.assertEquals(anotherValue, serviceReference.getProperty(PROP_NAME)); +checkPropertiesNotPresent(serviceReference,
svn commit: r1657569 - in /felix/trunk/scr: pom.xml src/test/java/org/apache/felix/scr/integration/Felix4188Test.java
Author: davidb
Date: Thu Feb 5 13:59:44 2015
New Revision: 1657569
URL: http://svn.apache.org/r1657569
Log:
FELIX-4789 Fix for SCR Felix4188Test fails when run with framework 4.4.1 or
newer
Also switched the framework used during the SCR integration tests to be 4.6.0
Modified:
felix/trunk/scr/pom.xml
felix/trunk/scr/src/test/java/org/apache/felix/scr/integration/Felix4188Test.java
Modified: felix/trunk/scr/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/scr/pom.xml?rev=1657569r1=1657568r2=1657569view=diff
==
--- felix/trunk/scr/pom.xml (original)
+++ felix/trunk/scr/pom.xml Thu Feb 5 13:59:44 2015
@@ -396,7 +396,7 @@
dependency
groupIdorg.apache.felix/groupId
artifactIdorg.apache.felix.framework/artifactId
-version4.0.2/version
+version4.6.0/version
scopetest/scope
/dependency
/dependencies
Modified:
felix/trunk/scr/src/test/java/org/apache/felix/scr/integration/Felix4188Test.java
URL:
http://svn.apache.org/viewvc/felix/trunk/scr/src/test/java/org/apache/felix/scr/integration/Felix4188Test.java?rev=1657569r1=1657568r2=1657569view=diff
==
---
felix/trunk/scr/src/test/java/org/apache/felix/scr/integration/Felix4188Test.java
(original)
+++
felix/trunk/scr/src/test/java/org/apache/felix/scr/integration/Felix4188Test.java
Thu Feb 5 13:59:44 2015
@@ -18,6 +18,9 @@
*/
package org.apache.felix.scr.integration;
+import static org.ops4j.pax.tinybundles.core.TinyBundles.bundle;
+import static org.ops4j.pax.tinybundles.core.TinyBundles.withBnd;
+
import java.io.IOException;
import java.io.InputStream;
import java.lang.reflect.Field;
@@ -25,7 +28,9 @@ import java.util.concurrent.CountDownLat
import javax.inject.Inject;
+import junit.framework.Assert;
import junit.framework.TestCase;
+
import
org.apache.felix.scr.integration.components.felix4188.Felix4188Component;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -34,11 +39,10 @@ import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
import org.osgi.framework.BundleException;
import org.osgi.framework.Constants;
+import org.osgi.framework.InvalidSyntaxException;
+import org.osgi.framework.ServiceReference;
import org.osgi.service.component.runtime.dto.ComponentConfigurationDTO;
-import static org.ops4j.pax.tinybundles.core.TinyBundles.bundle;
-import static org.ops4j.pax.tinybundles.core.TinyBundles.withBnd;
-
/**
* This test validates the FELIX-4188 issue.
*/
@@ -70,11 +74,11 @@ public class Felix4188Test extends Compo
final ComponentConfigurationDTO aComp1 =
findComponentConfigurationByName( bundle1,
org.apache.felix.scr.integration.components.Felix4188Component-1,
ComponentConfigurationDTO.SATISFIED);
-final Object aInst1 = getServiceFromConfiguration(aComp1,
Felix4188Component.class);
+final Object aInst1 =
getServiceFromConfigurationInAllClassSpaces(aComp1,
Felix4188Component.class.getName());
final ComponentConfigurationDTO aComp2 =
findComponentConfigurationByName( bundle2,
org.apache.felix.scr.integration.components.Felix4188Component-2,
ComponentConfigurationDTO.SATISFIED);
-final Object aInst2 = getServiceFromConfiguration(aComp2,
Felix4188Component.class);
+final Object aInst2 =
getServiceFromConfigurationInAllClassSpaces(aComp2,
Felix4188Component.class.getName());
final CountDownLatch latch = new CountDownLatch(1);
@@ -112,6 +116,23 @@ public class Felix4188Test extends Compo
return field.get(instance);
}
+// Note that this test installs two bundles both with the same class in it.
+// This causes multiple class spaces to be created by the framework.
+private Object getServiceFromConfigurationInAllClassSpaces(
ComponentConfigurationDTO dto, String clazz ) throws InvalidSyntaxException
+{
+long id = dto.id;
+String filter = (component.id= + id + );
+ServiceReference?[] srs;
+
+srs = bundleContext.getAllServiceReferences(clazz, filter);
+Assert.assertEquals(1, srs.length);
+ServiceReference? sr = srs[0];
+Object s = bundleContext.getService(sr);
+Assert.assertNotNull(s);
+return s;
+}
+
+
protected Bundle installBundle( final String descriptorFile, String
componentPackage, String symbolicname ) throws BundleException
{
final InputStream bundleStream = bundle()
svn commit: r1657578 - in /felix/trunk/scr: bnd.bnd pom.xml
Author: davidb Date: Thu Feb 5 14:25:51 2015 New Revision: 1657578 URL: http://svn.apache.org/r1657578 Log: Add osgi.implementation capability. DS 1.3 implementations are required to provide this capability alongside the osgi.extender capability. Also updated the maven module version to 2.0.0-SNAPSHOT to be aligned with the bundle version. Modified: felix/trunk/scr/bnd.bnd felix/trunk/scr/pom.xml Modified: felix/trunk/scr/bnd.bnd URL: http://svn.apache.org/viewvc/felix/trunk/scr/bnd.bnd?rev=1657578r1=1657577r2=1657578view=diff == --- felix/trunk/scr/bnd.bnd (original) +++ felix/trunk/scr/bnd.bnd Thu Feb 5 14:25:51 2015 @@ -8,7 +8,12 @@ Bundle-Version: 2.0.0 Provide-Capability: osgi.extender;\ osgi.extender=osgi.component;\ uses:=org.osgi.service.component;\ + version:Version=1.3,\ + osgi.implementation;\ + osgi.implementation=osgi.component;\ + uses:=org.osgi.service.component;\ version:Version=1.3 + Export-Package: org.apache.felix.scr;version=1.8.1, \ org.apache.felix.scr.component;version=1.1.0;mandatory:=status; status=provisional, \ Modified: felix/trunk/scr/pom.xml URL: http://svn.apache.org/viewvc/felix/trunk/scr/pom.xml?rev=1657578r1=1657577r2=1657578view=diff == --- felix/trunk/scr/pom.xml (original) +++ felix/trunk/scr/pom.xml Thu Feb 5 14:25:51 2015 @@ -30,7 +30,7 @@ Implementation of the Declarative Services specification 1.2 /description artifactIdorg.apache.felix.scr/artifactId -version1.8.3-SNAPSHOT/version +version2.0.0-SNAPSHOT/version scm connectionscm:svn:https://svn.apache.org/repos/asf/felix/trunk/scr/connection developerConnectionscm:svn:https://svn.apache.org/repos/asf/felix/trunk/scr/developerConnection
svn commit: r1657502 - in /felix/trunk/scr: ./ src/main/java/org/apache/felix/scr/ src/main/java/org/apache/felix/scr/impl/ src/main/java/org/apache/felix/scr/impl/config/ src/main/java/org/apache/fel
Author: cziegeler
Date: Thu Feb 5 09:41:52 2015
New Revision: 1657502
URL: http://svn.apache.org/r1657502
Log:
FELIX-4785 : Incompatible SCR API
Added:
felix/trunk/scr/src/main/java/org/apache/felix/scr/Component.java (with
props)
felix/trunk/scr/src/main/java/org/apache/felix/scr/Reference.java (with
props)
felix/trunk/scr/src/main/java/org/apache/felix/scr/ScrService.java (with
props)
Modified:
felix/trunk/scr/bnd.bnd
felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/Activator.java
felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/ComponentRegistry.java
felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/config/ReferenceManager.java
felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/DependencyManager.java
felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/runtime/ServiceComponentRuntimeImpl.java
Modified: felix/trunk/scr/bnd.bnd
URL:
http://svn.apache.org/viewvc/felix/trunk/scr/bnd.bnd?rev=1657502r1=1657501r2=1657502view=diff
==
--- felix/trunk/scr/bnd.bnd (original)
+++ felix/trunk/scr/bnd.bnd Thu Feb 5 09:41:52 2015
@@ -10,7 +10,7 @@ Provide-Capability: osgi.extender;\
uses:=org.osgi.service.component;\
version:Version=1.3
-Export-Package: org.apache.felix.scr;version=2.0, \
+Export-Package: org.apache.felix.scr;version=1.8.1, \
org.apache.felix.scr.component;version=1.1.0;mandatory:=status;
status=provisional, \
org.osgi.service.component;version=1.3;-split-package:=first, \
org.osgi.service.component.runtime.*;version=1.3, \
Added: felix/trunk/scr/src/main/java/org/apache/felix/scr/Component.java
URL:
http://svn.apache.org/viewvc/felix/trunk/scr/src/main/java/org/apache/felix/scr/Component.java?rev=1657502view=auto
==
--- felix/trunk/scr/src/main/java/org/apache/felix/scr/Component.java (added)
+++ felix/trunk/scr/src/main/java/org/apache/felix/scr/Component.java Thu Feb
5 09:41:52 2015
@@ -0,0 +1,403 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * License); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.felix.scr;
+
+
+import java.util.Dictionary;
+
+import org.osgi.framework.Bundle;
+import org.osgi.service.component.ComponentInstance;
+
+
+/**
+ * The codeComponent/code interface represents a single component managed
+ * by the Service Component Runtime. Management agents may access the Component
+ * instances through the {@link ScrService}.
+ *
+ * @deprecated Use the ServiceComponentRuntime service.
+ */
+@Deprecated
+public interface Component
+{
+
+/**
+ * The Component has just been created and is still disabled or it has
+ * been disabled by calling the {@link #disable()} method (value is 1).
+ */
+static final int STATE_DISABLED = 1;
+
+/**
+ * The Component is being enabled (value is 512). After the component has
+ * been enabled it enters the {@link #STATE_UNSATISFIED} state.
+ * @since 1.2
+ * @deprecated since 1.8.0
+ */
+@Deprecated
+static final int STATE_ENABLING = 512;
+
+/**
+ * The Component has been enabled and is now going to be activated (value
+ * is 2).
+ * @deprecated as of version 1.2 the enabled state is collapsed into the
+ * {@link #STATE_UNSATISFIED} state. This status code is never
returned
+ * from the {@link #getState()} method.
+ */
+@Deprecated
+static final int STATE_ENABLED = 2;
+
+/**
+ * The Component activation failed because any dependency is not satisfied
+ * (value is 4).
+ */
+static final int STATE_UNSATISFIED = 4;
+
+/**
+ * The Component is currently being activated either because it has been
+ * enabled or because any dependency which was previously unsatisfied has
+ * become satisfied (value is 8).
+ * @deprecated since 1.8.0 transient states are no longer used
+ */
+@Deprecated
+static final int STATE_ACTIVATING = 8;
+
+/**
+ * The Component has successfully been activated and is fully functional
+ * (value is 16). This is the state of immediate components after
+ *
svn commit: r1657605 - in /felix/trunk/scr: bnd.bnd src/main/java/org/apache/felix/scr/impl/helper/ClassUtils.java
Author: cziegeler
Date: Thu Feb 5 15:32:29 2015
New Revision: 1657605
URL: http://svn.apache.org/r1657605
Log:
FELIX-4787 : DS implementation should be based on R6
Modified:
felix/trunk/scr/bnd.bnd
felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/helper/ClassUtils.java
Modified: felix/trunk/scr/bnd.bnd
URL:
http://svn.apache.org/viewvc/felix/trunk/scr/bnd.bnd?rev=1657605r1=1657604r2=1657605view=diff
==
--- felix/trunk/scr/bnd.bnd (original)
+++ felix/trunk/scr/bnd.bnd Thu Feb 5 15:32:29 2015
@@ -19,8 +19,6 @@ Export-Package: org.apache.felix.scr;ver
org.apache.felix.scr.component;version=1.1.0;mandatory:=status;
status=provisional, \
org.osgi.service.component;version=1.3;-split-package:=first, \
org.osgi.service.component.runtime.*;version=1.3, \
- org.osgi.dto;version=1.0, \
- org.osgi.framework.dto;version=1.8, \
org.osgi.util.function;version=1.0, \
org.osgi.util.promise;version=1.0
@@ -32,8 +30,8 @@ Private-Package: org.apache.felix.scr.im
# Metatype import is optional and dynamic, but allow eager wiring by
importing it
# optional import for Gogo annotations
# The Felix Shell support is optional
-# Framework version 1.4 (from R4.1) is required because we depend on
ServiceReference being
-# Comparable and Bundle.getBundleContext method being available.
+# Framework version 1.8 (from R6) is required because we depend on
ServiceObjects
+# and prototype scope. being
# LogService is optional but if present the R4.0 version 1.3 is sufficient.
# PackageAdmin is used to find reference types if the component's bundle does
not import it.
# See BindMethod.getParameterClass(Class) for details. R4.0 version 1.2 is
sufficient.
@@ -42,7 +40,9 @@ Import-Package: \
org.osgi.service.metatype;version=[1.1,2);resolution:=optional, \
org.apache.felix.service.command;resolution:=optional, \
org.apache.felix.shell;provide:=true;resolution:=optional, \
- org.osgi.framework;version=[1.4,2), \
+ org.osgi.framework;version=[1.8,2), \
+ org.osgi.dto;version=1.0, \
+ org.osgi.framework.dto;version=1.8, \
org.osgi.service.log;version=[1.3,2);resolution:=optional, \
org.osgi.service.packageadmin;version=[1.2,2);resolution:=optional, \
org.osgi.service.component;provide:=true, \
Modified:
felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/helper/ClassUtils.java
URL:
http://svn.apache.org/viewvc/felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/helper/ClassUtils.java?rev=1657605r1=1657604r2=1657605view=diff
==
---
felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/helper/ClassUtils.java
(original)
+++
felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/helper/ClassUtils.java
Thu Feb 5 15:32:29 2015
@@ -41,7 +41,7 @@ public class ClassUtils
public static final Class? SERVICE_REFERENCE_CLASS =
ServiceReference.class;
-public static final Class? COMPONENTS_SERVICE_OBJECTS_CLASS;
+public static final Class? COMPONENTS_SERVICE_OBJECTS_CLASS =
ComponentServiceObjects.class;
public static final Class? MAP_CLASS = Map.class;
public static final Class? MAP_ENTRY_CLASS = Map.Entry.class;
@@ -49,18 +49,6 @@ public class ClassUtils
public static final Class? COLLECTION_CLASS = Collection.class;
public static final Class? LIST_CLASS = List.class;
-static {
-Class? serviceObjectsClass = null;
-try {
-serviceObjectsClass = ComponentServiceObjects.class;
-}
-catch (Throwable t)
-{
-//can't load class
-}
-COMPONENTS_SERVICE_OBJECTS_CLASS = serviceObjectsClass;
-}
-
/**
* Returns the class object representing the class of the field reference
* The class loader of the component class is used to load the service
class.
svn commit: r1657582 - /felix/trunk/scr/pom.xml
Author: davidb Date: Thu Feb 5 14:30:32 2015 New Revision: 1657582 URL: http://svn.apache.org/r1657582 Log: Update the Declarative Service version mentioned in the SCR pom. Modified: felix/trunk/scr/pom.xml Modified: felix/trunk/scr/pom.xml URL: http://svn.apache.org/viewvc/felix/trunk/scr/pom.xml?rev=1657582r1=1657581r2=1657582view=diff == --- felix/trunk/scr/pom.xml (original) +++ felix/trunk/scr/pom.xml Thu Feb 5 14:30:32 2015 @@ -27,7 +27,7 @@ packagingbundle/packaging nameApache Felix Declarative Services/name description -Implementation of the Declarative Services specification 1.2 +Implementation of the Declarative Services specification 1.3 /description artifactIdorg.apache.felix.scr/artifactId version2.0.0-SNAPSHOT/version
svn commit: r1657620 - /felix/trunk/scr/bnd.bnd
Author: davidb Date: Thu Feb 5 16:19:40 2015 New Revision: 1657620 URL: http://svn.apache.org/r1657620 Log: Removing the osgi.implementation capability again as it turns out that it's not needed. Modified: felix/trunk/scr/bnd.bnd Modified: felix/trunk/scr/bnd.bnd URL: http://svn.apache.org/viewvc/felix/trunk/scr/bnd.bnd?rev=1657620r1=1657619r2=1657620view=diff == --- felix/trunk/scr/bnd.bnd (original) +++ felix/trunk/scr/bnd.bnd Thu Feb 5 16:19:40 2015 @@ -8,10 +8,6 @@ Bundle-Version: 2.0.0 Provide-Capability: osgi.extender;\ osgi.extender=osgi.component;\ uses:=org.osgi.service.component;\ - version:Version=1.3,\ - osgi.implementation;\ - osgi.implementation=osgi.component;\ - uses:=org.osgi.service.component;\ version:Version=1.3
svn commit: r1657518 - /felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/ComponentRegistry.java
Author: cziegeler
Date: Thu Feb 5 10:31:23 2015
New Revision: 1657518
URL: http://svn.apache.org/r1657518
Log:
FELIX-4785 : Incompatible SCR API
Modified:
felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/ComponentRegistry.java
Modified:
felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/ComponentRegistry.java
URL:
http://svn.apache.org/viewvc/felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/ComponentRegistry.java?rev=1657518r1=1657517r2=1657518view=diff
==
---
felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/ComponentRegistry.java
(original)
+++
felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/ComponentRegistry.java
Thu Feb 5 10:31:23 2015
@@ -27,7 +27,6 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import org.apache.felix.scr.ScrService;
import org.apache.felix.scr.impl.config.ComponentHolder;
import org.apache.felix.scr.impl.config.ConfigurableComponentHolder;
import org.apache.felix.scr.impl.config.ConfigurationSupport;
@@ -49,9 +48,7 @@ import org.osgi.service.log.LogService;
/**
* The codeComponentRegistry/code class acts as the global registry for
- * components by name and by component ID. As such the component registry also
- * registers itself as the {@link ScrService} to support access to the
- * registered components.
+ * components by name and by component ID.
*/
public class ComponentRegistry implements ServiceListener
{
svn commit: r1657539 - in /felix/trunk/scr/src: main/java/org/apache/felix/scr/impl/Activator.java test/resources/integration_test_FELIX_3680.xml
Author: davidb
Date: Thu Feb 5 11:41:48 2015
New Revision: 1657539
URL: http://svn.apache.org/r1657539
Log:
FELIX-4785 Fix for test failure with old SCR API.
Thanks to Pierre de Rop and Carsten Ziegeler
Modified:
felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/Activator.java
felix/trunk/scr/src/test/resources/integration_test_FELIX_3680.xml
Modified: felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/Activator.java
URL:
http://svn.apache.org/viewvc/felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/Activator.java?rev=1657539r1=1657538r2=1657539view=diff
==
--- felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/Activator.java
(original)
+++ felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/Activator.java Thu
Feb 5 11:41:48 2015
@@ -26,6 +26,7 @@ import java.util.Map;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
+import org.apache.felix.scr.ScrService;
import org.apache.felix.scr.impl.config.ScrConfiguration;
import org.apache.felix.scr.impl.runtime.ServiceComponentRuntimeImpl;
import org.apache.felix.utils.extender.AbstractExtender;
@@ -149,7 +150,8 @@ public class Activator extends AbstractE
m_componentRegistry = new ComponentRegistry( m_context );
ServiceComponentRuntime runtime = new
ServiceComponentRuntimeImpl(m_context, m_componentRegistry);
-m_runtime_reg = m_context.registerService(new String[]
{ServiceComponentRuntime.class.getName()},
+m_runtime_reg = m_context.registerService(new String[]
{ScrService.class.getName(),
+ServiceComponentRuntime.class.getName()},
runtime, null);
// log SCR startup
Modified: felix/trunk/scr/src/test/resources/integration_test_FELIX_3680.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/scr/src/test/resources/integration_test_FELIX_3680.xml?rev=1657539r1=1657538r2=1657539view=diff
==
--- felix/trunk/scr/src/test/resources/integration_test_FELIX_3680.xml
(original)
+++ felix/trunk/scr/src/test/resources/integration_test_FELIX_3680.xml Thu Feb
5 11:41:48 2015
@@ -149,7 +149,7 @@
cardinality='0..n' bind='bindA' unbind='unbindA'
policy='dynamic' /
reference name='logService'
interface='org.osgi.service.log.LogService'
bind='bindLogService' /
- reference name='sCR'
interface='org.apache.felix.scr.ScrService'
+ reference name='sCR'
interface='org.osgi.service.component.runtime.ServiceComponentRuntime'
bind='bindSCR' /
/scr:component
/components
