Merge "Reorder modifiers"

[so.git] / bpmn / MSOInfrastructureBPMN / src / main / webapp / WEB-INF / applicationContext.xml

diff --git a/bpmn/MSOInfrastructureBPMN/src/main/webapp/WEB-INF/applicationContext.xml b/bpmn/MSOInfrastructureBPMN/src/main/webapp/WEB-INF/applicationContext.xml
index 03fff4f..1753ba1 100644 (file)
--- a/bpmn/MSOInfrastructureBPMN/src/main/webapp/WEB-INF/applicationContext.xml
+++ b/bpmn/MSOInfrastructureBPMN/src/main/webapp/WEB-INF/applicationContext.xml
@@ -15,13 +15,15 @@
   </bean>\r
 \r
   <bean id="informDmaapClient" class="org.openecomp.mso.bpmn.infrastructure.pnf.delegate.InformDmaapClient">\r
-    <property name="dmaapClient" ref="pnfEventReadyConsumer"/>\r
+    <property name="dmaapClient" ref="pnfEventReadyDmaapClient"/>\r
   </bean>\r
 \r
-  <bean id="pnfEventReadyConsumer" class="org.openecomp.mso.bpmn.infrastructure.pnf.dmaap.PnfEventReadyConsumer"\r
+  <bean id="cancelDmaapSubscription" class="org.openecomp.mso.bpmn.infrastructure.pnf.delegate.CancelDmaapSubscription">\r
+    <property name="dmaapClient" ref="pnfEventReadyDmaapClient"/>\r
+  </bean>\r
+\r
+  <bean id="pnfEventReadyDmaapClient" class="org.openecomp.mso.bpmn.infrastructure.pnf.dmaap.PnfEventReadyDmaapClient"\r
     init-method="init">\r
-    <property name="dmaapHost" value="${host}"/>\r
-    <property name="dmaapPort" value="${port}"/>\r
     <property name="dmaapProtocol" value="${protocol}"/>\r
     <property name="dmaapUriPathPrefix" value="${uriPathPrefix}"/>\r
     <property name="dmaapTopicName" value="${eventReadyTopicName}"/>\r
@@ -34,4 +36,8 @@
     <property name="locations" value="classpath:dmaap.properties"/>\r
   </bean>\r
 \r
+  <bean id="pnfCheckInputs" class="org.openecomp.mso.bpmn.infrastructure.pnf.delegate.PnfCheckInputs">\r
+    <property name="defaultTimeout" value="${pnfDefaultTimeout}"/>\r
+  </bean>\r
+\r
 </beans>\r