You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@axis.apache.org by ve...@apache.org on 2012/11/16 18:30:49 UTC
svn commit: r1410499 - in /axis/axis2/java/core/trunk: ./ modules/parent/
modules/transport/base/ modules/transport/jms/ modules/transport/mail/
modules/transport/tcp/ modules/transport/testkit/ modules/transport/udp/
modules/transport/xmpp/
Author: veithen
Date: Fri Nov 16 17:30:46 2012
New Revision: 1410499
URL: http://svn.apache.org/viewvc?rev=1410499&view=rev
Log:
AXIS2-5434: Integrated the transports from the transports subproject into Axis2 core.
Added:
axis/axis2/java/core/trunk/modules/transport/base/
- copied from r1410263, axis/axis2/java/transports/trunk/modules/base/
axis/axis2/java/core/trunk/modules/transport/jms/
- copied from r1410449, axis/axis2/java/transports/trunk/modules/jms/
axis/axis2/java/core/trunk/modules/transport/mail/
- copied from r1410377, axis/axis2/java/transports/trunk/modules/mail/
axis/axis2/java/core/trunk/modules/transport/tcp/
- copied from r1410382, axis/axis2/java/transports/trunk/modules/tcp/
axis/axis2/java/core/trunk/modules/transport/testkit/
- copied from r1410263, axis/axis2/java/transports/trunk/modules/testkit/
axis/axis2/java/core/trunk/modules/transport/udp/
- copied from r1410386, axis/axis2/java/transports/trunk/modules/udp/
axis/axis2/java/core/trunk/modules/transport/xmpp/
- copied from r1410450, axis/axis2/java/transports/trunk/modules/xmpp/
Modified:
axis/axis2/java/core/trunk/modules/parent/pom.xml
axis/axis2/java/core/trunk/modules/transport/base/pom.xml
axis/axis2/java/core/trunk/modules/transport/jms/pom.xml
axis/axis2/java/core/trunk/modules/transport/mail/pom.xml
axis/axis2/java/core/trunk/modules/transport/tcp/pom.xml
axis/axis2/java/core/trunk/modules/transport/testkit/pom.xml
axis/axis2/java/core/trunk/modules/transport/udp/pom.xml
axis/axis2/java/core/trunk/modules/transport/xmpp/pom.xml
axis/axis2/java/core/trunk/pom.xml
Modified: axis/axis2/java/core/trunk/modules/parent/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/parent/pom.xml?rev=1410499&r1=1410498&r2=1410499&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/parent/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/parent/pom.xml Fri Nov 16 17:30:46 2012
@@ -79,7 +79,7 @@
<commons.codec.version>1.3</commons.codec.version>
<commons.fileupload.version>1.2</commons.fileupload.version>
<commons.httpclient.version>3.1</commons.httpclient.version>
- <commons.io.version>1.4</commons.io.version>
+ <commons.io.version>2.1</commons.io.version>
<commons.logging.version>1.1.1</commons.logging.version>
<fi.version>1.2.7</fi.version>
<geronimo.spec.activation.version>1.0.2</geronimo.spec.activation.version>
@@ -971,6 +971,18 @@
<artifactId>jetty</artifactId>
<version>5.1.10</version>
</dependency>
+
+ <!-- AspectJ is used in the unit tests of several transports -->
+ <dependency>
+ <groupId>org.aspectj</groupId>
+ <artifactId>aspectjrt</artifactId>
+ <version>1.6.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.aspectj</groupId>
+ <artifactId>aspectjweaver</artifactId>
+ <version>1.6.1</version>
+ </dependency>
</dependencies>
</dependencyManagement>
Modified: axis/axis2/java/core/trunk/modules/transport/base/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/transport/base/pom.xml?rev=1410499&r1=1410263&r2=1410499&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/transport/base/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/transport/base/pom.xml Fri Nov 16 17:30:46 2012
@@ -22,9 +22,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.axis2</groupId>
- <artifactId>axis2-transports</artifactId>
+ <artifactId>axis2-parent</artifactId>
<version>1.7.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
+ <relativePath>../../parent/pom.xml</relativePath>
</parent>
<groupId>org.apache.axis2</groupId>
@@ -33,24 +33,16 @@
<description>Apache Axis2 - Base Transport</description>
<packaging>bundle</packaging>
+ <url>http://axis.apache.org/axis2/java/core/</url>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/axis/axis2/java/transports/trunk/modules/base</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/axis/axis2/java/transports/trunk/modules/base</developerConnection>
- <url>http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/base</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/axis/axis2/java/core/trunk/modules/transport/base</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/axis/axis2/java/core/trunk/modules/transport/base</developerConnection>
+ <url>http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/transport/base</url>
</scm>
<build>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
-
- <plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>1.4.0</version>
@@ -78,41 +70,15 @@
</build>
<dependencies>
- <!-- Axis2 -->
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-kernel</artifactId>
- <version>${axis2.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>2.0</version>
</dependency>
-
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <exclusions>
- <exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>logkit</groupId>
- <artifactId>logkit</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>avalon-framework</groupId>
- <artifactId>avalon-framework</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
@@ -121,7 +87,6 @@
<dependency>
<groupId>xmlunit</groupId>
<artifactId>xmlunit</artifactId>
- <version>1.2</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified: axis/axis2/java/core/trunk/modules/transport/jms/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/transport/jms/pom.xml?rev=1410499&r1=1410449&r2=1410499&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/transport/jms/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/transport/jms/pom.xml Fri Nov 16 17:30:46 2012
@@ -22,9 +22,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.axis2</groupId>
- <artifactId>axis2-transports</artifactId>
+ <artifactId>axis2-parent</artifactId>
<version>1.7.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
+ <relativePath>../../parent/pom.xml</relativePath>
</parent>
<groupId>org.apache.axis2</groupId>
@@ -33,10 +33,11 @@
<description>Apache Axis2 - JMS Transport</description>
<packaging>bundle</packaging>
+ <url>http://axis.apache.org/axis2/java/core/</url>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/axis/axis2/java/transports/trunk/modules/jms</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/axis/axis2/java/transports/trunk/modules/jms</developerConnection>
- <url>http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/jms</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/axis/axis2/java/core/trunk/modules/transport/jms</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/axis/axis2/java/core/trunk/modules/transport/jms</developerConnection>
+ <url>http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/transport/jms</url>
</scm>
<build>
Modified: axis/axis2/java/core/trunk/modules/transport/mail/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/transport/mail/pom.xml?rev=1410499&r1=1410377&r2=1410499&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/transport/mail/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/transport/mail/pom.xml Fri Nov 16 17:30:46 2012
@@ -22,9 +22,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.axis2</groupId>
- <artifactId>axis2-transports</artifactId>
+ <artifactId>axis2-parent</artifactId>
<version>1.7.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
+ <relativePath>../../parent/pom.xml</relativePath>
</parent>
<groupId>org.apache.axis2</groupId>
@@ -33,10 +33,11 @@
<description>Apache Axis2 - Mail Transport</description>
<packaging>bundle</packaging>
+ <url>http://axis.apache.org/axis2/java/core/</url>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/axis/axis2/java/transports/trunk/modules/mail</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/axis/axis2/java/transports/trunk/modules/mail</developerConnection>
- <url>http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/mail</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/axis/axis2/java/core/trunk/modules/transport/mail</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/axis/axis2/java/core/trunk/modules/transport/mail</developerConnection>
+ <url>http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/transport/mail</url>
</scm>
<build>
Modified: axis/axis2/java/core/trunk/modules/transport/tcp/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/transport/tcp/pom.xml?rev=1410499&r1=1410382&r2=1410499&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/transport/tcp/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/transport/tcp/pom.xml Fri Nov 16 17:30:46 2012
@@ -23,19 +23,20 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.axis2</groupId>
- <artifactId>axis2-transports</artifactId>
+ <artifactId>axis2-parent</artifactId>
<version>1.7.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
+ <relativePath>../../parent/pom.xml</relativePath>
</parent>
<artifactId>axis2-transport-tcp</artifactId>
<name>Apache Axis2 - Transport - TCP</name>
<description>This inclues all the available transports in Axis2</description>
<packaging>bundle</packaging>
+ <url>http://axis.apache.org/axis2/java/core/</url>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/axis/axis2/java/transports/trunk/modules/tcp</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/axis/axis2/java/transports/trunk/modules/tcp</developerConnection>
- <url>http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/tcp</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/axis/axis2/java/core/trunk/modules/transport/tcp</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/axis/axis2/java/core/trunk/modules/transport/tcp</developerConnection>
+ <url>http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/transport/tcp</url>
</scm>
<build>
@@ -67,7 +68,7 @@
<tasks>
<mkdir dir="target/test-resources/samples/modules" />
<mkdir dir="target/test-resources/samples/conf" />
- <copy file="${settings.localRepository}/org/apache/axis2/addressing/${axis2.version}/addressing-${axis2.version}.mar" tofile="target/test-resources/samples/modules/addressing.mar" />
+ <copy file="${settings.localRepository}/org/apache/axis2/addressing/${project.version}/addressing-${project.version}.mar" tofile="target/test-resources/samples/modules/addressing.mar" />
<copy file="conf/axis2.xml" tofile="target/test-resources/samples/conf/axis2.xml" />
<copy file="conf/client_axis2.xml" tofile="target/test-resources/samples/conf/client_axis2.xml" />
</tasks>
@@ -127,7 +128,7 @@
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>addressing</artifactId>
- <version>${axis2.version}</version>
+ <version>${project.version}</version>
<type>mar</type>
<scope>test</scope>
</dependency>
Modified: axis/axis2/java/core/trunk/modules/transport/testkit/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/transport/testkit/pom.xml?rev=1410499&r1=1410263&r2=1410499&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/transport/testkit/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/transport/testkit/pom.xml Fri Nov 16 17:30:46 2012
@@ -23,30 +23,32 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.axis2</groupId>
- <artifactId>axis2-transports</artifactId>
+ <artifactId>axis2-parent</artifactId>
<version>1.7.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
+ <relativePath>../../parent/pom.xml</relativePath>
</parent>
<artifactId>axis2-transport-testkit</artifactId>
<name>Apache Axis2 - Transport - testkit</name>
<description>Framework to build test suites for Axis2 transports</description>
+ <url>http://axis.apache.org/axis2/java/core/</url>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/axis/axis2/java/transports/trunk/modules/testkit</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/axis/axis2/java/transports/trunk/modules/testkit</developerConnection>
- <url>http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/testkit</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/axis/axis2/java/core/trunk/modules/transport/testkit</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/axis/axis2/java/core/trunk/modules/transport/testkit</developerConnection>
+ <url>http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/transport/base</url>
</scm>
<dependencies>
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-kernel</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>addressing</artifactId>
<type>mar</type>
- <version>${axis2.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.axis2</groupId>
Modified: axis/axis2/java/core/trunk/modules/transport/udp/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/transport/udp/pom.xml?rev=1410499&r1=1410386&r2=1410499&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/transport/udp/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/transport/udp/pom.xml Fri Nov 16 17:30:46 2012
@@ -23,19 +23,20 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.axis2</groupId>
- <artifactId>axis2-transports</artifactId>
+ <artifactId>axis2-parent</artifactId>
<version>1.7.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
+ <relativePath>../../parent/pom.xml</relativePath>
</parent>
<artifactId>axis2-transport-udp</artifactId>
<name>Apache Axis2 - Transport - UDP</name>
<description>UDP transport for Axis2</description>
<packaging>bundle</packaging>
+ <url>http://axis.apache.org/axis2/java/core/</url>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/axis/axis2/java/transports/trunk/modules/udp</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/axis/axis2/java/transports/trunk/modules/udp</developerConnection>
- <url>http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/udp</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/axis/axis2/java/core/trunk/modules/transport/udp</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/axis/axis2/java/core/trunk/modules/transport/udp</developerConnection>
+ <url>http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/transport/udp</url>
</scm>
<build>
Modified: axis/axis2/java/core/trunk/modules/transport/xmpp/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/transport/xmpp/pom.xml?rev=1410499&r1=1410450&r2=1410499&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/transport/xmpp/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/transport/xmpp/pom.xml Fri Nov 16 17:30:46 2012
@@ -23,19 +23,20 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.axis2</groupId>
- <artifactId>axis2-transports</artifactId>
+ <artifactId>axis2-parent</artifactId>
<version>1.7.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
+ <relativePath>../../parent/pom.xml</relativePath>
</parent>
<artifactId>axis2-transport-xmpp</artifactId>
<name>Apache Axis2 - Transport - XMPP</name>
<description>This inclues all the available transports in Axis2 </description>
<packaging>bundle</packaging>
+ <url>http://axis.apache.org/axis2/java/core/</url>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/axis/axis2/java/transports/trunk/modules/xmpp</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/axis/axis2/java/transports/trunk/modules/xmpp</developerConnection>
- <url>http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/xmpp</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/axis/axis2/java/core/trunk/modules/transport/xmpp</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/axis/axis2/java/core/trunk/modules/transport/xmpp</developerConnection>
+ <url>http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/transport/xmpp</url>
</scm>
<build>
@@ -79,6 +80,12 @@
<dependencies>
<dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-kernel</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</dependency>
Modified: axis/axis2/java/core/trunk/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/pom.xml?rev=1410499&r1=1410498&r2=1410499&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/pom.xml (original)
+++ axis/axis2/java/core/trunk/pom.xml Fri Nov 16 17:30:46 2012
@@ -85,6 +85,13 @@
<module>modules/osgi</module>
<module>modules/transport/local</module>
<module>modules/transport/http</module>
+ <module>modules/transport/base</module>
+ <module>modules/transport/jms</module>
+ <module>modules/transport/mail</module>
+ <module>modules/transport/tcp</module>
+ <module>modules/transport/testkit</module>
+ <module>modules/transport/udp</module>
+ <module>modules/transport/xmpp</module>
</modules>
<profiles>
<profile>