Move pnfDefaultTimeout to dmaap.properties 73/48373/2
authorArthur Martella <am153x@att.com>
Mon, 21 May 2018 20:09:27 +0000 (16:09 -0400)
committerArthur Martella <am153x@att.com>
Mon, 21 May 2018 20:13:35 +0000 (16:13 -0400)
commita69ded6458098401f16bd554567d6184ead449b5
tree2a9d14de81a43fd6e0d959a769edcb905493ce66
parentfca4f8e68e3bde5bc59356415b98104b3ad0f02c
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
bpmn/MSOInfrastructureBPMN/src/main/resources/pnf.properties [deleted file]
bpmn/MSOInfrastructureBPMN/src/main/webapp/WEB-INF/applicationContext.xml