From 072f482d381f6cc00c336e3f633c975eae3aef37 Mon Sep 17 00:00:00 2001
From: pdanner <pdanner@d688527b-c9ab-4aba-bd8d-4036d912da1d>
Date: Tue, 11 Sep 2007 10:24:18 +0000
Subject: fixed build process for spss tools

git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@1004 d688527b-c9ab-4aba-bd8d-4036d912da1d
---
 spss/assembly-lib.xml | 78 ++++++++++++++++++++++++++-------------------------
 1 file changed, 40 insertions(+), 38 deletions(-)

(limited to 'spss/assembly-lib.xml')

diff --git a/spss/assembly-lib.xml b/spss/assembly-lib.xml
index 158cf53e9..d955523d4 100644
--- a/spss/assembly-lib.xml
+++ b/spss/assembly-lib.xml
@@ -1,9 +1,10 @@
 <assembly>
 	<id>spss-${project.version}-lib</id>
-
+	
 	<formats>
+		<format>dir</format>
 		<format>zip</format>
-        <format>tar.gz</format>
+		<format>tar.gz</format>
 	</formats>
 
 	<baseDirectory>moa-spss-lib-${project.version}</baseDirectory>
@@ -21,11 +22,11 @@
 							<include>xalan-bin-dist:xalan</include>
 							<include>xerces:xercesImpl</include>
 							<include>xalan-bin-dist:xml-apis</include>
-                            <include>xalan-bin-dist:serializer</include>
+							<include>xalan-bin-dist:serializer</include>
 						</includes>
 						<outputDirectory>/endorsed</outputDirectory>
-                        <!-- strip version off the artifact file names -->
-                        <outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping>
+						<!-- strip version off the artifact file names -->
+						<outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping>
 					</dependencySet>
 					<dependencySet>
 						<includes>
@@ -35,31 +36,31 @@
 							<include>iaik.prod:iaik_Pkcs11Wrapper:jar</include>
 						</includes>
 						<outputDirectory>/ext</outputDirectory>
-                        <!-- strip version off the artifact file names -->
-                        <outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping>
+						<!-- strip version off the artifact file names -->
+						<outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping>
+					</dependencySet>
+					<dependencySet>
+						<includes>
+							<include>MOA:moa-common</include>
+						</includes>
+						<outputDirectory>/</outputDirectory>
+						<!-- strip version off the artifact file names -->
+						<outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping>
+					</dependencySet>
+					<dependencySet>
+						<excludes>
+							<exclude>MOA:moa-common</exclude>
+							<exclude>xalan-bin-dist:xalan</exclude>
+							<exclude>xerces:xercesImpl</exclude>
+							<exclude>xalan-bin-dist:xml-apis</exclude>
+							<exclude>xalan-bin-dist:serializer</exclude>
+							<exclude>iaik.prod:iaik_ecc</exclude>
+							<exclude>iaik.prod:iaik_jce_full</exclude>
+							<exclude>iaik.prod:iaik_Pkcs11Provider</exclude>
+							<exclude>iaik.prod:iaik_Pkcs11Wrapper</exclude>
+						</excludes>
+						<outputDirectory>/lib</outputDirectory>
 					</dependencySet>
-                    <dependencySet>
-                        <includes>
-                            <include>MOA:moa-common</include>
-                        </includes>
-                        <outputDirectory>/</outputDirectory>
-                        <!-- strip version off the artifact file names -->
-                        <outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping>
-                    </dependencySet>
-                    <dependencySet>
-                        <excludes>
-                            <exclude>MOA:moa-common</exclude>
-                            <exclude>xalan-bin-dist:xalan</exclude>
-                            <exclude>xerces:xercesImpl</exclude>
-                            <exclude>xalan-bin-dist:xml-apis</exclude>
-                            <exclude>xalan-bin-dist:serializer</exclude>
-                            <exclude>iaik.prod:iaik_ecc</exclude>
-                            <exclude>iaik.prod:iaik_jce_full</exclude>
-                            <exclude>iaik.prod:iaik_Pkcs11Provider</exclude>
-                            <exclude>iaik.prod:iaik_Pkcs11Wrapper</exclude>
-                        </excludes>
-                        <outputDirectory>/lib</outputDirectory>
-                    </dependencySet>
 				</dependencySets>
 				<outputFileNameMapping>moa-spss.${extension}</outputFileNameMapping>
 				<unpack>false</unpack>
@@ -86,13 +87,15 @@
 				<dependencySets>
 					<dependencySet>
 						<includes>
+							<include>iaik.prod:iaik_ecc</include>
+							<include>iaik.prod:iaik_jce_full</include>
 							<include>iaik.prod:iaik_moa</include>
 							<include>log4j:log4j</include>
 							<include>xalan-bin-dist:xalan</include>
 						</includes>
 						<outputDirectory>/tools</outputDirectory>
-                        <!-- strip version off the artifact file names -->
-                        <outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping>
+						<!-- strip version off the artifact file names -->
+						<outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping>
 					</dependencySet>
 				</dependencySets>
 				<outputDirectory>/tools</outputDirectory>
@@ -102,18 +105,17 @@
 		</moduleSet>
 	</moduleSets>
 	
-    <componentDescriptors>
-        <componentDescriptor>component-pkcs11libs.xml</componentDescriptor>
-    </componentDescriptors>
-    
-    
+	<componentDescriptors>
+		<componentDescriptor>component-pkcs11libs.xml</componentDescriptor>
+	</componentDescriptors>
+
 	<files>
 		<file>
 			<source>${basedir}/spss/handbook/handbook.html</source>
 			<outputDirectory>/doc</outputDirectory>
 		</file>
 	</files>
-	
+
 	<fileSets>
 		<fileSet>
 			<directory>${basedir}/spss/server</directory>
@@ -142,7 +144,7 @@
 			<outputDirectory>/licenses</outputDirectory>
 		</fileSet>
 		<fileSet>
-			<directory>${basedir}/spss/server/tools/run</directory>
+			<directory>${basedir}/spss/server/tools/src/main/scripts</directory>
 			<outputDirectory>/tools</outputDirectory>
 		</fileSet>
 	</fileSets>
-- 
cgit v1.2.3