FELIX-4785 Fix for test failure with old SCR API.
Thanks to Pierre de Rop and Carsten Ziegeler
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1657539 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/scr/src/main/java/org/apache/felix/scr/impl/Activator.java b/scr/src/main/java/org/apache/felix/scr/impl/Activator.java
index c081f88..69b28a5 100644
--- a/scr/src/main/java/org/apache/felix/scr/impl/Activator.java
+++ b/scr/src/main/java/org/apache/felix/scr/impl/Activator.java
@@ -26,6 +26,7 @@
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 @@
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
diff --git a/scr/src/test/resources/integration_test_FELIX_3680.xml b/scr/src/test/resources/integration_test_FELIX_3680.xml
index 5de486c..adbe733 100644
--- a/scr/src/test/resources/integration_test_FELIX_3680.xml
+++ b/scr/src/test/resources/integration_test_FELIX_3680.xml
@@ -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>