Updated xalan und xerces libraries and as consequence, added regexp to id/server/idserverlib.

Changed paths in distribution zip-files.

git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@928 d688527b-c9ab-4aba-bd8d-4036d912da1d

5 files changed, 28 insertions, 24 deletions

diff --git a/id/assembly-auth.xml b/id/assembly-auth.xml
index e0a1db0c7..0dd875720 100644
--- a/id/assembly-auth.xml
+++ b/id/assembly-auth.xml
@@ -6,37 +6,37 @@
 <!--        <format>tar.gz</format>-->

     </formats>

 

-    <includeBaseDirectory>false</includeBaseDirectory>

+	<baseDirectory>moa-id-auth-${project.version}</baseDirectory>
 

     <fileSets>

         <fileSet>

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

-            <outputDirectory>/auth</outputDirectory>
+            <outputDirectory>/</outputDirectory>
             <excludes>
                 <exclude>**/conf/moa-id/oa/**</exclude>
             </excludes>
         </fileSet>

         <fileSet>
             <directory>${basedir}/spss/handbook/conf/moa-spss/certstore</directory>
-            <outputDirectory>/auth/conf/moa-id/certs/certstore</outputDirectory>
+            <outputDirectory>/conf/moa-id/certs/certstore</outputDirectory>
             <includes>
                 <include>**/*</include>
             </includes>
         </fileSet>
         <fileSet>
             <directory>${basedir}/spss/handbook/conf/moa-spss/certstore</directory>
-            <outputDirectory>/auth/conf/moa-spss/certstore</outputDirectory>
+            <outputDirectory>/conf/moa-spss/certstore</outputDirectory>
             <includes>
                 <include>**/*</include>
             </includes>
         </fileSet>
         <fileSet>

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

-            <outputDirectory>/auth/doc</outputDirectory>

+            <outputDirectory>/doc</outputDirectory>

         </fileSet>

         <fileSet>

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

-            <outputDirectory>/auth</outputDirectory>

+            <outputDirectory>/</outputDirectory>

             <includes>

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

                 <include>history.txt</include>

@@ -53,7 +53,7 @@
             </includes>
             <binaries>
                 <includeDependencies>true</includeDependencies>
-                <outputDirectory>/auth</outputDirectory>
+                <outputDirectory>/</outputDirectory>
                 <outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping>
                 <dependencySets>
                     <dependencySet>
@@ -62,7 +62,7 @@
                             <include>xerces:xercesImpl</include>
                             <include>xerces:xmlParserAPIs</include>
                         </includes>
-                        <outputDirectory>/auth/endorsed</outputDirectory>
+                        <outputDirectory>/endorsed</outputDirectory>
                     </dependencySet>
                     <dependencySet>
                         <includes>
@@ -71,7 +71,7 @@
                             <include>iaik.prod:iaik_Pkcs11Provider</include>
                             <include>iaik.prod:iaik_Pkcs11Wrapper</include>
                         </includes>
-                        <outputDirectory>/auth/ext</outputDirectory>
+                        <outputDirectory>/ext</outputDirectory>
                     </dependencySet>
                 </dependencySets>
                 <unpack>false</unpack>
@@ -85,7 +85,7 @@
                 <attachmentClassifier>javadoc</attachmentClassifier>
                 <includeDependencies>false</includeDependencies>
                 <outputFileNameMapping>api-doc</outputFileNameMapping>
-                <outputDirectory>/auth/moa-id/doc</outputDirectory>
+                <outputDirectory>/moa-id/doc</outputDirectory>
                 <unpack>true</unpack>
             </binaries>
         </moduleSet>
@@ -96,7 +96,7 @@
             <binaries>
                 <includeDependencies>false</includeDependencies>
                 <outputFileNameMapping>moaid-templates.war</outputFileNameMapping>
-                <outputDirectory>/auth/templates</outputDirectory>
+                <outputDirectory>/templates</outputDirectory>
                 <unpack>false</unpack>
             </binaries>
         </moduleSet>
diff --git a/id/assembly-proxy.xml b/id/assembly-proxy.xml
index 52c9a4f30..03cdd837c 100644
--- a/id/assembly-proxy.xml
+++ b/id/assembly-proxy.xml
@@ -6,12 +6,12 @@
 <!--        <format>tar.gz</format>-->

     </formats>

 

-    <includeBaseDirectory>false</includeBaseDirectory>

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

     <fileSets>
         <fileSet>

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

-            <outputDirectory>/proxy</outputDirectory>

+            <outputDirectory>/</outputDirectory>

             <excludes>

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

@@ -19,11 +19,11 @@
         </fileSet>

         <fileSet>

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

-            <outputDirectory>/proxy/doc</outputDirectory>

+            <outputDirectory>/doc</outputDirectory>

         </fileSet>

         <fileSet>

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

-            <outputDirectory>/proxy</outputDirectory>

+            <outputDirectory>/</outputDirectory>

             <includes>

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

                 <include>history.txt</include>

@@ -40,7 +40,7 @@
             </includes>
             <binaries>
                 <includeDependencies>true</includeDependencies>
-                <outputDirectory>/proxy</outputDirectory>
+                <outputDirectory>/</outputDirectory>
                 <outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping>
                 <dependencySets>
                     <dependencySet>
@@ -49,7 +49,7 @@
                             <include>xerces:xercesImpl</include>
                             <include>xerces:xmlParserAPIs</include>
                         </includes>
-                        <outputDirectory>/proxy/endorsed</outputDirectory>
+                        <outputDirectory>/endorsed</outputDirectory>
                     </dependencySet>
                     <dependencySet>
                         <includes>
@@ -58,7 +58,7 @@
                             <include>iaik.prod:iaik_Pkcs11Provider</include>
                             <include>iaik.prod:iaik_Pkcs11Wrapper</include>
                         </includes>
-                        <outputDirectory>/proxy/ext</outputDirectory>
+                        <outputDirectory>/ext</outputDirectory>
                     </dependencySet>
                 </dependencySets>
                 <unpack>false</unpack>
@@ -72,7 +72,7 @@
                 <attachmentClassifier>javadoc</attachmentClassifier>
                 <includeDependencies>false</includeDependencies>
                 <outputFileNameMapping>api-doc</outputFileNameMapping>
-                <outputDirectory>/proxy/moa-id/doc</outputDirectory>
+                <outputDirectory>/moa-id/doc</outputDirectory>
                 <unpack>true</unpack>
             </binaries>
         </moduleSet>
@@ -83,7 +83,7 @@
             <binaries>
                 <includeDependencies>false</includeDependencies>
                 <outputFileNameMapping>moaid-templates.war</outputFileNameMapping>
-                <outputDirectory>/proxy/templates</outputDirectory>
+                <outputDirectory>/templates</outputDirectory>
                 <unpack>false</unpack>
             </binaries>
         </moduleSet>
diff --git a/id/server/idserverlib/pom.xml b/id/server/idserverlib/pom.xml
index daa9bfd6d..357ec0750 100644
--- a/id/server/idserverlib/pom.xml
+++ b/id/server/idserverlib/pom.xml
@@ -107,6 +107,10 @@
             <groupId>iaik.prod</groupId>
             <artifactId>iaik_X509TrustManager</artifactId>
         </dependency>
+        <dependency>
+          <groupId>regexp</groupId>
+          <artifactId>regexp</artifactId>
+        </dependency>
     </dependencies>
     <build>
         <plugins>
diff --git a/pom.xml b/pom.xml
index c85c7b307..b35bdc0ae 100644
--- a/pom.xml
+++ b/pom.xml
@@ -257,19 +257,19 @@
             <dependency>

                 <groupId>xalan</groupId>

                 <artifactId>xalan</artifactId>

-                <version>2.5.1</version>

+                <version>2.7.0</version>

                 <scope>compile</scope>

             </dependency>

             <dependency>

                 <groupId>xerces</groupId>

                 <artifactId>xercesImpl</artifactId>

-                <version>2.4.0</version>

+                <version>2.7.1</version>

                 <scope>compile</scope>

             </dependency>

             <dependency>

                 <groupId>xerces</groupId>

                 <artifactId>xmlParserAPIs</artifactId>

-                <version>2.6.0</version>

+                <version>2.6.2</version>

                 <scope>compile</scope>

             </dependency>

         </dependencies>

diff --git a/spss/assembly.xml b/spss/assembly.xml
index 998a0d0e4..aa5666b6f 100644
--- a/spss/assembly.xml
+++ b/spss/assembly.xml
@@ -5,7 +5,7 @@
 		<format>zip</format>
 	</formats>
 
-	<includeBaseDirectory>false</includeBaseDirectory>
+	<baseDirectory>moa-spss-${project.version}</baseDirectory>
 
 	<moduleSets>
 		<moduleSet>