summaryrefslogtreecommitdiffstats
path: root/packages
diff options
context:
space:
mode:
authorRob Daugherty <rd472p@att.com>2017-11-08 18:35:49 -0500
committerRob Daugherty <rd472p@att.com>2017-11-08 21:27:10 -0500
commitd750eabf5de2423f0a7c89ffbfbcc0d65bb4623e (patch)
tree2bea22d58ac6c5844e58a71487ee27b3c64ee832 /packages
parent3935e84e0306183450fc080a09fcc1d13ced345e (diff)
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>
Diffstat (limited to 'packages')
-rw-r--r--packages/arquillian-unit-tests/src/test/java/org/openecomp/mso/global_tests/soapui/SoapUiITCase.java6
-rw-r--r--packages/deliveries/src/main/assembly/war-pack/mso-wars.xml7
2 files changed, 0 insertions, 13 deletions
diff --git a/packages/arquillian-unit-tests/src/test/java/org/openecomp/mso/global_tests/soapui/SoapUiITCase.java b/packages/arquillian-unit-tests/src/test/java/org/openecomp/mso/global_tests/soapui/SoapUiITCase.java
index b7a3b04d96..868de8d089 100644
--- a/packages/arquillian-unit-tests/src/test/java/org/openecomp/mso/global_tests/soapui/SoapUiITCase.java
+++ b/packages/arquillian-unit-tests/src/test/java/org/openecomp/mso/global_tests/soapui/SoapUiITCase.java
@@ -105,12 +105,6 @@ public class SoapUiITCase {
return warArchive;
}
- @Deployment(name="common-bpmn",testable=false)
- public static Archive<?> createCommonBPMNDeployment () {
- System.out.println("Deploying Common BPMN WAR on default server");
- return ArquillianPackagerForITCases.createPackageFromExistingOne("../../bpmn/MSOCommonBPMN/target/", "MSOCommonBPMN*.war", "MSOCommonBPMN.war");
- }
-
@Deployment(name = "infrastructure-bpmn", testable = false)
public static Archive<?> createInfraBPMNDeployment() {
System.out.println("Deploying Infrastructure BPMN WAR on default server");
diff --git a/packages/deliveries/src/main/assembly/war-pack/mso-wars.xml b/packages/deliveries/src/main/assembly/war-pack/mso-wars.xml
index efbd78740b..e909b116e3 100644
--- a/packages/deliveries/src/main/assembly/war-pack/mso-wars.xml
+++ b/packages/deliveries/src/main/assembly/war-pack/mso-wars.xml
@@ -102,13 +102,6 @@
</fileSet>
<fileSet>
- <includes>
- <include>MSOCommonBPMN*.war</include>
- </includes>
- <directory>../../bpmn/MSOCommonBPMN/target/</directory>
- <outputDirectory>artifacts</outputDirectory>
- </fileSet>
- <fileSet>
<includes>
<include>MSOInfrastructureBPMN*.war</include>
</includes>