add new assembly process

5 files changed, 6 insertions, 507 deletions

diff --git a/id/ConfigWebTool/pom.xml b/id/ConfigWebTool/pom.xml
index b6c82328b..63db8f8db 100644
--- a/id/ConfigWebTool/pom.xml
+++ b/id/ConfigWebTool/pom.xml
@@ -227,7 +227,10 @@
         </dependency>
     </dependencies>
 
-		<build>
+    <packaging>war</packaging>
+		<build>      
+      <finalName>moa-id-configuration</finalName>
+      
 			<plugins>
 			
 <!-- 			       	<plugin>
@@ -272,7 +275,5 @@
 					</plugin>
 				</plugins>
 			
-		</build>
-
-		<packaging>war</packaging>
+		</build>		
 </project>
diff --git a/id/assembly-auth-edu.xml b/id/assembly-auth-edu.xml
deleted file mode 100644
index c11f790e4..000000000
--- a/id/assembly-auth-edu.xml
+++ /dev/null
@@ -1,191 +0,0 @@
-<assembly>
-	<id>id-auth-edu-${moa-id-version}</id>
-	
-	<formats>
-		<format>dir</format>
-		<format>zip</format>
-		<!-- <format>tar.gz</format> -->
-	</formats>
-
-	<baseDirectory>moa-id-auth-edu-${moa-id-version}</baseDirectory>
-
-	<fileSets>
-		<fileSet>
-			<directory>${basedir}/id/server/data/deploy</directory>
-			<outputDirectory>/</outputDirectory>
-			<excludes>
-				<exclude>**/conf/Catalina/**</exclude>
-				<exclude>${basedir}/id/server/data/deploy/conf/moa-id-proxy/**</exclude>
-			</excludes>
-		</fileSet>
-		<fileSet>
-			<directory>${basedir}/spss/handbook/conf/moa-spss/certstore</directory>
-			<outputDirectory>/conf/moa-id/certs/certstore</outputDirectory>
-			<includes>
-				<include>**/*</include>
-			</includes>
-		</fileSet>
-		<fileSet>
-			<directory>${basedir}/spss/handbook/conf/moa-spss/certstore</directory>
-			<outputDirectory>/conf/moa-spss/certstore</outputDirectory>
-			<includes>
-				<include>**/*</include>
-			</includes>
-		</fileSet>
-		<fileSet>
-			<directory>${basedir}/id/server/doc</directory>
-			<outputDirectory>/doc</outputDirectory>
-			<excludes>
-				<exclude>${basedir}/id/server/doc/proxy/**</exclude>
-			</excludes>
-		</fileSet>
-		<fileSet>
-			<directory>${basedir}/id/server/data/deploy/conf</directory>
-			<outputDirectory>/doc/conf</outputDirectory>
-			<excludes>
-				<exclude>${basedir}/id/server/data/deploy/conf/moa-id-proxy/**</exclude>
-			</excludes>
-		</fileSet>				
-		<fileSet>
-			<directory>${basedir}/id</directory>
-			<outputDirectory>/</outputDirectory>
-			<includes>
-				<include>history.txt</include>
-				<include>readme_${moa-id-version}.txt</include>
-			</includes>
-		</fileSet>
-		<fileSet>
-			<directory>${basedir}</directory>
-			<outputDirectory>/</outputDirectory>
-			<includes>
-				<include>LICENSE-2.0.txt</include>
-				<include>NOTICE.txt</include>
-				<include>IAIK-LICENSE.txt</include>
-				<include>EUPL v.1.1 - Licence.pdf</include>
-				<include>SIC_LICENSE.txt</include>				
-			</includes>
-		</fileSet>
-	</fileSets>
-
-	<moduleSets>
-		<moduleSet>
-			<includes>
-				<include>MOA.id.server:moa-id-auth-edu</include>
-			</includes>
-			<binaries>
-				<includeDependencies>true</includeDependencies>
-				<outputDirectory>/</outputDirectory>
-				<outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping>
-				<dependencySets>
-					<dependencySet>
-						<includes>
-							<include>xalan-bin-dist:xalan</include>
-							<include>xerces:xercesImpl</include>
-							<include>xalan-bin-dist:xml-apis</include>
-							<include>xalan-bin-dist:serializer</include>
-						</includes>
-						<outputDirectory>/endorsed</outputDirectory>
-						<outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping>
-					</dependencySet>
-					<dependencySet>
-						<includes>
-							<include>iaik.prod:iaik_ecc</include>
-							<include>iaik.prod:iaik_jce_full</include>
-							<include>iaik.prod:iaik_Pkcs11Provider</include>
-							<include>iaik.prod:iaik_Pkcs11Wrapper:jar</include>
-						</includes>
-						<outputDirectory>/ext</outputDirectory>
-						<outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping>
-					</dependencySet>
-				</dependencySets>
-				<unpack>false</unpack>
-			</binaries>
-		</moduleSet>
-		
-		<moduleSet>
-			<includes>
-				<include>MOA.id.server:moa-id-lib</include>
-			</includes>
-			<binaries>
-				<attachmentClassifier>javadoc</attachmentClassifier>
-				<includeDependencies>false</includeDependencies>
-				<outputFileNameMapping>api-doc</outputFileNameMapping>
-				<outputDirectory>/doc</outputDirectory>
-				<unpack>true</unpack>
-			</binaries>
-		</moduleSet>
-
-		<moduleSet>
-			<includes>
-				<include>MOA.id:moa-id-configuration</include>
-			</includes>
-			<binaries>
-				<includeDependencies>false</includeDependencies>
-				<outputDirectory>/</outputDirectory>
-				<outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping>
-				<unpack>false</unpack>
-			</binaries>
-		</moduleSet>
-		
-		<moduleSet>
-			<includes>
-				<include>MOA.id.server:moa-id-commons</include>
-			</includes>
-			<binaries>
-				<includeDependencies>false</includeDependencies>
-				<outputDirectory>/migration/</outputDirectory>
-				<outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping>
-				<unpack>false</unpack>
-				<dependencySets>
-					<dependencySet>
-						<outputDirectory>/migration/dependency-jars</outputDirectory>
-						<outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping>
-					</dependencySet>
-				</dependencySets>
-			</binaries>
-		</moduleSet>
-		
-		<moduleSet>
-			<includes>
-				<include>MOA.id:moa-id-oa</include>
-			</includes>
-			<sources>
-			   <useDefaultExcludes>true</useDefaultExcludes>
-			   <outputDirectory>../</outputDirectory>
-			   <includeModuleDirectory>true</includeModuleDirectory>
-			   <outputDirectoryMapping>/source/${artifactId}/src</outputDirectoryMapping>
-			   <excludes>			           
-         		<exclude>**/target/**</exclude>
-         		<exclude>**/bin/**</exclude>
-      			<exclude>**/.settings/**</exclude>
-			      <exclude>.*</exclude>
-			   </excludes>
-			   <includes>
-						<include>pom.xml</include>
-					</includes>
-			</sources>
-			<binaries>
-				<includeDependencies>false</includeDependencies>
-				<outputDirectory>/</outputDirectory>
-				<outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping>
-				<unpack>false</unpack>
-				<dependencySets>
-					<dependencySet>
-						<includes>
-							<include>iaik:commons-iaik</include>
-							<include>MOA:moa-common</include>
-						</includes>
-						<outputDirectory>/source/repositority</outputDirectory>
-						<outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping>
-					</dependencySet>
-				</dependencySets>
-			</binaries>
-		</moduleSet>
-
-	</moduleSets>
-
-	<componentDescriptors>
-		<componentDescriptor>component-pkcs11libs.xml</componentDescriptor>
-	</componentDescriptors>
-
-</assembly>
diff --git a/id/assembly-auth-final.xml b/id/assembly-auth-final.xml
deleted file mode 100644
index 504f5620a..000000000
--- a/id/assembly-auth-final.xml
+++ /dev/null
@@ -1,191 +0,0 @@
-<assembly>

-	<id>id-auth-final-${moa-id-version}</id>

-	

-	<formats>

-		<format>dir</format>

-		<format>zip</format>

-		<!-- <format>tar.gz</format> -->

-	</formats>

-

-	<baseDirectory>moa-id-auth-final-${moa-id-version}</baseDirectory>

-

-	<fileSets>

-		<fileSet>

-			<directory>${basedir}/id/server/data/deploy</directory>

-			<outputDirectory>/</outputDirectory>

-			<excludes>

-				<exclude>**/conf/Catalina/**</exclude>

-				<exclude>${basedir}/id/server/data/deploy/conf/moa-id-proxy/**</exclude>

-			</excludes>

-		</fileSet>

-		<fileSet>

-			<directory>${basedir}/spss/handbook/conf/moa-spss/certstore</directory>

-			<outputDirectory>/conf/moa-id/certs/certstore</outputDirectory>

-			<includes>

-				<include>**/*</include>

-			</includes>

-		</fileSet>

-		<fileSet>

-			<directory>${basedir}/spss/handbook/conf/moa-spss/certstore</directory>

-			<outputDirectory>/conf/moa-spss/certstore</outputDirectory>

-			<includes>

-				<include>**/*</include>

-			</includes>

-		</fileSet>

-		<fileSet>

-			<directory>${basedir}/id/server/doc</directory>

-			<outputDirectory>/doc</outputDirectory>

-			<excludes>

-				<exclude>${basedir}/id/server/doc/proxy/**</exclude>

-			</excludes>

-		</fileSet>

-		<fileSet>

-			<directory>${basedir}/id/server/data/deploy/conf</directory>

-			<outputDirectory>/doc/conf</outputDirectory>

-			<excludes>

-				<exclude>${basedir}/id/server/data/deploy/conf/moa-id-proxy/**</exclude>

-			</excludes>

-		</fileSet>				

-		<fileSet>

-			<directory>${basedir}/id</directory>

-			<outputDirectory>/</outputDirectory>

-			<includes>

-				<include>history.txt</include>

-				<include>readme_${moa-id-version}.txt</include>

-			</includes>

-		</fileSet>

-		<fileSet>

-			<directory>${basedir}</directory>

-			<outputDirectory>/</outputDirectory>

-			<includes>

-				<include>LICENSE-2.0.txt</include>

-				<include>NOTICE.txt</include>

-				<include>IAIK-LICENSE.txt</include>

-				<include>EUPL v.1.1 - Licence.pdf</include>

-				<include>SIC_LICENSE.txt</include>				

-			</includes>

-		</fileSet>

-	</fileSets>

-

-	<moduleSets>

-		<moduleSet>

-			<includes>

-				<include>MOA.id.server:moa-id-auth-final</include>

-			</includes>

-			<binaries>

-				<includeDependencies>true</includeDependencies>

-				<outputDirectory>/</outputDirectory>

-				<outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping>

-				<dependencySets>

-					<dependencySet>

-						<includes>

-							<include>xalan-bin-dist:xalan</include>

-							<include>xerces:xercesImpl</include>

-							<include>xalan-bin-dist:xml-apis</include>

-							<include>xalan-bin-dist:serializer</include>

-						</includes>

-						<outputDirectory>/endorsed</outputDirectory>

-						<outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping>

-					</dependencySet>

-					<dependencySet>

-						<includes>

-							<include>iaik.prod:iaik_ecc</include>

-							<include>iaik.prod:iaik_jce_full</include>

-							<include>iaik.prod:iaik_Pkcs11Provider</include>

-							<include>iaik.prod:iaik_Pkcs11Wrapper:jar</include>

-						</includes>

-						<outputDirectory>/ext</outputDirectory>

-						<outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping>

-					</dependencySet>

-				</dependencySets>

-				<unpack>false</unpack>

-			</binaries>

-		</moduleSet>

-		

-		<moduleSet>

-			<includes>

-				<include>MOA.id.server:moa-id-lib</include>

-			</includes>

-			<binaries>

-				<attachmentClassifier>javadoc</attachmentClassifier>

-				<includeDependencies>false</includeDependencies>

-				<outputFileNameMapping>api-doc</outputFileNameMapping>

-				<outputDirectory>/doc</outputDirectory>

-				<unpack>true</unpack>

-			</binaries>

-		</moduleSet>

-

-		<moduleSet>

-			<includes>

-				<include>MOA.id:moa-id-configuration</include>

-			</includes>

-			<binaries>

-				<includeDependencies>false</includeDependencies>

-				<outputDirectory>/</outputDirectory>

-				<outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping>

-				<unpack>false</unpack>

-			</binaries>

-		</moduleSet>

-		

-		<moduleSet>

-			<includes>

-				<include>MOA.id.server:moa-id-commons</include>

-			</includes>

-			<binaries>

-				<includeDependencies>false</includeDependencies>

-				<outputDirectory>/migration/</outputDirectory>

-				<outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping>

-				<unpack>false</unpack>

-				<dependencySets>

-					<dependencySet>

-						<outputDirectory>/migration/dependency-jars</outputDirectory>

-						<outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping>

-					</dependencySet>

-				</dependencySets>

-			</binaries>

-		</moduleSet>

-		

-		<moduleSet>

-			<includes>

-				<include>MOA.id:moa-id-oa</include>

-			</includes>

-			<sources>

-			   <useDefaultExcludes>true</useDefaultExcludes>

-			   <outputDirectory>../</outputDirectory>

-			   <includeModuleDirectory>true</includeModuleDirectory>

-			   <outputDirectoryMapping>/source/${artifactId}/src</outputDirectoryMapping>

-			   <excludes>			           

-         		<exclude>**/target/**</exclude>

-         		<exclude>**/bin/**</exclude>

-      			<exclude>**/.settings/**</exclude>

-			      <exclude>.*</exclude>

-			   </excludes>

-			   <includes>

-						<include>pom.xml</include>

-					</includes>

-			</sources>

-			<binaries>

-				<includeDependencies>false</includeDependencies>

-				<outputDirectory>/</outputDirectory>

-				<outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping>

-				<unpack>false</unpack>

-				<dependencySets>

-					<dependencySet>

-						<includes>

-							<include>iaik:commons-iaik</include>

-							<include>MOA:moa-common</include>

-						</includes>

-						<outputDirectory>/source/repositority</outputDirectory>

-						<outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping>

-					</dependencySet>

-				</dependencySets>

-			</binaries>

-		</moduleSet>

-

-	</moduleSets>

-

-	<componentDescriptors>

-		<componentDescriptor>component-pkcs11libs.xml</componentDescriptor>

-	</componentDescriptors>

-

-</assembly>

diff --git a/id/assembly-proxy.xml b/id/assembly-proxy.xml
deleted file mode 100644
index d43783e69..000000000
--- a/id/assembly-proxy.xml
+++ /dev/null
@@ -1,120 +0,0 @@
-<assembly>

-	<id>id-proxy-${moa-id-proxy-version}</id>

-	

-	<formats>

-		<format>dir</format>

-		<format>zip</format>

-		<!-- <format>tar.gz</format> -->

-	</formats>

-

-	<baseDirectory>moa-id-proxy-${moa-id-proxy-version}</baseDirectory>

-

-	<fileSets>

-		<fileSet>

-			<directory>${basedir}/id/server/data/deploy</directory>

-			<outputDirectory>/</outputDirectory>

-			<excludes>

-				<exclude>**/conf/moa-spss/**</exclude>

-				<exclude>**/conf/moa-id/transforms/**</exclude>

-			</excludes>

-		</fileSet>

-		<fileSet>

-			<directory>${basedir}/id/server/doc/proxy</directory>

-			<outputDirectory>/doc</outputDirectory>

-		</fileSet>

-		<fileSet>

-			<directory>${basedir}/id</directory>

-			<outputDirectory>/</outputDirectory>

-			<includes>

-				<include>history.txt</include>

-				<include>readme_${moa-id-proxy-version}.txt</include>

-			</includes>

-		</fileSet>

-		<fileSet>

-			<directory>${basedir}</directory>

-			<outputDirectory>/</outputDirectory>

-			<includes>

-				<include>LICENSE-2.0.txt</include>

-				<include>NOTICE.txt</include>

-				<include>IAIK-LICENSE.txt</include>

-				<include>EUPL v.1.1 - Licence.pdf</include>

-				<include>SIC_LICENSE.txt</include>	

-			</includes>

-		</fileSet>

-	</fileSets>

-

-	<moduleSets>

-		<moduleSet>

-			<includes>

-				<include>MOA.id.server:moa-id-proxy</include>

-			</includes>

-			<binaries>

-				<includeDependencies>true</includeDependencies>

-				<outputDirectory>/</outputDirectory>

-				<outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping>

-				<dependencySets>

-					<dependencySet>

-						<includes>

-							<include>xalan-bin-dist:xalan</include>

-							<include>xerces:xercesImpl</include>

-							<include>xalan-bin-dist:xml-apis</include>

-							<include>xalan-bin-dist:serializer</include>

-						</includes>

-						<outputDirectory>/endorsed</outputDirectory>

-						<outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping>

-					</dependencySet>

-					<dependencySet>

-						<includes>

-							<include>iaik.prod:iaik_ecc</include>

-							<include>iaik.prod:iaik_jce_full</include>

-							<include>iaik.prod:iaik_Pkcs11Provider</include>

-							<include>iaik.prod:iaik_Pkcs11Wrapper:jar</include>

-						</includes>

-						<outputDirectory>/ext</outputDirectory>

-						<outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping>

-					</dependencySet>

-				</dependencySets>

-				<unpack>false</unpack>

-			</binaries>

-		</moduleSet>

-<!-- 		<moduleSet>

-			<includes>

-				<include>MOA:moa-id-oa</include>

-			</includes>

-			<binaries>

-				<includeDependencies>true</includeDependencies>

-				<outputDirectory>/</outputDirectory>

-				<outputFileNameMapping>oa.${extension}</outputFileNameMapping>

-				<unpack>false</unpack>

-			</binaries>

-		</moduleSet> -->

-		<moduleSet>

-			<includes>

-				<include>MOA.id.server:moa-id-lib</include>

-			</includes>

-			<binaries>

-				<attachmentClassifier>javadoc</attachmentClassifier>

-				<includeDependencies>false</includeDependencies>

-				<outputFileNameMapping>api-doc</outputFileNameMapping>

-				<outputDirectory>/doc</outputDirectory>

-				<unpack>true</unpack>

-			</binaries>

-		</moduleSet>

-		<!-- <moduleSet>

-			<includes>

-				<include>MOA.id:moa-id-templates</include>

-			</includes>

-			<binaries>

-				<includeDependencies>false</includeDependencies>

-				<outputFileNameMapping>moaid-templates.war</outputFileNameMapping>

-				<outputDirectory>/templates</outputDirectory>

-				<unpack>false</unpack>

-			</binaries>

-		</moduleSet>-->

-	</moduleSets>

-	

-	<componentDescriptors>

-		<componentDescriptor>component-pkcs11libs.xml</componentDescriptor>

-	</componentDescriptors>

-

-</assembly>

diff --git a/id/oa/pom.xml b/id/oa/pom.xml
index b4e8b9858..2897de96b 100644
--- a/id/oa/pom.xml
+++ b/id/oa/pom.xml
@@ -19,7 +19,7 @@
     </properties>
     
     <build>
-        <finalName>oa</finalName>
+        <finalName>moa-id-oa</finalName>
         <plugins>
 <!--         		  <plugin>
             		<groupId>org.codehaus.mojo</groupId>