Author: ffang
Date: Wed Dec 28 05:46:02 2011
New Revision: 1225101
URL: http://svn.apache.org/viewvc?rev=1225101&view=rev
Log:
[SMX4NMR-290]nmr osgi bundle export duplicated OSGi service
org.osgi.service.cm.ManagedService
Modified:
servicemix/smx4/nmr/trunk/nmr/osgi/src/main/resources/OSGI-INF/blueprint/servicemix-nmr.xml
Modified:
servicemix/smx4/nmr/trunk/nmr/osgi/src/main/resources/OSGI-INF/blueprint/servicemix-nmr.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/nmr/osgi/src/main/resources/OSGI-INF/blueprint/servicemix-nmr.xml?rev=1225101&r1=1225100&r2=1225101&view=diff
==============================================================================
---
servicemix/smx4/nmr/trunk/nmr/osgi/src/main/resources/OSGI-INF/blueprint/servicemix-nmr.xml
(original)
+++
servicemix/smx4/nmr/trunk/nmr/osgi/src/main/resources/OSGI-INF/blueprint/servicemix-nmr.xml
Wed Dec 28 05:46:02 2011
@@ -132,16 +132,6 @@
<service ref="executorFactory"
interface="org.apache.servicemix.executors.ExecutorFactory"/>
- <!-- ExcutorFactory configurer -->
- <bean id="executorConfigurator"
class="org.apache.servicemix.nmr.osgi.ExecutorConfigurator">
- <property name="executorFactory" ref="executorFactory"/>
- </bean>
-
- <service ref="executorConfigurator"
interface="org.osgi.service.cm.ManagedService">
- <service-properties>
- <entry key="service.pid" value="org.apache.servicemix.nmr"/>
- </service-properties>
- </service>
<!-- Property place holder -->
<cm:property-placeholder persistent-id="org.apache.servicemix.nmr">