geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jboy...@apache.org
Subject svn commit: r289710 - in /geronimo/trunk/modules/assembly/src/plan: j2ee-server-plan.xml naming-server-plan.xml
Date Sat, 17 Sep 2005 07:02:26 GMT
Author: jboynes
Date: Sat Sep 17 00:02:23 2005
New Revision: 289710

URL: http://svn.apache.org/viewcvs?rev=289710&view=rev
Log:
activation must preceed spec-j2ee on classpath so that mailcap is defined correctly

Modified:
    geronimo/trunk/modules/assembly/src/plan/j2ee-server-plan.xml
    geronimo/trunk/modules/assembly/src/plan/naming-server-plan.xml

Modified: geronimo/trunk/modules/assembly/src/plan/j2ee-server-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/j2ee-server-plan.xml?rev=289710&r1=289709&r2=289710&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/j2ee-server-plan.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/j2ee-server-plan.xml Sat Sep 17 00:02:23 2005
@@ -33,15 +33,6 @@
 
     <!--runtime dependencies-->
     <dependency>
-        <uri>geronimo-spec/jars/geronimo-spec-j2ee-${geronimo_spec_j2ee_version}.jar</uri>
-    </dependency>
-    <dependency>
-        <uri>geronimo-spec/jars/geronimo-spec-j2ee-jacc-${geronimo_spec_j2ee_jacc_version}.jar</uri>
-    </dependency>
-    <dependency>
-        <uri>geronimo/jars/geronimo-activation-${geronimo_version}.jar</uri>
-    </dependency>
-    <dependency>
         <uri>geronimo/jars/geronimo-core-${geronimo_version}.jar</uri>
     </dependency>
     <dependency>

Modified: geronimo/trunk/modules/assembly/src/plan/naming-server-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/naming-server-plan.xml?rev=289710&r1=289709&r2=289710&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/naming-server-plan.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/naming-server-plan.xml Sat Sep 17 00:02:23 2005
@@ -37,6 +37,10 @@
     <dependency>
         <uri>geronimo/jars/geronimo-webservices-${geronimo_version}.jar</uri>
     </dependency>
+    <!-- activation must come before spec-j2ee to override stock mailcap file in its javamail
api -->
+    <dependency>
+        <uri>geronimo/jars/geronimo-activation-${geronimo_version}.jar</uri>
+    </dependency>
     <dependency>
         <uri>geronimo-spec/jars/geronimo-spec-j2ee-${geronimo_spec_j2ee_version}.jar</uri>
     </dependency>



Mime
View raw message