Include impacted changes for APPC-346,APPC-348

[appc.git] / appc-dispatcher / appc-command-executor / appc-command-executor-core / src / main / resources / OSGI-INF / blueprint / blueprint.xml

diff --git a/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/main/resources/OSGI-INF/blueprint/blueprint.xml
index d0ee8cd..aa4e129 100644 (file)
--- a/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/main/resources/OSGI-INF/blueprint/blueprint.xml
+++ b/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/main/resources/OSGI-INF/blueprint/blueprint.xml
@@ -32,35 +32,14 @@
     <bean id="commandExecutorBean" class="org.onap.appc.executor.impl.CommandExecutorImpl"
           scope="singleton" init-method="initialize">
         <property name="executionQueueService" ref="ExecutionQueueServiceRef"/>
-        <property name="executionTaskFactory" ref="CommandExecutionTaskFactory"/>
-        <property name="expiredMessageHandler" ref="expiredMessageHandlerBean"/>
+        <property name="workflowManager" ref="WorkFlowManagerRef" />
+        <property name="requestHandler" ref="RequestHandlerService" />
     </bean>
 
-    <bean id="CommandExecutionTaskFactory" class="org.onap.appc.executor.impl.CommandTaskFactory"
-          scope="singleton">
-        <property name="vnfRequestHandler" ref="vnfRequestHandlerService"/>
-        <property name="vmRequestHandler" ref="vmRequestHandlerService"/>
-        <property name="workflowManager" ref="WorkFlowManagerRef"/>
-        <property name="lifecyclemanager" ref="LifecyclemanagerRef"/>
-    </bean>
-
-    <bean id="expiredMessageHandlerBean" class="org.onap.appc.executor.impl.ExpiredMessageHandler"
-          scope="singleton">
-        <property name="vnfRequestHandler" ref="vnfRequestHandlerService"/>
-        <property name="vmRequestHandler" ref="vmRequestHandlerService"/>
-    </bean>
 
-    <reference id="WorkFlowManagerRef" availability="mandatory" activation="eager"
-               interface="org.onap.appc.workflow.WorkFlowManager"/>
-    <reference id="vnfRequestHandlerService" availability="optional" activation="eager"
-               interface="org.onap.appc.requesthandler.RequestHandler" filter="(level=VNF)"/>
-    <reference id="vmRequestHandlerService" availability="optional" activation="eager"
-               interface="org.onap.appc.requesthandler.RequestHandler" filter="(level=VM)"/>
-    <reference id="LifecyclemanagerRef" availability="mandatory" activation="eager"
-               interface="org.onap.appc.lifecyclemanager.LifecycleManager"/>
-    <reference id="ExecutionQueueServiceRef" availability="mandatory" activation="eager"
-               interface="org.onap.appc.executionqueue.ExecutionQueueService"/>
+    <reference id="WorkFlowManagerRef" availability="mandatory" activation="eager" interface="org.onap.appc.workflow.WorkFlowManager" />
+    <reference id="RequestHandlerService" availability="optional" activation="eager" interface="org.onap.appc.requesthandler.RequestHandler" filter="(level=VNF)" />
+    <reference id="ExecutionQueueServiceRef" availability="mandatory" activation="eager" interface="org.onap.appc.executionqueue.ExecutionQueueService" />
 
-    <service id="commandExecutorService" interface="org.onap.appc.executor.CommandExecutor"
-             ref="commandExecutorBean"/>
+    <service id="commandExecutorService" interface="org.onap.appc.executor.CommandExecutor" ref="commandExecutorBean"/>
 </blueprint>