Move BP xml files to standard OSGI-INF/blueprint

[controller.git] / opendaylight / config / netty-event-executor-config / src / main / resources / OSGI-INF / blueprint / netty-event-executor.xml

diff --git a/opendaylight/config/netty-event-executor-config/src/main/resources/org/opendaylight/blueprint/netty-event-executor.xml b/opendaylight/config/netty-event-executor-config/src/main/resources/OSGI-INF/blueprint/netty-event-executor.xml
similarity index 77%
rename from opendaylight/config/netty-event-executor-config/src/main/resources/org/opendaylight/blueprint/netty-event-executor.xml
rename to opendaylight/config/netty-event-executor-config/src/main/resources/OSGI-INF/blueprint/netty-event-executor.xml
index 66b22b52f84c0022b88a5ff2f9924135232caed2..0e845dfd8f6de94b949076d614f65c5c0d014c23 100644 (file)
--- a/opendaylight/config/netty-event-executor-config/src/main/resources/org/opendaylight/blueprint/netty-event-executor.xml
+++ b/opendaylight/config/netty-event-executor-config/src/main/resources/OSGI-INF/blueprint/netty-event-executor.xml
@@ -3,8 +3,8 @@
            xmlns:odl="http://opendaylight.org/xmlns/blueprint/v1.0.0"
            xmlns:cm="http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.1.0">
 
-  <bean id="executor" class="org.opendaylight.controller.config.yang.netty.eventexecutor.AutoCloseableEventExecutor.CloseableEventExecutorMixin"
-          factory-method="globalEventExecutor"/>
+  <bean id="executor" class="org.opendaylight.controller.config.yang.netty.eventexecutor.AutoCloseableEventExecutor"
+          factory-method="globalEventExecutor" destroy-method="close"/>
 
   <service ref="executor" interface="io.netty.util.concurrent.EventExecutor"
         odl:type="global-event-executor"/>