Clean up Process Engine selection logic

Several failed attempts to split the BPMN application into
multiple applications with separate camunda process engines
have left a mess of confusing classes and process engine
definitions.

In the Amsterdam release, there should be only one BPMN
application war.  This is MSOInfrastructureBPMN.
MSOCommonBPMN should not be deployed as a separate
application.  Its classes are compiled into a jar and
this is included inside MSOInfrastructureBPMN.

The MSOInfrastructureBPMN application should use the
"default" process engine.

WorkflowAsyncInfrastructureResource and
MSOCommonApplication classes are not needed.

Issue: SO-322
Change-Id: Ifdb3b33541346b561a16361d1aa791e8342a34fa
Signed-off-by: Rob Daugherty <rd472p@att.com>

4 files changed, 0 insertions, 153 deletions

diff --git a/bpmn/MSOCommonBPMN/src/main/webapp/WEB-INF/applicationContext.xml b/bpmn/MSOCommonBPMN/src/main/webapp/WEB-INF/applicationContext.xml
deleted file mode 100644
index 6f61c8fbf4..0000000000
--- a/bpmn/MSOCommonBPMN/src/main/webapp/WEB-INF/applicationContext.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<beans xmlns="http://www.springframework.org/schema/beans"

-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

-       xsi:schemaLocation="http://www.springframework.org/schema/beans

-                           http://www.springframework.org/schema/beans/spring-beans.xsd">

-

-  <!-- Spring bean to be invoked through the ApplicationContextElResolver -->

-

-</beans>

diff --git a/bpmn/MSOCommonBPMN/src/main/webapp/WEB-INF/jboss-deployment-structure.xml b/bpmn/MSOCommonBPMN/src/main/webapp/WEB-INF/jboss-deployment-structure.xml
deleted file mode 100644
index b68ebd943c..0000000000
--- a/bpmn/MSOCommonBPMN/src/main/webapp/WEB-INF/jboss-deployment-structure.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<!--

-  ============LICENSE_START=======================================================

-  ECOMP MSO

-  ================================================================================

-  Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.

-  ================================================================================

-  Licensed under the Apache License, Version 2.0 (the "License");

-  you may not use this file except in compliance with the License.

-  You may obtain a copy of the License at

-  

-       http://www.apache.org/licenses/LICENSE-2.0

-  

-  Unless required by applicable law or agreed to in writing, software

-  distributed under the License is distributed on an "AS IS" BASIS,

-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-  See the License for the specific language governing permissions and

-  limitations under the License.

-  ============LICENSE_END=========================================================

-  -->

-

-<jboss-deployment-structure>

-	<deployment>

-		<!-- Exclusions allow you to prevent the server from automatically adding some dependencies -->

-		<exclusions>

-			<module name="org.apache.log4j" />

-			<module name="org.slf4j" />

-			<module name="org.slf4j.impl" />

-			<module name="org.jboss.resteasy.resteasy-jackson-provider" />

-			<module name="org.jboss.resteasy.resteasy-jettison-provider" />

-		</exclusions>

-		<dependencies>

-			<module name="org.jboss.resteasy.resteasy-jackson2-provider" services="import" />

-			<!-- This module contain the ProviderBase class: -->

-			<module name="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider" export="true"/>

-		</dependencies>

-	</deployment>

-</jboss-deployment-structure>

-

diff --git a/bpmn/MSOCommonBPMN/src/main/webapp/WEB-INF/jboss-web.xml b/bpmn/MSOCommonBPMN/src/main/webapp/WEB-INF/jboss-web.xml
deleted file mode 100644
index a9a263b684..0000000000
--- a/bpmn/MSOCommonBPMN/src/main/webapp/WEB-INF/jboss-web.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

-  ============LICENSE_START=======================================================

-  ECOMP MSO

-  ================================================================================

-  Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.

-  ================================================================================

-  Licensed under the Apache License, Version 2.0 (the "License");

-  you may not use this file except in compliance with the License.

-  You may obtain a copy of the License at

-  

-       http://www.apache.org/licenses/LICENSE-2.0

-  

-  Unless required by applicable law or agreed to in writing, software

-  distributed under the License is distributed on an "AS IS" BASIS,

-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-  See the License for the specific language governing permissions and

-  limitations under the License.

-  ============LICENSE_END=========================================================

-  -->

-  

-<!DOCTYPE jboss-web PUBLIC "-//JBoss//DTD Web Application 5.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-web_5_0.dtd">

-<jboss-web>

-  <security-domain>other</security-domain>

-  <context-root>/mso/common</context-root>

-</jboss-web>  

diff --git a/bpmn/MSOCommonBPMN/src/main/webapp/WEB-INF/web.xml b/bpmn/MSOCommonBPMN/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 3a42877715..0000000000
--- a/bpmn/MSOCommonBPMN/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

-  ============LICENSE_START=======================================================

-  ECOMP MSO

-  ================================================================================

-  Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.

-  ================================================================================

-  Licensed under the Apache License, Version 2.0 (the "License");

-  you may not use this file except in compliance with the License.

-  You may obtain a copy of the License at

-

-       http://www.apache.org/licenses/LICENSE-2.0

-

-  Unless required by applicable law or agreed to in writing, software

-  distributed under the License is distributed on an "AS IS" BASIS,

-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-  See the License for the specific language governing permissions and

-  limitations under the License.

-  ============LICENSE_END=========================================================

-  -->

-<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" id="WebApp_ID" version="3.0">

-  <display-name>MSO Common BPMN Workflow Servlet</display-name>

-  <servlet>

-    <servlet-name>resteasy-servlet</servlet-name>

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

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

-  </context-param>

-  <context-param>

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

-    <param-value>logback.bpmn.xml</param-value>

-  </context-param>

-  <context-param>

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

-  </filter>

-  <filter-mapping>

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

-    <url-pattern>/*</url-pattern>

-  </filter-mapping>

-  <security-constraint>

-    <web-resource-collection>

-      <web-resource-name>HTTPBasicAuth</web-resource-name>

-      <description>Authentication for Client Apps</description>

-      <url-pattern>/workflow/*</url-pattern>

-      <http-method>GET</http-method>

-      <http-method>POST</http-method>

-    </web-resource-collection>

-    <auth-constraint>

-      <role-name>BPMN-Client</role-name>

-    </auth-constraint>

-  </security-constraint>

-  <login-config>

-    <auth-method>BASIC</auth-method>

-    <realm-name>ApplicationRealm</realm-name>

-  </login-config>

-  <security-role>

-    <role-name>BPMN-Client</role-name>

-  </security-role>

-</web-app>
\ No newline at end of file