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>
---
 .../WEB-INF/jboss-deployment-structure.xml         | 22 --------
 .../WebContent/WEB-INF/jboss-web.xml               |  3 -
 .../WebContent/WEB-INF/web.xml                     | 64 ----------------------
 3 files changed, 89 deletions(-)
 delete mode 100644 adapters/mso-catalog-db-adapter/WebContent/WEB-INF/jboss-deployment-structure.xml
 delete mode 100644 adapters/mso-catalog-db-adapter/WebContent/WEB-INF/jboss-web.xml
 delete mode 100644 adapters/mso-catalog-db-adapter/WebContent/WEB-INF/web.xml

(limited to 'adapters/mso-catalog-db-adapter/WebContent')

diff --git a/adapters/mso-catalog-db-adapter/WebContent/WEB-INF/jboss-deployment-structure.xml b/adapters/mso-catalog-db-adapter/WebContent/WEB-INF/jboss-deployment-structure.xml
deleted file mode 100644
index 53bdbc9ea7..0000000000
--- a/adapters/mso-catalog-db-adapter/WebContent/WEB-INF/jboss-deployment-structure.xml
+++ /dev/null
@@ -1,22 +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" />
-			<module name="org.jboss.resteasy.resteasy-jackson-provider" />
-			<module name="org.jboss.resteasy.resteasy-jettison-provider" />
-		</exclusions>
-		<dependencies>
-			<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/adapters/mso-catalog-db-adapter/WebContent/WEB-INF/jboss-web.xml b/adapters/mso-catalog-db-adapter/WebContent/WEB-INF/jboss-web.xml
deleted file mode 100644
index 2493bdb8b1..0000000000
--- a/adapters/mso-catalog-db-adapter/WebContent/WEB-INF/jboss-web.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<jboss-web>
-	<context-root>ecomp/mso/catalog</context-root>
-</jboss-web>
\ No newline at end of file
diff --git a/adapters/mso-catalog-db-adapter/WebContent/WEB-INF/web.xml b/adapters/mso-catalog-db-adapter/WebContent/WEB-INF/web.xml
deleted file mode 100644
index 750bba7633..0000000000
--- a/adapters/mso-catalog-db-adapter/WebContent/WEB-INF/web.xml
+++ /dev/null
@@ -1,64 +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-catalog-db</display-name>
-
-  <context-param>
-    <param-name>log.configuration</param-name>
-    <param-value>logback.catalog.xml</param-value>
-  </context-param>
-  <context-param>
-    <param-name>mso.configuration</param-name>
-    <param-value>MSO_PROP_TOPOLOGY=topology.properties</param-value>
-  </context-param>
-  <context-param>
-    <param-name>resteasy.resources</param-name>
-    <param-value>
-        org.openecomp.mso.adapters.catalogdb.CatalogDbAdapterRest
-    </param-value>
-  </context-param>
-  <servlet>
-    <servlet-name>Resteasy</servlet-name>
-    <servlet-class>org.jboss.resteasy.plugins.server.servlet.HttpServletDispatcher</servlet-class>
-  </servlet>
-  <servlet-mapping>
-    <servlet-name>Resteasy</servlet-name>
-    <url-pattern>/*</url-pattern>
-  </servlet-mapping>
-    <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-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>
-  <context-param>
-	<param-name>resteasy.scan</param-name>
-	<param-value>true</param-value>
-	</context-param>
-  <context-param>
-	<param-name>resteasy.scan.providers</param-name>
-	<param-value>true</param-value>
-  </context-param>
-  <context-param>
-	<param-name>resteasy.scan.resources</param-name>
-	<param-value>true</param-value>
-  </context-param>
-
-</web-app>
-- 
cgit 1.2.3-korg