[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>

1 files changed, 28 insertions, 12 deletions

diff --git a/mso-api-handlers/mso-api-handler-infra/WebContent/WEB-INF/web.xml b/mso-api-handlers/mso-api-handler-infra/WebContent/WEB-INF/web.xml
index e34740d613..fa80b9ee4e 100644
--- a/mso-api-handlers/mso-api-handler-infra/WebContent/WEB-INF/web.xml
+++ b/mso-api-handlers/mso-api-handler-infra/WebContent/WEB-INF/web.xml
@@ -2,20 +2,20 @@
 

 <web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" id="WebApp_ID" version="3.0">

   <display-name>MSO API Handler Infra</display-name>

- 

- 

+

+

    <context-param>

 	<param-name>resteasy.jndi.resources</param-name>

 	<param-value>java:module/MsoPropertiesFactory</param-value>

    </context-param>

- 

+

    <!-- enable the Asynchronous Job Service -->

     <context-param>

         <param-name>resteasy.async.job.service.enabled</param-name>

         <param-value>true</param-value>

     </context-param>

 

-    <!-- The next context parameters are all optional.  

+    <!-- The next context parameters are all optional.

          Their default values are shown as example param-values -->

 

     <!-- How many jobs results can be held in memory at once? -->

@@ -45,8 +45,8 @@
     <param-name>resteasy.scan</param-name>

     <param-value>true</param-value>

   </context-param>

- 

-  <!--  

+

+  <!--

   <context-param>

     <param-name>resteasy.servlet.mapping.prefix</param-name>

     <param-value>/v1</param-value>

@@ -56,17 +56,17 @@
   	<param-name>log.configuration</param-name>

   	<param-value>logback.apihandler-infra.xml</param-value>

   </context-param>

-  

+

   <context-param>

   	<param-name>mso.configuration</param-name>

   	<param-value>MSO_PROP_APIHANDLER_INFRA=mso.apihandler-infra.properties,MSO_PROP_TOPOLOGY=topology.properties</param-value>

   </context-param>

-  

+

   <context-param>

     <param-name>resteasy.resources</param-name>

     <param-value>org.openecomp.mso.logger.MsoLoggingServlet</param-value>

   </context-param>

-  

+

   <listener>

     <listener-class>

 			org.jboss.resteasy.plugins.server.servlet.ResteasyBootstrap

@@ -105,6 +105,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>/logging/*</url-pattern>

+            <url-pattern>/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>

    <security-constraint>

  	 <web-resource-collection>

       <web-resource-name>HTTPBasicAuth</web-resource-name>

@@ -117,7 +130,7 @@
        <role-name>InfraPortal-Client</role-name>

      </auth-constraint>

   </security-constraint>

- 

+

   <login-config>

   	<auth-method>BASIC</auth-method>

     <realm-name>ApplicationRealm</realm-name>

@@ -128,14 +141,17 @@
     <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>

-		<filter-class>org.openecomp.mso.logger.LogFilter</filter-class>	

+		<filter-class>org.openecomp.mso.logger.LogFilter</filter-class>

   </filter>

     <filter-mapping>

 		<filter-name>LogFilter</filter-name>

 		<url-pattern>/*</url-pattern>

 	</filter-mapping>

-  

+

 </web-app>