Author: veithen
Date: Sat Sep 27 04:02:53 2008
New Revision: 699617
URL: http://svn.apache.org/viewvc?rev=699617&view=rev
Log:
Moved the JMS transport tests from Synapse to WS commons.
Added:
webservices/commons/trunk/modules/transport/modules/jms/src/test/
webservices/commons/trunk/modules/transport/modules/jms/src/test/java/
webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/
webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/apache/
webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/apache/axis2/
webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/apache/axis2/transport/
webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/apache/axis2/transport/jms/
(props changed)
- copied from r698316,
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/
webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/apache/axis2/transport/jms/JMSChannel.java
- copied, changed from r699095,
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSChannel.java
webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/apache/axis2/transport/jms/JMSRequestResponseChannel.java
- copied, changed from r699095,
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSRequestResponseChannel.java
webservices/commons/trunk/modules/transport/modules/jms/src/test/resources/
webservices/commons/trunk/modules/transport/modules/jms/src/test/resources/META-INF/
webservices/commons/trunk/modules/transport/modules/jms/src/test/resources/META-INF/aop.xml
Modified:
webservices/commons/trunk/modules/transport/modules/jms/pom.xml
webservices/commons/trunk/modules/transport/modules/jms/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
webservices/commons/trunk/modules/transport/modules/jms/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
webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/apache/axis2/transport/jms/JMSAxisTestClientSetup.java
webservices/commons/trunk/modules/transport/modules/jms/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/JMSClient.java
webservices/commons/trunk/modules/transport/modules/jms/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/JMSRequestResponseClient.java
webservices/commons/trunk/modules/transport/modules/jms/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
webservices/commons/trunk/modules/transport/modules/jms/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
webservices/commons/trunk/modules/transport/modules/jms/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
webservices/commons/trunk/modules/transport/modules/jms/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
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=699617&r1=699616&r2=699617&view=diff
==============================================================================
--- webservices/commons/trunk/modules/transport/modules/jms/pom.xml (original)
+++ webservices/commons/trunk/modules/transport/modules/jms/pom.xml Sat Sep 27
04:02:53 2008
@@ -45,7 +45,39 @@
<source>1.5</source>
<target>1.5</target>
</configuration>
- </plugin>
+ </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>
+ <argLine>-javaagent:target/lib/aspectjweaver.jar -Xms64m
-Xmx128m</argLine>
+ </configuration>
+ </plugin>
</plugins>
</build>
@@ -122,6 +154,41 @@
<version>${jms-1.1-spec.version}</version>
</dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <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>
+ <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>
+ </dependency>
</dependencies>
<properties>
Propchange:
webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/apache/axis2/transport/jms/
------------------------------------------------------------------------------
svn:mergeinfo =
Modified:
webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/apache/axis2/transport/jms/ActiveMQTestEnvironment.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/apache/axis2/transport/jms/ActiveMQTestEnvironment.java?rev=699617&r1=698316&r2=699617&view=diff
==============================================================================
---
webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/apache/axis2/transport/jms/ActiveMQTestEnvironment.java
(original)
+++
webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/apache/axis2/transport/jms/ActiveMQTestEnvironment.java
Sat Sep 27 04:02:53 2008
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.synapse.transport.jms;
+package org.apache.axis2.transport.jms;
import javax.jms.Queue;
import javax.jms.Topic;
@@ -27,7 +27,7 @@
import org.apache.activemq.command.ActiveMQQueue;
import org.apache.activemq.command.ActiveMQTopic;
import org.apache.activemq.store.memory.MemoryPersistenceAdapter;
-import org.apache.synapse.transport.testkit.name.Name;
+import org.apache.axis2.transport.testkit.name.Name;
@Name("ActiveMQ")
public class ActiveMQTestEnvironment extends JMSTestEnvironment {
Modified:
webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/apache/axis2/transport/jms/ContentTypeMode.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/apache/axis2/transport/jms/ContentTypeMode.java?rev=699617&r1=698316&r2=699617&view=diff
==============================================================================
---
webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/apache/axis2/transport/jms/ContentTypeMode.java
(original)
+++
webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/apache/axis2/transport/jms/ContentTypeMode.java
Sat Sep 27 04:02:53 2008
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.synapse.transport.jms;
+package org.apache.axis2.transport.jms;
/**
* Enumeration specifying how a transport listener determines the content type
Modified:
webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/apache/axis2/transport/jms/JMSAsyncChannel.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/apache/axis2/transport/jms/JMSAsyncChannel.java?rev=699617&r1=698316&r2=699617&view=diff
==============================================================================
---
webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/apache/axis2/transport/jms/JMSAsyncChannel.java
(original)
+++
webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/apache/axis2/transport/jms/JMSAsyncChannel.java
Sat Sep 27 04:02:53 2008
@@ -17,9 +17,9 @@
* under the License.
*/
-package org.apache.synapse.transport.jms;
+package org.apache.axis2.transport.jms;
-import org.apache.synapse.transport.testkit.channel.AsyncChannel;
+import org.apache.axis2.transport.testkit.channel.AsyncChannel;
public class JMSAsyncChannel extends JMSChannel implements AsyncChannel {
public JMSAsyncChannel(String name, String destinationType,
ContentTypeMode contentTypeMode) {
Modified:
webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/apache/axis2/transport/jms/JMSAsyncClient.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/apache/axis2/transport/jms/JMSAsyncClient.java?rev=699617&r1=698316&r2=699617&view=diff
==============================================================================
---
webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/apache/axis2/transport/jms/JMSAsyncClient.java
(original)
+++
webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/apache/axis2/transport/jms/JMSAsyncClient.java
Sat Sep 27 04:02:53 2008
@@ -17,12 +17,12 @@
* under the License.
*/
-package org.apache.synapse.transport.jms;
+package org.apache.axis2.transport.jms;
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 JMSAsyncClient<T> extends JMSClient<T> implements
AsyncTestClient<T> {
public JMSAsyncClient(JMSMessageFactory<T> jmsMessageFactory) {
Modified:
webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/apache/axis2/transport/jms/JMSAxisTestClientSetup.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/apache/axis2/transport/jms/JMSAxisTestClientSetup.java?rev=699617&r1=698316&r2=699617&view=diff
==============================================================================
---
webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/apache/axis2/transport/jms/JMSAxisTestClientSetup.java
(original)
+++
webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/apache/axis2/transport/jms/JMSAxisTestClientSetup.java
Sat Sep 27 04:02:53 2008
@@ -17,13 +17,12 @@
* under the License.
*/
-package org.apache.synapse.transport.jms;
+package org.apache.axis2.transport.jms;
import org.apache.axis2.AxisFault;
import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.transport.jms.JMSConstants;
-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 JMSAxisTestClientSetup implements AxisTestClientSetup {
private final String jmsMessageType;
Modified:
webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/apache/axis2/transport/jms/JMSBytesMessageFactory.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/apache/axis2/transport/jms/JMSBytesMessageFactory.java?rev=699617&r1=698316&r2=699617&view=diff
==============================================================================
---
webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/apache/axis2/transport/jms/JMSBytesMessageFactory.java
(original)
+++
webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/apache/axis2/transport/jms/JMSBytesMessageFactory.java
Sat Sep 27 04:02:53 2008
@@ -17,14 +17,14 @@
* under the License.
*/
-package org.apache.synapse.transport.jms;
+package org.apache.axis2.transport.jms;
import javax.jms.BytesMessage;
import javax.jms.JMSException;
import javax.jms.Message;
import javax.jms.Session;
-import org.apache.synapse.transport.testkit.name.Name;
+import org.apache.axis2.transport.testkit.name.Name;
@Name("bytes")
public class JMSBytesMessageFactory implements JMSMessageFactory<byte[]> {
Copied:
webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/apache/axis2/transport/jms/JMSChannel.java
(from r699095,
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSChannel.java)
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/apache/axis2/transport/jms/JMSChannel.java?p2=webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/apache/axis2/transport/jms/JMSChannel.java&p1=synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSChannel.java&r1=699095&r2=699617&rev=699617&view=diff
==============================================================================
---
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSChannel.java
(original)
+++
webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/apache/axis2/transport/jms/JMSChannel.java
Sat Sep 27 04:02:53 2008
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.synapse.transport.jms;
+package org.apache.axis2.transport.jms;
import java.util.Enumeration;
@@ -31,9 +31,8 @@
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.description.AxisService;
-import org.apache.axis2.transport.jms.JMSConstants;
-import org.apache.synapse.transport.testkit.axis2.AxisServiceConfigurator;
-import org.apache.synapse.transport.testkit.name.Key;
+import org.apache.axis2.transport.testkit.axis2.AxisServiceConfigurator;
+import org.apache.axis2.transport.testkit.name.Key;
public abstract class JMSChannel implements AxisServiceConfigurator {
private final String name;
Modified:
webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/apache/axis2/transport/jms/JMSClient.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/apache/axis2/transport/jms/JMSClient.java?rev=699617&r1=698316&r2=699617&view=diff
==============================================================================
---
webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/apache/axis2/transport/jms/JMSClient.java
(original)
+++
webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/apache/axis2/transport/jms/JMSClient.java
Sat Sep 27 04:02:53 2008
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.synapse.transport.jms;
+package org.apache.axis2.transport.jms;
import javax.jms.Connection;
import javax.jms.ConnectionFactory;
@@ -28,10 +28,10 @@
import javax.mail.internet.ContentType;
import org.apache.axis2.transport.base.BaseConstants;
-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.synapse.transport.testkit.name.Named;
+import org.apache.axis2.transport.testkit.client.ClientOptions;
+import org.apache.axis2.transport.testkit.client.TestClient;
+import org.apache.axis2.transport.testkit.name.Name;
+import org.apache.axis2.transport.testkit.name.Named;
@Name("jms")
public class JMSClient<T> implements TestClient {
Modified:
webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/apache/axis2/transport/jms/JMSMessageFactory.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/apache/axis2/transport/jms/JMSMessageFactory.java?rev=699617&r1=698316&r2=699617&view=diff
==============================================================================
---
webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/apache/axis2/transport/jms/JMSMessageFactory.java
(original)
+++
webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/apache/axis2/transport/jms/JMSMessageFactory.java
Sat Sep 27 04:02:53 2008
@@ -17,13 +17,13 @@
* under the License.
*/
-package org.apache.synapse.transport.jms;
+package org.apache.axis2.transport.jms;
import javax.jms.JMSException;
import javax.jms.Message;
import javax.jms.Session;
-import org.apache.synapse.transport.testkit.name.Key;
+import org.apache.axis2.transport.testkit.name.Key;
@Key("jmsType")
public interface JMSMessageFactory<T> {
Copied:
webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/apache/axis2/transport/jms/JMSRequestResponseChannel.java
(from r699095,
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSRequestResponseChannel.java)
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/apache/axis2/transport/jms/JMSRequestResponseChannel.java?p2=webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/apache/axis2/transport/jms/JMSRequestResponseChannel.java&p1=synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSRequestResponseChannel.java&r1=699095&r2=699617&rev=699617&view=diff
==============================================================================
---
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSRequestResponseChannel.java
(original)
+++
webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/apache/axis2/transport/jms/JMSRequestResponseChannel.java
Sat Sep 27 04:02:53 2008
@@ -17,17 +17,16 @@
* under the License.
*/
-package org.apache.synapse.transport.jms;
+package org.apache.axis2.transport.jms;
import javax.jms.Destination;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.description.AxisService;
-import org.apache.axis2.transport.jms.JMSConstants;
-import org.apache.synapse.transport.testkit.axis2.client.AxisTestClientSetup;
-import org.apache.synapse.transport.testkit.channel.RequestResponseChannel;
-import org.apache.synapse.transport.testkit.name.Key;
+import org.apache.axis2.transport.testkit.axis2.client.AxisTestClientSetup;
+import org.apache.axis2.transport.testkit.channel.RequestResponseChannel;
+import org.apache.axis2.transport.testkit.name.Key;
public class JMSRequestResponseChannel extends JMSChannel implements
RequestResponseChannel, AxisTestClientSetup {
private final String replyDestinationType;
Modified:
webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/apache/axis2/transport/jms/JMSRequestResponseClient.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/apache/axis2/transport/jms/JMSRequestResponseClient.java?rev=699617&r1=698316&r2=699617&view=diff
==============================================================================
---
webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/apache/axis2/transport/jms/JMSRequestResponseClient.java
(original)
+++
webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/apache/axis2/transport/jms/JMSRequestResponseClient.java
Sat Sep 27 04:02:53 2008
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.synapse.transport.jms;
+package org.apache.axis2.transport.jms;
import javax.jms.Connection;
import javax.jms.ConnectionFactory;
@@ -27,9 +27,9 @@
import javax.jms.Session;
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 JMSRequestResponseClient<T> extends JMSClient<T> implements
RequestResponseTestClient<T,T> {
private Destination replyDestination;
Modified:
webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/apache/axis2/transport/jms/JMSTestEnvironment.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/apache/axis2/transport/jms/JMSTestEnvironment.java?rev=699617&r1=698316&r2=699617&view=diff
==============================================================================
---
webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/apache/axis2/transport/jms/JMSTestEnvironment.java
(original)
+++
webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/apache/axis2/transport/jms/JMSTestEnvironment.java
Sat Sep 27 04:02:53 2008
@@ -17,15 +17,14 @@
* under the License.
*/
-package org.apache.synapse.transport.jms;
+package org.apache.axis2.transport.jms;
import javax.jms.ConnectionFactory;
import javax.jms.Destination;
import javax.jms.Queue;
import javax.jms.Topic;
-import org.apache.axis2.transport.jms.JMSConstants;
-import org.apache.synapse.transport.testkit.name.Key;
+import org.apache.axis2.transport.testkit.name.Key;
@Key("broker")
public abstract class JMSTestEnvironment {
Modified:
webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/apache/axis2/transport/jms/JMSTextMessageFactory.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/apache/axis2/transport/jms/JMSTextMessageFactory.java?rev=699617&r1=698316&r2=699617&view=diff
==============================================================================
---
webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/apache/axis2/transport/jms/JMSTextMessageFactory.java
(original)
+++
webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/apache/axis2/transport/jms/JMSTextMessageFactory.java
Sat Sep 27 04:02:53 2008
@@ -17,14 +17,14 @@
* under the License.
*/
-package org.apache.synapse.transport.jms;
+package org.apache.axis2.transport.jms;
import javax.jms.JMSException;
import javax.jms.Message;
import javax.jms.Session;
import javax.jms.TextMessage;
-import org.apache.synapse.transport.testkit.name.Name;
+import org.apache.axis2.transport.testkit.name.Name;
@Name("text")
public class JMSTextMessageFactory implements JMSMessageFactory<String> {
Modified:
webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/apache/axis2/transport/jms/JMSTransportDescriptionFactory.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/apache/axis2/transport/jms/JMSTransportDescriptionFactory.java?rev=699617&r1=698316&r2=699617&view=diff
==============================================================================
---
webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/apache/axis2/transport/jms/JMSTransportDescriptionFactory.java
(original)
+++
webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/apache/axis2/transport/jms/JMSTransportDescriptionFactory.java
Sat Sep 27 04:02:53 2008
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.synapse.transport.jms;
+package org.apache.axis2.transport.jms;
import javax.jms.ConnectionFactory;
import javax.naming.Context;
@@ -31,11 +31,8 @@
import org.apache.axis2.description.ParameterInclude;
import org.apache.axis2.description.TransportInDescription;
import org.apache.axis2.description.TransportOutDescription;
-import org.apache.axis2.transport.jms.JMSConstants;
-import org.apache.axis2.transport.jms.JMSListener;
-import org.apache.axis2.transport.jms.JMSSender;
-import org.apache.synapse.transport.testkit.axis2.TransportDescriptionFactory;
-import org.apache.synapse.transport.testkit.name.Key;
+import org.apache.axis2.transport.testkit.axis2.TransportDescriptionFactory;
+import org.apache.axis2.transport.testkit.name.Key;
import org.mockejb.jndi.MockContextFactory;
public class JMSTransportDescriptionFactory implements
TransportDescriptionFactory {
Modified:
webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/apache/axis2/transport/jms/JMSTransportTest.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/apache/axis2/transport/jms/JMSTransportTest.java?rev=699617&r1=698316&r2=699617&view=diff
==============================================================================
---
webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/apache/axis2/transport/jms/JMSTransportTest.java
(original)
+++
webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/apache/axis2/transport/jms/JMSTransportTest.java
Sat Sep 27 04:02:53 2008
@@ -17,24 +17,23 @@
* under the License.
*/
-package org.apache.synapse.transport.jms;
+package org.apache.axis2.transport.jms;
import junit.framework.TestCase;
import junit.framework.TestSuite;
import org.apache.axis2.AxisFault;
import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.transport.jms.JMSConstants;
-import org.apache.synapse.transport.testkit.TransportTestSuite;
-import org.apache.synapse.transport.testkit.TransportTestSuiteBuilder;
-import org.apache.synapse.transport.testkit.axis2.client.AxisAsyncTestClient;
-import
org.apache.synapse.transport.testkit.axis2.client.AxisRequestResponseTestClient;
-import org.apache.synapse.transport.testkit.axis2.client.AxisTestClientSetup;
-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.AxisServer;
-import org.apache.synapse.transport.testkit.channel.AsyncChannel;
-import org.apache.synapse.transport.testkit.tests.misc.MinConcurrencyTest;
+import org.apache.axis2.transport.testkit.TransportTestSuite;
+import org.apache.axis2.transport.testkit.TransportTestSuiteBuilder;
+import org.apache.axis2.transport.testkit.axis2.client.AxisAsyncTestClient;
+import
org.apache.axis2.transport.testkit.axis2.client.AxisRequestResponseTestClient;
+import org.apache.axis2.transport.testkit.axis2.client.AxisTestClientSetup;
+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.AxisServer;
+import org.apache.axis2.transport.testkit.channel.AsyncChannel;
+import org.apache.axis2.transport.testkit.tests.misc.MinConcurrencyTest;
public class JMSTransportTest extends TestCase {
public static TestSuite suite() throws Exception {
Modified:
webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/apache/axis2/transport/jms/JNDIEnvironment.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/apache/axis2/transport/jms/JNDIEnvironment.java?rev=699617&r1=698316&r2=699617&view=diff
==============================================================================
---
webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/apache/axis2/transport/jms/JNDIEnvironment.java
(original)
+++
webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/apache/axis2/transport/jms/JNDIEnvironment.java
Sat Sep 27 04:02:53 2008
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.synapse.transport.jms;
+package org.apache.axis2.transport.jms;
import javax.naming.Context;
import javax.naming.InitialContext;
Modified:
webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/apache/axis2/transport/jms/LogAspect.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/apache/axis2/transport/jms/LogAspect.java?rev=699617&r1=698316&r2=699617&view=diff
==============================================================================
---
webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/apache/axis2/transport/jms/LogAspect.java
(original)
+++
webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/apache/axis2/transport/jms/LogAspect.java
Sat Sep 27 04:02:53 2008
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.synapse.transport.jms;
+package org.apache.axis2.transport.jms;
import java.io.OutputStream;
import java.io.OutputStreamWriter;
@@ -28,11 +28,10 @@
import javax.jms.Message;
import javax.jms.TextMessage;
-import org.apache.axis2.transport.jms.BytesMessageInputStream;
+import org.apache.axis2.transport.testkit.util.LogManager;
import org.apache.commons.io.IOUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.synapse.transport.testkit.util.LogManager;
import org.aspectj.lang.annotation.Aspect;
import org.aspectj.lang.annotation.Before;
Modified:
webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/apache/axis2/transport/jms/MockEchoEndpoint.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/apache/axis2/transport/jms/MockEchoEndpoint.java?rev=699617&r1=698316&r2=699617&view=diff
==============================================================================
---
webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/apache/axis2/transport/jms/MockEchoEndpoint.java
(original)
+++
webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/apache/axis2/transport/jms/MockEchoEndpoint.java
Sat Sep 27 04:02:53 2008
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.synapse.transport.jms;
+package org.apache.axis2.transport.jms;
import javax.jms.BytesMessage;
import javax.jms.Connection;
@@ -29,13 +29,11 @@
import javax.jms.Session;
import javax.jms.TextMessage;
-import org.apache.axis2.transport.jms.BytesMessageInputStream;
-import org.apache.axis2.transport.jms.BytesMessageOutputStream;
+import org.apache.axis2.transport.testkit.name.Name;
+import org.apache.axis2.transport.testkit.server.Endpoint;
import org.apache.commons.io.IOUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.synapse.transport.testkit.name.Name;
-import org.apache.synapse.transport.testkit.server.Endpoint;
@Name("mock")
public class MockEchoEndpoint implements Endpoint {
Modified:
webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/apache/axis2/transport/jms/QpidTestEnvironment.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/apache/axis2/transport/jms/QpidTestEnvironment.java?rev=699617&r1=698316&r2=699617&view=diff
==============================================================================
---
webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/apache/axis2/transport/jms/QpidTestEnvironment.java
(original)
+++
webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/apache/axis2/transport/jms/QpidTestEnvironment.java
Sat Sep 27 04:02:53 2008
@@ -17,17 +17,17 @@
* under the License.
*/
-package org.apache.synapse.transport.jms;
+package org.apache.axis2.transport.jms;
import javax.jms.Queue;
import javax.jms.Topic;
+import org.apache.axis2.transport.testkit.name.Name;
import org.apache.qpid.client.AMQConnectionFactory;
import org.apache.qpid.client.AMQQueue;
import org.apache.qpid.client.AMQTopic;
import org.apache.qpid.client.transport.TransportConnection;
import org.apache.qpid.framing.AMQShortString;
-import org.apache.synapse.transport.testkit.name.Name;
@Name("qpid")
public class QpidTestEnvironment extends JMSTestEnvironment {
Added:
webservices/commons/trunk/modules/transport/modules/jms/src/test/resources/META-INF/aop.xml
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/modules/jms/src/test/resources/META-INF/aop.xml?rev=699617&view=auto
==============================================================================
---
webservices/commons/trunk/modules/transport/modules/jms/src/test/resources/META-INF/aop.xml
(added)
+++
webservices/commons/trunk/modules/transport/modules/jms/src/test/resources/META-INF/aop.xml
Sat Sep 27 04:02:53 2008
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ -->
+<aspectj>
+ <aspects>
+ <aspect name="org.apache.axis2.transport.jms.LogAspect"/>
+ </aspects>
+ <weaver options="-showWeaveInfo">
+ <include within="org.apache.axis2.transport..*"/>
+ </weaver>
+</aspectj>
\ No newline at end of file
