From a69ded6458098401f16bd554567d6184ead449b5 Mon Sep 17 00:00:00 2001
From: Arthur Martella <am153x@att.com>
Date: Mon, 21 May 2018 16:09:27 -0400
Subject: 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>
---
 bpmn/MSOInfrastructureBPMN/src/main/resources/dmaap.properties      | 4 +++-
 bpmn/MSOInfrastructureBPMN/src/main/resources/pnf.properties        | 1 -
 .../src/main/webapp/WEB-INF/applicationContext.xml                  | 6 +-----
 3 files changed, 4 insertions(+), 7 deletions(-)
 delete mode 100644 bpmn/MSOInfrastructureBPMN/src/main/resources/pnf.properties

(limited to 'bpmn/MSOInfrastructureBPMN')

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>
-- 
cgit 1.2.3-korg