From 0764b6e3e5bc152a70d269bee283a52b7584f075 Mon Sep 17 00:00:00 2001
From: mcentner <mcentner@d688527b-c9ab-4aba-bd8d-4036d912da1d>
Date: Wed, 22 Aug 2007 14:28:38 +0000
Subject: 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
---
 id/assembly-proxy.xml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'id/assembly-proxy.xml')

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>
-- 
cgit v1.2.3