AT&T 1712 and 1802 release code

This is code from AT&T's 1712 and 1802 releases.

Change-Id: Ie1e85851e94bc66c4d9514a0226c221939531a04
Issue-ID: SO-425
Signed-off-by: Rob Daugherty <rd472p@att.com>

1 files changed, 8 insertions, 1 deletions

diff --git a/bpmn/MSOInfrastructureBPMN/src/main/webapp/WEB-INF/web.xml b/bpmn/MSOInfrastructureBPMN/src/main/webapp/WEB-INF/web.xml
index 907f511551..a357c2a6f3 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/webapp/WEB-INF/web.xml
+++ b/bpmn/MSOInfrastructureBPMN/src/main/webapp/WEB-INF/web.xml
@@ -25,7 +25,7 @@
     <servlet-class>org.jboss.resteasy.plugins.server.servlet.HttpServletDispatcher</servlet-class>

     <init-param>

       <param-name>javax.ws.rs.Application</param-name>

-      <param-value>org.openecomp.mso.bpmn.infrastructure.workflow.service.WorkflowResourceApplication</param-value>

+      <param-value>org.openecomp.mso.bpmn.common.workflow.service.WorkflowResourceApplication</param-value>

     </init-param>

   </servlet>

   <servlet-mapping>

@@ -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>