geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xuhaih...@apache.org
Subject svn commit: r832672 - in /geronimo/server/trunk/plugins: ./ classloaders/ client/client/ client/client/src/main/history/ jaxws/geronimo-jaxws/ openejb/openejb/ openejb/openejb/src/main/history/ openjpa2/persistence-jpa20-deployer/src/main/history/ webs...
Date Wed, 04 Nov 2009 07:20:14 GMT
Author: xuhaihong
Date: Wed Nov  4 07:20:13 2009
New Revision: 832672

URL: http://svn.apache.org/viewvc?rev=832672&view=rev
Log:
GERONIMO-4923 Remove those classloader plugins 

Removed:
    geronimo/server/trunk/plugins/classloaders/
Modified:
    geronimo/server/trunk/plugins/client/client/pom.xml
    geronimo/server/trunk/plugins/client/client/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/pom.xml
    geronimo/server/trunk/plugins/openejb/openejb/pom.xml
    geronimo/server/trunk/plugins/openejb/openejb/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/openjpa2/persistence-jpa20-deployer/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/pom.xml
    geronimo/server/trunk/plugins/webservices/webservices-common/src/main/history/dependencies.xml

Modified: geronimo/server/trunk/plugins/client/client/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/client/client/pom.xml?rev=832672&r1=832671&r2=832672&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/client/client/pom.xml (original)
+++ geronimo/server/trunk/plugins/client/client/pom.xml Wed Nov  4 07:20:13 2009
@@ -125,11 +125,10 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.plugins.classloaders</groupId>
+            <groupId>org.apache.xbean</groupId>
             <artifactId>xbean-finder</artifactId>
-            <version>${version}</version>
-            <type>car</type>
         </dependency>
+
         <!--<dependency>-->
             <!--<groupId>org.apache.xbean</groupId>-->
             <!--<artifactId>xbean-reflect</artifactId>-->

Modified: geronimo/server/trunk/plugins/client/client/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/client/client/src/main/history/dependencies.xml?rev=832672&r1=832671&r2=832672&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/client/client/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/client/client/src/main/history/dependencies.xml Wed Nov
 4 07:20:13 2009
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<plugin-artifact xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2" xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3">
+<plugin-artifact xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3" xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2">
     <module-id>
         <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>client</artifactId>
@@ -7,6 +7,16 @@
         <type>car</type>
     </module-id>
     <dependency>
+        <groupId>com.sun.xml.bind</groupId>
+        <artifactId>jaxb-impl</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>commons-cli</groupId>
+        <artifactId>commons-cli</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>client-system</artifactId>
         <type>car</type>
@@ -57,9 +67,14 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.plugins.classloaders</groupId>
-        <artifactId>xbean-finder</artifactId>
-        <type>car</type>
+        <groupId>org.apache.geronimo.modules</groupId>
+        <artifactId>geronimo-persistence-jpa20</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.openejb</groupId>
+        <artifactId>javaee-api</artifactId>
+        <type>jar</type>
     </dependency>
     <dependency>
         <groupId>org.apache.openejb</groupId>
@@ -107,12 +122,27 @@
         <type>jar</type>
     </dependency>
     <dependency>
+        <groupId>org.apache.servicemix.bundles</groupId>
+        <artifactId>org.apache.servicemix.bundles.xmlbeans</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.servicemix.specs</groupId>
+        <artifactId>org.apache.servicemix.specs.saaj-api-1.3</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
         <groupId>org.apache.xbean</groupId>
         <artifactId>xbean-asm-shaded</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
         <groupId>org.apache.xbean</groupId>
+        <artifactId>xbean-finder</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.xbean</groupId>
         <artifactId>xbean-naming</artifactId>
         <type>jar</type>
     </dependency>
@@ -122,6 +152,11 @@
         <type>jar</type>
     </dependency>
     <dependency>
+        <groupId>org.codehaus.woodstox</groupId>
+        <artifactId>wstx-asl</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
         <groupId>quartz</groupId>
         <artifactId>quartz</artifactId>
         <type>jar</type>

Modified: geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/pom.xml?rev=832672&r1=832671&r2=832672&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/pom.xml (original)
+++ geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/pom.xml Wed Nov  4 07:20:13 2009
@@ -103,12 +103,10 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.plugins.classloaders</groupId>
-            <artifactId>geronimo-schema-jee_5</artifactId>
-            <version>${version}</version>
-            <type>car</type>
+          <groupId>org.apache.geronimo.schema</groupId>
+          <artifactId>geronimo-schema-jee_5</artifactId>
         </dependency>
-
+        
         <dependency>
             <groupId>org.apache.servicemix.bundles</groupId>
             <artifactId>org.apache.servicemix.bundles.xmlbeans</artifactId>

Modified: geronimo/server/trunk/plugins/openejb/openejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/openejb/pom.xml?rev=832672&r1=832671&r2=832672&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/openejb/pom.xml (original)
+++ geronimo/server/trunk/plugins/openejb/openejb/pom.xml Wed Nov  4 07:20:13 2009
@@ -108,16 +108,15 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.plugins.classloaders</groupId>
+            <groupId>org.apache.xbean</groupId>
             <artifactId>xbean-finder</artifactId>
-            <version>${version}</version>
-            <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.codehaus.swizzle</groupId>
             <artifactId>swizzle-stream</artifactId>
         </dependency>
+
     </dependencies>
 
     <build>
@@ -152,7 +151,7 @@
                                     <attribute name="timeout">${StatelessTimeout}</attribute>
                                     <attribute name="poolSize">${StatelessPoolSize}</attribute>
                                     <attribute name="strictPooling">${StrictPooling}</attribute>
-				</gbean>
+                                </gbean>
                             </config-xml-content>
                             <config-substitution key="OpenEJBPort">4201</config-substitution>
                             <config-substitution key="StatefulTimeout">20</config-substitution>

Modified: geronimo/server/trunk/plugins/openejb/openejb/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/openejb/src/main/history/dependencies.xml?rev=832672&r1=832671&r2=832672&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/openejb/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/openejb/openejb/src/main/history/dependencies.xml Wed Nov
 4 07:20:13 2009
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<plugin-artifact xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2" xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3">
+<plugin-artifact xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3" xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2">
     <module-id>
         <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>openejb</artifactId>
@@ -62,11 +62,6 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.plugins.classloaders</groupId>
-        <artifactId>xbean-finder</artifactId>
-        <type>car</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.openejb</groupId>
         <artifactId>javaee-api</artifactId>
         <type>jar</type>

Modified: geronimo/server/trunk/plugins/openjpa2/persistence-jpa20-deployer/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openjpa2/persistence-jpa20-deployer/src/main/history/dependencies.xml?rev=832672&r1=832671&r2=832672&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openjpa2/persistence-jpa20-deployer/src/main/history/dependencies.xml
(original)
+++ geronimo/server/trunk/plugins/openjpa2/persistence-jpa20-deployer/src/main/history/dependencies.xml
Wed Nov  4 07:20:13 2009
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<plugin-artifact xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2" xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3">
+<plugin-artifact xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3" xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2">
     <module-id>
         <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>persistence-jpa20-deployer</artifactId>
@@ -17,16 +17,6 @@
         <type>car</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>geronimo-transformer</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>geronimo-naming-builder</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.geronimo.modules</groupId>
         <artifactId>geronimo-persistence-jpa20</artifactId>
         <type>jar</type>
@@ -36,9 +26,4 @@
         <artifactId>geronimo-persistence-jpa20-builder</artifactId>
         <type>jar</type>
     </dependency>
-    <dependency>
-        <groupId>org.apache.servicemix.bundles</groupId>
-        <artifactId>org.apache.servicemix.bundles.xmlbeans</artifactId>
-        <type>jar</type>
-    </dependency>
 </plugin-artifact>

Modified: geronimo/server/trunk/plugins/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/pom.xml?rev=832672&r1=832671&r2=832672&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/pom.xml (original)
+++ geronimo/server/trunk/plugins/pom.xml Wed Nov  4 07:20:13 2009
@@ -92,7 +92,6 @@
         <module>sharedlib</module>
         <module>welcome</module>
         <module>concurrent</module>
-        <module>classloaders</module>
         <module>procrun</module>
         <module>jetty7</module>
         <module>tomcat</module>

Modified: geronimo/server/trunk/plugins/webservices/webservices-common/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/webservices/webservices-common/src/main/history/dependencies.xml?rev=832672&r1=832671&r2=832672&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/webservices/webservices-common/src/main/history/dependencies.xml
(original)
+++ geronimo/server/trunk/plugins/webservices/webservices-common/src/main/history/dependencies.xml
Wed Nov  4 07:20:13 2009
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<plugin-artifact xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2" xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3">
+<plugin-artifact xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3" xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2">
     <module-id>
         <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>webservices-common</artifactId>
@@ -47,9 +47,9 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.plugins.classloaders</groupId>
+        <groupId>org.apache.geronimo.schema</groupId>
         <artifactId>geronimo-schema-jee_5</artifactId>
-        <type>car</type>
+        <type>jar</type>
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.specs</groupId>
@@ -102,6 +102,11 @@
         <type>jar</type>
     </dependency>
     <dependency>
+        <groupId>org.apache.servicemix.bundles</groupId>
+        <artifactId>org.apache.servicemix.bundles.xmlbeans</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
         <groupId>xml-resolver</groupId>
         <artifactId>xml-resolver</artifactId>
         <type>jar</type>



Mime
View raw message