geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r702989 - in /geronimo/server/trunk: ./ plugins/axis2/axis2-deployer/ plugins/axis2/axis2-deployer/src/main/history/ plugins/axis2/axis2/ plugins/axis2/axis2/src/main/history/ plugins/axis2/axis2/src/main/plan/
Date Wed, 08 Oct 2008 21:10:11 GMT
Author: gawor
Date: Wed Oct  8 14:10:10 2008
New Revision: 702989

URL: http://svn.apache.org/viewvc?rev=702989&view=rev
Log:
wsdl generation happens at deploy time so no need for axis2 plugin to have all these sun dependencies

Modified:
    geronimo/server/trunk/plugins/axis2/axis2-deployer/pom.xml
    geronimo/server/trunk/plugins/axis2/axis2-deployer/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/axis2/axis2/pom.xml
    geronimo/server/trunk/plugins/axis2/axis2/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/axis2/axis2/src/main/plan/plan.xml
    geronimo/server/trunk/pom.xml

Modified: geronimo/server/trunk/plugins/axis2/axis2-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis2/axis2-deployer/pom.xml?rev=702989&r1=702988&r2=702989&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis2/axis2-deployer/pom.xml (original)
+++ geronimo/server/trunk/plugins/axis2/axis2-deployer/pom.xml Wed Oct  8 14:10:10 2008
@@ -55,6 +55,32 @@
             <type>car</type>
             <version>${version}</version>
         </dependency>
+
+        <!-- Needed for generating wsdl -->
+        <dependency>
+            <groupId>com.sun.xml.ws</groupId>
+            <artifactId>jaxws-tools</artifactId>
+        </dependency>
+        
+        <dependency>
+            <groupId>com.sun.xml.ws</groupId>
+            <artifactId>jaxws-rt</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.sun.xml.stream.buffer</groupId>
+            <artifactId>streambuffer</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.jvnet.staxex</groupId>
+            <artifactId>stax-ex</artifactId>
+        </dependency>
+        
+        <dependency>
+            <groupId>com.sun.xml.bind</groupId>
+            <artifactId>jaxb-xjc</artifactId>
+        </dependency>
     </dependencies>
 
     <build>

Modified: geronimo/server/trunk/plugins/axis2/axis2-deployer/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis2/axis2-deployer/src/main/history/dependencies.xml?rev=702989&r1=702988&r2=702989&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis2/axis2-deployer/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/axis2/axis2-deployer/src/main/history/dependencies.xml Wed
Oct  8 14:10:10 2008
@@ -21,4 +21,29 @@
         <artifactId>geronimo-axis2-builder</artifactId>
         <type>jar</type>
     </dependency>
+    <dependency>
+        <groupId>org.jvnet.staxex</groupId>
+        <artifactId>stax-ex</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>com.sun.xml.stream.buffer</groupId>
+        <artifactId>streambuffer</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>com.sun.xml.ws</groupId>
+        <artifactId>jaxws-rt</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>com.sun.xml.ws</groupId>
+        <artifactId>jaxws-tools</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>com.sun.xml.bind</groupId>
+        <artifactId>jaxb-xjc</artifactId>
+        <type>jar</type>
+    </dependency>
 </plugin-artifact>

Modified: geronimo/server/trunk/plugins/axis2/axis2/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis2/axis2/pom.xml?rev=702989&r1=702988&r2=702989&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis2/axis2/pom.xml (original)
+++ geronimo/server/trunk/plugins/axis2/axis2/pom.xml Wed Oct  8 14:10:10 2008
@@ -169,31 +169,6 @@
         </dependency>
 
         <dependency>
-            <groupId>com.sun.xml.ws</groupId>
-            <artifactId>jaxws-tools</artifactId>
-        </dependency>
-        
-        <dependency>
-            <groupId>com.sun.xml.ws</groupId>
-            <artifactId>jaxws-rt</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.sun.xml.stream.buffer</groupId>
-            <artifactId>streambuffer</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.jvnet.staxex</groupId>
-            <artifactId>stax-ex</artifactId>
-        </dependency>
-        
-        <dependency>
-            <groupId>com.sun.xml.bind</groupId>
-            <artifactId>jaxb-xjc</artifactId>
-        </dependency>
-        
-        <dependency>
             <groupId>backport-util-concurrent</groupId>
             <artifactId>backport-util-concurrent</artifactId>
         </dependency>

Modified: geronimo/server/trunk/plugins/axis2/axis2/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis2/axis2/src/main/history/dependencies.xml?rev=702989&r1=702988&r2=702989&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis2/axis2/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/axis2/axis2/src/main/history/dependencies.xml Wed Oct  8
14:10:10 2008
@@ -42,11 +42,6 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>com.sun.xml.bind</groupId>
-        <artifactId>jaxb-xjc</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>commons-httpclient</groupId>
         <artifactId>commons-httpclient</artifactId>
         <type>jar</type>
@@ -87,11 +82,6 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>com.sun.xml.ws</groupId>
-        <artifactId>jaxws-tools</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>webservices-common</artifactId>
         <type>car</type>
@@ -102,11 +92,6 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>com.sun.xml.ws</groupId>
-        <artifactId>jaxws-rt</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>j2ee-server</artifactId>
         <type>car</type>
@@ -176,14 +161,4 @@
         <artifactId>woden-impl-dom</artifactId>
         <type>jar</type>
     </dependency>
-    <dependency>
-        <groupId>org.jvnet.staxex</groupId>
-        <artifactId>stax-ex</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>com.sun.xml.stream.buffer</groupId>
-        <artifactId>streambuffer</artifactId>
-        <type>jar</type>
-    </dependency>
 </plugin-artifact>

Modified: geronimo/server/trunk/plugins/axis2/axis2/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis2/axis2/src/main/plan/plan.xml?rev=702989&r1=702988&r2=702989&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis2/axis2/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/plugins/axis2/axis2/src/main/plan/plan.xml Wed Oct  8 14:10:10 2008
@@ -20,11 +20,4 @@
 
 <module xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
 
-    <gbean name="Axis2SystemProperties"
-           class="org.apache.geronimo.system.properties.SystemProperties">
-        <attribute name="systemProperties">
-            javax.xml.ws.spi.Provider=org.apache.axis2.jaxws.spi.Provider
-        </attribute>
-    </gbean>
-
 </module>

Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=702989&r1=702988&r2=702989&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Wed Oct  8 14:10:10 2008
@@ -1832,6 +1832,10 @@
                         <groupId>jaxen</groupId>
                         <artifactId>jaxen</artifactId>
                     </exclusion>
+                    <exclusion>
+                        <groupId>com.sun.xml.bind</groupId>
+                        <artifactId>jaxb-xjc</artifactId>
+                    </exclusion>
                 </exclusions>
             </dependency>
 
@@ -1856,6 +1860,10 @@
                         <groupId>commons-io</groupId>
                         <artifactId>commons-io</artifactId>
                     </exclusion>
+                    <exclusion>
+                        <groupId>com.sun.xml.bind</groupId>
+                        <artifactId>jaxb-xjc</artifactId>
+                    </exclusion>
                 </exclusions>
             </dependency>
 



Mime
View raw message