Author: dims
Date: Wed Oct 1 19:29:50 2008
New Revision: 700990
URL: http://svn.apache.org/viewvc?rev=700990&view=rev
Log:
move tests in http folder to testkit for now and fix names a bit, needed to
remove recursive dependency of http to addressing mar
Added:
webservices/commons/trunk/modules/transport/modules/testkit/test/
- copied from r700978,
webservices/commons/trunk/modules/transport/modules/http/test/
webservices/commons/trunk/modules/transport/modules/testkit/test-resources/
- copied from r700978,
webservices/commons/trunk/modules/transport/modules/http/test-resources/
Removed:
webservices/commons/trunk/modules/transport/modules/http/test/
webservices/commons/trunk/modules/transport/modules/http/test-resources/
Modified:
webservices/commons/trunk/modules/transport/modules/base/pom.xml
webservices/commons/trunk/modules/transport/modules/http/pom.xml
webservices/commons/trunk/modules/transport/modules/jms/pom.xml
webservices/commons/trunk/modules/transport/modules/local/pom.xml
webservices/commons/trunk/modules/transport/modules/mail/pom.xml
webservices/commons/trunk/modules/transport/modules/parent/pom.xml
webservices/commons/trunk/modules/transport/modules/tcp/pom.xml
webservices/commons/trunk/modules/transport/modules/testkit/pom.xml
webservices/commons/trunk/modules/transport/modules/xmpp/pom.xml
webservices/commons/trunk/modules/transport/pom.xml
Modified: webservices/commons/trunk/modules/transport/modules/base/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/modules/base/pom.xml?rev=700990&r1=700989&r2=700990&view=diff
==============================================================================
--- webservices/commons/trunk/modules/transport/modules/base/pom.xml (original)
+++ webservices/commons/trunk/modules/transport/modules/base/pom.xml Wed Oct 1
19:29:50 2008
@@ -32,7 +32,7 @@
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-transport-base</artifactId>
- <name>Apache Axis2 - Base Transport</name>
+ <name> Apache Axis2 - Transport - Base</name>
<description>Apache Axis2 - Base Transport</description>
<packaging>jar</packaging>
@@ -124,4 +124,4 @@
<commons.logging.version>1.1</commons.logging.version>
</properties>
-</project>
\ No newline at end of file
+</project>
Modified: webservices/commons/trunk/modules/transport/modules/http/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/modules/http/pom.xml?rev=700990&r1=700989&r2=700990&view=diff
==============================================================================
--- webservices/commons/trunk/modules/transport/modules/http/pom.xml (original)
+++ webservices/commons/trunk/modules/transport/modules/http/pom.xml Wed Oct 1
19:29:50 2008
@@ -29,7 +29,7 @@
<relativePath>../parent/pom.xml</relativePath>
</parent>
<artifactId>axis2-transport-http</artifactId>
- <name>Apache Axis2 - HTTP Transport</name>
+ <name>Apache Axis2 - Transport - HTTP</name>
<description>This inclues all the available transports in
Axis2</description>
<dependencies>
<dependency>
@@ -69,12 +69,6 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.axis2</groupId>
- <artifactId>axis2-transport-testkit</artifactId>
- <version>${pom.version}</version>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
@@ -95,45 +89,6 @@
</excludes>
</resource>
</resources>
- <testResources>
- <testResource>
- <directory>test-resources</directory>
- </testResource>
- </testResources>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <version>2.0</version>
- <executions>
- <execution>
- <id>copy</id>
- <phase>generate-test-resources</phase>
- <goals>
- <goal>copy</goal>
- </goals>
- <configuration>
- <stripVersion>true</stripVersion>
- <artifactItems>
- <artifactItem>
- <groupId>org.aspectj</groupId>
- <artifactId>aspectjweaver</artifactId>
-
<outputDirectory>target/lib</outputDirectory>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.3</version>
- <configuration>
- <argLine>-javaagent:target/lib/aspectjweaver.jar -Xms64m
-Xmx128m</argLine>
- </configuration>
- </plugin>
- </plugins>
</build>
<properties>
Modified: webservices/commons/trunk/modules/transport/modules/jms/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/modules/jms/pom.xml?rev=700990&r1=700989&r2=700990&view=diff
==============================================================================
--- webservices/commons/trunk/modules/transport/modules/jms/pom.xml (original)
+++ webservices/commons/trunk/modules/transport/modules/jms/pom.xml Wed Oct 1
19:29:50 2008
@@ -32,7 +32,7 @@
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-transport-jms</artifactId>
- <name>Apache Axis2 - JMS Transport</name>
+ <name>Apache Axis2 - Transport - JMS</name>
<description>Apache Axis2 - JMS Transport</description>
<packaging>jar</packaging>
Modified: webservices/commons/trunk/modules/transport/modules/local/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/modules/local/pom.xml?rev=700990&r1=700989&r2=700990&view=diff
==============================================================================
--- webservices/commons/trunk/modules/transport/modules/local/pom.xml (original)
+++ webservices/commons/trunk/modules/transport/modules/local/pom.xml Wed Oct
1 19:29:50 2008
@@ -29,7 +29,7 @@
<relativePath>../parent/pom.xml</relativePath>
</parent>
<artifactId>axis2-transport-local</artifactId>
- <name>Apache Axis2 - Local Transport</name>
+ <name>Apache Axis2 - Transport - Local</name>
<description>This inclues all the available transports in
Axis2</description>
<dependencies>
<dependency>
Modified: webservices/commons/trunk/modules/transport/modules/mail/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/modules/mail/pom.xml?rev=700990&r1=700989&r2=700990&view=diff
==============================================================================
--- webservices/commons/trunk/modules/transport/modules/mail/pom.xml (original)
+++ webservices/commons/trunk/modules/transport/modules/mail/pom.xml Wed Oct 1
19:29:50 2008
@@ -32,7 +32,7 @@
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-transport-mail</artifactId>
- <name>Apache Axis2 - Mail Transport</name>
+ <name>Apache Axis2 - Transport - Mail</name>
<description>Apache Axis2 - Mail Transport</description>
<packaging>jar</packaging>
Modified: webservices/commons/trunk/modules/transport/modules/parent/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/modules/parent/pom.xml?rev=700990&r1=700989&r2=700990&view=diff
==============================================================================
--- webservices/commons/trunk/modules/transport/modules/parent/pom.xml
(original)
+++ webservices/commons/trunk/modules/transport/modules/parent/pom.xml Wed Oct
1 19:29:50 2008
@@ -32,6 +32,7 @@
<version>SNAPSHOT</version>
<packaging>pom</packaging>
<description>Axis2 Transport</description>
+ <name>Apache Axis2 - Transport - Parent</name>
<url>http://ws.apache.org/commons/transport/</url>
<issueManagement>
<system>JIRA</system>
Modified: webservices/commons/trunk/modules/transport/modules/tcp/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/modules/tcp/pom.xml?rev=700990&r1=700989&r2=700990&view=diff
==============================================================================
--- webservices/commons/trunk/modules/transport/modules/tcp/pom.xml (original)
+++ webservices/commons/trunk/modules/transport/modules/tcp/pom.xml Wed Oct 1
19:29:50 2008
@@ -29,7 +29,7 @@
<relativePath>../parent/pom.xml</relativePath>
</parent>
<artifactId>axis2-transport-tcp</artifactId>
- <name>Apache Axis2 - TCP Transport</name>
+ <name>Apache Axis2 - Transport - TCP</name>
<description>This inclues all the available transports in
Axis2</description>
<dependencies>
<dependency>
Modified: webservices/commons/trunk/modules/transport/modules/testkit/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/modules/testkit/pom.xml?rev=700990&r1=700989&r2=700990&view=diff
==============================================================================
--- webservices/commons/trunk/modules/transport/modules/testkit/pom.xml
(original)
+++ webservices/commons/trunk/modules/transport/modules/testkit/pom.xml Wed Oct
1 19:29:50 2008
@@ -29,9 +29,9 @@
<relativePath>../parent/pom.xml</relativePath>
</parent>
<artifactId>axis2-transport-testkit</artifactId>
- <name>Apache Axis2 - Transport test kit</name>
+ <name>Apache Axis2 - Transport - testkit</name>
<description>Framework to build test suites for Axis2
transports</description>
-
+
<dependencies>
<dependency>
<groupId>org.apache.axis2</groupId>
@@ -71,7 +71,7 @@
<version>5.1.10</version>
</dependency>
</dependencies>
-
+
<build>
<resources>
<resource>
@@ -81,22 +81,19 @@
<directory>target/generated-resources</directory>
</resource>
</resources>
+ <testResources>
+ <testResource>
+ <directory>test-resources</directory>
+ </testResource>
+ </testResources>
<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.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>2.0</version>
<executions>
<execution>
- <id>copy</id>
+ <id>copy-1</id>
<phase>generate-resources</phase>
<goals>
<goal>copy</goal>
@@ -109,13 +106,48 @@
<artifactId>addressing</artifactId>
<version>${axis2.version}</version>
<type>mar</type>
-
<outputDirectory>target/generated-resources/org/apache/axis2/transport/repo/modules</outputDirectory>
+ <outputDirectory>
+
target/generated-resources/org/apache/axis2/transport/repo/modules
+ </outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ <execution>
+ <id>copy-2</id>
+ <phase>generate-test-resources</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <stripVersion>true</stripVersion>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.aspectj</groupId>
+ <artifactId>aspectjweaver</artifactId>
+
<outputDirectory>target/lib</outputDirectory>
</artifactItem>
</artifactItems>
</configuration>
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.3</version>
+ <configuration>
+ <argLine>-javaagent:target/lib/aspectjweaver.jar -Xms64m
-Xmx128m</argLine>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
</plugins>
</build>
</project>
Modified: webservices/commons/trunk/modules/transport/modules/xmpp/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/modules/xmpp/pom.xml?rev=700990&r1=700989&r2=700990&view=diff
==============================================================================
--- webservices/commons/trunk/modules/transport/modules/xmpp/pom.xml (original)
+++ webservices/commons/trunk/modules/transport/modules/xmpp/pom.xml Wed Oct 1
19:29:50 2008
@@ -29,7 +29,7 @@
<relativePath>../parent/pom.xml</relativePath>
</parent>
<artifactId>axis2-transport-xmpp</artifactId>
- <name>Apache Axis2 - XMPP Transport</name>
+ <name>Apache Axis2 - Transport - XMPP</name>
<description>This inclues all the available transports in Axis2
</description>
<dependencies>
<dependency>
Modified: webservices/commons/trunk/modules/transport/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/pom.xml?rev=700990&r1=700989&r2=700990&view=diff
==============================================================================
--- webservices/commons/trunk/modules/transport/pom.xml (original)
+++ webservices/commons/trunk/modules/transport/pom.xml Wed Oct 1 19:29:50 2008
@@ -32,17 +32,17 @@
<artifactId>axis2-transports</artifactId>
<version>SNAPSHOT</version>
<packaging>pom</packaging>
- <name>Axis2 Transport - Root</name>
+ <name>Apache Axis2 - Transport - Root</name>
<modules>
<module>modules/parent</module>
<module>modules/base</module>
- <module>modules/testkit</module>
<module>modules/http</module>
<module>modules/tcp</module>
<module>modules/local</module>
<module>modules/xmpp</module>
<module>modules/mail</module>
<module>modules/jms</module>
+ <module>modules/testkit</module>
</modules>
<profiles>
<profile>
