geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r701229 - in /geronimo/server/trunk: plugins/axis2/axis2/src/main/history/dependencies.xml plugins/axis2/geronimo-axis2/pom.xml pom.xml
Date Thu, 02 Oct 2008 20:11:05 GMT
Author: gawor
Date: Thu Oct  2 13:11:04 2008
New Revision: 701229

URL: http://svn.apache.org/viewvc?rev=701229&view=rev
Log:
dep fix: axis2-transports module got split into sub modules (GERONIMO-4327)

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

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=701229&r1=701228&r2=701229&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 Thu Oct  2
13:11:04 2008
@@ -143,11 +143,6 @@
     </dependency>
     <dependency>
         <groupId>org.apache.axis2</groupId>
-        <artifactId>axis2-transports</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.axis2</groupId>
         <artifactId>addressing</artifactId>
         <type>mar</type>
     </dependency>
@@ -162,6 +157,16 @@
         <type>jar</type>
     </dependency>
     <dependency>
+        <groupId>org.apache.axis2</groupId>
+        <artifactId>axis2-transport-tcp</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.axis2</groupId>
+        <artifactId>axis2-transport-local</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
         <groupId>commons-fileupload</groupId>
         <artifactId>commons-fileupload</artifactId>
         <type>jar</type>

Modified: geronimo/server/trunk/plugins/axis2/geronimo-axis2/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis2/geronimo-axis2/pom.xml?rev=701229&r1=701228&r2=701229&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis2/geronimo-axis2/pom.xml (original)
+++ geronimo/server/trunk/plugins/axis2/geronimo-axis2/pom.xml Thu Oct  2 13:11:04 2008
@@ -125,11 +125,6 @@
             <artifactId>commons-codec</artifactId>
         </dependency>
         
-        <!--<dependency>-->
-            <!--<groupId>org.apache.geronimo.specs</groupId>-->
-            <!--<artifactId>geronimo-stax-api_1.0_spec</artifactId>-->
-        <!--</dependency>-->
-        
         <dependency>
             <groupId>jaxen</groupId>
             <artifactId>jaxen</artifactId>
@@ -140,17 +135,6 @@
             <artifactId>annogen</artifactId>
         </dependency>
         
-        <!--<dependency>-->
-            <!--<groupId>javax.xml.bind</groupId>-->
-            <!--<artifactId>jaxb-api</artifactId>-->
-        <!--</dependency>-->
-
-        <!--<dependency>-->
-            <!--<groupId>org.codehaus.woodstox</groupId>-->
-            <!--<artifactId>wstx-asl</artifactId>-->
-            <!--<scope>test</scope>-->
-        <!--</dependency>-->
-        
     </dependencies>
 
 </project>

Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=701229&r1=701228&r2=701229&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Thu Oct  2 13:11:04 2008
@@ -1748,6 +1748,14 @@
                         <groupId>org.apache.ant</groupId>
                         <artifactId>ant</artifactId>
                     </exclusion>
+                    <exclusion>
+                        <groupId>org.apache.axis2</groupId>
+                        <artifactId>axis2-transport-tcp</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.apache.axis2</groupId>
+                        <artifactId>axis2-transport-local</artifactId>
+                    </exclusion>
                 </exclusions>
             </dependency>
 
@@ -1825,14 +1833,6 @@
                 <version>${axis2Version}</version>
                 <exclusions>
                     <exclusion>
-                        <groupId>org.apache.axis2</groupId>
-                        <artifactId>axis2-jaxws-api</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.apache.axis2</groupId>
-                        <artifactId>axis2-saaj-api</artifactId>
-                    </exclusion>
-                    <exclusion>
                         <groupId>javax.mail</groupId>
                         <artifactId>mail</artifactId>
                     </exclusion>
@@ -1857,14 +1857,6 @@
                 <version>${axis2Version}</version>
                 <exclusions>
                     <exclusion>
-                        <groupId>org.apache.axis2</groupId>
-                        <artifactId>axis2-jaxws-api</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.apache.axis2</groupId>
-                        <artifactId>axis2-jws-api</artifactId>
-                    </exclusion>
-                    <exclusion>
                         <groupId>javax.mail</groupId>
                         <artifactId>mail</artifactId>
                     </exclusion>
@@ -1889,10 +1881,6 @@
                 <version>${axis2Version}</version>
                 <exclusions>
                     <exclusion>
-                        <groupId>org.apache.axis2</groupId>
-                        <artifactId>axis2-saaj-api</artifactId>
-                    </exclusion>
-                    <exclusion>
                         <groupId>javax.mail</groupId>
                         <artifactId>mail</artifactId>
                     </exclusion>
@@ -1918,14 +1906,6 @@
                 <type>mar</type>
                 <exclusions>
                     <exclusion>
-                        <groupId>org.apache.axis2</groupId>
-                        <artifactId>axis2-transport-tcp</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.apache.axis2</groupId>
-                        <artifactId>axis2-transport-local</artifactId>
-                    </exclusion>
-                    <exclusion>
                         <groupId>javax.mail</groupId>
                         <artifactId>mail</artifactId>
                     </exclusion>
@@ -1969,6 +1949,30 @@
             </dependency>
 
             <dependency>
+                <groupId>org.apache.axis2</groupId>
+                <artifactId>axis2-transport-tcp</artifactId>
+                <version>${axis2Version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>commons-logging</groupId>
+                        <artifactId>commons-logging</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.axis2</groupId>
+                <artifactId>axis2-transport-local</artifactId>
+                <version>${axis2Version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>commons-logging</groupId>
+                        <artifactId>commons-logging</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+
+            <dependency>
                 <groupId>org.apache.httpcomponents</groupId>
                 <artifactId>httpcore</artifactId>
                 <version>4.0-beta1</version>



Mime
View raw message