You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by da...@apache.org on 2015/02/05 12:41:49 UTC

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=1657539&r1=1657538&r2=1657539&view=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=1657539&r1=1657538&r2=1657539&view=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>