diff options
3 files changed, 4 insertions, 7 deletions
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/dmaap.properties b/bpmn/MSOInfrastructureBPMN/src/main/resources/dmaap.properties index 5b1ffac571..6807a24ea9 100644 --- a/bpmn/MSOInfrastructureBPMN/src/main/resources/dmaap.properties +++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/dmaap.properties @@ -6,4 +6,6 @@ eventReadyTopicName=pnfEventReady consumerId=consumerId consumerGroup=group clientThreadInitialDelayInSeconds=1 -clientThreadDelayInSeconds=5
\ No newline at end of file +clientThreadDelayInSeconds=5 + +pnfDefaultTimeout=P14D diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/pnf.properties b/bpmn/MSOInfrastructureBPMN/src/main/resources/pnf.properties deleted file mode 100644 index 81637fa66e..0000000000 --- a/bpmn/MSOInfrastructureBPMN/src/main/resources/pnf.properties +++ /dev/null @@ -1 +0,0 @@ -defaultTimeout=P14D
\ No newline at end of file diff --git a/bpmn/MSOInfrastructureBPMN/src/main/webapp/WEB-INF/applicationContext.xml b/bpmn/MSOInfrastructureBPMN/src/main/webapp/WEB-INF/applicationContext.xml index 1273b30f0a..7a0aa60bb3 100644 --- a/bpmn/MSOInfrastructureBPMN/src/main/webapp/WEB-INF/applicationContext.xml +++ b/bpmn/MSOInfrastructureBPMN/src/main/webapp/WEB-INF/applicationContext.xml @@ -38,12 +38,8 @@ <property name="locations" value="classpath:dmaap.properties"/>
</bean>
- <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
- <property name="locations" value="classpath:pnf.properties"/>
- </bean>
-
<bean id="pnfCheckInputs" class="org.openecomp.mso.bpmn.infrastructure.pnf.delegate.PnfCheckInputs">
- <property name="defaultTimeout" value="${defaultTimeout}"/>
+ <property name="defaultTimeout" value="${pnfDefaultTimeout}"/>
</bean>
</beans>
|