From b4936aa62d9a942f9354503ab575f40d221ae0a4 Mon Sep 17 00:00:00 2001
From: Michael Arrastia <MArrasti@amdocs.com>
Date: Wed, 2 May 2018 10:37:09 +0100
Subject: Update Dockerfile and remove redundant AJSC files

Change-Id: Ibf166602929901d18d0ee24c8d5505e4489000fa
Issue-ID: AAI-1114
Signed-off-by: Michael Arrastia <MArrasti@amdocs.com>
---
 .../src/main/assemble/ajsc_module_assembly.xml     | 66 ----------------------
 .../src/main/assemble/ajsc_props_assembly.xml      | 23 --------
 .../src/main/assemble/ajsc_runtime_assembly.xml    | 44 ---------------
 3 files changed, 133 deletions(-)
 delete mode 100644 champ-service/src/main/assemble/ajsc_module_assembly.xml
 delete mode 100644 champ-service/src/main/assemble/ajsc_props_assembly.xml
 delete mode 100644 champ-service/src/main/assemble/ajsc_runtime_assembly.xml

(limited to 'champ-service/src/main/assemble')

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
-- 
cgit 1.2.3-korg