From 5a6a6de6f1a26a1897e4917a0df613e25a24eb70 Mon Sep 17 00:00:00 2001
From: "Benjamin, Max (mb388a)" <mb388a@us.att.com>
Date: Mon, 30 Jul 2018 15:56:09 -0400
Subject: Containerization feature of SO

Change-Id: I95381232eeefcd247a66a5cec370a8ce1c288e18
Issue-ID: SO-670
Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
---
 .../WebContent/WEB-INF/beans.xml                   |   0
 .../WEB-INF/jboss-deployment-structure.xml         |  23 ---
 .../WebContent/WEB-INF/jboss-web.xml               |   6 -
 .../WebContent/WEB-INF/web.xml                     | 165 ---------------------
 4 files changed, 194 deletions(-)
 delete mode 100644 mso-api-handlers/mso-api-handler-infra/WebContent/WEB-INF/beans.xml
 delete mode 100644 mso-api-handlers/mso-api-handler-infra/WebContent/WEB-INF/jboss-deployment-structure.xml
 delete mode 100644 mso-api-handlers/mso-api-handler-infra/WebContent/WEB-INF/jboss-web.xml
 delete mode 100644 mso-api-handlers/mso-api-handler-infra/WebContent/WEB-INF/web.xml

(limited to 'mso-api-handlers/mso-api-handler-infra/WebContent/WEB-INF')

diff --git a/mso-api-handlers/mso-api-handler-infra/WebContent/WEB-INF/beans.xml b/mso-api-handlers/mso-api-handler-infra/WebContent/WEB-INF/beans.xml
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/mso-api-handlers/mso-api-handler-infra/WebContent/WEB-INF/jboss-deployment-structure.xml b/mso-api-handlers/mso-api-handler-infra/WebContent/WEB-INF/jboss-deployment-structure.xml
deleted file mode 100644
index e687384774..0000000000
--- a/mso-api-handlers/mso-api-handler-infra/WebContent/WEB-INF/jboss-deployment-structure.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<jboss-deployment-structure>
-	<deployment>
-		<!-- Exclusions allow you to prevent the server from automatically adding some dependencies -->
-		<exclusions>
-			<module name="org.apache.log4j" />
-			<module name="org.slf4j" />
-			<module name="org.slf4j.impl" />
-			<!-- Just to make sure these modules are not loaded -->
-			<module name="org.jboss.resteasy.resteasy-jackson-provider"/>
-			<module name="org.jboss.resteasy.resteasy-jettison-provider"/>
-			<module name="org.hibernate" />
-		</exclusions>
-		<dependencies>
-				<module name="org.jboss.resteasy.resteasy-jackson2-provider" services="import"/>
-				<!-- This module contain the ProviderBase class: -->
-				<module name="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider" export="true"/>
-			    <module name="org.jboss.jandex" slot="main" />
-                <module name="org.javassist" slot="main" />
-                <module name="org.antlr" slot="main" />
-                <module name="org.dom4j" slot="main" />
-		</dependencies>
-	</deployment>
-</jboss-deployment-structure>
\ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/WebContent/WEB-INF/jboss-web.xml b/mso-api-handlers/mso-api-handler-infra/WebContent/WEB-INF/jboss-web.xml
deleted file mode 100644
index 984bfc6589..0000000000
--- a/mso-api-handlers/mso-api-handler-infra/WebContent/WEB-INF/jboss-web.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<jboss-web>
-    <context-root>ecomp/mso/infra</context-root>
-    <security-domain>other</security-domain>
-</jboss-web>
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
deleted file mode 100644
index bbd7c61bb9..0000000000
--- a/mso-api-handlers/mso-api-handler-infra/WebContent/WEB-INF/web.xml
+++ /dev/null
@@ -1,165 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<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>
-  	
-  	<listener>
-    	<listener-class>org.jboss.resteasy.plugins.server.servlet.ResteasyBootstrap</listener-class>
-  	</listener>
-  
-	<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.  
-         Their default values are shown as example param-values -->
-
-    <!-- How many jobs results can be held in memory at once? -->
-    <context-param>
-        <param-name>resteasy.async.job.service.max.job.results</param-name>
-        <param-value>100</param-value>
-    </context-param>
-	
- 	<!-- Maximum wait time on a job when a client is querying for it -->
-    <context-param>
-        <param-name>resteasy.async.job.service.max.wait</param-name>
-        <param-value>300000</param-value>
-    </context-param>
-    
-    <context-param>
-    	<param-name>resteasy.scan</param-name>
-    	<param-value>true</param-value>
- 	</context-param>
-
-    <!-- Thread pool size of background threads that run the job -->
-    <context-param>
-        <param-name>resteasy.async.job.service.thread.pool.size</param-name>
-        <param-value>100</param-value>
-    </context-param>
-
-    <!-- Set the base path for the Job uris -->
-    <context-param>
-        <param-name>resteasy.async.job.service.base.path</param-name>
-        <param-value>/asynch/jobs</param-value>
-    </context-param>
-  
-  	<context-param>
-  		<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>
-  
-  	<servlet>
-    	<servlet-name>resteasy-servlet</servlet-name>
-    	<servlet-class>org.jboss.resteasy.plugins.server.servlet.HttpServletDispatcher</servlet-class>
-  	</servlet>
-
-  	<servlet-mapping>
-	    <servlet-name>resteasy-servlet</servlet-name>
-	    <url-pattern>/serviceInstances/*</url-pattern>
-	    <url-pattern>/orchestrationRequests/*</url-pattern>
-	    <url-pattern>/nodehealthcheck</url-pattern>
-	    <url-pattern>/v1/*</url-pattern>
-	    <url-pattern>/v2/*</url-pattern>
-	    <url-pattern>/v3/*</url-pattern>
-	    <url-pattern>/logging/*</url-pattern>
-	    <url-pattern>/globalhealthcheck/*</url-pattern>
-	    <url-pattern>/healthcheck/*</url-pattern>
-	    <url-pattern>/setStatus/*</url-pattern>
-	    <url-pattern>/properties/*</url-pattern>
-		<url-pattern>/api-docs/*</url-pattern>
-		<url-pattern>/tasks/*</url-pattern>
-		<url-pattern>/e2eServiceInstances/*</url-pattern>
-		<url-pattern>/cloudResources/*</url-pattern>
-		<url-pattern>/cloudResourcesRequests/*</url-pattern>
-  	</servlet-mapping>
-  
-  <!-- To be replaced by AAF in the future, when Camunda scripts replacing the BPEL scripts completely -->
-  <security-constraint>
-    <web-resource-collection>
-      <web-resource-name>HealthcheckNoAuth</web-resource-name>
-      <description>No Authentication for Healthcheck</description>
-      	<url-pattern>/healthcheck</url-pattern>
-        <url-pattern>/globalhealthcheck</url-pattern>
-        <url-pattern>/nodehealthcheck</url-pattern>
-      <http-method>GET</http-method>
-      <http-method>POST</http-method>
-      </web-resource-collection>
-   </security-constraint>
-    <security-constraint>
-        <web-resource-collection>
-            <web-resource-name>SiteStatus</web-resource-name>
-            <description>SiteStatus APIs</description>
-            <url-pattern>/setStatus/*</url-pattern>
-            <http-method>POST</http-method>
-        </web-resource-collection>
-        <auth-constraint>
-            <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>
-      <description>Authentication for Infra Portal</description>
-      <url-pattern>/*</url-pattern>
-      <http-method>POST</http-method>
-      <http-method>GET</http-method>
-     </web-resource-collection>
-      <auth-constraint>
-       <role-name>InfraPortal-Client</role-name>
-     </auth-constraint>
-  </security-constraint>
- 
-  <login-config>
-  	<auth-method>BASIC</auth-method>
-    <realm-name>ApplicationRealm</realm-name>
-  </login-config>
-  <security-role>
-    <role-name>InfraPortal-Client</role-name>
-  </security-role>
-    <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>
-    <filter-mapping>
-		<filter-name>LogFilter</filter-name>
-		<url-pattern>/*</url-pattern>
-	</filter-mapping>  
-  
-</web-app>
\ No newline at end of file
-- 
cgit 1.2.3-korg