Move pnfDefaultTimeout to dmaap.properties

Re: https://gerrit.onap.org/r/#/c/48031/1

SO is failing health check because pnfCheckInputs
is not found in dmaap.properties, and
pnf.properties is not being read, since
applicationContext.xml has two
PropertyPlaceholderConfigurer attributes, but
it's only using one.

Moved defaultTimeout to dmaap.properties, where
applicationContext.xml will be able to read it,
and renamed it to pnfDefaultTimeout to make it
clearer what it is.

Change-Id: I6490de472fbf4875e53204f4248c6325787c8af5
Issue-ID: SO-506
Signed-off-by: Arthur Martella <am153x@att.com>

diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/dmaap.properties b/bpmn/MSOInfrastructureBPMN/src/main/resources/dmaap.properties
index 5b1ffac..6807a24 100644 (file)
--- 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 (file)
index 81637fa..0000000
--- 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 1273b30..7a0aa60 100644 (file)
--- 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"/>\r
   </bean>\r
 \r
-  <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">\r
-    <property name="locations" value="classpath:pnf.properties"/>\r
-  </bean>\r
-\r
   <bean id="pnfCheckInputs" class="org.openecomp.mso.bpmn.infrastructure.pnf.delegate.PnfCheckInputs">\r
-    <property name="defaultTimeout" value="${defaultTimeout}"/>\r
+    <property name="defaultTimeout" value="${pnfDefaultTimeout}"/>\r
   </bean>\r
 \r
 </beans>\r