diff options
| author | mcentner <mcentner@d688527b-c9ab-4aba-bd8d-4036d912da1d> | 2007-08-28 07:35:22 +0000 |
|---|---|---|
| committer | mcentner <mcentner@d688527b-c9ab-4aba-bd8d-4036d912da1d> | 2007-08-28 07:35:22 +0000 |
| commit | ef5f57de87191f8296359c4141d562453d15ca20 (patch) | |
| tree | 89883b4721a8caf1456e097dd4767655499f1bd0 | |
| parent | b7f3ed77f614672e8fb57ec6fb9f8ebcd0221b14 (diff) | |
| download | moa-id-spss-ef5f57de87191f8296359c4141d562453d15ca20.tar.gz moa-id-spss-ef5f57de87191f8296359c4141d562453d15ca20.tar.bz2 moa-id-spss-ef5f57de87191f8296359c4141d562453d15ca20.zip | |
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.
git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@966 d688527b-c9ab-4aba-bd8d-4036d912da1d
21 files changed, 73 insertions, 25 deletions
diff --git a/common-test/pom.xml b/common-test/pom.xml index 6c605f1b5..69f653348 100644 --- a/common-test/pom.xml +++ b/common-test/pom.xml @@ -38,7 +38,7 @@ <optional>true</optional> </dependency> <dependency> - <groupId>xalan</groupId> + <groupId>xalan-bin-dist</groupId> <artifactId>xalan</artifactId> </dependency> <dependency> diff --git a/common/pom.xml b/common/pom.xml index 85b206ee9..f4eacf8e9 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -40,8 +40,9 @@ <artifactId>saxpath</artifactId> </dependency> <dependency> - <groupId>xalan</groupId> + <groupId>xalan-bin-dist</groupId> <artifactId>xalan</artifactId> + <scope>compile</scope> <optional>true</optional> </dependency> <dependency> @@ -52,6 +53,7 @@ <dependency> <groupId>xerces</groupId> <artifactId>xmlParserAPIs</artifactId> + <scope>compile</scope> <optional>true</optional> </dependency> </dependencies> diff --git a/id/assembly-auth.xml b/id/assembly-auth.xml index eceffa00a..bde8a7bba 100644 --- a/id/assembly-auth.xml +++ b/id/assembly-auth.xml @@ -61,7 +61,7 @@ <dependencySets>
<dependencySet>
<includes>
- <include>xalan:xalan</include>
+ <include>xalan-bin-dist:xalan</include>
<include>xerces:xercesImpl</include>
<include>xerces:xmlParserAPIs</include>
</includes>
diff --git a/id/assembly-proxy.xml b/id/assembly-proxy.xml index 20f05d775..a24e3d217 100644 --- a/id/assembly-proxy.xml +++ b/id/assembly-proxy.xml @@ -47,7 +47,7 @@ <dependencySets>
<dependencySet>
<includes>
- <include>xalan:xalan</include>
+ <include>xalan-bin-dist:xalan</include>
<include>xerces:xercesImpl</include>
<include>xerces:xmlParserAPIs</include>
</includes>
diff --git a/id/server/auth/pom.xml b/id/server/auth/pom.xml index d0c8c1612..b3bb1f8b0 100644 --- a/id/server/auth/pom.xml +++ b/id/server/auth/pom.xml @@ -86,7 +86,7 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>xalan</groupId> + <groupId>xalan-bin-dist</groupId> <artifactId>xalan</artifactId> <!-- should be provided by the container or jre --> <scope>provided</scope> diff --git a/id/server/idserverlib/pom.xml b/id/server/idserverlib/pom.xml index 7c30ddbe2..1fbcfeb0c 100644 --- a/id/server/idserverlib/pom.xml +++ b/id/server/idserverlib/pom.xml @@ -44,7 +44,7 @@ <artifactId>xmlParserAPIs</artifactId> </dependency> <dependency> - <groupId>xalan</groupId> + <groupId>xalan-bin-dist</groupId> <artifactId>xalan</artifactId> </dependency> <dependency> diff --git a/id/server/proxy/pom.xml b/id/server/proxy/pom.xml index ee8c38c29..24024c9c7 100644 --- a/id/server/proxy/pom.xml +++ b/id/server/proxy/pom.xml @@ -88,7 +88,7 @@ <scope>provided</scope>
</dependency>
<dependency>
- <groupId>xalan</groupId>
+ <groupId>xalan-bin-dist</groupId>
<artifactId>xalan</artifactId>
<!-- should be provided by the container or jre -->
<scope>provided</scope>
@@ -253,12 +253,24 @@ <classifier>win32</classifier>
<type>dll</type>
<scope>runtime</scope>
- </dependency>
+ </dependency> + <dependency> + <groupId>xalan</groupId> + <artifactId>xalan</artifactId> + <version>2.7.0</version> + <scope>compile</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</groupId>
+ <groupId>xalan-bin-dist</groupId>
<artifactId>xalan</artifactId>
<version>2.7.0</version>
- <scope>compile</scope>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>xerces</groupId>
diff --git a/repository/xalan-bin-dist/xalan/2.7.0/xalan-2.7.0.jar b/repository/xalan-bin-dist/xalan/2.7.0/xalan-2.7.0.jar Binary files differnew file mode 100644 index 000000000..979ee761c --- /dev/null +++ b/repository/xalan-bin-dist/xalan/2.7.0/xalan-2.7.0.jar diff --git a/repository/xalan-bin-dist/xalan/2.7.0/xalan-2.7.0.jar.md5 b/repository/xalan-bin-dist/xalan/2.7.0/xalan-2.7.0.jar.md5 new file mode 100644 index 000000000..5a623f9d2 --- /dev/null +++ b/repository/xalan-bin-dist/xalan/2.7.0/xalan-2.7.0.jar.md5 @@ -0,0 +1 @@ +126c0c876a6b9726cfdd43f052923660
\ No newline at end of file diff --git a/repository/xalan-bin-dist/xalan/2.7.0/xalan-2.7.0.jar.sha1 b/repository/xalan-bin-dist/xalan/2.7.0/xalan-2.7.0.jar.sha1 new file mode 100644 index 000000000..c8b946d9e --- /dev/null +++ b/repository/xalan-bin-dist/xalan/2.7.0/xalan-2.7.0.jar.sha1 @@ -0,0 +1 @@ +10f170da8dfbcdcc4098131ba773710f0ba7aef1
\ No newline at end of file diff --git a/repository/xalan-bin-dist/xalan/2.7.0/xalan-2.7.0.pom b/repository/xalan-bin-dist/xalan/2.7.0/xalan-2.7.0.pom new file mode 100644 index 000000000..a957201e4 --- /dev/null +++ b/repository/xalan-bin-dist/xalan/2.7.0/xalan-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>xalan</artifactId> + <version>2.7.0</version> +</project>
\ No newline at end of file diff --git a/repository/xalan-bin-dist/xalan/2.7.0/xalan-2.7.0.pom.md5 b/repository/xalan-bin-dist/xalan/2.7.0/xalan-2.7.0.pom.md5 new file mode 100644 index 000000000..892d7635e --- /dev/null +++ b/repository/xalan-bin-dist/xalan/2.7.0/xalan-2.7.0.pom.md5 @@ -0,0 +1 @@ +fb90bb055826496abcc3bdbd07c78088
\ No newline at end of file diff --git a/repository/xalan-bin-dist/xalan/2.7.0/xalan-2.7.0.pom.sha1 b/repository/xalan-bin-dist/xalan/2.7.0/xalan-2.7.0.pom.sha1 new file mode 100644 index 000000000..a0286a312 --- /dev/null +++ b/repository/xalan-bin-dist/xalan/2.7.0/xalan-2.7.0.pom.sha1 @@ -0,0 +1 @@ +c58c98128a376191f6ddcd88b29c4adcd0f59dfb
\ No newline at end of file diff --git a/repository/xalan-bin-dist/xalan/maven-metadata.xml b/repository/xalan-bin-dist/xalan/maven-metadata.xml new file mode 100644 index 000000000..8564c8faa --- /dev/null +++ b/repository/xalan-bin-dist/xalan/maven-metadata.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?><metadata> + <groupId>xalan-bin-dist</groupId> + <artifactId>xalan</artifactId> + <version>2.7.0</version> + <versioning> + <versions> + <version>2.7.0</version> + </versions> + <lastUpdated>20070828063912</lastUpdated> + </versioning> +</metadata>
\ No newline at end of file diff --git a/repository/xalan-bin-dist/xalan/maven-metadata.xml.md5 b/repository/xalan-bin-dist/xalan/maven-metadata.xml.md5 new file mode 100644 index 000000000..2dfacdcec --- /dev/null +++ b/repository/xalan-bin-dist/xalan/maven-metadata.xml.md5 @@ -0,0 +1 @@ +ed0190e78f5dfbd8bb0906fe3d62948e
\ No newline at end of file diff --git a/repository/xalan-bin-dist/xalan/maven-metadata.xml.sha1 b/repository/xalan-bin-dist/xalan/maven-metadata.xml.sha1 new file mode 100644 index 000000000..3b9fc56e6 --- /dev/null +++ b/repository/xalan-bin-dist/xalan/maven-metadata.xml.sha1 @@ -0,0 +1 @@ +8ac861f6a88f53ac4807dd7de8d958d760165eaf
\ No newline at end of file diff --git a/spss/assembly-lib.xml b/spss/assembly-lib.xml index 669ef471f..0ca602f4a 100644 --- a/spss/assembly-lib.xml +++ b/spss/assembly-lib.xml @@ -17,7 +17,7 @@ <dependencySets> <dependencySet> <includes> - <include>xalan:xalan</include> + <include>xalan-bin-dist:xalan</include> <include>xerces:xercesImpl</include> <include>xerces:xmlParserAPIs</include> </includes> @@ -47,7 +47,7 @@ <dependencySet> <excludes> <exclude>MOA:moa-common</exclude> - <exclude>xalan:xalan</exclude> + <exclude>xalan-bin-dist:xalan</exclude> <exclude>xerces:xercesImpl</exclude> <exclude>xerces:xmlParserAPIs</exclude> <exclude>iaik.prod:iaik_ecc</exclude> @@ -62,7 +62,7 @@ <include>iaik.prod:iaik_Pkcs11Wrapper:dll:win32</include> </includes> <outputDirectory>/lib/win32</outputDirectory> - <outputFileNameMapping>pkcs11wrapper.dll</outputFileNameMapping> + <outputFileNameMapping>pkcs11wrapper.${extension}</outputFileNameMapping> </dependencySet> </dependencySets> <outputFileNameMapping>moa-spss.${extension}</outputFileNameMapping> @@ -92,7 +92,7 @@ <includes> <include>iaik.prod:iaik_moa</include> <include>log4j:log4j</include> - <include>xalan:xalan</include> + <include>xalan-bin-dist:xalan</include> </includes> <outputDirectory>/tools</outputDirectory> <!-- strip version off the artifact file names --> diff --git a/spss/assembly.xml b/spss/assembly.xml index d861b8ab9..a52860016 100644 --- a/spss/assembly.xml +++ b/spss/assembly.xml @@ -17,7 +17,7 @@ <dependencySets> <dependencySet> <includes> - <include>xalan:xalan</include> + <include>xalan-bin-dist:xalan</include> <include>xerces:xercesImpl</include> <include>xerces:xmlParserAPIs</include> </includes> @@ -36,18 +36,28 @@ <!-- strip version off the artifact file names --> <outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping> </dependencySet> - <dependencySet> - <includes> - <include>iaik.prod:iaik_Pkcs11Wrapper:dll:win32</include> - </includes> - <outputDirectory>/pkcs11/win32</outputDirectory> - <outputFileNameMapping>pkcs11wrapper.dll</outputFileNameMapping> - </dependencySet> </dependencySets> <outputFileNameMapping>moa-spss.${extension}</outputFileNameMapping> <unpack>false</unpack> </binaries> </moduleSet> + <moduleSet> + <includes> + <include>MOA.spss.server:moa-spss-lib</include> + </includes> + <binaries> + <includeDependencies>true</includeDependencies> + <dependencySets> + <dependencySet> + <includes> + <include>iaik.prod:iaik_Pkcs11Wrapper:dll:win32</include> + </includes> + <outputDirectory>/pkcs11/win32</outputDirectory> + <outputFileNameMapping>pkcs11wrapper.${extension}</outputFileNameMapping> + </dependencySet> + </dependencySets> + </binaries> + </moduleSet> <moduleSet> <includes> <include>MOA.spss.server:moa-spss-lib</include> @@ -71,7 +81,7 @@ <includes> <include>iaik.prod:iaik_moa</include> <include>log4j:log4j</include> - <include>xalan:xalan</include> + <include>xalan-bin-dist:xalan</include> </includes> <outputDirectory>/tools</outputDirectory> <!-- strip version off the artifact file names --> diff --git a/spss/server/serverlib/pom.xml b/spss/server/serverlib/pom.xml index 620d3ebd4..1a169b357 100644 --- a/spss/server/serverlib/pom.xml +++ b/spss/server/serverlib/pom.xml @@ -56,8 +56,9 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>xalan</groupId> + <groupId>xalan-bin-dist</groupId> <artifactId>xalan</artifactId> + <scope>compile</scope> </dependency> <dependency> <groupId>xerces</groupId> diff --git a/spss/server/serverws/pom.xml b/spss/server/serverws/pom.xml index 5a5afdebd..7fa109145 100644 --- a/spss/server/serverws/pom.xml +++ b/spss/server/serverws/pom.xml @@ -89,7 +89,7 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>xalan</groupId> + <groupId>xalan-bin-dist</groupId> <artifactId>xalan</artifactId> <!-- should be provided by the container or jre --> <scope>provided</scope> |