From: Michael Arrastia <MArrasti@amdocs.com>
Date: Wed, 2 May 2018 09:37:09 +0000 (+0100)
Subject: Update Dockerfile and remove redundant AJSC files
X-Git-Tag: v1.2.2~12
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=b4936aa62d9a942f9354503ab575f40d221ae0a4;p=aai%2Fchamp.git

Update Dockerfile and remove redundant AJSC files

Change-Id: Ibf166602929901d18d0ee24c8d5505e4489000fa
Issue-ID: AAI-1114
Signed-off-by: Michael Arrastia <MArrasti@amdocs.com>
---

diff --git a/champ-service/antBuild/build.xml b/champ-service/antBuild/build.xml
deleted file mode 100644
index b898a9e..0000000
--- a/champ-service/antBuild/build.xml
+++ /dev/null
@@ -1,178 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project>
-	<target name="runLocal">
-		<java dir="${basedir}" fork="yes" newenvironment="true"
-			failonerror="true" classname="com.att.ajsc.runner.Runner">
-			<classpath
-				path="${classpath}:${basedir}/ajsc-shared-config/etc:${runAjscHome}/lib/ajsc-runner-${ajscRuntimeVersion}.jar" />
-
-			<!-- Windows Users may need to add a jvmarg arg to create a temp directory 
-				properly. -->
-			<!-- <jvmarg value="-Djava.io.tmpdir=C:/yourTempDirectory"/> -->
-
-			<!-- Uncomment the following 2 jvmarg values to enable Remote Debugging. 
-			 -->
-			<!-- <jvmarg value="-Xdebug" /> -->
-			<!-- <jvmarg value="-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5432" 
-				/> -->
-
-			<jvmarg value="-XX:MaxPermSize=512m" />
-			<jvmarg value="-Xmx1024m" />
-
-			<!-- Main ajsc Variables below (Variables necessary for proper startup 
-				of AJSC) -->
-			<env key="AJSC_HOME" value="${runAjscHome}" />
-			<sysproperty key="AJSC_HOME" value="${runAjscHome}" />
-			<!-- you may specify any external location for AJSC_CONF_HOME where etc 
-				folder & all other configs can be found under it. If not specified, it will 
-				default to AJSC_HOME -->
-			<sysproperty key="AJSC_CONF_HOME" value="${basedir}/bundleconfig-local" />
-			<sysproperty key="AJSC_SHARED_CONFIG" value="${basedir}/ajsc-shared-config" />
-
-			<!-- Location of logback.xml file used for logging configurations. Please, 
-				note, when deploying a service to either CSI or NON-CSI environment, this 
-				system property will be set in sys-props.properties file. We are setting 
-				it here for running locally due to the ease of use of maven variable for 
-				basedir. -->
-			<sysproperty key="logback.configurationFile"
-				value="${basedir}/ajsc-shared-config/etc/logback.xml" />
-
-			<!-- Setting system properties for the AJSC external libs and properties 
-				folders below. When deploying to a node, these properties will be set within 
-				the bundleconfig/etc/sysprops/sys-props.properties file. However, when running 
-				locally, the ${basedir} substitution works more efficiently in this manner. -->
-			<sysproperty key="AJSC_EXTERNAL_LIB_FOLDERS" value="${basedir}/target/commonLibs" />
-			<sysproperty key="AJSC_EXTERNAL_PROPERTIES_FOLDERS"
-				value="${basedir}/ajsc-shared-config/etc" />
-
-			<!-- End of Main ajsc Variables below (Variables necessary for proper 
-				startup of AJSC) -->
-
-			<!-- Uncomment the following line to add oauthentication to your Service -->
-			<!-- <sysproperty key="spring.profiles.active" value="oauth" /> -->
-
-			<!-- If using Cassandra as Database, Enter the ip/host and port below 
-				based on your known configuration -->
-			<!-- <sysproperty key="cassandra.ip" value="hostname" /> -->
-			<!-- <sysproperty key="cassandra.port" value="9042" /> -->
-
-			<!-- The APP_SERVLET_URL_PATTERN variable is defaulted to "/services" 
-				within the initial configuration of the AJSC. If you are changing the CamelServlet 
-				Filter within the ajsc-override-web.xml, you should use that url-pattern 
-				here. This is necessary to properly register your service with dme2. An empty 
-				value, "", is used when NO value is wanted (url-pattern would be /* for CamelServlet 
-				Filter) -->
-			<!-- As of 4.5.1, this property is no longer needed -->
-			<!-- <sysproperty key="APP_SERVLET_URL_PATTERN" value="/services" /> -->
-
-			<!-- GRM/DME2 System Properties below -->
-			<sysproperty key="AJSC_SERVICE_NAMESPACE" value="${module.ajsc.namespace.name}" />
-			<sysproperty key="AJSC_SERVICE_VERSION" value="${module.ajsc.namespace.version}" />
-			<sysproperty key="SOACLOUD_SERVICE_VERSION" value="${project.version}" />
-			<!-- End of GRM/DME2 System Property Variables -->
-
-			<!-- The following server.port variable was necessary for the proper registration 
-				of the AJSC to dme2. This value may still need to be used if the Developer 
-				is hardcoding their port (example: 8080). Then, the server.port value="8080". 
-				The default functionality for the AJSC is to use EPHEMERAL ports. In this 
-				case, you do NOT need to set the server.port value. The AJSC will find the 
-				proper port value and register to dme2 correctly -->
-			<!-- <sysproperty key="server.port" value="${serverPort}" /> -->
-
-			<!-- Command Line Arguments to add to the java command. Here, you can 
-				specify the port as well as the Context you want your service to run in. 
-				Use context=/ to run in an unnamed Context (Root Context). The default configuration 
-				of the AJSC is to run under the /ajsc Context. Setting the port here can 
-				aid during the development phase of your service. However, you can leave 
-				this argument out entirely, and the AJSC will default to using an Ephemeral 
-				port. -->
-			<arg line="context=/ port=${serverPort} sslport=${sslport}" />
-		</java>
-	</target>
-	<target name="prep_home_directory_for_swm_pkgcreate">
-
-
-		<!-- These tasks are copying contents from the installHomeDirectory into 
-			the eventual $AJSC_HOME directory for running locally and soa cloud installation -->
-		<echo message="ENTERING 'prep_home_directory_for_swm_pkgcreate' ant tasks" />
-
-		<copy
-			toDir="${basedir}/target/swm/package/nix/dist_files${distFilesRoot}/bundleconfig"
-			failonerror="true">
-			<fileset dir="${basedir}/bundleconfig-local" includes="**/**" />
-		</copy>
-		<copy
-			toDir="${basedir}/target/swm/package/nix/dist_files${distFilesRoot}/bundleconfig/etc"
-			failonerror="true">
-			<fileset dir="${basedir}/ajsc-shared-config/etc" includes="**/**" />
-		</copy>
-		<!-- End of NON-CSI related build copy task. -->
-
-		<!-- Copying any zips (deployment packages) to $AJSC_HOME/services for 
-			auto-deployment -->
-		<copy
-			toDir="${basedir}/target/swm/package/nix/dist_files${distFilesRoot}/services"
-			failonerror="false">
-			<fileset dir="${basedir}/services" includes="*.zip" />
-		</copy>
-
-		<!-- Copying runtimeEnvironment zip file to $AJSC_HOME/runtime and renaming 
-			runtimeEnvironment.zip for proper auto-deployment of ajsc services. 
-		<copy
-			tofile="${basedir}/target/swm/package/nix/dist_files${distFilesRoot}/runtime/runtimeEnvironment.zip">
-			<fileset dir="target" includes="*-runtimeEnvironment.zip" />
-		</copy>-->
-
-		<!-- Copying dependencies from the service project (not provided by AJSC 
-			Container) to the $AJSC_HOME/extJars folder to be accessible on the classpath -->
-		<copy
-			toDir="${basedir}/target/swm/package/nix/dist_files${distFilesRoot}/extJars"
-			failonerror="false">
-			<fileset dir="target/userjars" includes="*" />
-		</copy>
-
-		<!-- extApps directory MUST be created for ajsc-runner to run correctly, 
-			even if empty. DO NOT REMOVE!!! -->
-		<!-- extApps directory created to deploy other war files on startup or 
-			hot deploy War files after ajsc starts up. -->
-		<mkdir
-			dir="${basedir}/target/swm/package/nix/dist_files${distFilesRoot}/extApps" />
-
-		<!-- Copying any extra wars to $AJSC_HOME/extApps to be deployed within 
-			AJSC -->
-		<copy
-			toDir="${basedir}/target/swm/package/nix/dist_files${distFilesRoot}/extApps"
-			failonerror="false">
-			<fileset dir="${basedir}/src/main/resources/extApps"
-				includes="*" />
-		</copy>
-
-		<!-- staticContent folder is for serving static content within an ajsc 
-			service. Any static content to be served will be copyied to the ultimate 
-			$AJSC_HOME/staticContent folder and can be served with the att-static-content 
-			camel component. -->
-		<!-- Uncomment the following snippet to copy items from staticContent folder 
-			to ultimate $AJSC_HOME/staticConent -->
-		<!-- <copy toDir="${basedir}/target/swm/package/nix/dist_files${distFilesRoot}/staticContent" 
-			failonerror="false"> <fileset dir="${basedir}/staticContent" includes="**/**" 
-			/> </copy> -->
-
-		<!-- Copying extra jar files that have been labeled as dependencies in 
-			service project to /extJars folder to be made available on the classpath 
-			for your service -->
-		<copy
-			toDir="${basedir}/target/swm/package/nix/dist_files${distFilesRoot}/extJars"
-			failonerror="false">
-			<fileset dir="target" includes="*.jar" />
-		</copy>
-
-		<!-- Copying deployment packages created within the project to the $AJSC_HOME/services 
-			folder to be auto deployed. -->
-		<copy
-			toDir="${basedir}/target/swm/package/nix/dist_files${distFilesRoot}/services">
-			<fileset dir="target" includes="*.zip" excludes="*-runtimeEnvironment.zip" />
-		</copy>
-
-		<echo message="EXITING 'prep_assembly_output_for_swm_plugin' ant tasks" />
-	</target>
-</project>
diff --git a/champ-service/src/main/assemble/ajsc_module_assembly.xml b/champ-service/src/main/assemble/ajsc_module_assembly.xml
deleted file mode 100644
index 4ec4e28..0000000
--- a/champ-service/src/main/assemble/ajsc_module_assembly.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<assembly
-	xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
-	<id>${version}</id>
-	<includeBaseDirectory>false</includeBaseDirectory>
-	<formats>
-		<format>zip</format>
-	</formats>
-	<fileSets>
-		<fileSet>
-			<directory>${project.basedir}/target/versioned-ajsc/routes/</directory>
-			<outputDirectory>${module.ajsc.namespace.name}/${module.ajsc.namespace.version}/routes/</outputDirectory>
-			<includes>
-				<include>*.route</include>
-			</includes>
-
-		</fileSet>
-
-		<fileSet>
-			<directory>${project.basedir}/target/versioned-ajsc/docs/</directory>
-			<outputDirectory>${module.ajsc.namespace.name}/${module.ajsc.namespace.version}/docs/</outputDirectory>
-			<includes>
-				<include>*.*</include>
-				<!-- <include>*.vm</include>  -->
-			</includes>
-
-		</fileSet>
-
-		<fileSet>
-			<directory>${project.basedir}/target/versioned-ajsc/lib/</directory>
-			<outputDirectory>${module.ajsc.namespace.name}/${module.ajsc.namespace.version}/lib/</outputDirectory>
-			<includes>
-				<include>*.jar</include>
-			</includes>
-
-		</fileSet>
-		<fileSet>
-			<directory>${project.basedir}/target/versioned-ajsc/extJars/</directory>
-			<outputDirectory>${module.ajsc.namespace.name}/${module.ajsc.namespace.version}/extJars/</outputDirectory>
-			<includes>
-				<include>*.jar</include>
-			</includes>
-		</fileSet>
-		
-		<!-- also try to grab outputs from the "jar" plugin's package phase -->
-		<fileSet>
-			<directory>${project.basedir}/target/</directory>
-			<outputDirectory>${module.ajsc.namespace.name}/${module.ajsc.namespace.version}/lib/</outputDirectory>
-			<includes>
-				<include>*.jar</include>
-			</includes>
-		</fileSet>
-
-		<fileSet>
-			<directory>${project.basedir}/target/versioned-ajsc/conf/</directory>
-			<outputDirectory>${module.ajsc.namespace.name}/${module.ajsc.namespace.version}/conf/</outputDirectory>
-			<includes>
-				<include>*.*</include>
-			</includes>
-
-		</fileSet>
-	</fileSets>
-
-</assembly>
-
diff --git a/champ-service/src/main/assemble/ajsc_props_assembly.xml b/champ-service/src/main/assemble/ajsc_props_assembly.xml
deleted file mode 100644
index 5b8a6fa..0000000
--- a/champ-service/src/main/assemble/ajsc_props_assembly.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<assembly
-	xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
-	<id>${version}_properties</id>
-	<includeBaseDirectory>false</includeBaseDirectory>
-	<formats>
-		<format>zip</format>
-	</formats>
-	<fileSets>
-		<fileSet>
-			<directory>${project.basedir}/target/versioned-ajsc/props</directory>
-			<outputDirectory>${module.ajsc.namespace.name}/${module.ajsc.namespace.version}/props/</outputDirectory>
-			<includes>
-				<include>*.props</include>
-			</includes>
-
-		</fileSet>
-
-	</fileSets>
-
-</assembly>
-
diff --git a/champ-service/src/main/assemble/ajsc_runtime_assembly.xml b/champ-service/src/main/assemble/ajsc_runtime_assembly.xml
deleted file mode 100644
index e37d366..0000000
--- a/champ-service/src/main/assemble/ajsc_runtime_assembly.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<assembly
-	xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
-	<id>runtimeEnvironment</id>
-	<includeBaseDirectory>false</includeBaseDirectory>
-	<formats>
-		<format>zip</format>
-	</formats>
-	<fileSets>
-		<fileSet>
-			<directory>${project.basedir}/target/versioned-runtime/context/</directory>
-			<outputDirectory>runtime/context/</outputDirectory>
-			<includes>
-				<include>*.context</include>
-			</includes>
-		</fileSet>
-		<fileSet>
-			<directory>${project.basedir}/target/versioned-runtime/serviceProperties/</directory>
-			<outputDirectory>runtime/serviceProperties/</outputDirectory>
-			<includes>
-				<include>*.props</include>
-			</includes>
-		</fileSet><fileSet>
-			<directory>${project.basedir}/target/versioned-runtime/shiroRole</directory>
-			<outputDirectory>runtime/shiroRole/</outputDirectory>
-			<includes>
-				<include>*.json</include>
-			</includes>
-		</fileSet><fileSet>
-			<directory>${project.basedir}/target/versioned-runtime/shiroUser</directory>
-			<outputDirectory>runtime/shiroUser/</outputDirectory>
-			<includes>
-				<include>*.json</include>
-			</includes>
-		</fileSet><fileSet>
-			<directory>${project.basedir}/target/versioned-runtime/shiroUserRole</directory>
-			<outputDirectory>runtime/shiroUserRole</outputDirectory>
-			<includes>
-				<include>*.json</include>
-			</includes>
-		</fileSet>
-	</fileSets>
-</assembly>
\ No newline at end of file
diff --git a/champ-service/src/main/config/ajsc-chef.jks b/champ-service/src/main/config/ajsc-chef.jks
deleted file mode 100644
index aeca770..0000000
Binary files a/champ-service/src/main/config/ajsc-chef.jks and /dev/null differ
diff --git a/champ-service/src/main/config/ajsc-jetty.xml b/champ-service/src/main/config/ajsc-jetty.xml
deleted file mode 100644
index 98cc02e..0000000
--- a/champ-service/src/main/config/ajsc-jetty.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0"  encoding="UTF-8"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd">
-<!-- Copyright (c) 2016 AT&T Intellectual Property. All rights reserved. -->
-<Configure id="ajsc-server" class="org.eclipse.jetty.server.Server">
-	<!-- DO NOT REMOVE!!!! This is setting up the AJSC Context -->
-	<New id="ajscContext" class="org.eclipse.jetty.webapp.WebAppContext">
-		<Set name="contextPath"><SystemProperty name="AJSC_CONTEXT_PATH" /></Set>
-		<Set name="extractWAR">true</Set>
-		<Set name="tempDirectory"><SystemProperty name="AJSC_TEMP_DIR" /></Set>
-		<Set name="war"><SystemProperty name="AJSC_WAR_PATH" /></Set>
-		<Set name="descriptor"><SystemProperty name="AJSC_HOME" />/etc/runner-web.xml</Set>
-		<Set name="overrideDescriptor"><SystemProperty name="AJSC_HOME" />/etc/ajsc-override-web.xml</Set>
-		<Set name="throwUnavailableOnStartupException">true</Set>
-		<Set name="servletHandler">
-			<New class="org.eclipse.jetty.servlet.ServletHandler">
-				<Set name="startWithUnavailable">false</Set>
-			</New>
-		</Set>
-		<Set name="extraClasspath"><SystemProperty name="AJSC_HOME" />/extJars/champ-service.jar,<SystemProperty name="AJSC_HOME" />/extJars/json-20160212.jar,<SystemProperty name="AJSC_HOME" />/extJars/javax.ws.rs-api-2.0.1.jar,<SystemProperty name="AJSC_HOME" />/extJars/jersey-client-2.23.jar</Set>		
-	</New>
-
-	<Set name="handler">
-		<New id="Contexts"
-			class="org.eclipse.jetty.server.handler.ContextHandlerCollection">
-			<Set name="Handlers">
-				<Array type="org.eclipse.jetty.webapp.WebAppContext">
-					<Item>
-						<Ref refid="ajscContext" />
-					</Item>
-				</Array>
-			</Set>
-		</New>
-	</Set>
-
-	<Call name="addBean">
-		<Arg>
-			<New id="DeploymentManager" class="org.eclipse.jetty.deploy.DeploymentManager">
-				<Set name="contexts">
-					<Ref refid="Contexts" />
-				</Set>
-				<Call id="extAppHotDeployProvider" name="addAppProvider">
-					<Arg>
-						<New class="org.eclipse.jetty.deploy.providers.WebAppProvider">
-							<Set name="monitoredDirName"><SystemProperty name="AJSC_HOME" />/extApps</Set>
-							<Set name="scanInterval">10</Set>
-							<Set name="extractWars">true</Set>
-						</New>
-					</Arg>
-				</Call>
-			</New>
-		</Arg>
-	</Call>
-
-	<New id="sslContextFactory" class="org.eclipse.jetty.util.ssl.SslContextFactory">
-		<Set name="keyStorePath">file:<SystemProperty name="CONFIG_HOME" />/auth/tomcat_keystore</Set>
-		<Set name="KeyStorePassword">
-			<Call class="org.eclipse.jetty.util.security.Password" name="deobfuscate">
-				<Arg><SystemProperty name="KEY_STORE_PASSWORD" /></Arg>
-			</Call>
-		</Set>
-		<Set name="KeyManagerPassword">
-			<Call class="org.eclipse.jetty.util.security.Password" name="deobfuscate">
-				<Arg><SystemProperty name="KEY_MANAGER_PASSWORD" /></Arg>
-			</Call>
-		</Set>
-		<Set name="needClientAuth">true</Set>
-		<Set name="wantClientAuth">true</Set>
-	</New>
-
-	<Call id="sslConnector" name="addConnector">
-		<Arg>
-			<New class="org.eclipse.jetty.server.ServerConnector">
-				<Arg name="server">
-					<Ref refid="ajsc-server" />
-				</Arg>
-				<Arg name="factories">
-					<Array type="org.eclipse.jetty.server.ConnectionFactory">
-						<Item>
-							<New class="org.eclipse.jetty.server.SslConnectionFactory">
-								<Arg name="next">http/1.1</Arg>
-								<Arg name="sslContextFactory">
-									<Ref refid="sslContextFactory" />
-								</Arg>
-							</New>
-						</Item>
-						<Item>
-							<New class="org.eclipse.jetty.server.HttpConnectionFactory">
-								<Arg name="config">
-									<New class="org.eclipse.jetty.server.HttpConfiguration">
-										<Call name="addCustomizer">
-											<Arg>
-												<New class="org.eclipse.jetty.server.SecureRequestCustomizer" />
-											</Arg>
-										</Call>
-									</New>
-								</Arg>
-							</New>
-						</Item>
-					</Array>
-				</Arg>
-				<Set name="port"><SystemProperty name="AJSC_HTTPS_PORT" default="9522" /></Set>
-				<Set name="idleTimeout">30000</Set>
-			</New>
-		</Arg>
-	</Call>
-
-	<Get name="ThreadPool">
-		<Set name="minThreads"><SystemProperty name="AJSC_JETTY_ThreadCount_MIN" /></Set>
-		<Set name="maxThreads"><SystemProperty name="AJSC_JETTY_ThreadCount_MAX" /></Set>
-		<Set name="idleTimeout"><SystemProperty name="AJSC_JETTY_IDLETIME_MAX" /></Set>
-		<Set name="detailedDump">false</Set>
-	</Get>
-
-</Configure>
diff --git a/champ-service/src/main/config/ajsc-override-web.xml b/champ-service/src/main/config/ajsc-override-web.xml
deleted file mode 100644
index 8e02d6d..0000000
--- a/champ-service/src/main/config/ajsc-override-web.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<web-app xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
-	metadata-complete="false" version="3.0">
-
-	<filter-mapping>
-		<filter-name>InterceptorFilter</filter-name>
-		<url-pattern>/services/*</url-pattern>
-	</filter-mapping> 
-	<filter-mapping>
-		<filter-name>InterceptorFilter</filter-name>
-		<url-pattern>/rest/*</url-pattern>
- 	</filter-mapping>  
-
-	<filter-mapping>
-		<filter-name>springSecurityFilterChain</filter-name>
-		<url-pattern>/*</url-pattern>
-	</filter-mapping>
-		
-	<servlet-mapping>
-		<servlet-name>ManagementServlet</servlet-name>
-		<url-pattern>/mgmt</url-pattern>
-	</servlet-mapping>
-	 
-	 <servlet-mapping>
-			<servlet-name>RestletServlet</servlet-name>
-			<url-pattern>/rest/*</url-pattern>
-	</servlet-mapping>
-
- 	<servlet-mapping>
-		<servlet-name>CamelServlet</servlet-name>
-		<url-pattern>/services/*</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>jsp</servlet-name>
-		<url-pattern>*.jsp</url-pattern>
-		<url-pattern>*.jspf</url-pattern>
-		<url-pattern>*.jspx</url-pattern>
-		<url-pattern>*.xsp</url-pattern>
-		<url-pattern>*.JSP</url-pattern>
-		<url-pattern>*.JSPF</url-pattern>
-		<url-pattern>*.JSPX</url-pattern>
-		<url-pattern>*.XSP</url-pattern>
-	</servlet-mapping>
-	<servlet-mapping>
-		<servlet-name>default</servlet-name>
-		<url-pattern>/*</url-pattern>
-	</servlet-mapping>
-</web-app>
\ No newline at end of file
diff --git a/champ-service/src/main/config/ajscJetty.jks b/champ-service/src/main/config/ajscJetty.jks
deleted file mode 100644
index 48cdbff..0000000
Binary files a/champ-service/src/main/config/ajscJetty.jks and /dev/null differ
diff --git a/champ-service/src/main/config/cadi.properties b/champ-service/src/main/config/cadi.properties
deleted file mode 100644
index cc527ed..0000000
--- a/champ-service/src/main/config/cadi.properties
+++ /dev/null
@@ -1,28 +0,0 @@
-#This properties file is used for defining AAF properties related to the CADI framework. This file is used for running AAF framework
-hostname=mywebserver.att.com
-
-#Setting csp_domain to PROD will allow for testing using your attuid and password through GLO.
-csp_domain=PROD
-csp_devl_localhost=true
-
-basic_realm=csp.att.com
-#basic_realm=aaf.att.com
-basic_warn=TRUE
-
-cadi_loglevel=WARN
-cadi_keyfile=target/swm/package/nix/dist_files/appl/champ-service/etc/keyfile
-
-# Configure AAF
-#These are dummy values add appropriate values required
-aaf_url=url
-
-#AJSC - MECHID
-#These are dummy values add appropriate values required
-aaf_id=dummyid@ajsc.att.com
-aaf_password=enc:277edqJCjT0RlUI3BtbDQa-3Ha-CQGd
-aaf_timeout=5000
-aaf_clean_interval=30000
-aaf_user_expires=5000
-aaf_high_count=1000
-
-
diff --git a/champ-service/src/main/config/jul-redirect.properties b/champ-service/src/main/config/jul-redirect.properties
deleted file mode 100644
index 8b6624d..0000000
--- a/champ-service/src/main/config/jul-redirect.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-
-#  	Bridge JUL->slf4j Logging Configuration File
-#
-# This file bridges the JUL logging infrastructure into
-# SLF4J so JUL logs go to logback implementation provided
-# in this project.  SLF4J also captures log4j and has 
-# other framework options as well providing a common
-# logging infrastructure for capturing all logs from different
-# libraries using different frameworks in one place.
-
-#  	Global properties
-handlers=org.slf4j.bridge.SLF4JBridgeHandler
-.level= ALL
diff --git a/champ-service/src/main/config/keyfile b/champ-service/src/main/config/keyfile
deleted file mode 100644
index 882e86a..0000000
--- a/champ-service/src/main/config/keyfile
+++ /dev/null
@@ -1,27 +0,0 @@
-ZuIwp0TkyVPDeX1Up-8JtkMWvjsCpoiu1_VKeWrtrvxunvAke8_tiFyHPPyb2nkhepFYj6tXzpfS
-rGz5XF_TH9NbsKaP8u0HV5clz2WriYQRvHS85vjY7hXxkpFuLb7zkLAPqTyIDpj7FiW61NzsRUAq
-TM8jH16jr7mBNnb56w24mNGOwznMPcIZKcjgZU1ekaPDFpWyhQElU7Y0q_94P_Gkk45r66Hj22sU
-OiOaaftmudZlswLw8-8Zaakqf2yW9HjMVfuYCwSodBHCW5rdB3Ctb5W36rnD_AQco3Ky2PgPmqvk
-QkJYuUHpbuDqVHqLOajlKSIGMTIqAIBg51fRaaONtD-Q5xzY8E5wO1YWTLKcP5tsNvUpzM8Wu3NS
-ynpGpUcvlTqWWsGzTbzOyamyKkdNdx97sSqjM25Zh1-ps48h6cddGYWpab7SUvqRCS11QBUyLTry
-2iwTEHMhHRIbo7PO99ALQfuq9gI1zKGfurJdvLBeBaFs5SCF0AiCZ3WcDO8Rv3HpxVZ2_ShbDxb0
-eMoO6SotXu51fj8Y3-WqsfZziQyEsHyqpg5uQ6yUtz01h5YHLEoVuotF1U4agmQR6kEkYk-wNOiZ
-v-8gaA9gtbLoAdKhuKFxQgQLNMf6GzVzZNujbmDzLoZAP_mXAv29aBPaf64Ugzv-Oa5GZdBgD-Xd
-_pahML-ionw99r0TnkpShYmDqMKhMdjaP3m87WIAZkIB-L-VTyKcEsJ4340VSzCOsv3waiM0S89u
-4cMcG5y-PLY8IoipIlLUPTWD3SjcQ9DV1Dt3T5KjdWLsj48D3W4K4e9PB8yxs0gtUjgVUR2_xEir
-G5eDO9Ac1eHFWGDFFP0SgG-TbHJUKlvy9mwLzmU0fC3xPjhqmIr-v0HxF7HN-tmb1LHDorno8tSN
-u7kUGcKSchIiFfvkd066crUb2mH7PnXTaWmAjyVj9VsBExFUYEdpHMAV4sAP9-RxZGDRt46UhrDK
-QZvvNhBVyOEjHPHWI4vl1r1v8HNH1_2jZu5DVJWyHWR56aCo1lhFH9_X6UAHUHbnXViDONZOVXlT
-9-WD0tk2zJGuwrhdZDAnPnAmjfwbwbpnr5Hmex1i1JiD7WVyP1kbfoej2TmdiYbxr9oBYaGQ29JI
-aHod7MQCLtvL1z5XgnDPLZ4y3_9SbqHKYbNa8UgZkTLF5EacGThYVFDLA9cbafHDtR1kMGE3vv4D
-EJ-0pAYTOGmKlVI7DwNyKsY9JTyudrxTqhOxi9jgcJNWiUaNe9yhL8Pyc2YBqUTTYhh_a2d1rvkZ
-0Gh1crviVxqBrIkRKaMRXZ4f1vDLz-3NvG_vwPOo8WRFo5nGmSdTw7CjBaigJ_cYCfDhoP11pEnw
-cndsZNcHs-v05LlxeIIMDD_f5Bvz-il_DLA4eK2HqgLdxh8ziSDl2azk14MJY4amzz6reEXUuKLV
-RsZGf_jbDGKhE2HuDQ5ovoLOi4OqE1oRuqh-dGxitrYouP2SN1l_1tCEMRth86FMV-6AQtZsvdUo
-y9MtQ7e35atjA8nHtgADlDTmJBKQiUHUsOZ77p1qp17HAFMovUkc739opfEYnKUn6Itpw5Ipm_Is
-ra6chJUfMpOFof5rb5OjqFAN27c_-mPo1lQU3ndYlKGh_n5V8ufX6v2Yri8WzOPf6hjVYotkmoMP
-NPAICDCB8W5ddBjsopzLVVEtaXDu9Qj6-zf77hT4iQ7rBd2Ner8iLqN3Kis0dvkNM3_uH8onau1G
-Y_YYw7PPSZyd2S_7Dd6G-IG4ayO6e5DD6oUwwekyiQI_3rTXNa_wldGxqW9u818010ekE4Qdlfcj
-beIn7fAeaOjReZ87hRgWyMs-EgTVHw8RL3yI_O6VvRTVRONRF1Y4C_-IYa8z-bfrwXx3BBd9TTgb
-EnS9wVOyC2OgUN6BhPLGLhxzkJ05nEjizXEc9t5EPYoSRwesajGGrrG_0-qWbuU5hKLPLkyeJLHb
-5HXOTVsrUR59Vov2M3_EswkxcImblox3k3VS2yihZMGyfqLzZIUXgd8ufkevKKU6DxwacGTb
\ No newline at end of file
diff --git a/champ-service/src/main/config/runner-web.xml b/champ-service/src/main/config/runner-web.xml
deleted file mode 100644
index 5f65183..0000000
--- a/champ-service/src/main/config/runner-web.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<web-app xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
-	metadata-complete="false" version="3.0">
-
-	<context-param>
-		<param-name>contextConfigLocation</param-name>
-		<param-value>/WEB-INF/spring-servlet.xml,
-					classpath:applicationContext.xml
-		</param-value>
-  	</context-param>
-  	
-  	<context-param>
-        <param-name>spring.profiles.default</param-name>
-        <param-value>nooauth</param-value>
-    </context-param>
-    
-	<listener>
-		<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
-	</listener>
-	
-	<servlet>
-		<servlet-name>ManagementServlet</servlet-name>
-		<servlet-class>ajsc.ManagementServlet</servlet-class>
-	</servlet>
-
-    
-  	<filter> 
-		<filter-name>InterceptorFilter</filter-name>
-		<filter-class>ajsc.filters.InterceptorFilter</filter-class>
-		<init-param>
-                <param-name>preProcessor_interceptor_config_file</param-name>
-                <param-value>/etc/PreProcessorInterceptors.properties</param-value>
-        </init-param>
-        <init-param>
-                <param-name>postProcessor_interceptor_config_file</param-name>
-                <param-value>/etc/PostProcessorInterceptors.properties</param-value>
-        </init-param>
-        
-	</filter>
-
-	 <servlet>
-		<servlet-name>RestletServlet</servlet-name>
-		<servlet-class>ajsc.restlet.RestletSpringServlet</servlet-class>
-		<init-param>
-				<param-name>org.restlet.component</param-name>
-				<param-value>restletComponent</param-value>
-		</init-param>
-	</servlet>
-	
-	<servlet>
-		<servlet-name>CamelServlet</servlet-name>
-		<servlet-class>ajsc.servlet.AjscCamelServlet</servlet-class>
-	</servlet>
-
-
-	<filter>
-		<filter-name>springSecurityFilterChain</filter-name>
-		<filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class>
-	</filter>
-
-	<servlet>
-		<servlet-name>spring</servlet-name>
-		<servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
-		<load-on-startup>1</load-on-startup>
-	</servlet>	
-	
-<!--	<servlet-mapping>
-		<servlet-name>spring</servlet-name>
-		<url-pattern>/</url-pattern>
-	</servlet-mapping>-->
-
-<!-- BEGIN jsp -->
-
-  <servlet id="jsp">
-    <servlet-name>jsp</servlet-name>
-    <servlet-class>org.apache.jasper.servlet.JspServlet</servlet-class>
-  </servlet>
-
-	
-	
-
-	  
-	<!-- BEGIN static content -->
-	<servlet>
- 	   <servlet-name>default</servlet-name>
-	    <servlet-class>org.eclipse.jetty.servlet.DefaultServlet</servlet-class>
-	    <init-param>
-	        <param-name>dirAllowed</param-name>
-	        <param-value>true</param-value>
-	    </init-param>
-	</servlet>
-	<!-- END static content --> 	
-</web-app>
diff --git a/champ-service/src/main/docker/Dockerfile b/champ-service/src/main/docker/Dockerfile
index cf299a2..9b23d00 100644
--- a/champ-service/src/main/docker/Dockerfile
+++ b/champ-service/src/main/docker/Dockerfile
@@ -14,7 +14,7 @@ RUN export JAVA_HOME
 
 # Build up the deployment folder structure
 RUN mkdir -p $MICRO_HOME
-ADD swm/package/nix/dist_files/appl/champ-service/* $MICRO_HOME/
+COPY champ-service.jar $MICRO_HOME/
 RUN mkdir -p $GRAPHLIB_HOME
 ADD graph-deps $GRAPHLIB_HOME
 RUN mkdir -p $BIN_HOME
diff --git a/champ-service/src/main/runtime/context/__module.ajsc.namespace.name__#__module.ajsc.namespace.version__.context b/champ-service/src/main/runtime/context/__module.ajsc.namespace.name__#__module.ajsc.namespace.version__.context
deleted file mode 100644
index 8514196..0000000
--- a/champ-service/src/main/runtime/context/__module.ajsc.namespace.name__#__module.ajsc.namespace.version__.context
+++ /dev/null
@@ -1 +0,0 @@
-{"context":{"contextClass":"ajsc.Context","contextId":"__module_ajsc_namespace_name__:__module_ajsc_namespace_version__","contextName":"__module_ajsc_namespace_name__","contextVersion":"__module_ajsc_namespace_version__","description":"__module_ajsc_namespace_name__ Context"}}
\ No newline at end of file
diff --git a/champ-service/src/main/runtime/context/default#0.context b/champ-service/src/main/runtime/context/default#0.context
deleted file mode 100644
index d1b5ab4..0000000
--- a/champ-service/src/main/runtime/context/default#0.context
+++ /dev/null
@@ -1 +0,0 @@
-{"context":{"contextClass":"ajsc.Context","contextId":"default:0","contextName":"default","contextVersion":"0","description":"Default Context"}}
\ No newline at end of file
diff --git a/champ-service/src/main/runtime/deploymentPackage/__module.ajsc.namespace.name__#__module.ajsc.namespace.version__.json b/champ-service/src/main/runtime/deploymentPackage/__module.ajsc.namespace.name__#__module.ajsc.namespace.version__.json
deleted file mode 100644
index d0954cf..0000000
--- a/champ-service/src/main/runtime/deploymentPackage/__module.ajsc.namespace.name__#__module.ajsc.namespace.version__.json
+++ /dev/null
@@ -1 +0,0 @@
-{"deploymentPackage":{"Class":"ajsc.DeploymentPackage","Id":"__module.ajsc.namespace.name__:__module_ajsc_namespace_version__","namespace":"__module_ajsc_namespace_name__","namespaceVersion":"__module_ajsc_namespace_version__","description":"__module_ajsc_namespace_name__ __module_ajsc_namespace_version__ - default description","userId":"ajsc"}}
\ No newline at end of file
diff --git a/champ-service/src/main/runtime/shiroRole/ajscadmin.json b/champ-service/src/main/runtime/shiroRole/ajscadmin.json
deleted file mode 100644
index f5e981e..0000000
--- a/champ-service/src/main/runtime/shiroRole/ajscadmin.json
+++ /dev/null
@@ -1 +0,0 @@
-{"shiroRoleClass":"ajsc.auth.ShiroRole","shiroRoleId":"ajscadmin","name":"ajscadmin","permissions":"[ajscadmin:*, ajsc:*]"}
\ No newline at end of file
diff --git a/champ-service/src/main/runtime/shiroRole/contextadmin#__module.ajsc.namespace.name__.json b/champ-service/src/main/runtime/shiroRole/contextadmin#__module.ajsc.namespace.name__.json
deleted file mode 100644
index 2dae9f5..0000000
--- a/champ-service/src/main/runtime/shiroRole/contextadmin#__module.ajsc.namespace.name__.json
+++ /dev/null
@@ -1 +0,0 @@
-{"shiroRoleClass":"ajsc.auth.ShiroRole","shiroRoleId":"contextadmin:__module_ajsc_namespace_name__","name":"contextadmin:__module_ajsc_namespace_name__","permissions":"[]"}
\ No newline at end of file
diff --git a/champ-service/src/main/runtime/shiroRole/contextadmin#default.json b/champ-service/src/main/runtime/shiroRole/contextadmin#default.json
deleted file mode 100644
index 5de814e..0000000
--- a/champ-service/src/main/runtime/shiroRole/contextadmin#default.json
+++ /dev/null
@@ -1 +0,0 @@
-{"shiroRoleClass":"ajsc.auth.ShiroRole","shiroRoleId":"contextadmin:default","name":"contextadmin:default","permissions":"[]"}
\ No newline at end of file
diff --git a/champ-service/src/main/runtime/shiroUser/ajsc.json b/champ-service/src/main/runtime/shiroUser/ajsc.json
deleted file mode 100644
index f4c7855..0000000
--- a/champ-service/src/main/runtime/shiroUser/ajsc.json
+++ /dev/null
@@ -1 +0,0 @@
-{"shiroUserClass":"ajsc.auth.ShiroUser","shiroUserId":"ajsc","passwordHash":"9471697417008c880720ba54c6038791ad7e98f3b88136fe34f4d31a462dd27a","permissions":"[*:*]","username":"ajsc"}
\ No newline at end of file
diff --git a/champ-service/src/main/runtime/shiroUserRole/ajsc#ajscadmin.json b/champ-service/src/main/runtime/shiroUserRole/ajsc#ajscadmin.json
deleted file mode 100644
index cb8d483..0000000
--- a/champ-service/src/main/runtime/shiroUserRole/ajsc#ajscadmin.json
+++ /dev/null
@@ -1 +0,0 @@
-{"shiroUserRoleClass":"ajsc.auth.ShiroUserRole","shiroUserRoleId":"ajsc:ajscadmin","roleId":"ajscadmin","userId":"ajsc"}
\ No newline at end of file
diff --git a/champ-service/src/main/runtime/shiroUserRole/ajsc#contextadmin#__module.ajsc.namespace.name__.json b/champ-service/src/main/runtime/shiroUserRole/ajsc#contextadmin#__module.ajsc.namespace.name__.json
deleted file mode 100644
index 95d2361..0000000
--- a/champ-service/src/main/runtime/shiroUserRole/ajsc#contextadmin#__module.ajsc.namespace.name__.json
+++ /dev/null
@@ -1 +0,0 @@
-{"shiroUserRoleClass":"ajsc.auth.ShiroUserRole","shiroUserRoleId":"ajsc:contextadmin:__module_ajsc_namespace_name__","roleId":"contextadmin:__module_ajsc_namespace_name__","userId":"ajsc"}
\ No newline at end of file
diff --git a/champ-service/src/main/runtime/shiroUserRole/ajsc#contextadmin#default.json b/champ-service/src/main/runtime/shiroUserRole/ajsc#contextadmin#default.json
deleted file mode 100644
index 2bd5063..0000000
--- a/champ-service/src/main/runtime/shiroUserRole/ajsc#contextadmin#default.json
+++ /dev/null
@@ -1 +0,0 @@
-{"shiroUserRoleClass":"ajsc.auth.ShiroUserRole","shiroUserRoleId":"ajsc:contextadmin:default","roleId":"contextadmin:default","userId":"ajsc"}
\ No newline at end of file