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>

3 files changed, 5 insertions, 7 deletions

diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/BPMNUtil.java b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/BPMNUtil.java
index f60d984a6d..eef9ed8ee0 100644
--- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/BPMNUtil.java
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/BPMNUtil.java
@@ -42,7 +42,6 @@ import org.camunda.bpm.engine.variable.impl.VariableMapImpl;
 import org.jboss.resteasy.spi.AsynchronousResponse;

 import org.mockito.invocation.InvocationOnMock;

 import org.mockito.stubbing.Answer;

-import org.openecomp.mso.bpmn.common.workflow.service.WorkflowAsyncCommonResource;

 import org.openecomp.mso.bpmn.common.workflow.service.WorkflowAsyncResource;

 import org.openecomp.mso.bpmn.common.workflow.service.WorkflowResource;

 import org.openecomp.mso.bpmn.common.workflow.service.WorkflowResponse;

@@ -201,7 +200,7 @@ public class BPMNUtil {
 	 * @param variables

 	 */

 	private static void executeAsyncFlow(ProcessEngineServices processEngineServices, String processKey, AsynchronousResponse asyncResponse, Map<String,String> variables) {

-		WorkflowAsyncResource workflowResource = new WorkflowAsyncCommonResource();

+		WorkflowAsyncResource workflowResource = new WorkflowAsyncResource();

 		VariableMapImpl variableMap = new VariableMapImpl();

 

 		Map<String, Object> variableValueType = new HashMap<String, Object>();

diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/WorkflowAsyncResourceTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/WorkflowAsyncResourceTest.java
index 51a1484cf9..426bceef4b 100644
--- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/WorkflowAsyncResourceTest.java
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/WorkflowAsyncResourceTest.java
@@ -31,7 +31,7 @@ import org.camunda.bpm.engine.test.Deployment;
 import org.camunda.bpm.engine.variable.impl.VariableMapImpl;
 import org.jboss.resteasy.spi.AsynchronousResponse;
 import org.junit.Test;
-import org.openecomp.mso.bpmn.common.workflow.service.WorkflowAsyncCommonResource;
+import org.openecomp.mso.bpmn.common.workflow.service.WorkflowAsyncResource;
 import org.openecomp.mso.bpmn.common.workflow.service.WorkflowResponse;
 
 public class WorkflowAsyncResourceTest extends WorkflowTest {
@@ -53,7 +53,7 @@ public class WorkflowAsyncResourceTest extends WorkflowTest {
 	}
 
 	private void executeWorkflow(String request, String requestId, AsynchronousResponse asyncResponse, String processKey) {
-		WorkflowAsyncCommonResource workflowResource = new WorkflowAsyncCommonResource();
+		WorkflowAsyncResource workflowResource = new WorkflowAsyncResource();
 		VariableMapImpl variableMap = new VariableMapImpl();
 
 		Map<String, Object> variableValueType = new HashMap<String, Object>();
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/WorkflowTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/WorkflowTest.java
index 63403f40ce..15dc4f4609 100644
--- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/WorkflowTest.java
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/WorkflowTest.java
@@ -75,7 +75,6 @@ import org.openecomp.mso.bpmn.common.adapter.vnf.UpdateVnfNotification;
 import org.openecomp.mso.bpmn.common.adapter.vnf.VnfRollback;

 import org.openecomp.mso.bpmn.common.workflow.service.SDNCAdapterCallbackServiceImpl;

 import org.openecomp.mso.bpmn.common.workflow.service.VnfAdapterNotifyServiceImpl;

-import org.openecomp.mso.bpmn.common.workflow.service.WorkflowAsyncCommonResource;

 import org.openecomp.mso.bpmn.common.workflow.service.WorkflowAsyncResource;

 import org.openecomp.mso.bpmn.common.workflow.service.WorkflowMessageResource;

 import org.openecomp.mso.bpmn.common.workflow.service.WorkflowResponse;

@@ -273,7 +272,7 @@ public class WorkflowTest {
 		VariableMapImpl variableMapImpl = createVariableMapImpl(variables);

 

 		System.out.println("Sending " + request + " to " + processKey + " process");

-		WorkflowAsyncResource workflowResource = new WorkflowAsyncCommonResource();

+		WorkflowAsyncResource workflowResource = new WorkflowAsyncResource();

 		workflowResource.setProcessEngineServices4junit(processEngineRule);

 

 		TestAsyncResponse asyncResponse = new TestAsyncResponse();

@@ -306,7 +305,7 @@ public class WorkflowTest {
 		VariableMapImpl variableMapImpl = createVariableMapImpl(variables);

 

 		System.out.println("Sending " + request + " to " + processKey + " process");

-		WorkflowAsyncResource workflowResource = new WorkflowAsyncCommonResource();

+		WorkflowAsyncResource workflowResource = new WorkflowAsyncResource();

 		workflowResource.setProcessEngineServices4junit(processEngineRule);

 

 		TestAsyncResponse asyncResponse = new TestAsyncResponse();