[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, 174 insertions, 158 deletions

diff --git a/adapters/mso-vnf-adapter/WebContent/WEB-INF/web.xml b/adapters/mso-vnf-adapter/WebContent/WEB-INF/web.xml
index 3a50781b22..e69486e1fd 100644
--- a/adapters/mso-vnf-adapter/WebContent/WEB-INF/web.xml
+++ b/adapters/mso-vnf-adapter/WebContent/WEB-INF/web.xml
@@ -79,6 +79,19 @@
             <role-name>SiteControl-Client</role-name>
         </auth-constraint>
     </security-constraint>
+    <security-constraint>
+        <web-resource-collection>
+            <web-resource-name>MSO internal Requests</web-resource-name>
+            <description>Internal Requests</description>
+            <url-pattern>/rest/logging/*</url-pattern>
+            <url-pattern>/rest/properties/*</url-pattern>
+            <http-method>POST</http-method>
+            <http-method>GET</http-method>
+        </web-resource-collection>
+        <auth-constraint>
+            <role-name>MSO-Client</role-name>
+        </auth-constraint>
+    </security-constraint>
     <login-config>
         <auth-method>BASIC</auth-method>
         <realm-name>ApplicationRealm</realm-name>
@@ -89,6 +102,9 @@
     <security-role>
         <role-name>SiteControl-Client</role-name>
     </security-role>
+    <security-role>
+        <role-name>MSO-Client</role-name>
+    </security-role>
 
     <filter>
 		<filter-name>LogFilter</filter-name>
diff --git a/adapters/mso-vnf-adapter/pom.xml b/adapters/mso-vnf-adapter/pom.xml
index bc32498b20..ced5c3ae6e 100644
--- a/adapters/mso-vnf-adapter/pom.xml
+++ b/adapters/mso-vnf-adapter/pom.xml
@@ -1,159 +1,159 @@
-<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">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>org.openecomp.mso</groupId>
-		<artifactId>adapters</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">

+	<modelVersion>4.0.0</modelVersion>

+	<parent>

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

+		<artifactId>adapters</artifactId>

 		<version>1.1.0-SNAPSHOT</version>
-	</parent>
-	<groupId>org.openecomp.mso.adapters</groupId>
-	<artifactId>mso-vnf-adapter</artifactId>
-	<packaging>war</packaging>
-	<name>mso-vnf-adapter</name>
-	<description>Web Service and REST endpoint for VNF operations</description>
-
-	<build>
-		<finalName>${project.artifactId}-${project.version}</finalName>
-		<plugins>
-			<plugin>
-				<artifactId>maven-war-plugin</artifactId>
-				<version>2.4</version>
-				<configuration>
-					<warSourceDirectory>WebContent</warSourceDirectory>
-					<failOnMissingWebXml>false</failOnMissingWebXml>
-					<attachClasses>true</attachClasses>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.jvnet.jax-ws-commons</groupId>
-				<artifactId>jaxws-maven-plugin</artifactId>
-				<version>2.3</version>
-				<executions>
-					<execution>
-					    <id>Synch</id>
-						<goals>
-							<goal>wsgen</goal>
-						</goals>
-						<configuration>
-							<verbose>true</verbose>
-							<sei>org.openecomp.mso.adapters.vnf.MsoVnfAdapterImpl</sei>
-							<genWsdl>true</genWsdl>
-							<inlineSchemas>true</inlineSchemas>
-						</configuration>
-					</execution>
-					<execution>
-					        <id>Asynch</id>
-						<goals>
-							<goal>wsgen</goal>
-						</goals>
-						<configuration>
-							<verbose>true</verbose>
-							<sei>org.openecomp.mso.adapters.vnf.MsoVnfAdapterAsyncImpl</sei>
-							<genWsdl>true</genWsdl>
-							<inlineSchemas>true</inlineSchemas>
-						</configuration>
-					</execution>
-				</executions>
-				<dependencies>
-					<dependency>
-						<groupId>org.openecomp.mso.adapters</groupId>
-						<artifactId>mso-adapter-utils</artifactId>
-						<version>${project.version}</version>
-					</dependency>
-					<dependency>
-						<groupId>com.sun.xml.ws</groupId>
-						<artifactId>jaxws-tools</artifactId>
-						<version>2.2.7</version>
-					</dependency>
-				</dependencies>
-			</plugin>
-		</plugins>
-		<pluginManagement>
-			<plugins>
-				<!--This plugin's configuration is used to store Eclipse m2e settings
-					only. It has no influence on the Maven build itself. -->
-				<plugin>
-					<groupId>org.eclipse.m2e</groupId>
-					<artifactId>lifecycle-mapping</artifactId>
-					<version>1.0.0</version>
-					<configuration>
-						<lifecycleMappingMetadata>
-							<pluginExecutions>
-								<pluginExecution>
-									<pluginExecutionFilter>
-										<groupId>
-											org.jvnet.jax-ws-commons
-										</groupId>
-										<artifactId>
-											jaxws-maven-plugin
-										</artifactId>
-										<versionRange>
-											[2.3,)
-										</versionRange>
-										<goals>
-											<goal>wsgen</goal>
-										</goals>
-									</pluginExecutionFilter>
-									<action>
-										<ignore></ignore>
-									</action>
-								</pluginExecution>
-							</pluginExecutions>
-						</lifecycleMappingMetadata>
-					</configuration>
-				</plugin>
-			</plugins>
-		</pluginManagement>
-	</build>
-	<dependencies>
-		<dependency>
-			<groupId>org.openecomp.mso.adapters</groupId>
-			<artifactId>mso-adapter-utils</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.openecomp.mso.adapters</groupId>
-			<artifactId>mso-adapters-rest-interface</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.openecomp.mso.adapters</groupId>
-			<artifactId>mso-vnf-adapter-async-client</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>javax</groupId>
-			<artifactId>javaee-web-api</artifactId>
-			<version>6.0</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.spec.javax.ejb</groupId>
-			<artifactId>jboss-ejb-api_3.2_spec</artifactId>
-			<version>1.0.0.Final</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.ejb3</groupId>
-			<artifactId>jboss-ejb3-ext-api</artifactId>
-			<version>2.2.0.Final</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.openecomp.mso</groupId>
-			<artifactId>status-control</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-
-		<!-- <dependency> -->
-		<!-- <groupId>org.openecomp.mso</groupId> -->
-		<!-- <artifactId>mso-catalog-db</artifactId> -->
-		<!-- <version>${project.version}</version> -->
-		<!-- </dependency> -->
-		<!-- <dependency> -->
-		<!-- <groupId>log4j</groupId> -->
-		<!-- <artifactId>log4j</artifactId> -->
-		<!-- <version>1.2.17</version> -->
-		<!-- </dependency> -->
-	</dependencies>
-</project>
+	</parent>

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

+	<artifactId>mso-vnf-adapter</artifactId>

+	<packaging>war</packaging>

+	<name>mso-vnf-adapter</name>

+	<description>Web Service and REST endpoint for VNF operations</description>

+

+	<build>

+		<finalName>${project.artifactId}-${project.version}</finalName>

+		<plugins>

+			<plugin>

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

+				<version>2.4</version>

+				<configuration>

+					<warSourceDirectory>WebContent</warSourceDirectory>

+					<failOnMissingWebXml>false</failOnMissingWebXml>

+					<attachClasses>true</attachClasses>

+				</configuration>

+			</plugin>

+			<plugin>

+				<groupId>org.jvnet.jax-ws-commons</groupId>

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

+				<version>2.3</version>

+				<executions>

+					<execution>

+					    <id>Synch</id>

+						<goals>

+							<goal>wsgen</goal>

+						</goals>

+						<configuration>

+							<verbose>true</verbose>

+							<sei>org.openecomp.mso.adapters.vnf.MsoVnfAdapterImpl</sei>

+							<genWsdl>true</genWsdl>

+							<inlineSchemas>true</inlineSchemas>

+						</configuration>

+					</execution>

+					<execution>

+					        <id>Asynch</id>

+						<goals>

+							<goal>wsgen</goal>

+						</goals>

+						<configuration>

+							<verbose>true</verbose>

+							<sei>org.openecomp.mso.adapters.vnf.MsoVnfAdapterAsyncImpl</sei>

+							<genWsdl>true</genWsdl>

+							<inlineSchemas>true</inlineSchemas>

+						</configuration>

+					</execution>

+				</executions>

+				<dependencies>

+					<dependency>

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

+						<artifactId>mso-adapter-utils</artifactId>

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

+					</dependency>

+					<dependency>

+						<groupId>com.sun.xml.ws</groupId>

+						<artifactId>jaxws-tools</artifactId>

+						<version>2.2.7</version>

+					</dependency>

+				</dependencies>

+			</plugin>

+		</plugins>

+		<pluginManagement>

+			<plugins>

+				<!--This plugin's configuration is used to store Eclipse m2e settings

+					only. It has no influence on the Maven build itself. -->

+				<plugin>

+					<groupId>org.eclipse.m2e</groupId>

+					<artifactId>lifecycle-mapping</artifactId>

+					<version>1.0.0</version>

+					<configuration>

+						<lifecycleMappingMetadata>

+							<pluginExecutions>

+								<pluginExecution>

+									<pluginExecutionFilter>

+										<groupId>

+											org.jvnet.jax-ws-commons

+										</groupId>

+										<artifactId>

+											jaxws-maven-plugin

+										</artifactId>

+										<versionRange>

+											[2.3,)

+										</versionRange>

+										<goals>

+											<goal>wsgen</goal>

+										</goals>

+									</pluginExecutionFilter>

+									<action>

+										<ignore></ignore>

+									</action>

+								</pluginExecution>

+							</pluginExecutions>

+						</lifecycleMappingMetadata>

+					</configuration>

+				</plugin>

+			</plugins>

+		</pluginManagement>

+	</build>

+	<dependencies>

+		<dependency>

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

+			<artifactId>mso-adapter-utils</artifactId>

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

+		</dependency>

+		<dependency>

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

+			<artifactId>mso-adapters-rest-interface</artifactId>

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

+		</dependency>

+		<dependency>

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

+			<artifactId>mso-vnf-adapter-async-client</artifactId>

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

+		</dependency>

+		<dependency>

+			<groupId>javax</groupId>

+			<artifactId>javaee-web-api</artifactId>

+			<version>6.0</version>

+			<scope>provided</scope>

+		</dependency>

+		<dependency>

+			<groupId>org.jboss.spec.javax.ejb</groupId>

+			<artifactId>jboss-ejb-api_3.2_spec</artifactId>

+			<version>1.0.0.Final</version>

+			<scope>provided</scope>

+		</dependency>

+		<dependency>

+			<groupId>org.jboss.ejb3</groupId>

+			<artifactId>jboss-ejb3-ext-api</artifactId>

+			<version>2.2.0.Final</version>

+			<scope>provided</scope>

+		</dependency>

+		<dependency>

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

+			<artifactId>status-control</artifactId>

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

+		</dependency>

+

+		<!-- <dependency> -->

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

+		<!-- <artifactId>mso-catalog-db</artifactId> -->

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

+		<!-- </dependency> -->

+		<!-- <dependency> -->

+		<!-- <groupId>log4j</groupId> -->

+		<!-- <artifactId>log4j</artifactId> -->

+		<!-- <version>1.2.17</version> -->

+		<!-- </dependency> -->

+	</dependencies>

+</project>