From 07991cc65dc53726d0144b637e55227d613e13a1 Mon Sep 17 00:00:00 2001
From: knowcenter <knowcenter@7b5415b0-85f9-ee4d-85bd-d5d0c3b42d1c>
Date: Fri, 21 Sep 2007 07:30:22 +0000
Subject: git-svn-id: https://joinup.ec.europa.eu/svn/pdf-as/trunk@219
 7b5415b0-85f9-ee4d-85bd-d5d0c3b42d1c

---
 src/main/assembly/assemble_distribution_cl.xml | 40 +----------------------
 src/main/assembly/assemble_distribution_ws.xml | 44 ++++----------------------
 2 files changed, 8 insertions(+), 76 deletions(-)

diff --git a/src/main/assembly/assemble_distribution_cl.xml b/src/main/assembly/assemble_distribution_cl.xml
index 89acd5e..1cc3062 100644
--- a/src/main/assembly/assemble_distribution_cl.xml
+++ b/src/main/assembly/assemble_distribution_cl.xml
@@ -5,39 +5,8 @@
 	<formats>
 		<format>zip</format>
 	</formats>
-	<includeBaseDirectory>true</includeBaseDirectory>
+	<includeBaseDirectory>false</includeBaseDirectory>
 	<fileSets>
-		<!--fileSet>
-    <directory>src/main/resources</directory>
-    <outputDirectory>/SeLaN</outputDirectory>
-    <includes>
-      <include>**/*</include>
-    </includes>
-  </fileSet>
-  <fileSet>
-    <directory>src/main/java</directory>
-    <outputDirectory>/SeLaN</outputDirectory>
-    <includes>
-      <include>**/*</include>
-    </includes>
-  </fileSet>
-  <fileSet>
-    <directory>doc/readme</directory>
-    <outputDirectory>/</outputDirectory>
-    <includes>
-      <include>readme.pdf</include>
-    </includes>
-  </fileSet-->
-		<!--fileSet>
-  <directory>misc/deliverable</directory>
-  <outputDirectory>/</outputDirectory>
-  <includes>
-    <include>**/*</include>
-  </includes>
-  <excludes>
-    <exclude>.svn</exclude>
-  </excludes>
-</fileSet-->
 		<fileSet>
 			<directory>distribution/jdk/1.5.0_06/jre</directory>
 			<outputDirectory>/pdf-as-cl/jre</outputDirectory>
@@ -45,13 +14,6 @@
 				<include>**/*</include>
 			</includes>
 		</fileSet>
-		<!--fileSet>
-<directory>target</directory>
-<outputDirectory>/pdf-as-cl</outputDirectory>
-<includes>
-  <include>pdf-as*.jar</include>
-</includes>
-</fileSet-->
 		<fileSet>
 			<directory>target</directory>
 			<outputDirectory>/pdf-as-cl</outputDirectory>
diff --git a/src/main/assembly/assemble_distribution_ws.xml b/src/main/assembly/assemble_distribution_ws.xml
index 5f791b9..ff73f9d 100644
--- a/src/main/assembly/assemble_distribution_ws.xml
+++ b/src/main/assembly/assemble_distribution_ws.xml
@@ -5,39 +5,8 @@
 	<formats>
 		<format>zip</format>
 	</formats>
-	<includeBaseDirectory>true</includeBaseDirectory>
+	<includeBaseDirectory>false</includeBaseDirectory>
 	<fileSets>
-		<!--fileSet>
-    <directory>src/main/resources</directory>
-    <outputDirectory>/SeLaN</outputDirectory>
-    <includes>
-      <include>**/*</include>
-    </includes>
-  </fileSet>
-  <fileSet>
-    <directory>src/main/java</directory>
-    <outputDirectory>/SeLaN</outputDirectory>
-    <includes>
-      <include>**/*</include>
-    </includes>
-  </fileSet>
-  <fileSet>
-    <directory>doc/readme</directory>
-    <outputDirectory>/</outputDirectory>
-    <includes>
-      <include>readme.pdf</include>
-    </includes>
-  </fileSet-->
-		<!--fileSet>
-  <directory>misc/deliverable</directory>
-  <outputDirectory>/</outputDirectory>
-  <includes>
-    <include>**/*</include>
-  </includes>
-  <excludes>
-    <exclude>.svn</exclude>
-  </excludes>
-</fileSet-->
 		<fileSet>
 			<directory>distribution/tomcat/tomcat-5.5.20-standalone</directory>
 			<outputDirectory>/pdf-as-ws/tomcat</outputDirectory>
@@ -151,7 +120,7 @@
 		</fileSet>
 		
 						<fileSet>
-			<directory>distribution/moaspss/moa-spss-1.4.0</directory>
+			<directory>distribution/moaspss/moa-spss-1.4.2beta1</directory>
 			<outputDirectory>/pdf-as-ws/tomcat/webapps</outputDirectory>
 			<includes>
 				<include>moa-spss.war</include>
@@ -161,7 +130,7 @@
 			</excludes>
 		</fileSet>
 								<fileSet>
-			<directory>distribution/moaspss/moa-spss-1.4.0/conf</directory>
+			<directory>distribution/moaspss/moa-spss-1.4.2beta1/conf</directory>
 			<outputDirectory>/pdf-as-ws/tomcat/conf</outputDirectory>
 			<includes>
 				<include>**/*</include>
@@ -171,7 +140,7 @@
 			</excludes>
 		</fileSet>
 					<fileSet>
-			<directory>distribution/moaspss/moa-spss-1.4.0/endorsed</directory>
+			<directory>distribution/moaspss/moa-spss-1.4.2beta1/endorsed</directory>
 			<outputDirectory>/pdf-as-ws/tomcat/common/endorsed</outputDirectory>
 			<includes>
 				<include>**/*</include>
@@ -181,7 +150,7 @@
 			</excludes>
 		</fileSet>
 							<fileSet>
-			<directory>distribution/moaspss/moa-spss-1.4.0/ext</directory>
+			<directory>distribution/moaspss/moa-spss-1.4.2beta1/ext</directory>
 			<outputDirectory>/pdf-as-ws/tomcat/common/lib</outputDirectory>
 			<includes>
 				<include>**/*</include>
@@ -197,7 +166,8 @@
 			<outputDirectory>/pdf-as-ws/tomcat</outputDirectory>
 			<includes>
 				<include>startTomcat.bat</include>
-				<include>stopTomcat.bat</include>
+				<include>stopTomcat.bat</include>
+				<include>favicon.ico</include>
 			</includes>
 		</fileSet>
 		<fileSet>
-- 
cgit v1.2.3