geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r518431 - in /geronimo/server/trunk: configs/openejb/pom.xml modules/geronimo-openejb/pom.xml modules/geronimo-openejb/src/main/resources/META-INF/geronimo-dependency.xml
Date Thu, 15 Mar 2007 01:34:08 GMT
Author: djencks
Date: Wed Mar 14 18:34:07 2007
New Revision: 518431

URL: http://svn.apache.org/viewvc?view=rev&rev=518431
Log:
GERONIMO-2937 Move some dependencies out of geronimo-dependencies.xml and put the ones still
required in the config plan.  Also exclude stax-api from openejb.

Modified:
    geronimo/server/trunk/configs/openejb/pom.xml
    geronimo/server/trunk/modules/geronimo-openejb/pom.xml
    geronimo/server/trunk/modules/geronimo-openejb/src/main/resources/META-INF/geronimo-dependency.xml

Modified: geronimo/server/trunk/configs/openejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/openejb/pom.xml?view=diff&rev=518431&r1=518430&r2=518431
==============================================================================
--- geronimo/server/trunk/configs/openejb/pom.xml (original)
+++ geronimo/server/trunk/configs/openejb/pom.xml Wed Mar 14 18:34:07 2007
@@ -62,6 +62,13 @@
             <version>${version}</version>
             <type>car</type>
         </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>activemq</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
 
         <dependency>
             <groupId>org.apache.openejb</groupId>
@@ -123,6 +130,12 @@
         <dependency>
              <groupId>org.apache.xbean</groupId>
              <artifactId>xbean-finder</artifactId>
+        </dependency>
+
+        <!-- required for castor -->
+        <dependency>
+             <groupId>xerces</groupId>
+             <artifactId>xercesImpl</artifactId>
         </dependency>
 
     </dependencies>

Modified: geronimo/server/trunk/modules/geronimo-openejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-openejb/pom.xml?view=diff&rev=518431&r1=518430&r2=518431
==============================================================================
--- geronimo/server/trunk/modules/geronimo-openejb/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-openejb/pom.xml Wed Mar 14 18:34:07 2007
@@ -67,6 +67,10 @@
                 <groupId>org.apache.geronimo.modules</groupId>
                 <artifactId>geronimo-webservices</artifactId>
               </exclusion>
+              <exclusion>
+                <groupId>stax</groupId>
+                <artifactId>stax-api</artifactId>
+              </exclusion>
             </exclusions>
         </dependency>
 

Modified: geronimo/server/trunk/modules/geronimo-openejb/src/main/resources/META-INF/geronimo-dependency.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-openejb/src/main/resources/META-INF/geronimo-dependency.xml?view=diff&rev=518431&r1=518430&r2=518431
==============================================================================
--- geronimo/server/trunk/modules/geronimo-openejb/src/main/resources/META-INF/geronimo-dependency.xml
(original)
+++ geronimo/server/trunk/modules/geronimo-openejb/src/main/resources/META-INF/geronimo-dependency.xml
Wed Mar 14 18:34:07 2007
@@ -18,10 +18,6 @@
 
 <service xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
     <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-jpa_3.0_spec</artifactId>
-    </dependency>
-    <dependency>
       <groupId>org.apache.openejb</groupId>
       <artifactId>openejb-loader</artifactId>
     </dependency>
@@ -46,26 +42,9 @@
       <artifactId>openejb-jee</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-annotation_1.0_spec</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-ejb_3.0_spec</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-interceptor_3.0_spec</artifactId>
-    </dependency>
-    <dependency>
       <groupId>org.apache.xbean</groupId>
       <artifactId>xbean-reflect</artifactId>
     </dependency>
-    <!-- moved to the openejb config -->
-    <!--<dependency>-->
-      <!--<groupId>org.apache.xbean</groupId>-->
-      <!--<artifactId>xbean-finder</artifactId>-->
-    <!--</dependency>-->
     <dependency>
       <groupId>org.codehaus.swizzle</groupId>
       <artifactId>swizzle-stream</artifactId>
@@ -78,62 +57,14 @@
       <groupId>asm</groupId>
       <artifactId>asm-commons</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-activation_1.1_spec</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.sun.xml.bind</groupId>
-      <artifactId>jaxb-impl</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-stax-api_1.0_spec</artifactId>
-    </dependency>
     <!-- castor -->
     <dependency>
       <groupId>org.codehaus.castor</groupId>
       <artifactId>castor</artifactId>
     </dependency>
     <dependency>
-      <groupId>xerces</groupId>
-      <artifactId>xercesImpl</artifactId>
-    </dependency>
-    <dependency>
       <groupId>oro</groupId>
       <artifactId>oro</artifactId>
     </dependency>
     <!-- end castor -->
-    <!-- activemq -->
-    <dependency>
-      <groupId>org.apache.activemq</groupId>
-      <artifactId>activemq-ra</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.activemq</groupId>
-      <artifactId>activemq-core</artifactId>
-    </dependency>
-    <!-- end activemq -->
-    <!-- openjpa -->
-    <dependency>
-      <groupId>org.apache.openjpa</groupId>
-      <artifactId>openjpa-all</artifactId>
-      <version>0.9.6-incubating</version>
-    </dependency>
-    <dependency>
-      <groupId>net.sourceforge.serp</groupId>
-      <artifactId>serp</artifactId>
-      <version>1.11.0</version>
-    </dependency>
-    <dependency>
-      <groupId>commons-collections</groupId>
-      <artifactId>commons-collections</artifactId>
-      <version>3.1</version>
-    </dependency>
-    <dependency>
-      <groupId>commons-lang</groupId>
-      <artifactId>commons-lang</artifactId>
-       <version>2.0</version>
-    </dependency>
-    <!-- end openjpa -->
 </service>



Mime
View raw message