From 6be52df44678056f95d36f08361b94e2befeb044 Mon Sep 17 00:00:00 2001
From: mcentner <mcentner@d688527b-c9ab-4aba-bd8d-4036d912da1d>
Date: Tue, 28 Aug 2007 11:53:33 +0000
Subject: Xalan artifact serializer.jar added.

git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@968 d688527b-c9ab-4aba-bd8d-4036d912da1d
---
 common-test/pom.xml                                |  12 ++-
 common/pom.xml                                     |  10 ++-
 id/assembly-auth.xml                               |   3 +-
 id/assembly-proxy.xml                              |   3 +-
 id/server/auth/pom.xml                             |  10 ++-
 id/server/idserverlib/pom.xml                      |   8 +-
 id/server/proxy/pom.xml                            |  10 ++-
 pom.xml                                            |  52 ++++++------
 .../serializer/2.7.0/serializer-2.7.0.jar          | Bin 0 -> 188993 bytes
 .../serializer/2.7.0/serializer-2.7.0.jar.md5      |   1 +
 .../serializer/2.7.0/serializer-2.7.0.jar.sha1     |   1 +
 .../serializer/2.7.0/serializer-2.7.0.pom          |   6 ++
 .../serializer/2.7.0/serializer-2.7.0.pom.md5      |   1 +
 .../serializer/2.7.0/serializer-2.7.0.pom.sha1     |   1 +
 .../xalan-bin-dist/serializer/maven-metadata.xml   |  11 +++
 .../serializer/maven-metadata.xml.md5              |   1 +
 .../serializer/maven-metadata.xml.sha1             |   1 +
 .../xml-apis/2.7.0/xml-apis-2.7.0.jar              | Bin 0 -> 194205 bytes
 .../xml-apis/2.7.0/xml-apis-2.7.0.jar.md5          |   1 +
 .../xml-apis/2.7.0/xml-apis-2.7.0.jar.sha1         |   1 +
 .../xml-apis/2.7.0/xml-apis-2.7.0.pom              |   6 ++
 .../xml-apis/2.7.0/xml-apis-2.7.0.pom.md5          |   1 +
 .../xml-apis/2.7.0/xml-apis-2.7.0.pom.sha1         |   1 +
 .../xalan-bin-dist/xml-apis/maven-metadata.xml     |  11 +++
 .../xalan-bin-dist/xml-apis/maven-metadata.xml.md5 |   1 +
 .../xml-apis/maven-metadata.xml.sha1               |   1 +
 spss/assembly-lib.xml                              |  89 ++-------------------
 spss/assembly.xml                                  |  86 +-------------------
 spss/server/serverlib/pom.xml                      |   8 +-
 spss/server/serverws/pom.xml                       |  10 ++-
 30 files changed, 139 insertions(+), 208 deletions(-)
 create mode 100644 repository/xalan-bin-dist/serializer/2.7.0/serializer-2.7.0.jar
 create mode 100644 repository/xalan-bin-dist/serializer/2.7.0/serializer-2.7.0.jar.md5
 create mode 100644 repository/xalan-bin-dist/serializer/2.7.0/serializer-2.7.0.jar.sha1
 create mode 100644 repository/xalan-bin-dist/serializer/2.7.0/serializer-2.7.0.pom
 create mode 100644 repository/xalan-bin-dist/serializer/2.7.0/serializer-2.7.0.pom.md5
 create mode 100644 repository/xalan-bin-dist/serializer/2.7.0/serializer-2.7.0.pom.sha1
 create mode 100644 repository/xalan-bin-dist/serializer/maven-metadata.xml
 create mode 100644 repository/xalan-bin-dist/serializer/maven-metadata.xml.md5
 create mode 100644 repository/xalan-bin-dist/serializer/maven-metadata.xml.sha1
 create mode 100644 repository/xalan-bin-dist/xml-apis/2.7.0/xml-apis-2.7.0.jar
 create mode 100644 repository/xalan-bin-dist/xml-apis/2.7.0/xml-apis-2.7.0.jar.md5
 create mode 100644 repository/xalan-bin-dist/xml-apis/2.7.0/xml-apis-2.7.0.jar.sha1
 create mode 100644 repository/xalan-bin-dist/xml-apis/2.7.0/xml-apis-2.7.0.pom
 create mode 100644 repository/xalan-bin-dist/xml-apis/2.7.0/xml-apis-2.7.0.pom.md5
 create mode 100644 repository/xalan-bin-dist/xml-apis/2.7.0/xml-apis-2.7.0.pom.sha1
 create mode 100644 repository/xalan-bin-dist/xml-apis/maven-metadata.xml
 create mode 100644 repository/xalan-bin-dist/xml-apis/maven-metadata.xml.md5
 create mode 100644 repository/xalan-bin-dist/xml-apis/maven-metadata.xml.sha1

diff --git a/common-test/pom.xml b/common-test/pom.xml
index 69f653348..697cc04b8 100644
--- a/common-test/pom.xml
+++ b/common-test/pom.xml
@@ -37,17 +37,21 @@
             <artifactId>iaik_jce_full</artifactId>
             <optional>true</optional>
         </dependency>
+        <dependency>
+            <groupId>xerces</groupId>
+            <artifactId>xercesImpl</artifactId>
+        </dependency>
         <dependency>
             <groupId>xalan-bin-dist</groupId>
             <artifactId>xalan</artifactId>
         </dependency>
         <dependency>
-            <groupId>xerces</groupId>
-            <artifactId>xercesImpl</artifactId>
+            <groupId>xalan-bin-dist</groupId>
+            <artifactId>xml-apis</artifactId>
         </dependency>
         <dependency>
-            <groupId>xerces</groupId>
-            <artifactId>xmlParserAPIs</artifactId>
+            <groupId>xalan-bin-dist</groupId>
+            <artifactId>serializer</artifactId>
         </dependency>
     </dependencies>
 </project>
diff --git a/common/pom.xml b/common/pom.xml
index f4eacf8e9..c51265c96 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -51,10 +51,16 @@
             <optional>true</optional>
         </dependency>
         <dependency>
-            <groupId>xerces</groupId>
-            <artifactId>xmlParserAPIs</artifactId>
+            <groupId>xalan-bin-dist</groupId>
+            <artifactId>xml-apis</artifactId>
             <scope>compile</scope>
             <optional>true</optional>
         </dependency>
+        <dependency>
+            <groupId>xalan-bin-dist</groupId>
+            <artifactId>serializer</artifactId>
+            <scope>runtime</scope>
+            <optional>true</optional>
+        </dependency>
     </dependencies>
 </project>
diff --git a/id/assembly-auth.xml b/id/assembly-auth.xml
index bde8a7bba..c92e30179 100644
--- a/id/assembly-auth.xml
+++ b/id/assembly-auth.xml
@@ -63,7 +63,8 @@
                         <includes>
                             <include>xalan-bin-dist:xalan</include>
                             <include>xerces:xercesImpl</include>
-                            <include>xerces:xmlParserAPIs</include>
+                            <include>xalan-bin-dist:xml-apis</include>
+                            <include>xalan-bin-dist:serializer</include>
                         </includes>
                         <outputDirectory>/endorsed</outputDirectory>
                         <outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping>
diff --git a/id/assembly-proxy.xml b/id/assembly-proxy.xml
index a24e3d217..6817b70be 100644
--- a/id/assembly-proxy.xml
+++ b/id/assembly-proxy.xml
@@ -49,7 +49,8 @@
                         <includes>
                             <include>xalan-bin-dist:xalan</include>
                             <include>xerces:xercesImpl</include>
-                            <include>xerces:xmlParserAPIs</include>
+                            <include>xalan-bin-dist:xml-apis</include>
+                            <include>xalan-bin-dist:serializer</include>
                         </includes>
                         <outputDirectory>/endorsed</outputDirectory>
                         <outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping>
diff --git a/id/server/auth/pom.xml b/id/server/auth/pom.xml
index b3bb1f8b0..54f7ee54e 100644
--- a/id/server/auth/pom.xml
+++ b/id/server/auth/pom.xml
@@ -98,8 +98,14 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>xerces</groupId>
-            <artifactId>xmlParserAPIs</artifactId>
+            <groupId>xalan-bin-dist</groupId>
+            <artifactId>xml-apis</artifactId>
+            <!-- should be provided by the container or jre -->
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>xalan-bin-dist</groupId>
+            <artifactId>serializer</artifactId>
             <!-- should be provided by the container or jre -->
             <scope>provided</scope>
         </dependency>
diff --git a/id/server/idserverlib/pom.xml b/id/server/idserverlib/pom.xml
index 1fbcfeb0c..22dadc5b9 100644
--- a/id/server/idserverlib/pom.xml
+++ b/id/server/idserverlib/pom.xml
@@ -40,13 +40,17 @@
             <artifactId>xercesImpl</artifactId>
         </dependency>
         <dependency>
-            <groupId>xerces</groupId>
-            <artifactId>xmlParserAPIs</artifactId>
+            <groupId>xalan-bin-dist</groupId>
+            <artifactId>xml-apis</artifactId>
         </dependency>
         <dependency>
             <groupId>xalan-bin-dist</groupId>
             <artifactId>xalan</artifactId>
         </dependency>
+        <dependency>
+            <groupId>xalan-bin-dist</groupId>
+            <artifactId>serializer</artifactId>
+        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
diff --git a/id/server/proxy/pom.xml b/id/server/proxy/pom.xml
index 24024c9c7..3c29d62b5 100644
--- a/id/server/proxy/pom.xml
+++ b/id/server/proxy/pom.xml
@@ -100,11 +100,17 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>xerces</groupId>
-            <artifactId>xmlParserAPIs</artifactId>
+            <groupId>xalan-bin-dist</groupId>
+            <artifactId>xml-apis</artifactId>
             <!-- should be provided by the container or jre -->
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>xalan-bin-dist</groupId>
+            <artifactId>serializer</artifactId>
+            <!-- should be provided by the container or jre -->
+            <scope>provided</scope>
+        </dependency>
 	</dependencies>
 
 </project>
diff --git a/pom.xml b/pom.xml
index ff5fb98c5..7746a6891 100644
--- a/pom.xml
+++ b/pom.xml
@@ -254,36 +254,42 @@
                 <type>dll</type>
                 <scope>runtime</scope>
             </dependency>
+            <dependency>
+                <groupId>xerces</groupId>
+                <artifactId>xercesImpl</artifactId>
+                <version>2.7.1</version>
+                <scope>compile</scope>
+            </dependency>
+            <!-- The xmlParserAPIs.jar of the official xalan distribution
+                 and the one in the central repository differ. So, we
+                 are going to include the official one in our own
+                 distribution to prevent from problems with different
+                 versions in the endorsed directory of the servlet container
+                 or jre endorsed directory. -->
             <dependency>
-                <groupId>xalan</groupId>
-                <artifactId>xalan</artifactId>
-                <version>2.7.0</version>
-                <scope>compile</scope>
+                <groupId>xalan-bin-dist</groupId>
+                <artifactId>xml-apis</artifactId>
+                <version>2.7.0</version><!-- xalan version -->
+                <scope>runtime</scope>
             </dependency>
             <!-- The xalan.jar of the official xalan distribution
                  and the one in the central repository differ. So, we
                  are going to include the official one in our own
                  distribution to prevent from problems with different
                  versions in the endorsed directory of the servlet container
-                 or jre endorsed directory. -->
-            <dependency>
-                <groupId>xalan-bin-dist</groupId>
-                <artifactId>xalan</artifactId>
-                <version>2.7.0</version>
-                <scope>runtime</scope>
-            </dependency>
-            <dependency>
-                <groupId>xerces</groupId>
-                <artifactId>xercesImpl</artifactId>
-                <version>2.7.1</version>
-                <scope>compile</scope>
-            </dependency>
-            <dependency>
-                <groupId>xerces</groupId>
-                <artifactId>xmlParserAPIs</artifactId>
-                <version>2.6.2</version>
-                <scope>compile</scope>
-            </dependency>
+                 or jre endorsed directory. -->
+            <dependency>
+                <groupId>xalan-bin-dist</groupId>
+                <artifactId>xalan</artifactId>
+                <version>2.7.0</version>
+                <scope>runtime</scope>
+            </dependency>
+            <dependency>
+                <groupId>xalan-bin-dist</groupId>
+                <artifactId>serializer</artifactId>
+                <version>2.7.0</version><!-- xalan version -->
+                <scope>runtime</scope>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
diff --git a/repository/xalan-bin-dist/serializer/2.7.0/serializer-2.7.0.jar b/repository/xalan-bin-dist/serializer/2.7.0/serializer-2.7.0.jar
new file mode 100644
index 000000000..7cd806964
Binary files /dev/null and b/repository/xalan-bin-dist/serializer/2.7.0/serializer-2.7.0.jar differ
diff --git a/repository/xalan-bin-dist/serializer/2.7.0/serializer-2.7.0.jar.md5 b/repository/xalan-bin-dist/serializer/2.7.0/serializer-2.7.0.jar.md5
new file mode 100644
index 000000000..42964c31e
--- /dev/null
+++ b/repository/xalan-bin-dist/serializer/2.7.0/serializer-2.7.0.jar.md5
@@ -0,0 +1 @@
+35aa6a56662458d9dc28a9b628f84847
\ No newline at end of file
diff --git a/repository/xalan-bin-dist/serializer/2.7.0/serializer-2.7.0.jar.sha1 b/repository/xalan-bin-dist/serializer/2.7.0/serializer-2.7.0.jar.sha1
new file mode 100644
index 000000000..8bcab225d
--- /dev/null
+++ b/repository/xalan-bin-dist/serializer/2.7.0/serializer-2.7.0.jar.sha1
@@ -0,0 +1 @@
+85ddd38e4cdbc22fb6c518f3d35744336da6fbfd
\ No newline at end of file
diff --git a/repository/xalan-bin-dist/serializer/2.7.0/serializer-2.7.0.pom b/repository/xalan-bin-dist/serializer/2.7.0/serializer-2.7.0.pom
new file mode 100644
index 000000000..87bfdd006
--- /dev/null
+++ b/repository/xalan-bin-dist/serializer/2.7.0/serializer-2.7.0.pom
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?><project>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>xalan-bin-dist</groupId>
+  <artifactId>serializer</artifactId>
+  <version>2.7.0</version>
+</project>
\ No newline at end of file
diff --git a/repository/xalan-bin-dist/serializer/2.7.0/serializer-2.7.0.pom.md5 b/repository/xalan-bin-dist/serializer/2.7.0/serializer-2.7.0.pom.md5
new file mode 100644
index 000000000..7b1cf9d6d
--- /dev/null
+++ b/repository/xalan-bin-dist/serializer/2.7.0/serializer-2.7.0.pom.md5
@@ -0,0 +1 @@
+b40d1a414676a4f358f157c6898664bb
\ No newline at end of file
diff --git a/repository/xalan-bin-dist/serializer/2.7.0/serializer-2.7.0.pom.sha1 b/repository/xalan-bin-dist/serializer/2.7.0/serializer-2.7.0.pom.sha1
new file mode 100644
index 000000000..2ebd5256a
--- /dev/null
+++ b/repository/xalan-bin-dist/serializer/2.7.0/serializer-2.7.0.pom.sha1
@@ -0,0 +1 @@
+9e7770973422a62b4a3ae7ea5c20b6d06b463528
\ No newline at end of file
diff --git a/repository/xalan-bin-dist/serializer/maven-metadata.xml b/repository/xalan-bin-dist/serializer/maven-metadata.xml
new file mode 100644
index 000000000..3b2919728
--- /dev/null
+++ b/repository/xalan-bin-dist/serializer/maven-metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?><metadata>
+  <groupId>xalan-bin-dist</groupId>
+  <artifactId>serializer</artifactId>
+  <version>2.7.0</version>
+  <versioning>
+    <versions>
+      <version>2.7.0</version>
+    </versions>
+    <lastUpdated>20070828113437</lastUpdated>
+  </versioning>
+</metadata>
\ No newline at end of file
diff --git a/repository/xalan-bin-dist/serializer/maven-metadata.xml.md5 b/repository/xalan-bin-dist/serializer/maven-metadata.xml.md5
new file mode 100644
index 000000000..1e74cd099
--- /dev/null
+++ b/repository/xalan-bin-dist/serializer/maven-metadata.xml.md5
@@ -0,0 +1 @@
+618746ccbd308489eec0a5f6ceafb565
\ No newline at end of file
diff --git a/repository/xalan-bin-dist/serializer/maven-metadata.xml.sha1 b/repository/xalan-bin-dist/serializer/maven-metadata.xml.sha1
new file mode 100644
index 000000000..4463aea5b
--- /dev/null
+++ b/repository/xalan-bin-dist/serializer/maven-metadata.xml.sha1
@@ -0,0 +1 @@
+de784579e439fb38440facdd43d70c159434cc44
\ No newline at end of file
diff --git a/repository/xalan-bin-dist/xml-apis/2.7.0/xml-apis-2.7.0.jar b/repository/xalan-bin-dist/xml-apis/2.7.0/xml-apis-2.7.0.jar
new file mode 100644
index 000000000..243eaeaeb
Binary files /dev/null and b/repository/xalan-bin-dist/xml-apis/2.7.0/xml-apis-2.7.0.jar differ
diff --git a/repository/xalan-bin-dist/xml-apis/2.7.0/xml-apis-2.7.0.jar.md5 b/repository/xalan-bin-dist/xml-apis/2.7.0/xml-apis-2.7.0.jar.md5
new file mode 100644
index 000000000..739ea21f7
--- /dev/null
+++ b/repository/xalan-bin-dist/xml-apis/2.7.0/xml-apis-2.7.0.jar.md5
@@ -0,0 +1 @@
+2e7aed876c51af3ee6a23ed524180d37
\ No newline at end of file
diff --git a/repository/xalan-bin-dist/xml-apis/2.7.0/xml-apis-2.7.0.jar.sha1 b/repository/xalan-bin-dist/xml-apis/2.7.0/xml-apis-2.7.0.jar.sha1
new file mode 100644
index 000000000..0916b2415
--- /dev/null
+++ b/repository/xalan-bin-dist/xml-apis/2.7.0/xml-apis-2.7.0.jar.sha1
@@ -0,0 +1 @@
+dc7315e359b5e43f20131414d60b5c307aace975
\ No newline at end of file
diff --git a/repository/xalan-bin-dist/xml-apis/2.7.0/xml-apis-2.7.0.pom b/repository/xalan-bin-dist/xml-apis/2.7.0/xml-apis-2.7.0.pom
new file mode 100644
index 000000000..152db2bdc
--- /dev/null
+++ b/repository/xalan-bin-dist/xml-apis/2.7.0/xml-apis-2.7.0.pom
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?><project>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>xalan-bin-dist</groupId>
+  <artifactId>xml-apis</artifactId>
+  <version>2.7.0</version>
+</project>
\ No newline at end of file
diff --git a/repository/xalan-bin-dist/xml-apis/2.7.0/xml-apis-2.7.0.pom.md5 b/repository/xalan-bin-dist/xml-apis/2.7.0/xml-apis-2.7.0.pom.md5
new file mode 100644
index 000000000..b4ab1984a
--- /dev/null
+++ b/repository/xalan-bin-dist/xml-apis/2.7.0/xml-apis-2.7.0.pom.md5
@@ -0,0 +1 @@
+397393d2fed99f21295f9765db4daa39
\ No newline at end of file
diff --git a/repository/xalan-bin-dist/xml-apis/2.7.0/xml-apis-2.7.0.pom.sha1 b/repository/xalan-bin-dist/xml-apis/2.7.0/xml-apis-2.7.0.pom.sha1
new file mode 100644
index 000000000..af96bd0f0
--- /dev/null
+++ b/repository/xalan-bin-dist/xml-apis/2.7.0/xml-apis-2.7.0.pom.sha1
@@ -0,0 +1 @@
+e05fa7c530c0d57a6727153144b099f9ac7bd3bf
\ No newline at end of file
diff --git a/repository/xalan-bin-dist/xml-apis/maven-metadata.xml b/repository/xalan-bin-dist/xml-apis/maven-metadata.xml
new file mode 100644
index 000000000..97cbc7798
--- /dev/null
+++ b/repository/xalan-bin-dist/xml-apis/maven-metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?><metadata>
+  <groupId>xalan-bin-dist</groupId>
+  <artifactId>xml-apis</artifactId>
+  <version>2.7.0</version>
+  <versioning>
+    <versions>
+      <version>2.7.0</version>
+    </versions>
+    <lastUpdated>20070828112349</lastUpdated>
+  </versioning>
+</metadata>
\ No newline at end of file
diff --git a/repository/xalan-bin-dist/xml-apis/maven-metadata.xml.md5 b/repository/xalan-bin-dist/xml-apis/maven-metadata.xml.md5
new file mode 100644
index 000000000..59864b4b4
--- /dev/null
+++ b/repository/xalan-bin-dist/xml-apis/maven-metadata.xml.md5
@@ -0,0 +1 @@
+3b2a8867dbd3e9474a2ff3fce851d510
\ No newline at end of file
diff --git a/repository/xalan-bin-dist/xml-apis/maven-metadata.xml.sha1 b/repository/xalan-bin-dist/xml-apis/maven-metadata.xml.sha1
new file mode 100644
index 000000000..6ed6a1d39
--- /dev/null
+++ b/repository/xalan-bin-dist/xml-apis/maven-metadata.xml.sha1
@@ -0,0 +1 @@
+12d4a985dee1a1d5e9cbb524c83c2f5f8be5cd81
\ No newline at end of file
diff --git a/spss/assembly-lib.xml b/spss/assembly-lib.xml
index 0ca602f4a..0b47705a2 100644
--- a/spss/assembly-lib.xml
+++ b/spss/assembly-lib.xml
@@ -19,7 +19,8 @@
 						<includes>
 							<include>xalan-bin-dist:xalan</include>
 							<include>xerces:xercesImpl</include>
-							<include>xerces:xmlParserAPIs</include>
+							<include>xalan-bin-dist:xml-apis</include>
+                            <include>xalan-bin-dist:serializer</include>
 						</includes>
 						<outputDirectory>/endorsed</outputDirectory>
                         <!-- strip version off the artifact file names -->
@@ -49,7 +50,8 @@
                             <exclude>MOA:moa-common</exclude>
                             <exclude>xalan-bin-dist:xalan</exclude>
                             <exclude>xerces:xercesImpl</exclude>
-                            <exclude>xerces:xmlParserAPIs</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>
@@ -142,85 +144,4 @@
 		</fileSet>
 	</fileSets>
 	
-	<!--
-	
-	
-	<files>
-		<file>
-			<source>${basedir}/../handbook/handbook.html</source>
-			<outputDirectory>/doc</outputDirectory>
-		</file>
-	</files>
-	
-	<fileSets>
-		<fileSet>
-			<directory>${basedir}/../../handbook/conf</directory>
-			<outputDirectory>/conf</outputDirectory>
-		</fileSet>
-		<fileSet>
-			<directory>${basedir}/../../handbook/handbook</directory>
-			<outputDirectory>/doc/handbook</outputDirectory>
-		</fileSet>
-		<fileSet>
-			<directory>${basedir}/../../handbook/clients</directory>
-			<outputDirectory>/doc/clients</outputDirectory>
-		</fileSet>
-		<fileSet>
-			<directory>${basedir}/../serverlib/resources/licenses</directory>
-			<outputDirectory>/licenses</outputDirectory>
-		</fileSet>
-		<fileSet>
-			<directory>${basedir}/../serverws/data/deploy/tomcat</directory>
-			<outputDirectory>/tomcat</outputDirectory>
-		</fileSet>
-		<fileSet>
-			<directory>${basedir}/../serverws/target</directory>
-			<outputDirectory>/</outputDirectory>
-		</fileSet>
-		<fileSet>
-			<directory>${basedir}/../serverws/data/deploy/tools</directory>
-			<outputDirectory>/tools</outputDirectory>
-		</fileSet>
-	</fileSets>
-
-	<dependencySets>
-		<dependencySet>
-			<includes>
-				<include>MOA.ssps.server:serverwebasdfasdf</include>
-			</includes>
-		</dependencySet>
-		<dependencySet>
-			<includes>
-				<include>xalan:xalan</include>
-				<include>xerces:xercesImpl</include>
-				<include>xerces:xmlParserAPIs</include>
-			</includes>
-			<outputDirectory>/endorsed</outputDirectory>
-		</dependencySet>
-		<dependencySet>
-			<includes>
-				<include>iaik.prod:iaik_ecc</include>
-				<include>iaik.prod:iaik_jce_full</include>
-				<include>iaik.prod:iaik_Pkcs11Provider</include>
-			</includes>
-			<outputDirectory>/ext</outputDirectory>
-		</dependencySet>
-		<dependencySet>
-			<includes>
-				<include>iaik.win32:Pkcs11Wrapper</include>
-			</includes>
-			<outputDirectory>/pkcs11/win32</outputDirectory>
-		</dependencySet>
-		<dependencySet>
-			<includes>
-				<include>iaik.prod:iaik_ecc</include>
-				<include>iaik.prod:iaik_jce_full</include>
-				<include>iaik.prod:iaik_moa_full</include>
-				<include>log4j:log4j</include>
-				<include>xalan:xalan</include>
-			</includes>
-			<outputDirectory>/tools</outputDirectory>
-		</dependencySet>
-	</dependencySets>
-
---></assembly>
\ No newline at end of file
+</assembly>
\ No newline at end of file
diff --git a/spss/assembly.xml b/spss/assembly.xml
index a52860016..435dd04ec 100644
--- a/spss/assembly.xml
+++ b/spss/assembly.xml
@@ -19,7 +19,8 @@
 						<includes>
 							<include>xalan-bin-dist:xalan</include>
 							<include>xerces:xercesImpl</include>
-							<include>xerces:xmlParserAPIs</include>
+							<include>xalan-bin-dist:xml-apis</include>
+                            <include>xalan-bin-dist:serializer</include>
 						</includes>
 						<outputDirectory>/endorsed</outputDirectory>
                         <!-- strip version off the artifact file names -->
@@ -139,85 +140,4 @@
 		</fileSet>
 	</fileSets>
 	
-	<!--
-	
-	
-	<files>
-		<file>
-			<source>${basedir}/../handbook/handbook.html</source>
-			<outputDirectory>/doc</outputDirectory>
-		</file>
-	</files>
-	
-	<fileSets>
-		<fileSet>
-			<directory>${basedir}/../../handbook/conf</directory>
-			<outputDirectory>/conf</outputDirectory>
-		</fileSet>
-		<fileSet>
-			<directory>${basedir}/../../handbook/handbook</directory>
-			<outputDirectory>/doc/handbook</outputDirectory>
-		</fileSet>
-		<fileSet>
-			<directory>${basedir}/../../handbook/clients</directory>
-			<outputDirectory>/doc/clients</outputDirectory>
-		</fileSet>
-		<fileSet>
-			<directory>${basedir}/../serverlib/resources/licenses</directory>
-			<outputDirectory>/licenses</outputDirectory>
-		</fileSet>
-		<fileSet>
-			<directory>${basedir}/../serverws/data/deploy/tomcat</directory>
-			<outputDirectory>/tomcat</outputDirectory>
-		</fileSet>
-		<fileSet>
-			<directory>${basedir}/../serverws/target</directory>
-			<outputDirectory>/</outputDirectory>
-		</fileSet>
-		<fileSet>
-			<directory>${basedir}/../serverws/data/deploy/tools</directory>
-			<outputDirectory>/tools</outputDirectory>
-		</fileSet>
-	</fileSets>
-
-	<dependencySets>
-		<dependencySet>
-			<includes>
-				<include>MOA.ssps.server:serverwebasdfasdf</include>
-			</includes>
-		</dependencySet>
-		<dependencySet>
-			<includes>
-				<include>xalan:xalan</include>
-				<include>xerces:xercesImpl</include>
-				<include>xerces:xmlParserAPIs</include>
-			</includes>
-			<outputDirectory>/endorsed</outputDirectory>
-		</dependencySet>
-		<dependencySet>
-			<includes>
-				<include>iaik.prod:iaik_ecc</include>
-				<include>iaik.prod:iaik_jce_full</include>
-				<include>iaik.prod:iaik_Pkcs11Provider</include>
-			</includes>
-			<outputDirectory>/ext</outputDirectory>
-		</dependencySet>
-		<dependencySet>
-			<includes>
-				<include>iaik.win32:Pkcs11Wrapper</include>
-			</includes>
-			<outputDirectory>/pkcs11/win32</outputDirectory>
-		</dependencySet>
-		<dependencySet>
-			<includes>
-				<include>iaik.prod:iaik_ecc</include>
-				<include>iaik.prod:iaik_jce_full</include>
-				<include>iaik.prod:iaik_moa_full</include>
-				<include>log4j:log4j</include>
-				<include>xalan:xalan</include>
-			</includes>
-			<outputDirectory>/tools</outputDirectory>
-		</dependencySet>
-	</dependencySets>
-
---></assembly>
\ No newline at end of file
+</assembly>
\ No newline at end of file
diff --git a/spss/server/serverlib/pom.xml b/spss/server/serverlib/pom.xml
index 1a169b357..c71b4708d 100644
--- a/spss/server/serverlib/pom.xml
+++ b/spss/server/serverlib/pom.xml
@@ -65,8 +65,12 @@
       <artifactId>xercesImpl</artifactId>
     </dependency>
     <dependency>
-      <groupId>xerces</groupId>
-      <artifactId>xmlParserAPIs</artifactId>
+      <groupId>xalan-bin-dist</groupId>
+      <artifactId>xml-apis</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>xalan-bin-dist</groupId>
+      <artifactId>serializer</artifactId>
     </dependency>
     <dependency>
       <groupId>iaik.prod</groupId>
diff --git a/spss/server/serverws/pom.xml b/spss/server/serverws/pom.xml
index 7fa109145..62b925957 100644
--- a/spss/server/serverws/pom.xml
+++ b/spss/server/serverws/pom.xml
@@ -101,8 +101,14 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>xerces</groupId>
-            <artifactId>xmlParserAPIs</artifactId>
+            <groupId>xalan-bin-dist</groupId>
+            <artifactId>xml-apis</artifactId>
+            <!-- should be provided by the container or jre -->
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>xalan-bin-dist</groupId>
+            <artifactId>serializer</artifactId>
             <!-- should be provided by the container or jre -->
             <scope>provided</scope>
         </dependency>
-- 
cgit v1.2.3