Code Review / so.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
1710 Rebase - Second Attempt
[so.git] / mso-api-handlers / mso-api-handler-infra / WebContent / WEB-INF / web.xml
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 fa80b9e..cd4a560 100644 (file)
--- 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,23 @@
 \r
 <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">\r
   <display-name>MSO API Handler Infra</display-name>\r
-\r
-\r
-   <context-param>\r
-       <param-name>resteasy.jndi.resources</param-name>\r
-       <param-value>java:module/MsoPropertiesFactory</param-value>\r
+       \r
+       <listener>\r
+       <listener-class>org.jboss.resteasy.plugins.server.servlet.ResteasyBootstrap</listener-class>\r
+       </listener>\r
+  \r
+       <context-param>\r
+               <param-name>resteasy.jndi.resources</param-name>\r
+               <param-value>java:module/MsoPropertiesFactory</param-value>\r
    </context-param>\r
-\r
+ \r
    <!-- enable the Asynchronous Job Service -->\r
     <context-param>\r
         <param-name>resteasy.async.job.service.enabled</param-name>\r
         <param-value>true</param-value>\r
     </context-param>\r
 \r
-    <!-- The next context parameters are all optional.\r
+    <!-- The next context parameters are all optional.  \r
          Their default values are shown as example param-values -->\r
 \r
     <!-- How many jobs results can be held in memory at once? -->\r
@@ -23,12 +26,17 @@
         <param-name>resteasy.async.job.service.max.job.results</param-name>\r
         <param-value>100</param-value>\r
     </context-param>\r
-\r
-    <!-- Maximum wait time on a job when a client is querying for it -->\r
+       \r
+       <!-- Maximum wait time on a job when a client is querying for it -->\r
     <context-param>\r
         <param-name>resteasy.async.job.service.max.wait</param-name>\r
         <param-value>300000</param-value>\r
     </context-param>\r
+    \r
+    <context-param>\r
+       <param-name>resteasy.scan</param-name>\r
+       <param-value>true</param-value>\r
+       </context-param>\r
 \r
     <!-- Thread pool size of background threads that run the job -->\r
     <context-param>\r
@@ -41,55 +49,52 @@
         <param-name>resteasy.async.job.service.base.path</param-name>\r
         <param-value>/asynch/jobs</param-value>\r
     </context-param>\r
-  <context-param>\r
-    <param-name>resteasy.scan</param-name>\r
-    <param-value>true</param-value>\r
-  </context-param>\r
-\r
-  <!--\r
-  <context-param>\r
-    <param-name>resteasy.servlet.mapping.prefix</param-name>\r
-    <param-value>/v1</param-value>\r
-  </context-param>\r
-  -->\r
-   <context-param>\r
-       <param-name>log.configuration</param-name>\r
-       <param-value>logback.apihandler-infra.xml</param-value>\r
-  </context-param>\r
-\r
-  <context-param>\r
-       <param-name>mso.configuration</param-name>\r
-       <param-value>MSO_PROP_APIHANDLER_INFRA=mso.apihandler-infra.properties,MSO_PROP_TOPOLOGY=topology.properties</param-value>\r
-  </context-param>\r
-\r
-  <context-param>\r
-    <param-name>resteasy.resources</param-name>\r
-    <param-value>org.openecomp.mso.logger.MsoLoggingServlet</param-value>\r
-  </context-param>\r
-\r
-  <listener>\r
-    <listener-class>\r
-                       org.jboss.resteasy.plugins.server.servlet.ResteasyBootstrap\r
-       </listener-class>\r
-  </listener>\r
-  <servlet>\r
-    <servlet-name>msoapihandler-infra-servlet</servlet-name>\r
-    <servlet-class>\r
-                       org.jboss.resteasy.plugins.server.servlet.HttpServletDispatcher\r
-               </servlet-class>\r
-  </servlet>\r
-  <servlet-mapping>\r
-    <servlet-name>msoapihandler-infra-servlet</servlet-name>\r
-    <url-pattern>/*</url-pattern>\r
-  </servlet-mapping>\r
-\r
+  \r
+       <context-param>\r
+               <param-name>log.configuration</param-name>\r
+               <param-value>logback.apihandler-infra.xml</param-value>\r
+       </context-param>\r
+  \r
+       <context-param>\r
+               <param-name>mso.configuration</param-name>\r
+               <param-value>MSO_PROP_APIHANDLER_INFRA=mso.apihandler-infra.properties,MSO_PROP_TOPOLOGY=topology.properties</param-value>\r
+       </context-param>\r
+  \r
+         <context-param>\r
+           <param-name>resteasy.resources</param-name>\r
+           <param-value>org.openecomp.mso.logger.MsoLoggingServlet</param-value>\r
+         </context-param>\r
+  \r
+       <servlet>\r
+       <servlet-name>resteasy-servlet</servlet-name>\r
+       <servlet-class>org.jboss.resteasy.plugins.server.servlet.HttpServletDispatcher</servlet-class>\r
+       </servlet>\r
+\r
+       <servlet-mapping>\r
+           <servlet-name>resteasy-servlet</servlet-name>\r
+           <url-pattern>/serviceInstances/*</url-pattern>\r
+           <url-pattern>/orchestrationRequests/*</url-pattern>\r
+           <url-pattern>/nodehealthcheck</url-pattern>\r
+           <url-pattern>/v1/*</url-pattern>\r
+           <url-pattern>/v2/*</url-pattern>\r
+           <url-pattern>/v3/*</url-pattern>\r
+           <url-pattern>/logging/*</url-pattern>\r
+           <url-pattern>/globalhealthcheck/*</url-pattern>\r
+           <url-pattern>/healthcheck/*</url-pattern>\r
+           <url-pattern>/setStatus/*</url-pattern>\r
+           <url-pattern>/properties/*</url-pattern>\r
+               <url-pattern>/api-docs/*</url-pattern>\r
+               <url-pattern>/tasks/*</url-pattern>\r
+       </servlet-mapping>\r
+  \r
+  <!-- To be replaced by AAF in the future, when Camunda scripts replacing the BPEL scripts completely -->\r
   <security-constraint>\r
     <web-resource-collection>\r
       <web-resource-name>HealthcheckNoAuth</web-resource-name>\r
       <description>No Authentication for Healthcheck</description>\r
-      <url-pattern>/healthcheck</url-pattern>\r
-        <url-pattern>/nodehealthcheck</url-pattern>\r
+       <url-pattern>/healthcheck</url-pattern>\r
         <url-pattern>/globalhealthcheck</url-pattern>\r
+        <url-pattern>/nodehealthcheck</url-pattern>\r
       <http-method>GET</http-method>\r
       <http-method>POST</http-method>\r
       </web-resource-collection>\r
@@ -105,9 +110,9 @@
             <role-name>SiteControl-Client</role-name>\r
         </auth-constraint>\r
     </security-constraint>\r
-    <security-constraint>\r
-        <web-resource-collection>\r
-            <web-resource-name>MSO internal Requests</web-resource-name>\r
+   <security-constraint>\r
+        <web-resource-collection>\r
+        <web-resource-name>MSO internal Requests</web-resource-name>\r
             <description>Internal Requests</description>\r
             <url-pattern>/logging/*</url-pattern>\r
             <url-pattern>/properties/*</url-pattern>\r
@@ -130,7 +135,7 @@
        <role-name>InfraPortal-Client</role-name>\r
      </auth-constraint>\r
   </security-constraint>\r
-\r
+ \r
   <login-config>\r
        <auth-method>BASIC</auth-method>\r
     <realm-name>ApplicationRealm</realm-name>\r
@@ -140,11 +145,11 @@
   </security-role>\r
     <security-role>\r
         <role-name>SiteControl-Client</role-name>\r
-    </security-role>\r
-    <security-role>\r
+    </security-role> \r
+       <security-role>\r
         <role-name>MSO-Client</role-name>\r
     </security-role>\r
-\r
+  \r
     <filter>\r
                <filter-name>LogFilter</filter-name>\r
                <filter-class>org.openecomp.mso.logger.LogFilter</filter-class>\r
@@ -152,6 +157,6 @@
     <filter-mapping>\r
                <filter-name>LogFilter</filter-name>\r
                <url-pattern>/*</url-pattern>\r
-       </filter-mapping>\r
-\r
+       </filter-mapping>  \r
+  \r
 </web-app>\r
Service Orchestrator