geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rickmcgu...@apache.org
Subject svn commit: r1001708 - in /geronimo/server/trunk: ./ plugingroups/webservices-axis2/ plugins/axis/ plugins/axis/axis/ plugins/axis/axis/src/main/history/ plugins/j2ee/j2ee-server/src/main/history/ plugins/jetty8/jetty8-deployer/src/main/history/
Date Mon, 27 Sep 2010 12:40:53 GMT
Author: rickmcguire
Date: Mon Sep 27 12:40:53 2010
New Revision: 1001708

URL: http://svn.apache.org/viewvc?rev=1001708&view=rev
Log:
More osgi work on the axis plugins

Modified:
    geronimo/server/trunk/plugingroups/webservices-axis2/pom.xml
    geronimo/server/trunk/plugins/axis/axis/pom.xml
    geronimo/server/trunk/plugins/axis/axis/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/axis/pom.xml
    geronimo/server/trunk/plugins/j2ee/j2ee-server/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/jetty8/jetty8-deployer/src/main/history/dependencies.xml
    geronimo/server/trunk/pom.xml

Modified: geronimo/server/trunk/plugingroups/webservices-axis2/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/webservices-axis2/pom.xml?rev=1001708&r1=1001707&r2=1001708&view=diff
==============================================================================
--- geronimo/server/trunk/plugingroups/webservices-axis2/pom.xml (original)
+++ geronimo/server/trunk/plugingroups/webservices-axis2/pom.xml Mon Sep 27 12:40:53 2010
@@ -44,7 +44,7 @@
             <!--<version>${project.version}</version>-->
             <!--<type>car</type>-->
         <!--</dependency>-->
-
+        
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>axis2-deployer</artifactId>

Modified: geronimo/server/trunk/plugins/axis/axis/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis/axis/pom.xml?rev=1001708&r1=1001707&r2=1001708&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis/axis/pom.xml (original)
+++ geronimo/server/trunk/plugins/axis/axis/pom.xml Mon Sep 27 12:40:53 2010
@@ -82,16 +82,22 @@
             <groupId>org.apache.geronimo.bundles</groupId>
             <artifactId>commons-discovery</artifactId>
         </dependency>
-
-        <!-- JAXR implementation -->
+            
         <dependency>
-            <groupId>org.apache.ws.scout</groupId>
-            <artifactId>scout</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jaxr_1.0_spec</artifactId>
+            <version>2.1</version>
         </dependency>
+
+        <!-- JAXR implementation -->
         <dependency>
             <groupId>org.apache.juddi</groupId>
             <artifactId>uddi-ws</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.bundles</groupId>
+            <artifactId>scout</artifactId>
+        </dependency>
     </dependencies>
 
     <build>

Modified: geronimo/server/trunk/plugins/axis/axis/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis/axis/src/main/history/dependencies.xml?rev=1001708&r1=1001707&r2=1001708&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis/axis/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/axis/axis/src/main/history/dependencies.xml Mon Sep 27 12:40:53
2010
@@ -52,6 +52,11 @@
         <type>jar</type>
     </dependency>
     <dependency>
+        <groupId>org.apache.geronimo.bundles</groupId>
+        <artifactId>scout</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
         <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>openejb</artifactId>
         <type>car</type>
@@ -72,26 +77,11 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.specs</groupId>
-        <artifactId>geronimo-jaxb_2.1_spec</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.specs</groupId>
-        <artifactId>geronimo-stax-api_1.0_spec</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.juddi</groupId>
         <artifactId>uddi-ws</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.ws.scout</groupId>
-        <artifactId>scout</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>org.jvnet.staxex</groupId>
         <artifactId>stax-ex</artifactId>
         <type>jar</type>

Modified: geronimo/server/trunk/plugins/axis/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis/pom.xml?rev=1001708&r1=1001707&r2=1001708&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis/pom.xml (original)
+++ geronimo/server/trunk/plugins/axis/pom.xml Mon Sep 27 12:40:53 2010
@@ -58,28 +58,9 @@
                 <version>1.4_1</version>
             </dependency>
             <dependency>
-                <groupId>org.apache.ws.scout</groupId>
-                <artifactId>scout</artifactId>
-                <version>1.2.1</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>commons-logging</groupId>
-                        <artifactId>commons-logging</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>xerces</groupId>
-                        <artifactId>xercesImpl</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.apache.juddi</groupId>
-                        <artifactId>uddi-ws</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
-            <dependency>
                 <groupId>org.apache.juddi</groupId>
                 <artifactId>uddi-ws</artifactId>
-                <version>3.0.1</version>
+                <version>3.0.2</version>
                 <exclusions>
                     <exclusion>
                         <groupId>log4j</groupId>

Modified: geronimo/server/trunk/plugins/j2ee/j2ee-server/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/j2ee-server/src/main/history/dependencies.xml?rev=1001708&r1=1001707&r2=1001708&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/j2ee-server/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/j2ee/j2ee-server/src/main/history/dependencies.xml Mon Sep
27 12:40:53 2010
@@ -27,33 +27,8 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.specs</groupId>
-        <artifactId>geronimo-osgi-registry</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.servicemix.bundles</groupId>
         <artifactId>org.apache.servicemix.bundles.howl</artifactId>
         <type>jar</type>
     </dependency>
-    <dependency>
-        <groupId>org.apache.servicemix.bundles</groupId>
-        <artifactId>org.apache.servicemix.bundles.xpp3</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.xbean</groupId>
-        <artifactId>xbean-bundleutils</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-reflect</artifactId>
-        <type>jar</type>
-    </dependency>
 </plugin-artifact>

Modified: geronimo/server/trunk/plugins/jetty8/jetty8-deployer/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty8/jetty8-deployer/src/main/history/dependencies.xml?rev=1001708&r1=1001707&r2=1001708&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty8/jetty8-deployer/src/main/history/dependencies.xml
(original)
+++ geronimo/server/trunk/plugins/jetty8/jetty8-deployer/src/main/history/dependencies.xml
Mon Sep 27 12:40:53 2010
@@ -26,29 +26,4 @@
         <artifactId>geronimo-jetty8-builder</artifactId>
         <type>jar</type>
     </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>geronimo-web</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.specs</groupId>
-        <artifactId>geronimo-jacc_1.4_spec</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.specs</groupId>
-        <artifactId>geronimo-jaspic_1.0_spec</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.specs</groupId>
-        <artifactId>geronimo-osgi-locator</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.xbean</groupId>
-        <artifactId>xbean-bundleutils</artifactId>
-        <type>jar</type>
-    </dependency>
 </plugin-artifact>

Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=1001708&r1=1001707&r2=1001708&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Mon Sep 27 12:40:53 2010
@@ -714,9 +714,9 @@
             </dependency>
 
             <dependency>
-                <groupId>org.apache.ws.scout</groupId>
+                <groupId>org.apache.geronimo.bundles</groupId>
                 <artifactId>scout</artifactId>
-                <version>1.2.1</version>
+                <version>1.2.2_1-SNAPSHOT</version>
                 <exclusions>
                     <exclusion>
                         <groupId>commons-logging</groupId>
@@ -726,6 +726,34 @@
                         <groupId>xerces</groupId>
                         <artifactId>xercesImpl</artifactId>
                     </exclusion>
+                    <exclusion>
+                        <groupId>org.apache.geronimo.specs</groupId>
+                        <artifactId>geronimo-jaxr_1.0_spec</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.apache.geronimo.specs</groupId>
+                        <artifactId>geronimo-activation_1.1_spec</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.apache.geronimo.specs</groupId>
+                        <artifactId>geronimo-jaxb_2.1_spec</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.apache.geronimo.specs</groupId>
+                        <artifactId>geronimo-jaxrpc_1.1_spec</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.apache.geronimo.specs</groupId>
+                        <artifactId>geronimo-saaj_1.3_spec</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.apache.geronimo.specs</groupId>
+                        <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>com.sun.xml.bind</groupId>
+                        <artifactId>jaxb-impl</artifactId>
+                    </exclusion>
                 </exclusions>
             </dependency>
 



Mime
View raw message