aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRob Daugherty <rd472p@att.com>2017-10-09 16:47:29 -0400
committerRob Daugherty <rd472p@att.com>2017-10-09 16:47:50 -0400
commit9bd4816faf634e5e972e82a01f4090c300feedea (patch)
treefc3a82d6cd0f2ccf846f4d202b1a98ac2117ccb1
parentd53a72c4f5a613c1dee59a1eab9d1c8dd800d28a (diff)
MSOCommonBPMN flows are not being deployed
Flows in the MSOCommonBPMN jar, which is embedded in the MSOInfrastructureBPMN war, are not being deployed. MSOCommonBPMN needs a processes.xml file. I'm also fixing a problem with CustomE2EGetService.bpmn, which claims it is the GenericGetService flow. This creates a conflict with the real GenericGetService flow. Issue: SO-199 Change-Id: I1ec9d4ad079abf65b5c276b625b46a86805a15e6 Signed-off-by: Rob Daugherty <rd472p@att.com>
-rw-r--r--bpmn/MSOCommonBPMN/src/main/resources/META-INF/processes.xml32
-rw-r--r--bpmn/MSOCommonBPMN/src/main/resources/subprocess/CustomE2EGetService.bpmn2
2 files changed, 33 insertions, 1 deletions
diff --git a/bpmn/MSOCommonBPMN/src/main/resources/META-INF/processes.xml b/bpmn/MSOCommonBPMN/src/main/resources/META-INF/processes.xml
new file mode 100644
index 0000000000..d328246b2c
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/main/resources/META-INF/processes.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ ============LICENSE_START=======================================================
+ ONAP SO
+ ================================================================================
+ 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=========================================================
+ -->
+
+<process-application
+ xmlns="http://www.camunda.org/schema/1.0/ProcessApplication"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+
+ <process-archive name="MSOCommonBPMN">
+ <process-engine>infrastructure</process-engine>
+ <properties>
+ <property name="isDeleteUponUndeploy">false</property>
+ <property name="isScanForProcessDefinitions">true</property>
+ </properties>
+ </process-archive>
+
+</process-application>
diff --git a/bpmn/MSOCommonBPMN/src/main/resources/subprocess/CustomE2EGetService.bpmn b/bpmn/MSOCommonBPMN/src/main/resources/subprocess/CustomE2EGetService.bpmn
index 28ba0363cb..37c6605a0e 100644
--- a/bpmn/MSOCommonBPMN/src/main/resources/subprocess/CustomE2EGetService.bpmn
+++ b/bpmn/MSOCommonBPMN/src/main/resources/subprocess/CustomE2EGetService.bpmn
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<bpmn2:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn2="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" id="_D5VzAHElEeaJwpcpVN5gXw" targetNamespace="http://camunda.org/schema/1.0/bpmn" exporter="Camunda Modeler" exporterVersion="1.10.0" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd">
- <bpmn2:process id="GenericGetService" name="GenericGetService" isExecutable="true">
+ <bpmn2:process id="CustomE2EGetService" name="CustomE2EGetService" isExecutable="true">
<bpmn2:scriptTask id="intialization" name="Initialization" scriptFormat="groovy">
<bpmn2:incoming>SequenceFlow_1</bpmn2:incoming>
<bpmn2:outgoing>SequenceFlow_2</bpmn2:outgoing>