geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jboy...@apache.org
Subject svn commit: r265599 - in /geronimo/trunk/modules/assembly/src/plan: j2ee-server-plan.xml system-database-plan.xml
Date Wed, 31 Aug 2005 22:24:00 GMT
Author: jboynes
Date: Wed Aug 31 15:23:54 2005
New Revision: 265599

URL: http://svn.apache.org/viewcvs?rev=265599&view=rev
Log:
GERONIMO-963 move derby classes to server classloader

Modified:
    geronimo/trunk/modules/assembly/src/plan/j2ee-server-plan.xml
    geronimo/trunk/modules/assembly/src/plan/system-database-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=265599&r1=265598&r2=265599&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/j2ee-server-plan.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/j2ee-server-plan.xml Wed Aug 31 15:23:54 2005
@@ -149,6 +149,17 @@
         <uri>jdom/jars/jdom-1.0.jar</uri>
     </dependency>
 
+    <!-- Derby classes must be loaded from a common classloader -->
+    <dependency>
+        <uri>org.apache.derby/jars/derby-${derby_version}.jar</uri>
+    </dependency>
+    <dependency>
+        <uri>org.apache.derby/jars/derbynet-${derby_version}.jar</uri>
+    </dependency>
+    <dependency>
+        <uri>geronimo/jars/geronimo-derby-${geronimo_version}.jar</uri>
+    </dependency>
+
 
 
     ${webcontainer}

Modified: geronimo/trunk/modules/assembly/src/plan/system-database-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/system-database-plan.xml?rev=265599&r1=265598&r2=265599&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/system-database-plan.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/system-database-plan.xml Wed Aug 31 15:23:54
2005
@@ -23,16 +23,6 @@
     configId="org/apache/geronimo/SystemDatabase"
     parentId="org/apache/geronimo/Server">
 
-    <dependency>
-        <uri>org.apache.derby/jars/derby-${derby_version}.jar</uri>
-    </dependency>
-    <dependency>
-        <uri>org.apache.derby/jars/derbynet-${derby_version}.jar</uri>
-    </dependency>
-    <dependency>
-        <uri>geronimo/jars/geronimo-derby-${geronimo_version}.jar</uri>
-    </dependency>                      
-
     <resourceadapter>
         <outbound-resourceadapter>
             <connection-definition>



Mime
View raw message