Author: veithen
Date: Sat Oct 11 05:03:01 2008
New Revision: 703652
URL: http://svn.apache.org/viewvc?rev=703652&view=rev
Log:
Transport testkit: some package and class renames (no functional changes)
Added:
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/ManagedTestSuite.java
- copied, changed from r703640,
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/TransportTestSuite.java
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/LogAspect.java
(contents, props changed)
- copied, changed from r703640,
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/client/LogAspect.java
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/endpoint/
(props changed)
- copied from r703640,
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/server/
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/ManagedTestCase.java
(contents, props changed)
- copied, changed from r703640,
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/TransportTestCase.java
Removed:
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/TransportTestSuite.java
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/client/LogAspect.java
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/server/
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/TransportTestCase.java
Modified:
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/AdapterUtils.java
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/TransportTestSuiteBuilder.java
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/endpoint/AxisAsyncEndpoint.java
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/endpoint/AxisTestEndpoint.java
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/endpoint/AsyncEndpoint.java
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/endpoint/AsyncEndpointAdapter.java
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/endpoint/TestEndpoint.java
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/http/HttpTransportTestSuiteBuilder.java
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/http/JettyAsyncEndpoint.java
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/http/JettyEndpoint.java
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/MessageTestCase.java
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/async/AsyncMessageTestCase.java
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/async/BinaryTestCase.java
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/async/LargeSOAPAsyncMessageTestCase.java
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/async/RESTTestCase.java
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/async/SwATestCase.java
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/async/TextPlainTestCase.java
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/async/XMLAsyncMessageTestCase.java
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/echo/RequestResponseMessageTestCase.java
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/echo/XMLRequestResponseMessageTestCase.java
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/misc/MinConcurrencyTest.java
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/util/LogManager.java
webservices/commons/trunk/modules/transport/modules/testkit/src/main/resources/META-INF/aop.xml
webservices/commons/trunk/modules/transport/modules/tests/src/test/java/org/apache/axis2/transport/http/SimpleHTTPServerTest.java
webservices/commons/trunk/modules/transport/modules/tests/src/test/java/org/apache/axis2/transport/jms/JMSTransportTest.java
webservices/commons/trunk/modules/transport/modules/tests/src/test/java/org/apache/axis2/transport/jms/MockEchoEndpoint.java
webservices/commons/trunk/modules/transport/modules/tests/src/test/java/org/apache/axis2/transport/mail/MailTransportTest.java
Modified:
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/AdapterUtils.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/AdapterUtils.java?rev=703652&r1=703651&r2=703652&view=diff
==============================================================================
---
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/AdapterUtils.java
(original)
+++
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/AdapterUtils.java
Sat Oct 11 05:03:01 2008
@@ -23,10 +23,10 @@
import org.apache.axis2.transport.testkit.client.AsyncTestClientAdapter;
import org.apache.axis2.transport.testkit.client.RequestResponseTestClient;
import
org.apache.axis2.transport.testkit.client.RequestResponseTestClientAdapter;
+import org.apache.axis2.transport.testkit.endpoint.AsyncEndpoint;
+import org.apache.axis2.transport.testkit.endpoint.AsyncEndpointAdapter;
import org.apache.axis2.transport.testkit.message.MessageDecoder;
import org.apache.axis2.transport.testkit.message.MessageEncoder;
-import org.apache.axis2.transport.testkit.server.AsyncEndpoint;
-import org.apache.axis2.transport.testkit.server.AsyncEndpointAdapter;
public class AdapterUtils {
public static <M,N> AsyncTestClient<M> adapt(AsyncTestClient<N> target,
MessageEncoder<M,N> encoder) {
Copied:
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/ManagedTestSuite.java
(from r703640,
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/TransportTestSuite.java)
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/ManagedTestSuite.java?p2=webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/ManagedTestSuite.java&p1=webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/TransportTestSuite.java&r1=703640&r2=703652&rev=703652&view=diff
==============================================================================
---
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/TransportTestSuite.java
(original)
+++
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/ManagedTestSuite.java
Sat Oct 11 05:03:01 2008
@@ -33,23 +33,23 @@
import org.apache.axis2.transport.testkit.filter.FilterExpressionParser;
import org.apache.axis2.transport.testkit.tests.TestResourceSet;
import org.apache.axis2.transport.testkit.tests.TestResourceSetTransition;
-import org.apache.axis2.transport.testkit.tests.TransportTestCase;
+import org.apache.axis2.transport.testkit.tests.ManagedTestCase;
import org.apache.axis2.transport.testkit.util.LogManager;
import org.apache.commons.lang.StringUtils;
-public class TransportTestSuite extends TestSuite {
+public class ManagedTestSuite extends TestSuite {
private final Class<?> testClass;
private final List<FilterExpression> excludes = new
LinkedList<FilterExpression>();
private final boolean reuseResources;
private boolean invertExcludes;
private int nextId = 1;
- public TransportTestSuite(Class<?> testClass, boolean reuseResources) {
+ public ManagedTestSuite(Class<?> testClass, boolean reuseResources) {
this.testClass = testClass;
this.reuseResources = reuseResources;
}
- public TransportTestSuite(Class<?> testClass) {
+ public ManagedTestSuite(Class<?> testClass) {
this(testClass, true);
}
@@ -67,8 +67,8 @@
@Override
public void addTest(Test test) {
- if (test instanceof TransportTestCase) {
- TransportTestCase ttest = (TransportTestCase)test;
+ if (test instanceof ManagedTestCase) {
+ ManagedTestCase ttest = (ManagedTestCase)test;
Map<String,String> map = ttest.getNameComponents();
boolean excluded = false;
for (FilterExpression exclude : excludes) {
@@ -96,8 +96,8 @@
TestResourceSet resourceSet = null;
for (Enumeration<?> e = tests(); e.hasMoreElements(); ) {
Test test = (Test)e.nextElement();
- if (test instanceof TransportTestCase) {
- TransportTestCase ttest = (TransportTestCase)test;
+ if (test instanceof ManagedTestCase) {
+ ManagedTestCase ttest = (ManagedTestCase)test;
TestResourceSet newResourceSet = ttest.getResourceSet();
try {
if (resourceSet == null) {
Modified:
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/TransportTestSuiteBuilder.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/TransportTestSuiteBuilder.java?rev=703652&r1=703651&r2=703652&view=diff
==============================================================================
---
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/TransportTestSuiteBuilder.java
(original)
+++
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/TransportTestSuiteBuilder.java
Sat Oct 11 05:03:01 2008
@@ -33,14 +33,14 @@
import org.apache.axis2.transport.testkit.channel.RequestResponseChannel;
import org.apache.axis2.transport.testkit.client.AsyncTestClient;
import org.apache.axis2.transport.testkit.client.RequestResponseTestClient;
+import org.apache.axis2.transport.testkit.endpoint.AsyncEndpoint;
+import org.apache.axis2.transport.testkit.endpoint.TestEndpoint;
import org.apache.axis2.transport.testkit.message.AxisMessage;
import org.apache.axis2.transport.testkit.message.MessageDecoder;
import org.apache.axis2.transport.testkit.message.MessageEncoder;
import org.apache.axis2.transport.testkit.message.RESTMessage;
import org.apache.axis2.transport.testkit.message.XMLMessage;
import org.apache.axis2.transport.testkit.message.RESTMessage.Parameter;
-import org.apache.axis2.transport.testkit.server.AsyncEndpoint;
-import org.apache.axis2.transport.testkit.server.TestEndpoint;
import org.apache.axis2.transport.testkit.tests.async.BinaryTestCase;
import
org.apache.axis2.transport.testkit.tests.async.LargeSOAPAsyncMessageTestCase;
import org.apache.axis2.transport.testkit.tests.async.RESTTestCase;
@@ -102,7 +102,7 @@
new Parameter("param", "value2"),
});
- private final TransportTestSuite suite;
+ private final ManagedTestSuite suite;
private final List<Object[]> environments = new LinkedList<Object[]>();
@@ -124,7 +124,7 @@
private final ResourceList<TestEndpoint> echoEndpoints = new
ResourceList<TestEndpoint>();
- public TransportTestSuiteBuilder(TransportTestSuite suite) {
+ public TransportTestSuiteBuilder(ManagedTestSuite suite) {
this.suite = suite;
try {
// We only want tests with client and/or endpoint based on Axis
Copied:
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/LogAspect.java
(from r703640,
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/client/LogAspect.java)
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/LogAspect.java?p2=webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/LogAspect.java&p1=webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/client/LogAspect.java&r1=703640&r2=703652&rev=703652&view=diff
==============================================================================
---
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/client/LogAspect.java
(original)
+++
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/LogAspect.java
Sat Oct 11 05:03:01 2008
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.axis2.transport.testkit.axis2.client;
+package org.apache.axis2.transport.testkit.axis2;
import java.io.InputStream;
import java.io.OutputStream;
Propchange:
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/LogAspect.java
------------------------------------------------------------------------------
svn:mergeinfo =
Modified:
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/endpoint/AxisAsyncEndpoint.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/endpoint/AxisAsyncEndpoint.java?rev=703652&r1=703651&r2=703652&view=diff
==============================================================================
---
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/endpoint/AxisAsyncEndpoint.java
(original)
+++
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/endpoint/AxisAsyncEndpoint.java
Sat Oct 11 05:03:01 2008
@@ -33,9 +33,9 @@
import org.apache.axis2.description.InOnlyAxisOperation;
import org.apache.axis2.engine.MessageReceiver;
import org.apache.axis2.transport.testkit.axis2.MessageContextValidator;
+import org.apache.axis2.transport.testkit.endpoint.AsyncEndpoint;
import org.apache.axis2.transport.testkit.message.AxisMessage;
import org.apache.axis2.transport.testkit.message.IncomingMessage;
-import org.apache.axis2.transport.testkit.server.AsyncEndpoint;
public class AxisAsyncEndpoint extends AxisTestEndpoint implements
AsyncEndpoint<AxisMessage>, MessageReceiver /*, TransportErrorListener*/ {
private interface Event {
Modified:
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/endpoint/AxisTestEndpoint.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/endpoint/AxisTestEndpoint.java?rev=703652&r1=703651&r2=703652&view=diff
==============================================================================
---
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/endpoint/AxisTestEndpoint.java
(original)
+++
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/endpoint/AxisTestEndpoint.java
Sat Oct 11 05:03:01 2008
@@ -26,8 +26,8 @@
import org.apache.axis2.description.AxisService;
import org.apache.axis2.transport.testkit.axis2.AxisServiceConfigurator;
import org.apache.axis2.transport.testkit.channel.Channel;
+import org.apache.axis2.transport.testkit.endpoint.TestEndpoint;
import org.apache.axis2.transport.testkit.name.Name;
-import org.apache.axis2.transport.testkit.server.TestEndpoint;
@Name("axis")
public abstract class AxisTestEndpoint implements TestEndpoint {
Propchange:
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/endpoint/
------------------------------------------------------------------------------
svn:mergeinfo =
Modified:
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/endpoint/AsyncEndpoint.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/endpoint/AsyncEndpoint.java?rev=703652&r1=703640&r2=703652&view=diff
==============================================================================
---
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/endpoint/AsyncEndpoint.java
(original)
+++
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/endpoint/AsyncEndpoint.java
Sat Oct 11 05:03:01 2008
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.axis2.transport.testkit.server;
+package org.apache.axis2.transport.testkit.endpoint;
import org.apache.axis2.transport.testkit.message.IncomingMessage;
Modified:
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/endpoint/AsyncEndpointAdapter.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/endpoint/AsyncEndpointAdapter.java?rev=703652&r1=703640&r2=703652&view=diff
==============================================================================
---
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/endpoint/AsyncEndpointAdapter.java
(original)
+++
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/endpoint/AsyncEndpointAdapter.java
Sat Oct 11 05:03:01 2008
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.axis2.transport.testkit.server;
+package org.apache.axis2.transport.testkit.endpoint;
import javax.mail.internet.ContentType;
Modified:
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/endpoint/TestEndpoint.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/endpoint/TestEndpoint.java?rev=703652&r1=703640&r2=703652&view=diff
==============================================================================
---
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/endpoint/TestEndpoint.java
(original)
+++
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/endpoint/TestEndpoint.java
Sat Oct 11 05:03:01 2008
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.axis2.transport.testkit.server;
+package org.apache.axis2.transport.testkit.endpoint;
import org.apache.axis2.transport.testkit.name.Key;
Modified:
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/http/HttpTransportTestSuiteBuilder.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/http/HttpTransportTestSuiteBuilder.java?rev=703652&r1=703651&r2=703652&view=diff
==============================================================================
---
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/http/HttpTransportTestSuiteBuilder.java
(original)
+++
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/http/HttpTransportTestSuiteBuilder.java
Sat Oct 11 05:03:01 2008
@@ -22,7 +22,7 @@
import java.util.LinkedList;
import java.util.List;
-import org.apache.axis2.transport.testkit.TransportTestSuite;
+import org.apache.axis2.transport.testkit.ManagedTestSuite;
import org.apache.axis2.transport.testkit.TransportTestSuiteBuilder;
import org.apache.axis2.transport.testkit.axis2.TransportDescriptionFactory;
import org.apache.axis2.transport.testkit.axis2.client.AxisAsyncTestClient;
@@ -34,12 +34,12 @@
import org.apache.axis2.transport.testkit.tests.misc.MinConcurrencyTest;
public class HttpTransportTestSuiteBuilder {
- private final TransportTestSuite suite;
+ private final ManagedTestSuite suite;
private final TransportDescriptionFactory tdf;
private final List<AxisTestClientConfigurator> axisTestClientConfigurators
= new LinkedList<AxisTestClientConfigurator>();
- public HttpTransportTestSuiteBuilder(TransportTestSuite suite,
+ public HttpTransportTestSuiteBuilder(ManagedTestSuite suite,
TransportDescriptionFactory tdf) {
this.suite = suite;
this.tdf = tdf;
Modified:
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/http/JettyAsyncEndpoint.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/http/JettyAsyncEndpoint.java?rev=703652&r1=703651&r2=703652&view=diff
==============================================================================
---
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/http/JettyAsyncEndpoint.java
(original)
+++
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/http/JettyAsyncEndpoint.java
Sat Oct 11 05:03:01 2008
@@ -24,9 +24,9 @@
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.TimeUnit;
+import org.apache.axis2.transport.testkit.endpoint.AsyncEndpoint;
import org.apache.axis2.transport.testkit.message.IncomingMessage;
import org.apache.axis2.transport.testkit.name.Name;
-import org.apache.axis2.transport.testkit.server.AsyncEndpoint;
import org.mortbay.http.HttpException;
import org.mortbay.http.HttpRequest;
import org.mortbay.http.HttpResponse;
Modified:
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/http/JettyEndpoint.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/http/JettyEndpoint.java?rev=703652&r1=703651&r2=703652&view=diff
==============================================================================
---
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/http/JettyEndpoint.java
(original)
+++
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/http/JettyEndpoint.java
Sat Oct 11 05:03:01 2008
@@ -21,7 +21,7 @@
import java.io.IOException;
-import org.apache.axis2.transport.testkit.server.TestEndpoint;
+import org.apache.axis2.transport.testkit.endpoint.TestEndpoint;
import org.mortbay.http.HttpException;
import org.mortbay.http.HttpHandler;
import org.mortbay.http.HttpRequest;
Copied:
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/ManagedTestCase.java
(from r703640,
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/TransportTestCase.java)
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/ManagedTestCase.java?p2=webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/ManagedTestCase.java&p1=webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/TransportTestCase.java&r1=703640&r2=703652&rev=703652&view=diff
==============================================================================
---
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/TransportTestCase.java
(original)
+++
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/ManagedTestCase.java
Sat Oct 11 05:03:01 2008
@@ -29,7 +29,7 @@
import org.apache.axis2.transport.testkit.util.LogManager;
@Key("test")
-public abstract class TransportTestCase extends TestCase {
+public abstract class ManagedTestCase extends TestCase {
private final TestResourceSet resourceSet = new TestResourceSet();
private Map<String,String> nameComponents;
@@ -38,7 +38,7 @@
private boolean managed;
private Class<?> testClass;
- public TransportTestCase(Object... resources) {
+ public ManagedTestCase(Object... resources) {
resourceSet.addResources(resources);
addResource(LogManager.INSTANCE);
}
Propchange:
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/ManagedTestCase.java
------------------------------------------------------------------------------
svn:mergeinfo =
Modified:
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/MessageTestCase.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/MessageTestCase.java?rev=703652&r1=703651&r2=703652&view=diff
==============================================================================
---
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/MessageTestCase.java
(original)
+++
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/MessageTestCase.java
Sat Oct 11 05:03:01 2008
@@ -23,7 +23,7 @@
import org.apache.axis2.transport.testkit.client.ClientOptions;
-public class MessageTestCase extends TransportTestCase {
+public class MessageTestCase extends ManagedTestCase {
protected final ClientOptions options;
public MessageTestCase(ContentType contentType, String charset, Object...
resources) {
Modified:
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/async/AsyncMessageTestCase.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/async/AsyncMessageTestCase.java?rev=703652&r1=703651&r2=703652&view=diff
==============================================================================
---
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/async/AsyncMessageTestCase.java
(original)
+++
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/async/AsyncMessageTestCase.java
Sat Oct 11 05:03:01 2008
@@ -23,8 +23,8 @@
import org.apache.axis2.transport.testkit.channel.AsyncChannel;
import org.apache.axis2.transport.testkit.client.AsyncTestClient;
+import org.apache.axis2.transport.testkit.endpoint.AsyncEndpoint;
import org.apache.axis2.transport.testkit.message.IncomingMessage;
-import org.apache.axis2.transport.testkit.server.AsyncEndpoint;
import org.apache.axis2.transport.testkit.tests.MessageTestCase;
public abstract class AsyncMessageTestCase<M> extends MessageTestCase {
Modified:
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/async/BinaryTestCase.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/async/BinaryTestCase.java?rev=703652&r1=703651&r2=703652&view=diff
==============================================================================
---
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/async/BinaryTestCase.java
(original)
+++
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/async/BinaryTestCase.java
Sat Oct 11 05:03:01 2008
@@ -26,8 +26,8 @@
import org.apache.axis2.transport.testkit.channel.AsyncChannel;
import org.apache.axis2.transport.testkit.client.AsyncTestClient;
+import org.apache.axis2.transport.testkit.endpoint.AsyncEndpoint;
import org.apache.axis2.transport.testkit.name.Name;
-import org.apache.axis2.transport.testkit.server.AsyncEndpoint;
@Name("AsyncBinary")
public class BinaryTestCase extends AsyncMessageTestCase<byte[]> {
Modified:
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/async/LargeSOAPAsyncMessageTestCase.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/async/LargeSOAPAsyncMessageTestCase.java?rev=703652&r1=703651&r2=703652&view=diff
==============================================================================
---
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/async/LargeSOAPAsyncMessageTestCase.java
(original)
+++
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/async/LargeSOAPAsyncMessageTestCase.java
Sat Oct 11 05:03:01 2008
@@ -28,9 +28,9 @@
import org.apache.axiom.om.OMFactory;
import org.apache.axis2.transport.testkit.channel.AsyncChannel;
import org.apache.axis2.transport.testkit.client.AsyncTestClient;
+import org.apache.axis2.transport.testkit.endpoint.AsyncEndpoint;
import org.apache.axis2.transport.testkit.message.XMLMessage;
import org.apache.axis2.transport.testkit.name.Name;
-import org.apache.axis2.transport.testkit.server.AsyncEndpoint;
@Name("AsyncSOAPLarge")
// TODO: maybe we should use XMLUnit to construct these kind of tests
Modified:
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/async/RESTTestCase.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/async/RESTTestCase.java?rev=703652&r1=703651&r2=703652&view=diff
==============================================================================
---
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/async/RESTTestCase.java
(original)
+++
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/async/RESTTestCase.java
Sat Oct 11 05:03:01 2008
@@ -25,10 +25,10 @@
import org.apache.axis2.transport.testkit.channel.AsyncChannel;
import org.apache.axis2.transport.testkit.client.AsyncTestClient;
+import org.apache.axis2.transport.testkit.endpoint.AsyncEndpoint;
import org.apache.axis2.transport.testkit.message.RESTMessage;
import org.apache.axis2.transport.testkit.message.RESTMessage.Parameter;
import org.apache.axis2.transport.testkit.name.Name;
-import org.apache.axis2.transport.testkit.server.AsyncEndpoint;
@Name("REST")
public class RESTTestCase extends AsyncMessageTestCase<RESTMessage> {
Modified:
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/async/SwATestCase.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/async/SwATestCase.java?rev=703652&r1=703651&r2=703652&view=diff
==============================================================================
---
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/async/SwATestCase.java
(original)
+++
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/async/SwATestCase.java
Sat Oct 11 05:03:01 2008
@@ -34,9 +34,9 @@
import org.apache.axiom.om.util.UUIDGenerator;
import org.apache.axis2.transport.testkit.channel.AsyncChannel;
import org.apache.axis2.transport.testkit.client.AsyncTestClient;
+import org.apache.axis2.transport.testkit.endpoint.AsyncEndpoint;
import org.apache.axis2.transport.testkit.message.XMLMessage;
import org.apache.axis2.transport.testkit.name.Name;
-import org.apache.axis2.transport.testkit.server.AsyncEndpoint;
@Name("AsyncSwA")
public class SwATestCase extends AsyncMessageTestCase<XMLMessage> {
Modified:
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/async/TextPlainTestCase.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/async/TextPlainTestCase.java?rev=703652&r1=703651&r2=703652&view=diff
==============================================================================
---
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/async/TextPlainTestCase.java
(original)
+++
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/async/TextPlainTestCase.java
Sat Oct 11 05:03:01 2008
@@ -24,9 +24,9 @@
import org.apache.axis2.transport.testkit.MessageTestData;
import org.apache.axis2.transport.testkit.channel.AsyncChannel;
import org.apache.axis2.transport.testkit.client.AsyncTestClient;
+import org.apache.axis2.transport.testkit.endpoint.AsyncEndpoint;
import org.apache.axis2.transport.testkit.name.Name;
import org.apache.axis2.transport.testkit.name.Named;
-import org.apache.axis2.transport.testkit.server.AsyncEndpoint;
@Name("AsyncTextPlain")
public class TextPlainTestCase extends AsyncMessageTestCase<String> {
Modified:
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/async/XMLAsyncMessageTestCase.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/async/XMLAsyncMessageTestCase.java?rev=703652&r1=703651&r2=703652&view=diff
==============================================================================
---
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/async/XMLAsyncMessageTestCase.java
(original)
+++
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/async/XMLAsyncMessageTestCase.java
Sat Oct 11 05:03:01 2008
@@ -27,11 +27,11 @@
import org.apache.axis2.transport.testkit.MessageTestData;
import org.apache.axis2.transport.testkit.channel.AsyncChannel;
import org.apache.axis2.transport.testkit.client.AsyncTestClient;
+import org.apache.axis2.transport.testkit.endpoint.AsyncEndpoint;
import org.apache.axis2.transport.testkit.message.XMLMessage;
import org.apache.axis2.transport.testkit.name.Key;
import org.apache.axis2.transport.testkit.name.Name;
import org.apache.axis2.transport.testkit.name.Named;
-import org.apache.axis2.transport.testkit.server.AsyncEndpoint;
@Name("AsyncXML")
public class XMLAsyncMessageTestCase extends AsyncMessageTestCase<XMLMessage> {
Modified:
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/echo/RequestResponseMessageTestCase.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/echo/RequestResponseMessageTestCase.java?rev=703652&r1=703651&r2=703652&view=diff
==============================================================================
---
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/echo/RequestResponseMessageTestCase.java
(original)
+++
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/echo/RequestResponseMessageTestCase.java
Sat Oct 11 05:03:01 2008
@@ -23,7 +23,7 @@
import org.apache.axis2.transport.testkit.channel.RequestResponseChannel;
import org.apache.axis2.transport.testkit.client.RequestResponseTestClient;
-import org.apache.axis2.transport.testkit.server.TestEndpoint;
+import org.apache.axis2.transport.testkit.endpoint.TestEndpoint;
import org.apache.axis2.transport.testkit.tests.MessageTestCase;
public abstract class RequestResponseMessageTestCase<M,N> extends
MessageTestCase {
Modified:
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/echo/XMLRequestResponseMessageTestCase.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/echo/XMLRequestResponseMessageTestCase.java?rev=703652&r1=703651&r2=703652&view=diff
==============================================================================
---
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/echo/XMLRequestResponseMessageTestCase.java
(original)
+++
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/echo/XMLRequestResponseMessageTestCase.java
Sat Oct 11 05:03:01 2008
@@ -27,11 +27,11 @@
import org.apache.axis2.transport.testkit.MessageTestData;
import org.apache.axis2.transport.testkit.channel.RequestResponseChannel;
import org.apache.axis2.transport.testkit.client.RequestResponseTestClient;
+import org.apache.axis2.transport.testkit.endpoint.TestEndpoint;
import org.apache.axis2.transport.testkit.message.XMLMessage;
import org.apache.axis2.transport.testkit.name.Key;
import org.apache.axis2.transport.testkit.name.Name;
import org.apache.axis2.transport.testkit.name.Named;
-import org.apache.axis2.transport.testkit.server.TestEndpoint;
@Name("EchoXML")
public class XMLRequestResponseMessageTestCase extends
RequestResponseMessageTestCase<XMLMessage,XMLMessage> {
Modified:
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/misc/MinConcurrencyTest.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/misc/MinConcurrencyTest.java?rev=703652&r1=703651&r2=703652&view=diff
==============================================================================
---
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/misc/MinConcurrencyTest.java
(original)
+++
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/misc/MinConcurrencyTest.java
Sat Oct 11 05:03:01 2008
@@ -43,7 +43,7 @@
import org.apache.axis2.transport.testkit.message.AxisMessage;
import org.apache.axis2.transport.testkit.name.Name;
import org.apache.axis2.transport.testkit.tests.TestResourceSet;
-import org.apache.axis2.transport.testkit.tests.TransportTestCase;
+import org.apache.axis2.transport.testkit.tests.ManagedTestCase;
/**
* Generic test case to check whether a transport listener processes messages
with the expected
@@ -57,7 +57,7 @@
* the test fails.
*/
@Name("MinConcurrency")
-public class MinConcurrencyTest extends TransportTestCase {
+public class MinConcurrencyTest extends ManagedTestCase {
private final AsyncChannel[] channels;
private final int messages;
private final boolean preloadMessages;
Modified:
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/util/LogManager.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/util/LogManager.java?rev=703652&r1=703651&r2=703652&view=diff
==============================================================================
---
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/util/LogManager.java
(original)
+++
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/util/LogManager.java
Sat Oct 11 05:03:01 2008
@@ -26,7 +26,7 @@
import java.util.LinkedList;
import java.util.List;
-import org.apache.axis2.transport.testkit.tests.TransportTestCase;
+import org.apache.axis2.transport.testkit.tests.ManagedTestCase;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.log4j.Logger;
@@ -46,7 +46,7 @@
logDir = new File("target" + File.separator + "testkit-logs");
}
- public void setTestCase(TransportTestCase testCase) throws IOException {
+ public void setTestCase(ManagedTestCase testCase) throws IOException {
if (appender != null) {
Logger.getRootLogger().removeAppender(appender);
appender.close();
Modified:
webservices/commons/trunk/modules/transport/modules/testkit/src/main/resources/META-INF/aop.xml
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/modules/testkit/src/main/resources/META-INF/aop.xml?rev=703652&r1=703651&r2=703652&view=diff
==============================================================================
---
webservices/commons/trunk/modules/transport/modules/testkit/src/main/resources/META-INF/aop.xml
(original)
+++
webservices/commons/trunk/modules/transport/modules/testkit/src/main/resources/META-INF/aop.xml
Sat Oct 11 05:03:01 2008
@@ -19,6 +19,6 @@
-->
<aspectj>
<aspects>
- <aspect
name="org.apache.axis2.transport.testkit.axis2.client.LogAspect"/>
+ <aspect name="org.apache.axis2.transport.testkit.axis2.LogAspect"/>
</aspects>
</aspectj>
\ No newline at end of file
Modified:
webservices/commons/trunk/modules/transport/modules/tests/src/test/java/org/apache/axis2/transport/http/SimpleHTTPServerTest.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/modules/tests/src/test/java/org/apache/axis2/transport/http/SimpleHTTPServerTest.java?rev=703652&r1=703651&r2=703652&view=diff
==============================================================================
---
webservices/commons/trunk/modules/transport/modules/tests/src/test/java/org/apache/axis2/transport/http/SimpleHTTPServerTest.java
(original)
+++
webservices/commons/trunk/modules/transport/modules/tests/src/test/java/org/apache/axis2/transport/http/SimpleHTTPServerTest.java
Sat Oct 11 05:03:01 2008
@@ -22,13 +22,13 @@
import junit.framework.TestCase;
import junit.framework.TestSuite;
-import org.apache.axis2.transport.testkit.TransportTestSuite;
+import org.apache.axis2.transport.testkit.ManagedTestSuite;
import org.apache.axis2.transport.testkit.axis2.TransportDescriptionFactory;
import org.apache.axis2.transport.testkit.http.HttpTransportTestSuiteBuilder;
public class SimpleHTTPServerTest extends TestCase {
public static TestSuite suite() throws Exception {
- TransportTestSuite suite = new
TransportTestSuite(SimpleHTTPServerTest.class);
+ ManagedTestSuite suite = new
ManagedTestSuite(SimpleHTTPServerTest.class);
TransportDescriptionFactory tdf = new
HttpTransportDescriptionFactory(8280);
Modified:
webservices/commons/trunk/modules/transport/modules/tests/src/test/java/org/apache/axis2/transport/jms/JMSTransportTest.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/modules/tests/src/test/java/org/apache/axis2/transport/jms/JMSTransportTest.java?rev=703652&r1=703651&r2=703652&view=diff
==============================================================================
---
webservices/commons/trunk/modules/transport/modules/tests/src/test/java/org/apache/axis2/transport/jms/JMSTransportTest.java
(original)
+++
webservices/commons/trunk/modules/transport/modules/tests/src/test/java/org/apache/axis2/transport/jms/JMSTransportTest.java
Sat Oct 11 05:03:01 2008
@@ -24,7 +24,7 @@
import org.apache.axis2.AxisFault;
import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.transport.testkit.TransportTestSuite;
+import org.apache.axis2.transport.testkit.ManagedTestSuite;
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;
@@ -36,7 +36,7 @@
public class JMSTransportTest extends TestCase {
public static TestSuite suite() throws Exception {
- TransportTestSuite suite = new
TransportTestSuite(JMSTransportTest.class);
+ ManagedTestSuite suite = new ManagedTestSuite(JMSTransportTest.class);
// SwA doesn't make sense with text messages
suite.addExclude("(&(test=AsyncSwA)(client=jms)(jmsType=text))");
Modified:
webservices/commons/trunk/modules/transport/modules/tests/src/test/java/org/apache/axis2/transport/jms/MockEchoEndpoint.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/modules/tests/src/test/java/org/apache/axis2/transport/jms/MockEchoEndpoint.java?rev=703652&r1=703651&r2=703652&view=diff
==============================================================================
---
webservices/commons/trunk/modules/transport/modules/tests/src/test/java/org/apache/axis2/transport/jms/MockEchoEndpoint.java
(original)
+++
webservices/commons/trunk/modules/transport/modules/tests/src/test/java/org/apache/axis2/transport/jms/MockEchoEndpoint.java
Sat Oct 11 05:03:01 2008
@@ -29,8 +29,8 @@
import javax.jms.Session;
import javax.jms.TextMessage;
+import org.apache.axis2.transport.testkit.endpoint.TestEndpoint;
import org.apache.axis2.transport.testkit.name.Name;
-import org.apache.axis2.transport.testkit.server.TestEndpoint;
import org.apache.commons.io.IOUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Modified:
webservices/commons/trunk/modules/transport/modules/tests/src/test/java/org/apache/axis2/transport/mail/MailTransportTest.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/modules/tests/src/test/java/org/apache/axis2/transport/mail/MailTransportTest.java?rev=703652&r1=703651&r2=703652&view=diff
==============================================================================
---
webservices/commons/trunk/modules/transport/modules/tests/src/test/java/org/apache/axis2/transport/mail/MailTransportTest.java
(original)
+++
webservices/commons/trunk/modules/transport/modules/tests/src/test/java/org/apache/axis2/transport/mail/MailTransportTest.java
Sat Oct 11 05:03:01 2008
@@ -22,7 +22,7 @@
import junit.framework.TestCase;
import junit.framework.TestSuite;
-import org.apache.axis2.transport.testkit.TransportTestSuite;
+import org.apache.axis2.transport.testkit.ManagedTestSuite;
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;
@@ -32,7 +32,7 @@
public class MailTransportTest extends TestCase {
public static TestSuite suite() throws Exception {
- TransportTestSuite suite = new
TransportTestSuite(MailTransportTest.class);
+ ManagedTestSuite suite = new ManagedTestSuite(MailTransportTest.class);
// SwA doesn't work because attachments are sent with
"Content-Transfer-Encoding: binary"
// and mail servers don't like that.