From bb5668fdd40f923694a4aa3a3b5bf5f7009b6cd7 Mon Sep 17 00:00:00 2001
From: Rob Daugherty <rd472p@att.com>
Date: Tue, 19 Sep 2017 18:08:26 -0400
Subject: BPMN applications not deployed properly

Since the 1710 MSO merge the following problems exist:

The workflow applications are not deployed properly.

I've also fixed a few small issues with the CreateCustomE2EServiceInstance
flows that prevented them from being deployed.

Change-Id: Ia4f7a6de87abbc99e80c0e9083e2175cdf9b4fe5
Issue-id: SO-148
Signed-off-by: Rob Daugherty <rd472p@att.com>
---
 bpmn/MSOInfrastructureBPMN/src/main/webapp/WEB-INF/web.xml | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

(limited to 'bpmn/MSOInfrastructureBPMN/src/main/webapp')

diff --git a/bpmn/MSOInfrastructureBPMN/src/main/webapp/WEB-INF/web.xml b/bpmn/MSOInfrastructureBPMN/src/main/webapp/WEB-INF/web.xml
index cd114a85dc..907f511551 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/webapp/WEB-INF/web.xml
+++ b/bpmn/MSOInfrastructureBPMN/src/main/webapp/WEB-INF/web.xml
@@ -25,17 +25,13 @@
     <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.common.workflow.service.WorkflowResourceApplication</param-value>
+      <param-value>org.openecomp.mso.bpmn.infrastructure.workflow.service.WorkflowResourceApplication</param-value>
     </init-param>
   </servlet>
   <servlet-mapping>
     <servlet-name>resteasy-servlet</servlet-name>
     <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>
@@ -48,9 +44,6 @@
     <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>
@@ -78,4 +71,4 @@
   <security-role>
     <role-name>BPMN-Client</role-name>
   </security-role>
-</web-app>
\ No newline at end of file
+</web-app>
-- 
cgit 1.2.3-korg