Author: gdaniels
Date: Wed Mar 4 21:53:30 2009
New Revision: 750174
URL: http://svn.apache.org/viewvc?rev=750174&view=rev
Log:
Move tests into individual transport modules, prep for removing tests module.
Added:
webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/apache/axis2/transport/jms/ActiveMQTestEnvironment.java
(props changed)
- copied unchanged from r749521,
webservices/commons/trunk/modules/transport/modules/tests/src/test/java/org/apache/axis2/transport/jms/ActiveMQTestEnvironment.java
webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/apache/axis2/transport/jms/ContentTypeMode.java
(props changed)
- copied unchanged from r749521,
webservices/commons/trunk/modules/transport/modules/tests/src/test/java/org/apache/axis2/transport/jms/ContentTypeMode.java
webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/apache/axis2/transport/jms/JMSAsyncChannel.java
(props changed)
- copied unchanged from r749521,
webservices/commons/trunk/modules/transport/modules/tests/src/test/java/org/apache/axis2/transport/jms/JMSAsyncChannel.java
webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/apache/axis2/transport/jms/JMSAsyncClient.java
(props changed)
- copied unchanged from r749521,
webservices/commons/trunk/modules/transport/modules/tests/src/test/java/org/apache/axis2/transport/jms/JMSAsyncClient.java
webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/apache/axis2/transport/jms/JMSAxisTestClientConfigurator.java
(props changed)
- copied unchanged from r749521,
webservices/commons/trunk/modules/transport/modules/tests/src/test/java/org/apache/axis2/transport/jms/JMSAxisTestClientConfigurator.java
webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/apache/axis2/transport/jms/JMSBytesMessageFactory.java
(props changed)
- copied unchanged from r749521,
webservices/commons/trunk/modules/transport/modules/tests/src/test/java/org/apache/axis2/transport/jms/JMSBytesMessageFactory.java
webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/apache/axis2/transport/jms/JMSChannel.java
(props changed)
- copied unchanged from r749521,
webservices/commons/trunk/modules/transport/modules/tests/src/test/java/org/apache/axis2/transport/jms/JMSChannel.java
webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/apache/axis2/transport/jms/JMSClient.java
(props changed)
- copied unchanged from r749521,
webservices/commons/trunk/modules/transport/modules/tests/src/test/java/org/apache/axis2/transport/jms/JMSClient.java
webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/apache/axis2/transport/jms/JMSMessageFactory.java
(props changed)
- copied unchanged from r749521,
webservices/commons/trunk/modules/transport/modules/tests/src/test/java/org/apache/axis2/transport/jms/JMSMessageFactory.java
webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/apache/axis2/transport/jms/JMSRequestResponseChannel.java
(props changed)
- copied unchanged from r749521,
webservices/commons/trunk/modules/transport/modules/tests/src/test/java/org/apache/axis2/transport/jms/JMSRequestResponseChannel.java
webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/apache/axis2/transport/jms/JMSRequestResponseClient.java
(props changed)
- copied unchanged from r749521,
webservices/commons/trunk/modules/transport/modules/tests/src/test/java/org/apache/axis2/transport/jms/JMSRequestResponseClient.java
webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/apache/axis2/transport/jms/JMSTestEnvironment.java
(props changed)
- copied unchanged from r749521,
webservices/commons/trunk/modules/transport/modules/tests/src/test/java/org/apache/axis2/transport/jms/JMSTestEnvironment.java
webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/apache/axis2/transport/jms/JMSTextMessageFactory.java
(props changed)
- copied unchanged from r749521,
webservices/commons/trunk/modules/transport/modules/tests/src/test/java/org/apache/axis2/transport/jms/JMSTextMessageFactory.java
webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/apache/axis2/transport/jms/JMSTransportDescriptionFactory.java
(props changed)
- copied unchanged from r749521,
webservices/commons/trunk/modules/transport/modules/tests/src/test/java/org/apache/axis2/transport/jms/JMSTransportDescriptionFactory.java
webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/apache/axis2/transport/jms/JMSTransportTest.java
(props changed)
- copied unchanged from r749521,
webservices/commons/trunk/modules/transport/modules/tests/src/test/java/org/apache/axis2/transport/jms/JMSTransportTest.java
webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/apache/axis2/transport/jms/JNDIEnvironment.java
(props changed)
- copied unchanged from r749521,
webservices/commons/trunk/modules/transport/modules/tests/src/test/java/org/apache/axis2/transport/jms/JNDIEnvironment.java
webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/apache/axis2/transport/jms/LogAspect.java
(props changed)
- copied unchanged from r749521,
webservices/commons/trunk/modules/transport/modules/tests/src/test/java/org/apache/axis2/transport/jms/LogAspect.java
webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/apache/axis2/transport/jms/MockEchoEndpoint.java
(props changed)
- copied unchanged from r749521,
webservices/commons/trunk/modules/transport/modules/tests/src/test/java/org/apache/axis2/transport/jms/MockEchoEndpoint.java
webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/apache/axis2/transport/jms/QpidTestEnvironment.java
(props changed)
- copied unchanged from r749521,
webservices/commons/trunk/modules/transport/modules/tests/src/test/java/org/apache/axis2/transport/jms/QpidTestEnvironment.java
webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/apache/axis2/transport/jms/QpidUtil.java
(props changed)
- copied unchanged from r749521,
webservices/commons/trunk/modules/transport/modules/tests/src/test/java/org/apache/axis2/transport/jms/QpidUtil.java
webservices/commons/trunk/modules/transport/modules/mail/src/test/
webservices/commons/trunk/modules/transport/modules/mail/src/test/java/
webservices/commons/trunk/modules/transport/modules/mail/src/test/java/org/
webservices/commons/trunk/modules/transport/modules/mail/src/test/java/org/apache/
webservices/commons/trunk/modules/transport/modules/mail/src/test/java/org/apache/axis2/
webservices/commons/trunk/modules/transport/modules/mail/src/test/java/org/apache/axis2/transport/
webservices/commons/trunk/modules/transport/modules/mail/src/test/java/org/apache/axis2/transport/mail/
- copied from r749888,
webservices/commons/trunk/modules/transport/modules/tests/src/test/java/org/apache/axis2/transport/mail/
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/AbstractTransportTest.java
(props changed)
- copied unchanged from r749521,
webservices/commons/trunk/modules/transport/modules/tests/src/test/java/org/apache/axis2/transport/AbstractTransportTest.java
webservices/commons/trunk/modules/transport/modules/udp/test/
webservices/commons/trunk/modules/transport/modules/udp/test/org/
webservices/commons/trunk/modules/transport/modules/udp/test/org/apache/
webservices/commons/trunk/modules/transport/modules/udp/test/org/apache/axis2/
webservices/commons/trunk/modules/transport/modules/udp/test/org/apache/axis2/transport/
webservices/commons/trunk/modules/transport/modules/udp/test/org/apache/axis2/transport/udp/
- copied from r749521,
webservices/commons/trunk/modules/transport/modules/tests/src/test/java/org/apache/axis2/transport/udp/
Removed:
webservices/commons/trunk/modules/transport/modules/tests/src/test/java/org/apache/axis2/transport/AbstractTransportTest.java
webservices/commons/trunk/modules/transport/modules/tests/src/test/java/org/apache/axis2/transport/http/
webservices/commons/trunk/modules/transport/modules/tests/src/test/java/org/apache/axis2/transport/jms/
webservices/commons/trunk/modules/transport/modules/tests/src/test/java/org/apache/axis2/transport/mail/
webservices/commons/trunk/modules/transport/modules/tests/src/test/java/org/apache/axis2/transport/udp/
Modified:
webservices/commons/trunk/modules/transport/modules/http/pom.xml
webservices/commons/trunk/modules/transport/modules/jms/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/udp/pom.xml
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=750174&r1=750173&r2=750174&view=diff
==============================================================================
--- webservices/commons/trunk/modules/transport/modules/http/pom.xml (original)
+++ webservices/commons/trunk/modules/transport/modules/http/pom.xml Wed Mar 4
21:53:30 2009
@@ -37,6 +37,20 @@
<sourceDirectory>src</sourceDirectory>
<testSourceDirectory>test</testSourceDirectory>
<plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.3</version>
+ <configuration>
+ <systemProperties>
+ <property>
+ <name>log4j.configuration</name>
+ <value>file:log4j.properties</value>
+ </property>
+ </systemProperties>
+ </configuration>
+ </plugin>
+
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
@@ -99,6 +113,14 @@
<artifactId>axis2-transport-base</artifactId>
<version>${version}</version>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-transport-testkit</artifactId>
+ <version>${pom.version}</version>
+ <scope>test</scope>
+ </dependency>
+
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
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=750174&r1=750173&r2=750174&view=diff
==============================================================================
--- webservices/commons/trunk/modules/transport/modules/jms/pom.xml (original)
+++ webservices/commons/trunk/modules/transport/modules/jms/pom.xml Wed Mar 4
21:53:30 2009
@@ -38,6 +38,20 @@
<build>
<plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.3</version>
+ <configuration>
+ <systemProperties>
+ <property>
+ <name>log4j.configuration</name>
+ <value>file:log4j.properties</value>
+ </property>
+ </systemProperties>
+ </configuration>
+ </plugin>
+
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
@@ -71,6 +85,44 @@
<version>${version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-transport-testkit</artifactId>
+ <version>${pom.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.mockejb</groupId>
+ <artifactId>mockejb</artifactId>
+ <version>0.6-beta2</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.qpid</groupId>
+ <artifactId>qpid-broker</artifactId>
+ <version>1.0-incubating-M2.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.qpid</groupId>
+ <artifactId>qpid-client</artifactId>
+ <version>1.0-incubating-M2.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-core</artifactId>
+ <version>5.1.0</version>
+ <scope>test</scope>
+ <exclusions>
+ <!-- We want to choose the JAF implementation ourselves -->
+ <exclusion>
+ <groupId>javax.activation</groupId>
+ <artifactId>activation</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jms_1.1_spec</artifactId>
Propchange:
webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/apache/axis2/transport/jms/ActiveMQTestEnvironment.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/apache/axis2/transport/jms/ContentTypeMode.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/apache/axis2/transport/jms/ContentTypeMode.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange:
webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/apache/axis2/transport/jms/JMSAsyncChannel.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/apache/axis2/transport/jms/JMSAsyncClient.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/apache/axis2/transport/jms/JMSAxisTestClientConfigurator.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/apache/axis2/transport/jms/JMSBytesMessageFactory.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/apache/axis2/transport/jms/JMSChannel.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/apache/axis2/transport/jms/JMSClient.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/apache/axis2/transport/jms/JMSMessageFactory.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/apache/axis2/transport/jms/JMSRequestResponseChannel.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/apache/axis2/transport/jms/JMSRequestResponseClient.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/apache/axis2/transport/jms/JMSTestEnvironment.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/apache/axis2/transport/jms/JMSTestEnvironment.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange:
webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/apache/axis2/transport/jms/JMSTextMessageFactory.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/apache/axis2/transport/jms/JMSTransportDescriptionFactory.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/apache/axis2/transport/jms/JMSTransportTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/apache/axis2/transport/jms/JNDIEnvironment.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/apache/axis2/transport/jms/LogAspect.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/apache/axis2/transport/jms/MockEchoEndpoint.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/apache/axis2/transport/jms/QpidTestEnvironment.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/apache/axis2/transport/jms/QpidTestEnvironment.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange:
webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/apache/axis2/transport/jms/QpidUtil.java
------------------------------------------------------------------------------
svn:eol-style = native
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=750174&r1=750173&r2=750174&view=diff
==============================================================================
--- webservices/commons/trunk/modules/transport/modules/mail/pom.xml (original)
+++ webservices/commons/trunk/modules/transport/modules/mail/pom.xml Wed Mar 4
21:53:30 2009
@@ -61,6 +61,48 @@
</instructions>
</configuration>
</plugin>
+ <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>
+ <systemProperties>
+ <property>
+ <name>log4j.configuration</name>
+ <value>file:log4j.properties</value>
+ </property>
+ <property>
+ <name>net.sourceforge.cobertura.datafile</name>
+ <value>target/cobertura.ser</value>
+ </property>
+ </systemProperties>
+ <argLine>-javaagent:target/lib/aspectjweaver.jar -Xms64m
-Xmx128m</argLine>
+ </configuration>
+ </plugin>
</plugins>
</build>
@@ -69,6 +111,40 @@
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-transport-base</artifactId>
<version>${version}</version>
+ <exclusions>
+ <!-- We want to choose the JavaMail implementation ourselves -->
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-javamail_1.4_spec</artifactId>
+ </exclusion>
+ </exclusions>
+
</dependency>
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-transport-testkit</artifactId>
+ <version>${pom.version}</version>
+ <scope>test</scope>
+ <exclusions>
+ <!-- We want to choose the JavaMail implementation ourselves -->
+ <exclusion>
+ <groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>com.icegreen</groupId>
+ <artifactId>greenmail</artifactId>
+ <version>1.3</version>
+ <scope>test</scope>
+ <exclusions>
+ <!-- We want to choose the JavaMail implementation ourselves -->
+ <exclusion>
+ <groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
</dependencies>
</project>
\ No newline at end of file
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=750174&r1=750173&r2=750174&view=diff
==============================================================================
--- webservices/commons/trunk/modules/transport/modules/parent/pom.xml
(original)
+++ webservices/commons/trunk/modules/transport/modules/parent/pom.xml Wed Mar
4 21:53:30 2009
@@ -144,6 +144,19 @@
<tagBase>https://svn.apache.org/repos/asf/webservices/commons/tags/transport</tagBase>
</configuration>
</plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-gpg-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>sign</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
</plugins>
</build>
</profile>
@@ -209,7 +222,6 @@
<attach>true</attach>
</configuration>
</plugin>
-
</plugins>
</build>
<pluginRepositories>
Propchange:
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/AbstractTransportTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: webservices/commons/trunk/modules/transport/modules/udp/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/modules/udp/pom.xml?rev=750174&r1=750173&r2=750174&view=diff
==============================================================================
--- webservices/commons/trunk/modules/transport/modules/udp/pom.xml (original)
+++ webservices/commons/trunk/modules/transport/modules/udp/pom.xml Wed Mar 4
21:53:30 2009
@@ -34,6 +34,7 @@
<packaging>bundle</packaging>
<build>
+ <testSourceDirectory>test</testSourceDirectory>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
@@ -62,6 +63,13 @@
<artifactId>axis2-transport-base</artifactId>
<version>${version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-transport-testkit</artifactId>
+ <version>${pom.version}</version>
+ <scope>test</scope>
+ </dependency>
+
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
