Author: veithen
Date: Sat Sep 27 05:46:41 2008
New Revision: 699631
URL: http://svn.apache.org/viewvc?rev=699631&view=rev
Log:
Moved transport testkit and tests for JMS and mail to WS commons.
Removed:
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/Echo.java
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/UtilsTransportServer.java
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/mail/
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/
Modified:
synapse/trunk/java/modules/transports/pom.xml
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/AbstractTransportTest.java
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/nhttp/HttpAxisTestClientSetup.java
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/nhttp/HttpCoreNIOListenerTest.java
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/udp/UDPTest.java
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/udp/UtilsUDPServer.java
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSAsyncClient.java
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSAsyncFileChannel.java
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSClient.java
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSFileChannel.java
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSMockAsyncEndpoint.java
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSRequestResponseClient.java
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSRequestResponseFileChannel.java
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSTransportTest.java
synapse/trunk/java/modules/transports/src/test/resources/META-INF/aop.xml
Modified: synapse/trunk/java/modules/transports/pom.xml
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/pom.xml?rev=699631&r1=699630&r2=699631&view=diff
==============================================================================
--- synapse/trunk/java/modules/transports/pom.xml (original)
+++ synapse/trunk/java/modules/transports/pom.xml Sat Sep 27 05:46:41 2008
@@ -83,14 +83,6 @@
<configuration>
<artifactItems>
<artifactItem>
- <groupId>org.apache.axis2</groupId>
- <artifactId>addressing</artifactId>
- <version>${addressing.version}</version>
- <type>mar</type>
- <overWrite>true</overWrite>
-
<outputDirectory>target/test_rep/modules</outputDirectory>
- </artifactItem>
- <artifactItem>
<groupId>org.aspectj</groupId>
<artifactId>aspectjweaver</artifactId>
<version>${aspectj.version}</version>
@@ -154,60 +146,11 @@
</dependency>
<dependency>
- <groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-ldap</artifactId>
- <version>0.9.11</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.aspectj</groupId>
- <artifactId>aspectjrt</artifactId>
- <version>${aspectj.version}</version>
- <scope>test</scope>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-transport-testkit</artifactId>
+ <version>${axis2.version}</version>
</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>${qpid.version}</version>
- <scope>test</scope>
- </dependency>
- <!-- qpid 1.0-incubating-M2.1 only works correctly with this version
of mina -->
- <dependency>
- <groupId>org.apache.mina</groupId>
- <artifactId>mina-core</artifactId>
- <version>1.0.1</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-core</artifactId>
- <version>5.1.0</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>com.icegreen</groupId>
- <artifactId>greenmail</artifactId>
- <version>1.3</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>jetty</groupId>
- <artifactId>jetty</artifactId>
- <version>5.1.10</version>
- <scope>test</scope>
- </dependency>
-
<!-- Workaround for SYNAPSE-400 -->
<dependency>
<groupId>org.apache.woden</groupId>
Modified:
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/AbstractTransportTest.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/AbstractTransportTest.java?rev=699631&r1=699630&r2=699631&view=diff
==============================================================================
---
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/AbstractTransportTest.java
(original)
+++
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/AbstractTransportTest.java
Sat Sep 27 05:46:41 2008
@@ -31,6 +31,7 @@
import org.apache.axiom.soap.impl.builder.StAXSOAPModelBuilder;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.engine.AxisConfiguration;
+import org.apache.axis2.transport.UtilsTransportServer;
public abstract class AbstractTransportTest extends TestCase {
Modified:
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/nhttp/HttpAxisTestClientSetup.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/nhttp/HttpAxisTestClientSetup.java?rev=699631&r1=699630&r2=699631&view=diff
==============================================================================
---
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/nhttp/HttpAxisTestClientSetup.java
(original)
+++
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/nhttp/HttpAxisTestClientSetup.java
Sat Sep 27 05:46:41 2008
@@ -21,8 +21,8 @@
import org.apache.axis2.AxisFault;
import org.apache.axis2.context.MessageContext;
-import org.apache.synapse.transport.testkit.axis2.client.AxisTestClientSetup;
-import org.apache.synapse.transport.testkit.name.Key;
+import org.apache.axis2.transport.testkit.axis2.client.AxisTestClientSetup;
+import org.apache.axis2.transport.testkit.name.Key;
public class HttpAxisTestClientSetup implements AxisTestClientSetup {
private final boolean forceHTTP10;
Modified:
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/nhttp/HttpCoreNIOListenerTest.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/nhttp/HttpCoreNIOListenerTest.java?rev=699631&r1=699630&r2=699631&view=diff
==============================================================================
---
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/nhttp/HttpCoreNIOListenerTest.java
(original)
+++
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/nhttp/HttpCoreNIOListenerTest.java
Sat Sep 27 05:46:41 2008
@@ -22,10 +22,10 @@
import junit.framework.TestCase;
import junit.framework.TestSuite;
-import org.apache.synapse.transport.testkit.TransportTestSuite;
-import
org.apache.synapse.transport.testkit.axis2.SimpleTransportDescriptionFactory;
-import org.apache.synapse.transport.testkit.axis2.TransportDescriptionFactory;
-import org.apache.synapse.transport.testkit.http.HttpTransportTestSuiteBuilder;
+import org.apache.axis2.transport.testkit.TransportTestSuite;
+import
org.apache.axis2.transport.testkit.axis2.SimpleTransportDescriptionFactory;
+import org.apache.axis2.transport.testkit.axis2.TransportDescriptionFactory;
+import org.apache.axis2.transport.testkit.http.HttpTransportTestSuiteBuilder;
public class HttpCoreNIOListenerTest extends TestCase {
public static TestSuite suite() throws Exception {
Modified:
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/udp/UDPTest.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/udp/UDPTest.java?rev=699631&r1=699630&r2=699631&view=diff
==============================================================================
---
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/udp/UDPTest.java
(original)
+++
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/udp/UDPTest.java
Sat Sep 27 05:46:41 2008
@@ -31,8 +31,8 @@
import org.apache.axis2.description.TransportInDescription;
import org.apache.axis2.description.TransportOutDescription;
import org.apache.axis2.engine.AxisConfiguration;
+import org.apache.axis2.transport.UtilsTransportServer;
import org.apache.synapse.transport.AbstractTransportTest;
-import org.apache.synapse.transport.UtilsTransportServer;
/**
* Test case for [EMAIL PROTECTED] UDPListener} and [EMAIL PROTECTED]
UDPSender}.
Modified:
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/udp/UtilsUDPServer.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/udp/UtilsUDPServer.java?rev=699631&r1=699630&r2=699631&view=diff
==============================================================================
---
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/udp/UtilsUDPServer.java
(original)
+++
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/udp/UtilsUDPServer.java
Sat Sep 27 05:46:41 2008
@@ -25,7 +25,7 @@
import org.apache.axis2.description.Parameter;
import org.apache.axis2.description.TransportInDescription;
import org.apache.axis2.description.TransportOutDescription;
-import org.apache.synapse.transport.UtilsTransportServer;
+import org.apache.axis2.transport.UtilsTransportServer;
public class UtilsUDPServer extends UtilsTransportServer {
public UtilsUDPServer() throws Exception {
Modified:
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSAsyncClient.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSAsyncClient.java?rev=699631&r1=699630&r2=699631&view=diff
==============================================================================
---
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSAsyncClient.java
(original)
+++
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSAsyncClient.java
Sat Sep 27 05:46:41 2008
@@ -21,8 +21,8 @@
import javax.mail.internet.ContentType;
-import org.apache.synapse.transport.testkit.client.AsyncTestClient;
-import org.apache.synapse.transport.testkit.client.ClientOptions;
+import org.apache.axis2.transport.testkit.client.AsyncTestClient;
+import org.apache.axis2.transport.testkit.client.ClientOptions;
public class VFSAsyncClient extends VFSClient implements
AsyncTestClient<byte[]> {
public void sendMessage(ClientOptions options, ContentType contentType,
byte[] message) throws Exception {
Modified:
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSAsyncFileChannel.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSAsyncFileChannel.java?rev=699631&r1=699630&r2=699631&view=diff
==============================================================================
---
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSAsyncFileChannel.java
(original)
+++
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSAsyncFileChannel.java
Sat Sep 27 05:46:41 2008
@@ -19,7 +19,7 @@
package org.apache.synapse.transport.vfs;
-import org.apache.synapse.transport.testkit.channel.AsyncChannel;
+import org.apache.axis2.transport.testkit.channel.AsyncChannel;
public class VFSAsyncFileChannel extends VFSFileChannel implements
AsyncChannel {
public VFSAsyncFileChannel(String path) {
Modified:
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSClient.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSClient.java?rev=699631&r1=699630&r2=699631&view=diff
==============================================================================
---
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSClient.java
(original)
+++
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSClient.java
Sat Sep 27 05:46:41 2008
@@ -26,9 +26,9 @@
import javax.mail.internet.ContentType;
-import org.apache.synapse.transport.testkit.client.ClientOptions;
-import org.apache.synapse.transport.testkit.client.TestClient;
-import org.apache.synapse.transport.testkit.name.Name;
+import org.apache.axis2.transport.testkit.client.ClientOptions;
+import org.apache.axis2.transport.testkit.client.TestClient;
+import org.apache.axis2.transport.testkit.name.Name;
@Name("java.io")
public class VFSClient implements TestClient {
Modified:
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSFileChannel.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSFileChannel.java?rev=699631&r1=699630&r2=699631&view=diff
==============================================================================
---
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSFileChannel.java
(original)
+++
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSFileChannel.java
Sat Sep 27 05:46:41 2008
@@ -23,7 +23,7 @@
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.description.AxisService;
-import org.apache.synapse.transport.testkit.axis2.AxisServiceConfigurator;
+import org.apache.axis2.transport.testkit.axis2.AxisServiceConfigurator;
public class VFSFileChannel implements AxisServiceConfigurator {
private final String path;
Modified:
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSMockAsyncEndpoint.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSMockAsyncEndpoint.java?rev=699631&r1=699630&r2=699631&view=diff
==============================================================================
---
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSMockAsyncEndpoint.java
(original)
+++
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSMockAsyncEndpoint.java
Sat Sep 27 05:46:41 2008
@@ -21,11 +21,11 @@
import javax.mail.internet.ContentType;
-import org.apache.synapse.transport.testkit.client.ClientOptions;
-import org.apache.synapse.transport.testkit.client.TestClient;
-import org.apache.synapse.transport.testkit.message.IncomingMessage;
-import org.apache.synapse.transport.testkit.name.Name;
-import org.apache.synapse.transport.testkit.server.AsyncEndpoint;
+import org.apache.axis2.transport.testkit.client.ClientOptions;
+import org.apache.axis2.transport.testkit.client.TestClient;
+import org.apache.axis2.transport.testkit.message.IncomingMessage;
+import org.apache.axis2.transport.testkit.name.Name;
+import org.apache.axis2.transport.testkit.server.AsyncEndpoint;
@Name("mock")
public class VFSMockAsyncEndpoint implements AsyncEndpoint<byte[]> {
Modified:
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSRequestResponseClient.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSRequestResponseClient.java?rev=699631&r1=699630&r2=699631&view=diff
==============================================================================
---
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSRequestResponseClient.java
(original)
+++
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSRequestResponseClient.java
Sat Sep 27 05:46:41 2008
@@ -23,9 +23,9 @@
import javax.mail.internet.ContentType;
-import org.apache.synapse.transport.testkit.client.ClientOptions;
-import org.apache.synapse.transport.testkit.client.RequestResponseTestClient;
-import org.apache.synapse.transport.testkit.message.IncomingMessage;
+import org.apache.axis2.transport.testkit.client.ClientOptions;
+import org.apache.axis2.transport.testkit.client.RequestResponseTestClient;
+import org.apache.axis2.transport.testkit.message.IncomingMessage;
public class VFSRequestResponseClient extends VFSClient implements
RequestResponseTestClient<byte[],byte[]> {
private File replyFile;
Modified:
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSRequestResponseFileChannel.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSRequestResponseFileChannel.java?rev=699631&r1=699630&r2=699631&view=diff
==============================================================================
---
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSRequestResponseFileChannel.java
(original)
+++
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSRequestResponseFileChannel.java
Sat Sep 27 05:46:41 2008
@@ -22,7 +22,7 @@
import java.io.File;
import org.apache.axis2.description.AxisService;
-import org.apache.synapse.transport.testkit.channel.RequestResponseChannel;
+import org.apache.axis2.transport.testkit.channel.RequestResponseChannel;
public class VFSRequestResponseFileChannel extends VFSFileChannel implements
RequestResponseChannel {
private final String replyPath;
Modified:
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSTransportTest.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSTransportTest.java?rev=699631&r1=699630&r2=699631&view=diff
==============================================================================
---
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSTransportTest.java
(original)
+++
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSTransportTest.java
Sat Sep 27 05:46:41 2008
@@ -24,14 +24,14 @@
import junit.framework.TestCase;
import junit.framework.TestSuite;
-import org.apache.synapse.transport.testkit.TransportTestSuite;
-import org.apache.synapse.transport.testkit.TransportTestSuiteBuilder;
-import
org.apache.synapse.transport.testkit.axis2.SimpleTransportDescriptionFactory;
-import org.apache.synapse.transport.testkit.axis2.TransportDescriptionFactory;
-import org.apache.synapse.transport.testkit.axis2.client.AxisAsyncTestClient;
-import org.apache.synapse.transport.testkit.axis2.endpoint.AxisAsyncEndpoint;
-import org.apache.synapse.transport.testkit.axis2.endpoint.AxisEchoEndpoint;
-import
org.apache.synapse.transport.testkit.axis2.endpoint.ContentTypeServiceConfigurator;
+import org.apache.axis2.transport.testkit.TransportTestSuite;
+import org.apache.axis2.transport.testkit.TransportTestSuiteBuilder;
+import
org.apache.axis2.transport.testkit.axis2.SimpleTransportDescriptionFactory;
+import org.apache.axis2.transport.testkit.axis2.TransportDescriptionFactory;
+import org.apache.axis2.transport.testkit.axis2.client.AxisAsyncTestClient;
+import org.apache.axis2.transport.testkit.axis2.endpoint.AxisAsyncEndpoint;
+import org.apache.axis2.transport.testkit.axis2.endpoint.AxisEchoEndpoint;
+import
org.apache.axis2.transport.testkit.axis2.endpoint.ContentTypeServiceConfigurator;
/**
* TransportListenerTestTemplate implementation for the VFS transport.
Modified:
synapse/trunk/java/modules/transports/src/test/resources/META-INF/aop.xml
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/resources/META-INF/aop.xml?rev=699631&r1=699630&r2=699631&view=diff
==============================================================================
--- synapse/trunk/java/modules/transports/src/test/resources/META-INF/aop.xml
(original)
+++ synapse/trunk/java/modules/transports/src/test/resources/META-INF/aop.xml
Sat Sep 27 05:46:41 2008
@@ -18,13 +18,8 @@
~ under the License.
-->
<aspectj>
- <aspects>
- <aspect name="org.apache.synapse.transport.jms.LogAspect"/>
- <aspect name="org.apache.synapse.transport.mail.LogAspect"/>
- <aspect
name="org.apache.synapse.transport.testkit.axis2.client.LogAspect"/>
- </aspects>
<weaver options="-showWeaveInfo">
<include within="org.apache.synapse.transport..*"/>
- <include within="org.apache.axis2.transport..*"/>
+ <include within="org.apache.axis2.transport.base..*"/>
</weaver>
</aspectj>
\ No newline at end of file
