svn commit: r153110 - in geronimo/trunk/modules/assembly: maven.xml project.xml

[da...@apache.org]

Author: dain
Date: Wed Feb  9 11:45:50 2005
New Revision: 153110

URL: http://svn.apache.org/viewcvs?view=rev&rev=153110
Log:
Add endorse jars to the system classpath, so we actually use xerces instead of crimson.
Make endorsedDirs manifest entry not an absolute path.

Modified:
    geronimo/trunk/modules/assembly/maven.xml
    geronimo/trunk/modules/assembly/project.xml

Modified: geronimo/trunk/modules/assembly/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/maven.xml?view=diff&r1=153109&r2=153110
==============================================================================
--- geronimo/trunk/modules/assembly/maven.xml (original)
+++ geronimo/trunk/modules/assembly/maven.xml Wed Feb  9 11:45:50 2005
@@ -85,19 +85,20 @@
             <j:set var="dependency" value="${artifact.dependency}"/>
             <j:if test="${dependency.getProperty('lib') == 'true'}">
                 <ant:copy todir="${libDir}" file="${artifact.path}"/>
-                <j:set var="classpath" value="${classpath} ../lib/${artifact.name}"/>
+                <j:set var="classpathEntry" value="../lib/${artifact.name}"/>
             </j:if>
             <j:if test="${dependency.getProperty('endorsed') == 'true'}">
                 <ant:copy todir="${libDir}/endorsed" file="${artifact.path}"/>
+                <j:set var="classpathEntry" value="../lib/endorsed/${artifact.name}"/>
             </j:if>
             <j:if test="${dependency.getProperty('server') == 'true'}">
-                <j:set var="server.classpath" value="${server.classpath} ../lib/${artifact.name}"/>
+                <j:set var="server.classpath" value="${server.classpath} ${classpathEntry}"/>
             </j:if>
             <j:if test="${dependency.getProperty('client') == 'true'}">
-                <j:set var="client.classpath" value="${client.classpath} ../lib/${artifact.name}"/>
+                <j:set var="client.classpath" value="${client.classpath} ${classpathEntry}"/>
             </j:if>
             <j:if test="${dependency.getProperty('deploy') == 'true'}">
-                <j:set var="deploy.classpath" value="${deploy.classpath} ../lib/${artifact.name}"/>
+                <j:set var="deploy.classpath" value="${deploy.classpath} ${classpathEntry}"/>
             </j:if>
         </j:forEach>
 
@@ -241,7 +242,7 @@
             <ant:arg value="--mainClass"/>
             <ant:arg value="org.apache.geronimo.system.main.Daemon"/>
             <ant:arg value="--endorsedDirs"/>
-            <ant:arg value="${libDir}/endorsed"/>
+            <ant:arg value="lib/endorsed"/>
             <ant:arg value="--install"/>
             <ant:arg value="target/plan/system-plan.xml"/>
             <ant:arg value="${distDir}/bin/server.jar"/>

Modified: geronimo/trunk/modules/assembly/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/project.xml?view=diff&r1=153109&r2=153110
==============================================================================
--- geronimo/trunk/modules/assembly/project.xml (original)
+++ geronimo/trunk/modules/assembly/project.xml Wed Feb  9 11:45:50 2005
@@ -698,6 +698,8 @@
             <version>${xerces_version}</version>
             <properties>
                 <endorsed>true</endorsed>
+                <server>true</server>
+                <client>true</client>
             </properties>
         </dependency>
 
@@ -707,6 +709,8 @@
             <version>${xml_parser_apis_version}</version>
             <properties>
                 <endorsed>true</endorsed>
+                <server>true</server>
+                <client>true</client>
             </properties>
         </dependency>
 
@@ -737,7 +741,7 @@
         <dependency>
             <groupId>antlr</groupId>
             <artifactId>antlr</artifactId>
-            <version>${antlr_version}</version>
+            <version>${antlr_version}</version>                                                         `
             <properties>
                 <repository>true</repository>
             </properties>