[MSO-8] Second step of the rebase for MSO

Second rebase containing additional features for MSO + total reworking
of the BPMN structure + Notification flow can now be added at the end of
some BPMN flows

Change-Id: I7e937c7a0ba1593ca85e164a093f79c7e38b6ce0
Signed-off-by: Determe, Sebastien (sd378r) <sd378r@intl.att.com>

2 files changed, 160 insertions, 162 deletions

diff --git a/bpmn/MSOCockpit/pom.xml b/bpmn/MSOCockpit/pom.xml
index a985dc91b1..165c528812 100644
--- a/bpmn/MSOCockpit/pom.xml
+++ b/bpmn/MSOCockpit/pom.xml
@@ -1,72 +1,72 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<parent>
-		<groupId>org.openecomp.mso</groupId>
-		<artifactId>bpmn</artifactId>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

+	<parent>

+		<groupId>org.openecomp.mso</groupId>

+		<artifactId>bpmn</artifactId>

 		<version>1.1.0-SNAPSHOT</version>
-	</parent>
-
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.openecomp.mso</groupId>
-	<artifactId>MSOCockpit</artifactId>
-	<packaging>pom</packaging>
-	<name>MSOCockpit</name>
-	<description>Builds the Camunda cockpit webapp for MSO</description>
-
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-assembly-plugin</artifactId>
-				<executions>
-					<execution>
-						<configuration>
-							<descriptors>
-								<descriptor>src/main/assembly/cockpit-build.xml</descriptor>
-							</descriptors>
-							<appendAssemblyId>false</appendAssemblyId>
-						</configuration>
-						<id>cockpit-build</id>
-						<phase>package</phase>
-						<goals>
-							<goal>single</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
-	
-	<dependencies>
-		
-		<dependency>
-			<groupId>org.camunda.bpm.webapp</groupId>
-			<artifactId>camunda-webapp-jboss-standalone</artifactId>
-			<version>${camunda.version}</version>
-			<type>war</type>
-		</dependency>
-		
-		<dependency>
-			<groupId>org.openecomp.mso</groupId>
-			<artifactId>common</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.openecomp.mso</groupId>
-			<artifactId>cockpit-urnmap-plugin</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.openecomp.mso</groupId>
-			<artifactId>MSOCoreBPMN</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-             <groupId>org.evosuite</groupId>
-             <artifactId>evosuite-standalone-runtime</artifactId>
-             <version>${evosuiteVersion}</version>
-             <scope>test</scope>
-        </dependency>
-	</dependencies>
-	
-</project>
+	</parent>

+

+	<modelVersion>4.0.0</modelVersion>

+	<groupId>org.openecomp.mso</groupId>

+	<artifactId>MSOCockpit</artifactId>

+	<packaging>pom</packaging>

+	<name>MSOCockpit</name>

+	<description>Builds the Camunda cockpit webapp for MSO</description>

+

+	<build>

+		<plugins>

+			<plugin>

+				<groupId>org.apache.maven.plugins</groupId>

+				<artifactId>maven-assembly-plugin</artifactId>

+				<executions>

+					<execution>

+						<configuration>

+							<descriptors>

+								<descriptor>src/main/assembly/cockpit-build.xml</descriptor>

+							</descriptors>

+							<appendAssemblyId>false</appendAssemblyId>

+						</configuration>

+						<id>cockpit-build</id>

+						<phase>package</phase>

+						<goals>

+							<goal>single</goal>

+						</goals>

+					</execution>

+				</executions>

+			</plugin>

+		</plugins>

+	</build>

+	

+	<dependencies>

+		

+		<dependency>

+			<groupId>org.camunda.bpm.webapp</groupId>

+			<artifactId>camunda-webapp-jboss-standalone</artifactId>

+			<version>${camunda.version}</version>

+			<type>war</type>

+		</dependency>

+		

+		<dependency>

+			<groupId>org.openecomp.mso</groupId>

+			<artifactId>common</artifactId>

+			<version>${project.version}</version>

+		</dependency>

+		<dependency>

+			<groupId>org.openecomp.mso</groupId>

+			<artifactId>cockpit-urnmap-plugin</artifactId>

+			<version>${project.version}</version>

+		</dependency>

+		<dependency>

+			<groupId>org.openecomp.mso</groupId>

+			<artifactId>MSOCoreBPMN</artifactId>

+			<version>${project.version}</version>

+		</dependency>

+		<dependency>

+             <groupId>org.evosuite</groupId>

+             <artifactId>evosuite-standalone-runtime</artifactId>

+             <version>${evosuiteVersion}</version>

+             <scope>test</scope>

+        </dependency>

+	</dependencies>

+	

+</project>

diff --git a/bpmn/MSOCockpit/src/main/assembly/cockpit-build.xml b/bpmn/MSOCockpit/src/main/assembly/cockpit-build.xml
index d623aa585a..b84a84df8a 100644
--- a/bpmn/MSOCockpit/src/main/assembly/cockpit-build.xml
+++ b/bpmn/MSOCockpit/src/main/assembly/cockpit-build.xml
@@ -1,91 +1,89 @@
-<!--
-  ============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=========================================================
-  -->
-
-<assembly
-	xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1 http://maven.apache.org/xsd/assembly-1.1.1.xsd">
-	<id>cockpit-build</id>
-
-	<formats>
-		<format>war</format>
-	</formats>
-	
-	<includeBaseDirectory>false</includeBaseDirectory>
-
-	<dependencySets>
-		<dependencySet>
-			<outputDirectory>/</outputDirectory>
-			<includes>
-				<include>org.camunda.bpm.webapp:camunda-webapp-jboss-standalone</include>
-			</includes>
-			<unpack>true</unpack>
-			<unpackOptions>
-				<excludes>
-					<exclude>WEB-INF/applicationContext.xml</exclude>
-					<exclude>WEB-INF/web.xml</exclude>
-					<exclude>WEB-INF/jboss-deployment-structure.xml</exclude>
-				</excludes>
-			</unpackOptions>
-			<scope>runtime</scope>
-			<useProjectArtifact>false</useProjectArtifact>
-		</dependencySet>
-
-		<!-- Here is where cockpit plugins are embedded -->
-
-		<dependencySet>
-			<outputDirectory>/WEB-INF/lib</outputDirectory>
-			<includes>
-				<!-- The URN Mapping plugin -->
-				<!-- <include>com.att.camunda.bpm.cockpit.plugin:cockpit-urnmap-plugin</include> -->
-
-				<!-- for MSO Logging -->
-				<include>org.openecomp.mso:logger</include>
-				<include>ch.qos.logback:logback-core</include>
-				<include>ch.qos.logback:logback-classic</include>
-				<include>com.att.eelf:eelf-core</include>
-
-				<!-- Included so the cockpit can deserialize and display core
-				     class objects, like MSOWorkflowException -->
-				<include>org.openecomp.mso:MSOCoreBPMN</include>
-			</includes>
-			<unpack>false</unpack>
-			<scope>runtime</scope>
-			<useProjectArtifact>false</useProjectArtifact>
-		</dependencySet>
-	</dependencySets>
-
-	<!-- We provide our own versions of the following files -->
-
-	<files>
-		<file>
-			<source>src/main/resources/WEB-INF/applicationContext.xml</source>
-			<outputDirectory>/WEB-INF</outputDirectory>
-		</file>
-		<file>
-			<source>src/main/resources/WEB-INF/web.xml</source>
-			<outputDirectory>/WEB-INF</outputDirectory>
-		</file>
-		<file>
-			<source>src/main/resources/WEB-INF/jboss-deployment-structure.xml</source>
-			<outputDirectory>/WEB-INF</outputDirectory>
-		</file>
-	</files>
-</assembly>
+<!--

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

+  -->

+

+<assembly

+	xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1"

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

+	xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1 http://maven.apache.org/xsd/assembly-1.1.1.xsd">

+	<id>cockpit-build</id>

+

+	<formats>

+		<format>war</format>

+	</formats>

+	

+	<includeBaseDirectory>false</includeBaseDirectory>

+

+	<dependencySets>

+		<dependencySet>

+			<outputDirectory>/</outputDirectory>

+			<includes>

+				<include>org.camunda.bpm.webapp:camunda-webapp-jboss-standalone</include>

+			</includes>

+			<unpack>true</unpack>

+			<unpackOptions>

+				<excludes>

+					<exclude>WEB-INF/applicationContext.xml</exclude>

+					<exclude>WEB-INF/web.xml</exclude>

+					<exclude>WEB-INF/jboss-deployment-structure.xml</exclude>

+				</excludes>

+			</unpackOptions>

+			<scope>runtime</scope>

+			<useProjectArtifact>false</useProjectArtifact>

+		</dependencySet>

+

+		<!-- Here is where cockpit plugins are embedded -->

+

+		<dependencySet>

+			<outputDirectory>/WEB-INF/lib</outputDirectory>

+			<includes>

+				<!-- The URN Mapping plugin -->

+				<!-- for MSO Logging -->

+				<include>org.openecomp.mso:logger</include>

+				<include>ch.qos.logback:logback-core</include>

+				<include>ch.qos.logback:logback-classic</include>

+				<include>com.att.eelf:eelf-core</include>

+

+				<!-- Included so the cockpit can deserialize and display core

+				     class objects, like MSOWorkflowException -->

+				<include>org.openecomp.mso:MSOCoreBPMN</include>

+			</includes>

+			<unpack>false</unpack>

+			<scope>runtime</scope>

+			<useProjectArtifact>false</useProjectArtifact>

+		</dependencySet>

+	</dependencySets>

+

+	<!-- We provide our own versions of the following files -->

+

+	<files>

+		<file>

+			<source>src/main/resources/WEB-INF/applicationContext.xml</source>

+			<outputDirectory>/WEB-INF</outputDirectory>

+		</file>

+		<file>

+			<source>src/main/resources/WEB-INF/web.xml</source>

+			<outputDirectory>/WEB-INF</outputDirectory>

+		</file>

+		<file>

+			<source>src/main/resources/WEB-INF/jboss-deployment-structure.xml</source>

+			<outputDirectory>/WEB-INF</outputDirectory>

+		</file>

+	</files>

+</assembly>