You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ga...@apache.org on 2009/04/06 20:07:27 UTC
svn commit: r762443 - in /geronimo/server/trunk:
plugins/axis2/axis2/src/main/history/dependencies.xml
plugins/axis2/geronimo-axis2/pom.xml
plugins/axis2/geronimo-axis2/src/main/resources/META-INF/geronimo-axis2.xml
pom.xml
Author: gawor
Date: Mon Apr 6 18:07:26 2009
New Revision: 762443
URL: http://svn.apache.org/viewvc?rev=762443&view=rev
Log:
Axis2 does not depend on Transport modules anymore
Modified:
geronimo/server/trunk/plugins/axis2/axis2/src/main/history/dependencies.xml
geronimo/server/trunk/plugins/axis2/geronimo-axis2/pom.xml
geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/main/resources/META-INF/geronimo-axis2.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=762443&r1=762442&r2=762443&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 Mon Apr 6 18:07:26 2009
@@ -118,16 +118,6 @@
</dependency>
<dependency>
<groupId>org.apache.axis2</groupId>
- <artifactId>axis2-transport-base</artifactId>
- <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>
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=762443&r1=762442&r2=762443&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis2/geronimo-axis2/pom.xml (original)
+++ geronimo/server/trunk/plugins/axis2/geronimo-axis2/pom.xml Mon Apr 6 18:07:26 2009
@@ -117,7 +117,7 @@
<dependency>
<groupId>org.apache.axis2</groupId>
- <artifactId>axis2-transport-tcp</artifactId>
+ <artifactId>axis2-transport-http</artifactId>
</dependency>
<dependency>
Modified: geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/main/resources/META-INF/geronimo-axis2.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/main/resources/META-INF/geronimo-axis2.xml?rev=762443&r1=762442&r2=762443&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/main/resources/META-INF/geronimo-axis2.xml (original)
+++ geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/main/resources/META-INF/geronimo-axis2.xml Mon Apr 6 18:07:26 2009
@@ -142,22 +142,10 @@
<!--<parameter name="hostname">http://myApp.com/ws</parameter>-->
</transportReceiver>
- <transportReceiver name="tcp"
- class="org.apache.axis2.transport.tcp.TCPServer">
- <parameter name="port">6061</parameter>
- <!--If you want to give your own host address for EPR generation-->
- <!--uncomment following parameter , and set as you required.-->
- <!--<parameter name="hostname">tcp://myApp.com/ws</parameter>-->
- </transportReceiver>
-
<!-- ================================================= -->
<!-- Transport Outs -->
<!-- ================================================= -->
- <!--<transportSender name="jms"-->
- <!--class="org.apache.axis2.transport.jms.JMSSender"/>-->
- <transportSender name="tcp"
- class="org.apache.axis2.transport.tcp.TCPTransportSender"/>
<transportSender name="local"
class="org.apache.axis2.transport.local.LocalTransportSender"/>
<transportSender name="http"
Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=762443&r1=762442&r2=762443&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Mon Apr 6 18:07:26 2009
@@ -79,7 +79,6 @@
<tomcatPatchedVersion>6.0.18-G678601</tomcatPatchedVersion>
<cxfVersion>2.1.4</cxfVersion>
<axis2Version>1.5-SNAPSHOT</axis2Version>
- <axis2TransportVersion>SNAPSHOT</axis2TransportVersion>
<axiomVersion>1.2.8</axiomVersion>
<springVersion>2.5.6</springVersion>
<plutoVersion>1.1.6-G643117</plutoVersion>
@@ -1602,10 +1601,6 @@
<artifactId>xalan</artifactId>
</exclusion>
<exclusion>
- <groupId>commons-fileupload</groupId>
- <artifactId>commons-fileupload</artifactId>
- </exclusion>
- <exclusion>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</exclusion>
@@ -1727,52 +1722,32 @@
<dependency>
<groupId>org.apache.axis2</groupId>
- <artifactId>axis2-transport-base</artifactId>
- <version>${axis2TransportVersion}</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.apache.axis2</groupId>
<artifactId>axis2-transport-http</artifactId>
- <version>${axis2TransportVersion}</version>
+ <version>${axis2Version}</version>
<exclusions>
<exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
+ <groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
</exclusion>
<exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
+ <groupId>xalan</groupId>
+ <artifactId>xalan</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.axis2</groupId>
- <artifactId>axis2-transport-tcp</artifactId>
- <version>${axis2TransportVersion}</version>
+ <artifactId>axis2-transport-local</artifactId>
+ <version>${axis2Version}</version>
<exclusions>
<exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
+ <groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
</exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.apache.axis2</groupId>
- <artifactId>axis2-transport-local</artifactId>
- <version>${axis2TransportVersion}</version>
- <exclusions>
<exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
+ <groupId>xalan</groupId>
+ <artifactId>xalan</artifactId>
</exclusion>
</exclusions>
</dependency>