commit 62cd6aaaf74aa91ee0037c0e155c8e7284f07567
author Arthur Martella <amartell@research.att.com> Fri Sep 08 13:27:46 2017 -0400
committer Arthur Martella <amartell@research.att.com> Fri Sep 08 13:32:24 2017 -0400
tree 68c0c53c9156f5aa3c6b3599ac940770f986633d
parent fa1a211d28a912892fcd888569df033900eb01ee

1710 Rebase - Second Attempt

This commit rebases changes from openecomp-mso/internal-staging-1710 up to and including this codecloud commit:
54483fc6606ddb1591a2e9da61bff8712325f924
Wed Sep 6 18:12:56 2017 -0400

Rebasing was done on a branch on top of this commit in so/master in ONAP:
93fbdfbe46104f8859d4754040f979cb7997c157
Thu Sep 7 16:42:59 2017 +0000

Change-Id: I4ad9abf40da32bf5bdca43e868b8fa2dbcd9dc59
Issue-id: SO-107
Signed-off-by: Arthur Martella <amartell@research.att.com>

bpmn/MSOCommonBPMN/src/main/webapp/WEB-INF/web.xml

diff --git a/bpmn/MSOCommonBPMN/src/main/webapp/WEB-INF/web.xml b/bpmn/MSOCommonBPMN/src/main/webapp/WEB-INF/web.xml
index 6c822a9..3a42877 100644
--- a/bpmn/MSOCommonBPMN/src/main/webapp/WEB-INF/web.xml
+++ b/bpmn/MSOCommonBPMN/src/main/webapp/WEB-INF/web.xml
@@ -33,6 +33,10 @@
     <url-pattern>/*</url-pattern>

   </servlet-mapping>

   <context-param>

+    <param-name>contextConfigLocation</param-name>

+    <param-value>/WEB-INF/applicationContext.xml</param-value>

+  </context-param>

+  <context-param>

     <param-name>mso.configuration</param-name>

     <param-value>MSO_PROP_TOPOLOGY=topology.properties</param-value>

   </context-param>

@@ -44,6 +48,9 @@
     <param-name>resteasy.resources</param-name>

     <param-value>org.openecomp.mso.logger.MsoLoggingServlet,org.openecomp.mso.bpmn.core.HealthCheckHandler</param-value>

   </context-param>

+  <listener>

+    <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>

+  </listener>

   <filter>

     <filter-name>LogFilter</filter-name>

     <filter-class>org.openecomp.mso.logger.LogFilter</filter-class>