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>
---
 asdc-controller/WebContent/META-INF/MANIFEST.MF    |   3 +
 .../WEB-INF/jboss-deployment-structure.xml         |  26 -----
 asdc-controller/WebContent/WEB-INF/jboss-web.xml   |   6 -
 asdc-controller/WebContent/WEB-INF/web.xml         | 129 ---------------------
 4 files changed, 3 insertions(+), 161 deletions(-)
 create mode 100644 asdc-controller/WebContent/META-INF/MANIFEST.MF
 delete mode 100644 asdc-controller/WebContent/WEB-INF/jboss-deployment-structure.xml
 delete mode 100644 asdc-controller/WebContent/WEB-INF/jboss-web.xml
 delete mode 100644 asdc-controller/WebContent/WEB-INF/web.xml

(limited to 'asdc-controller/WebContent')

diff --git a/asdc-controller/WebContent/META-INF/MANIFEST.MF b/asdc-controller/WebContent/META-INF/MANIFEST.MF
new file mode 100644
index 0000000000..193fa1d282
--- /dev/null
+++ b/asdc-controller/WebContent/META-INF/MANIFEST.MF
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Class-Path:
+Main-Class: org.onap.so.asdc.Application
\ No newline at end of file
diff --git a/asdc-controller/WebContent/WEB-INF/jboss-deployment-structure.xml b/asdc-controller/WebContent/WEB-INF/jboss-deployment-structure.xml
deleted file mode 100644
index c2869686fd..0000000000
--- a/asdc-controller/WebContent/WEB-INF/jboss-deployment-structure.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<jboss-deployment-structure>
-	<deployment>
-		<!-- Exclusions allow you to prevent the server from automatically adding some dependencies -->
-		<exclusions>
-			<!-- <module name="org.jboss.resteasy.resteasy-jackson-provider" /> -->
-      		<!-- <module name="org.jboss.resteasy.resteasy-jettison-provider" /> -->
-			<module name="org.apache.log4j" />
-			<module name="org.slf4j" />
-			<module name="org.slf4j.impl" />
-			<module name="org.jboss.resteasy.resteasy-jackson-provider" />
-			<module name="org.jboss.resteasy.resteasy-jettison-provider" />
-		</exclusions>
-		<dependencies>
-				<module name="org.jboss.resteasy.resteasy-jackson2-provider" services="import" />
-            	<module name="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider" />				
-			    <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" />
-                <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" />
-		</dependencies>
-	</deployment>
-</jboss-deployment-structure>
-
diff --git a/asdc-controller/WebContent/WEB-INF/jboss-web.xml b/asdc-controller/WebContent/WEB-INF/jboss-web.xml
deleted file mode 100644
index 2a1f26f2c4..0000000000
--- a/asdc-controller/WebContent/WEB-INF/jboss-web.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<jboss-web>
-    <context-root>asdc</context-root>
-    <security-domain>other</security-domain>
-</jboss-web>
\ No newline at end of file
diff --git a/asdc-controller/WebContent/WEB-INF/web.xml b/asdc-controller/WebContent/WEB-INF/web.xml
deleted file mode 100644
index 910b466fa5..0000000000
--- a/asdc-controller/WebContent/WEB-INF/web.xml
+++ /dev/null
@@ -1,129 +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>ASDC Controller</display-name>
-
-
-   <!-- enable the Asynchronous Job Service -->
-    <context-param>
-        <param-name>resteasy.async.job.service.enabled</param-name>
-        <param-value>true</param-value>
-    </context-param>
-
-	 <context-param>
-		<param-name>resteasy.jndi.resources</param-name>
-		<param-value>java:module/MsoPropertiesFactory</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>
-
-    <!-- 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>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>
-  </context-param>
-  -->
-   <context-param>
-  	<param-name>log.configuration</param-name>
-  	<param-value>logback.asdc.xml</param-value>
-  </context-param>
-
-  <context-param>
-  	<param-name>mso.configuration</param-name>
-  	<param-value>MSO_PROP_ASDC=mso.asdc.json,MSO_PROP_TOPOLOGY=topology.properties,MSO_ASDC_CLIENTS=mso.asdc.clients.properties</param-value>
-  </context-param>
-
-  <context-param>
-    <param-name>resteasy.resources</param-name>
-    <param-value>org.openecomp.mso.logger.MsoLoggingServlet,org.openecomp.mso.asdc.healthcheck.HealthCheckHandler</param-value>
-  </context-param>
-
-  <listener>
-    <listener-class>
-			org.jboss.resteasy.plugins.server.servlet.ResteasyBootstrap
-	</listener-class>
-  </listener>
-  <servlet>
-    <servlet-name>asdccontroller-servlet</servlet-name>
-    <servlet-class>
-			org.jboss.resteasy.plugins.server.servlet.HttpServletDispatcher
-		</servlet-class>
-  </servlet>
-  <servlet-mapping>
-    <servlet-name>asdccontroller-servlet</servlet-name>
-    <url-pattern>/*</url-pattern>
-  </servlet-mapping>
-
-    <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>
-
-    <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>
-    <login-config>
-        <auth-method>BASIC</auth-method>
-        <realm-name>ApplicationRealm</realm-name>
-    </login-config>
-    <security-role>
-        <role-name>SiteControl-Client</role-name>
-    </security-role>
-    <security-role>
-        <role-name>MSO-Client</role-name>
-    </security-role>
-</web-app>
\ No newline at end of file
-- 
cgit 1.2.3-korg