dain 2005/02/08 18:42:50
Modified: modules/assembly maven.xml project.xml
Log:
Set endorsed dirs in server.jar and client.jar to
<geronimo-install-dir>/lib/endorsed
Added xerces and xerces-apis to the endorsed dir
Revision Changes Path
1.19 +7 -1 openejb/modules/assembly/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/projects/openejb/scm/openejb/modules/assembly/maven.xml,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- maven.xml 22 Jan 2005 00:39:13 -0000 1.18
+++ maven.xml 8 Feb 2005 23:42:50 -0000 1.19
@@ -50,6 +50,7 @@
<!-- Copy the runtime dependencies into lib and create a classpath
for the server.jar file -->
<j:set var="libDir" value="${distDir}/lib"/>
<ant:mkdir dir="${libDir}"/>
+ <ant:mkdir dir="${libDir}/endorsed"/>
<j:forEach var="artifact" items="${pom.artifacts}">
<j:set var="dependency" value="${artifact.dependency}"/>
@@ -57,6 +58,9 @@
<ant:copy todir="${libDir}" file="${artifact.path}"/>
<j:set var="classpath" value="${classpath}
../lib/${artifact.name}"/>
</j:if>
+ <j:if test="${dependency.getProperty('endorsed') == 'true'}">
+ <ant:copy todir="${libDir}/endorsed"
file="${artifact.path}"/>
+ </j:if>
<j:if test="${dependency.getProperty('server') == 'true'}">
<j:set var="server.classpath" value="${server.classpath}
../lib/${artifact.name}"/>
</j:if>
@@ -160,6 +164,8 @@
<ant:arg value="org.apache.geronimo.system.main.Daemon"/>
<ant:arg value="--classPath"/>
<ant:arg value="${server.classpath}"/>
+ <ant:arg value="--endorsedDirs"/>
+ <ant:arg value="${libDir}/endorsed"/>
<ant:arg value="--install"/>
<ant:arg value="target/plan/system-plan.xml"/>
<ant:arg value="${distDir}/bin/server.jar"/>
1.40 +15 -13 openejb/modules/assembly/project.xml
Index: project.xml
===================================================================
RCS file: /home/projects/openejb/scm/openejb/modules/assembly/project.xml,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- project.xml 3 Feb 2005 00:07:56 -0000 1.39
+++ project.xml 8 Feb 2005 23:42:50 -0000 1.40
@@ -544,8 +544,16 @@
<artifactId>xercesImpl</artifactId>
<version>${xerces_version}</version>
<properties>
- <lib>true</lib>
- <server>true</server>
+ <endorsed>true</endorsed>
+ </properties>
+ </dependency>
+
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xmlParserAPIs</artifactId>
+ <version>${xml_parser_apis_version}</version>
+ <properties>
+ <endorsed>true</endorsed>
</properties>
</dependency>
@@ -556,6 +564,10 @@
<properties>
<lib>true</lib>
<deploy>true</deploy>
+ <!--server and client should not be needed, but there are
problems ATM removing them -->
+ <!--client is needed for the QName implementation for
deserializing axis objects-->
+ <server>true</server>
+<!-- <client>true</client>-->
<repository>true</repository>
</properties>
</dependency>
@@ -658,16 +670,6 @@
<version>${avalon_logkit_version}</version>
<properties>
<repository>true</repository>
- </properties>
- </dependency>
-
- <dependency>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- <version>${xml_apis_version}</version>
- <properties>
- <lib>true</lib>
- <server>true</server>
</properties>
</dependency>
