Author: veithen
Date: Mon Sep 22 12:23:51 2008
New Revision: 697954
URL: http://svn.apache.org/viewvc?rev=697954&view=rev
Log:
Corrected the import statements in synapse-transports (after the move of some
transports to the ws-commons project) so that it can be built again.
Modified:
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/fix/FIXApplicationFactory.java
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/fix/FIXIncomingMessageHandler.java
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/fix/FIXTransportListener.java
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/fix/FIXTransportSender.java
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/nhttp/ClientHandler.java
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/nhttp/ClientWorker.java
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/nhttp/HttpCoreNIOListener.java
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/nhttp/HttpCoreNIOSender.java
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/nhttp/NhttpUtils.java
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/nhttp/ServerHandler.java
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/nhttp/ServerWorker.java
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/pipe/EndDelimitedProtocol.java
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/pipe/PipeDispatcher.java
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/pipe/PipeEndpoint.java
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/pipe/PipeEndpointListener.java
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/pipe/PipeListener.java
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/udp/Endpoint.java
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/udp/IODispatcher.java
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/udp/UDPListener.java
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/udp/UDPSender.java
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/vfs/PollTableEntry.java
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/vfs/VFSTransportListener.java
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/vfs/VFSTransportSender.java
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/vfs/VFSUtils.java
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/format/PlainTextFormatterTest.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/JMSAxisTestClientSetup.java
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSChannel.java
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSClient.java
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSRequestResponseChannel.java
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSTestEnvironment.java
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSTransportDescriptionFactory.java
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSTransportTest.java
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/LogAspect.java
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/MockEchoEndpoint.java
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/mail/MailAxisTestClientSetup.java
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/mail/MailChannel.java
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/mail/MailClient.java
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/mail/MailRequestResponseClient.java
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/mail/MailTestEnvironment.java
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/mail/MailTransportListenerTest.java
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/client/axis2/AxisTestClientContext.java
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/client/axis2/LogAspect.java
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/message/MessageDecoder.java
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/message/MessageEncoder.java
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/util/tcpmon/Relay.java
Modified:
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/fix/FIXApplicationFactory.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/fix/FIXApplicationFactory.java?rev=697954&r1=697953&r2=697954&view=diff
==============================================================================
---
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/fix/FIXApplicationFactory.java
(original)
+++
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/fix/FIXApplicationFactory.java
Mon Sep 22 12:23:51 2008
@@ -21,7 +21,7 @@
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.description.AxisService;
-import org.apache.synapse.transport.base.threads.WorkerPool;
+import org.apache.axis2.transport.base.threads.WorkerPool;
import quickfix.Application;
public class FIXApplicationFactory {
Modified:
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/fix/FIXIncomingMessageHandler.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/fix/FIXIncomingMessageHandler.java?rev=697954&r1=697953&r2=697954&view=diff
==============================================================================
---
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/fix/FIXIncomingMessageHandler.java
(original)
+++
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/fix/FIXIncomingMessageHandler.java
Mon Sep 22 12:23:51 2008
@@ -26,13 +26,13 @@
import org.apache.axis2.description.AxisOperation;
import org.apache.axis2.description.AxisService;
import org.apache.axis2.description.Parameter;
+import org.apache.axis2.transport.base.AbstractTransportListener;
+import org.apache.axis2.transport.base.AbstractTransportSender;
+import org.apache.axis2.transport.base.BaseConstants;
+import org.apache.axis2.transport.base.BaseUtils;
+import org.apache.axis2.transport.base.threads.WorkerPool;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.synapse.transport.base.AbstractTransportListener;
-import org.apache.synapse.transport.base.AbstractTransportSender;
-import org.apache.synapse.transport.base.BaseConstants;
-import org.apache.synapse.transport.base.BaseUtils;
-import org.apache.synapse.transport.base.threads.WorkerPool;
import quickfix.*;
import quickfix.field.MsgSeqNum;
import quickfix.field.MsgType;
Modified:
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/fix/FIXTransportListener.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/fix/FIXTransportListener.java?rev=697954&r1=697953&r2=697954&view=diff
==============================================================================
---
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/fix/FIXTransportListener.java
(original)
+++
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/fix/FIXTransportListener.java
Mon Sep 22 12:23:51 2008
@@ -24,7 +24,7 @@
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.description.AxisService;
import org.apache.axis2.description.TransportInDescription;
-import org.apache.synapse.transport.base.AbstractTransportListener;
+import org.apache.axis2.transport.base.AbstractTransportListener;
/**
* The FIX transport listener implementation. A FIX Transport Listner will hold
Modified:
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/fix/FIXTransportSender.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/fix/FIXTransportSender.java?rev=697954&r1=697953&r2=697954&view=diff
==============================================================================
---
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/fix/FIXTransportSender.java
(original)
+++
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/fix/FIXTransportSender.java
Mon Sep 22 12:23:51 2008
@@ -26,8 +26,8 @@
import org.apache.axis2.description.Parameter;
import org.apache.axis2.description.TransportOutDescription;
import org.apache.axis2.transport.OutTransportInfo;
+import org.apache.axis2.transport.base.AbstractTransportSender;
import org.apache.commons.logging.LogFactory;
-import org.apache.synapse.transport.base.AbstractTransportSender;
import quickfix.*;
import quickfix.field.*;
Modified:
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/nhttp/ClientHandler.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/nhttp/ClientHandler.java?rev=697954&r1=697953&r2=697954&view=diff
==============================================================================
---
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/nhttp/ClientHandler.java
(original)
+++
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/nhttp/ClientHandler.java
Mon Sep 22 12:23:51 2008
@@ -28,6 +28,9 @@
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.description.WSDL2Constants;
import org.apache.axis2.engine.MessageReceiver;
+import org.apache.axis2.transport.base.MetricsCollector;
+import org.apache.axis2.transport.base.threads.WorkerPool;
+import org.apache.axis2.transport.base.threads.WorkerPoolFactory;
import org.apache.axis2.util.MessageContextBuilder;
import org.apache.axis2.wsdl.WSDLConstants;
import org.apache.commons.logging.Log;
@@ -44,9 +47,6 @@
import org.apache.http.params.DefaultedHttpParams;
import org.apache.http.params.HttpParams;
import org.apache.http.protocol.*;
-import org.apache.synapse.transport.base.MetricsCollector;
-import org.apache.synapse.transport.base.threads.WorkerPool;
-import org.apache.synapse.transport.base.threads.WorkerPoolFactory;
import org.apache.synapse.transport.nhttp.util.SharedInputBuffer;
import java.io.IOException;
Modified:
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/nhttp/ClientWorker.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/nhttp/ClientWorker.java?rev=697954&r1=697953&r2=697954&view=diff
==============================================================================
---
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/nhttp/ClientWorker.java
(original)
+++
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/nhttp/ClientWorker.java
Mon Sep 22 12:23:51 2008
@@ -36,7 +36,6 @@
import org.apache.http.Header;
import org.apache.http.HttpResponse;
import org.apache.http.protocol.HTTP;
-import org.apache.synapse.transport.base.MetricsCollector;
import javax.xml.stream.XMLStreamException;
import java.io.IOException;
Modified:
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/nhttp/HttpCoreNIOListener.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/nhttp/HttpCoreNIOListener.java?rev=697954&r1=697953&r2=697954&view=diff
==============================================================================
---
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/nhttp/HttpCoreNIOListener.java
(original)
+++
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/nhttp/HttpCoreNIOListener.java
Mon Sep 22 12:23:51 2008
@@ -28,6 +28,7 @@
import org.apache.axis2.context.SessionContext;
import org.apache.axis2.description.*;
import org.apache.axis2.transport.TransportListener;
+import org.apache.axis2.transport.base.*;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.http.impl.nio.reactor.DefaultListeningIOReactor;
@@ -40,7 +41,6 @@
import org.apache.http.params.HttpConnectionParams;
import org.apache.http.params.HttpParams;
import org.apache.http.params.HttpProtocolParams;
-import org.apache.synapse.transport.base.*;
import org.apache.axiom.om.OMElement;
import javax.net.ssl.SSLContext;
Modified:
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/nhttp/HttpCoreNIOSender.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/nhttp/HttpCoreNIOSender.java?rev=697954&r1=697953&r2=697954&view=diff
==============================================================================
---
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/nhttp/HttpCoreNIOSender.java
(original)
+++
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/nhttp/HttpCoreNIOSender.java
Mon Sep 22 12:23:51 2008
@@ -32,6 +32,10 @@
import org.apache.axis2.transport.MessageFormatter;
import org.apache.axis2.transport.OutTransportInfo;
import org.apache.axis2.transport.TransportSender;
+import org.apache.axis2.transport.base.BaseConstants;
+import org.apache.axis2.transport.base.ManagementSupport;
+import org.apache.axis2.transport.base.MetricsCollector;
+import org.apache.axis2.transport.base.TransportMBeanSupport;
import org.apache.axis2.util.MessageContextBuilder;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -51,10 +55,6 @@
import org.apache.http.params.HttpParams;
import org.apache.http.params.HttpProtocolParams;
import org.apache.http.protocol.HTTP;
-import org.apache.synapse.transport.base.BaseConstants;
-import org.apache.synapse.transport.base.ManagementSupport;
-import org.apache.synapse.transport.base.MetricsCollector;
-import org.apache.synapse.transport.base.TransportMBeanSupport;
import
org.apache.synapse.transport.nhttp.util.MessageFormatterDecoratorFactory;
import javax.net.ssl.SSLContext;
Modified:
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/nhttp/NhttpUtils.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/nhttp/NhttpUtils.java?rev=697954&r1=697953&r2=697954&view=diff
==============================================================================
---
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/nhttp/NhttpUtils.java
(original)
+++
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/nhttp/NhttpUtils.java
Mon Sep 22 12:23:51 2008
@@ -23,6 +23,7 @@
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.context.OperationContext;
import org.apache.axis2.Constants;
+import org.apache.axis2.transport.base.BaseUtils;
import org.apache.axis2.transport.http.HTTPTransportUtils;
import org.apache.axis2.transport.http.HTTPConstants;
import org.apache.axiom.om.OMOutputFormat;
@@ -61,14 +62,14 @@
public static OMOutputFormat getOMOutputFormat(MessageContext msgContext) {
OMOutputFormat format = new OMOutputFormat();
- msgContext.setDoingMTOM(HTTPTransportUtils.doWriteMTOM(msgContext));
- msgContext.setDoingSwA(HTTPTransportUtils.doWriteSwA(msgContext));
- msgContext.setDoingREST(HTTPTransportUtils.isDoingREST(msgContext));
+ msgContext.setDoingMTOM(BaseUtils.doWriteMTOM(msgContext));
+ msgContext.setDoingSwA(BaseUtils.doWriteSwA(msgContext));
+ msgContext.setDoingREST(BaseUtils.isDoingREST(msgContext));
format.setSOAP11(msgContext.isSOAP11());
format.setDoOptimize(msgContext.isDoingMTOM());
format.setDoingSWA(msgContext.isDoingSwA());
-
format.setCharSetEncoding(HTTPTransportUtils.getCharSetEncoding(msgContext));
+ format.setCharSetEncoding(BaseUtils.getCharSetEncoding(msgContext));
Object mimeBoundaryProperty =
msgContext.getProperty(Constants.Configuration.MIME_BOUNDARY);
if (mimeBoundaryProperty != null) {
format.setMimeBoundary((String) mimeBoundaryProperty);
Modified:
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/nhttp/ServerHandler.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/nhttp/ServerHandler.java?rev=697954&r1=697953&r2=697954&view=diff
==============================================================================
---
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/nhttp/ServerHandler.java
(original)
+++
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/nhttp/ServerHandler.java
Mon Sep 22 12:23:51 2008
@@ -19,9 +19,9 @@
package org.apache.synapse.transport.nhttp;
import org.apache.axis2.context.ConfigurationContext;
-import org.apache.synapse.transport.base.MetricsCollector;
-import org.apache.synapse.transport.base.threads.WorkerPoolFactory;
-import org.apache.synapse.transport.base.threads.WorkerPool;
+import org.apache.axis2.transport.base.MetricsCollector;
+import org.apache.axis2.transport.base.threads.WorkerPoolFactory;
+import org.apache.axis2.transport.base.threads.WorkerPool;
import org.apache.synapse.transport.nhttp.util.SharedInputBuffer;
import org.apache.http.*;
import org.apache.http.entity.BasicHttpEntity;
Modified:
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/nhttp/ServerWorker.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/nhttp/ServerWorker.java?rev=697954&r1=697953&r2=697954&view=diff
==============================================================================
---
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/nhttp/ServerWorker.java
(original)
+++
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/nhttp/ServerWorker.java
Mon Sep 22 12:23:51 2008
@@ -28,6 +28,7 @@
import org.apache.axis2.description.AxisService;
import org.apache.axis2.engine.AxisEngine;
import org.apache.axis2.transport.RequestResponseTransport;
+import org.apache.axis2.transport.base.MetricsCollector;
import org.apache.axis2.transport.http.HTTPTransportReceiver;
import org.apache.axis2.transport.http.HTTPTransportUtils;
import org.apache.axis2.util.MessageContextBuilder;
@@ -36,7 +37,6 @@
import org.apache.http.*;
import org.apache.http.nio.NHttpServerConnection;
import org.apache.http.protocol.HTTP;
-import org.apache.synapse.transport.base.MetricsCollector;
import org.apache.synapse.transport.nhttp.util.RESTUtil;
import org.apache.ws.commons.schema.XmlSchema;
Modified:
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/pipe/EndDelimitedProtocol.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/pipe/EndDelimitedProtocol.java?rev=697954&r1=697953&r2=697954&view=diff
==============================================================================
---
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/pipe/EndDelimitedProtocol.java
(original)
+++
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/pipe/EndDelimitedProtocol.java
Mon Sep 22 12:23:51 2008
@@ -24,7 +24,7 @@
import org.apache.axis2.AxisFault;
import org.apache.axis2.description.ParameterInclude;
-import org.apache.synapse.transport.base.ParamUtils;
+import org.apache.axis2.transport.base.ParamUtils;
/**
* End delimited protocol implementation.
Modified:
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/pipe/PipeDispatcher.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/pipe/PipeDispatcher.java?rev=697954&r1=697953&r2=697954&view=diff
==============================================================================
---
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/pipe/PipeDispatcher.java
(original)
+++
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/pipe/PipeDispatcher.java
Mon Sep 22 12:23:51 2008
@@ -24,8 +24,8 @@
import java.util.IdentityHashMap;
import java.util.Map;
-import org.apache.synapse.transport.base.datagram.DatagramDispatcher;
-import org.apache.synapse.transport.base.datagram.DatagramDispatcherCallback;
+import org.apache.axis2.transport.base.datagram.DatagramDispatcher;
+import org.apache.axis2.transport.base.datagram.DatagramDispatcherCallback;
/**
* [EMAIL PROTECTED] DatagramDispatcher} implementation for the pipe transport.
Modified:
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/pipe/PipeEndpoint.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/pipe/PipeEndpoint.java?rev=697954&r1=697953&r2=697954&view=diff
==============================================================================
---
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/pipe/PipeEndpoint.java
(original)
+++
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/pipe/PipeEndpoint.java
Mon Sep 22 12:23:51 2008
@@ -21,7 +21,7 @@
import java.io.File;
import org.apache.axis2.addressing.EndpointReference;
-import org.apache.synapse.transport.base.datagram.DatagramEndpoint;
+import org.apache.axis2.transport.base.datagram.DatagramEndpoint;
/**
* Pipe endpoint description.
Modified:
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/pipe/PipeEndpointListener.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/pipe/PipeEndpointListener.java?rev=697954&r1=697953&r2=697954&view=diff
==============================================================================
---
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/pipe/PipeEndpointListener.java
(original)
+++
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/pipe/PipeEndpointListener.java
Mon Sep 22 12:23:51 2008
@@ -27,9 +27,9 @@
import java.nio.channels.FileChannel;
import java.util.concurrent.CountDownLatch;
+import org.apache.axis2.transport.base.datagram.DatagramDispatcherCallback;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.synapse.transport.base.datagram.DatagramDispatcherCallback;
/**
* [EMAIL PROTECTED] Runnable} that reads messages from a given UNIX pipe.
Modified:
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/pipe/PipeListener.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/pipe/PipeListener.java?rev=697954&r1=697953&r2=697954&view=diff
==============================================================================
---
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/pipe/PipeListener.java
(original)
+++
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/pipe/PipeListener.java
Mon Sep 22 12:23:51 2008
@@ -25,10 +25,10 @@
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.description.AxisService;
import org.apache.axis2.description.TransportInDescription;
-import org.apache.synapse.transport.base.ManagementSupport;
-import org.apache.synapse.transport.base.ParamUtils;
-import
org.apache.synapse.transport.base.datagram.AbstractDatagramTransportListener;
-import org.apache.synapse.transport.base.datagram.DatagramDispatcherCallback;
+import org.apache.axis2.transport.base.ManagementSupport;
+import org.apache.axis2.transport.base.ParamUtils;
+import
org.apache.axis2.transport.base.datagram.AbstractDatagramTransportListener;
+import org.apache.axis2.transport.base.datagram.DatagramDispatcherCallback;
/**
* Transport listener for UNIX pipes.
Modified:
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/udp/Endpoint.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/udp/Endpoint.java?rev=697954&r1=697953&r2=697954&view=diff
==============================================================================
---
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/udp/Endpoint.java
(original)
+++
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/udp/Endpoint.java
Mon Sep 22 12:23:51 2008
@@ -19,7 +19,7 @@
package org.apache.synapse.transport.udp;
import org.apache.axis2.addressing.EndpointReference;
-import org.apache.synapse.transport.base.datagram.DatagramEndpoint;
+import org.apache.axis2.transport.base.datagram.DatagramEndpoint;
/**
* UDP endpoint description.
Modified:
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/udp/IODispatcher.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/udp/IODispatcher.java?rev=697954&r1=697953&r2=697954&view=diff
==============================================================================
---
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/udp/IODispatcher.java
(original)
+++
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/udp/IODispatcher.java
Mon Sep 22 12:23:51 2008
@@ -30,12 +30,12 @@
import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.concurrent.CountDownLatch;
+import org.apache.axis2.transport.base.datagram.DatagramDispatcher;
+import org.apache.axis2.transport.base.datagram.DatagramDispatcherCallback;
+import org.apache.axis2.transport.base.datagram.ProcessPacketTask;
+import org.apache.axis2.transport.base.threads.WorkerPool;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.synapse.transport.base.datagram.DatagramDispatcher;
-import org.apache.synapse.transport.base.datagram.DatagramDispatcherCallback;
-import org.apache.synapse.transport.base.datagram.ProcessPacketTask;
-import org.apache.synapse.transport.base.threads.WorkerPool;
/**
* I/O dispatcher for incoming UDP packets.
Modified:
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/udp/UDPListener.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/udp/UDPListener.java?rev=697954&r1=697953&r2=697954&view=diff
==============================================================================
---
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/udp/UDPListener.java
(original)
+++
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/udp/UDPListener.java
Mon Sep 22 12:23:51 2008
@@ -22,10 +22,10 @@
import org.apache.axis2.AxisFault;
import org.apache.axis2.description.AxisService;
-import org.apache.synapse.transport.base.ManagementSupport;
-import org.apache.synapse.transport.base.ParamUtils;
-import
org.apache.synapse.transport.base.datagram.AbstractDatagramTransportListener;
-import org.apache.synapse.transport.base.datagram.DatagramDispatcherCallback;
+import org.apache.axis2.transport.base.ManagementSupport;
+import org.apache.axis2.transport.base.ParamUtils;
+import
org.apache.axis2.transport.base.datagram.AbstractDatagramTransportListener;
+import org.apache.axis2.transport.base.datagram.DatagramDispatcherCallback;
/**
* Transport listener for the UDP protocol.
Modified:
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/udp/UDPSender.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/udp/UDPSender.java?rev=697954&r1=697953&r2=697954&view=diff
==============================================================================
---
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/udp/UDPSender.java
(original)
+++
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/udp/UDPSender.java
Mon Sep 22 12:23:51 2008
@@ -31,9 +31,9 @@
import org.apache.axis2.transport.MessageFormatter;
import org.apache.axis2.transport.OutTransportInfo;
import org.apache.axis2.transport.TransportUtils;
+import org.apache.axis2.transport.base.AbstractTransportSender;
+import org.apache.axis2.transport.base.BaseUtils;
import org.apache.commons.logging.LogFactory;
-import org.apache.synapse.transport.base.AbstractTransportSender;
-import org.apache.synapse.transport.base.BaseUtils;
/**
* Transport sender for the UDP protocol.
Modified:
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/vfs/PollTableEntry.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/vfs/PollTableEntry.java?rev=697954&r1=697953&r2=697954&view=diff
==============================================================================
---
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/vfs/PollTableEntry.java
(original)
+++
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/vfs/PollTableEntry.java
Mon Sep 22 12:23:51 2008
@@ -21,7 +21,7 @@
import java.text.DateFormat;
import org.apache.axis2.addressing.EndpointReference;
-import org.apache.synapse.transport.base.AbstractPollTableEntry;
+import org.apache.axis2.transport.base.AbstractPollTableEntry;
/**
* Holds information about an entry in the VFS transport poll table used by the
Modified:
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/vfs/VFSTransportListener.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/vfs/VFSTransportListener.java?rev=697954&r1=697953&r2=697954&view=diff
==============================================================================
---
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/vfs/VFSTransportListener.java
(original)
+++
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/vfs/VFSTransportListener.java
Mon Sep 22 12:23:51 2008
@@ -18,16 +18,16 @@
*/
package org.apache.synapse.transport.vfs;
-import org.apache.synapse.transport.base.BaseConstants;
-import org.apache.synapse.transport.base.BaseUtils;
-import org.apache.synapse.transport.base.AbstractPollingTransportListener;
-import org.apache.synapse.transport.base.ManagementSupport;
-import org.apache.synapse.transport.base.ParamUtils;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axis2.AxisFault;
import org.apache.axis2.Constants;
import org.apache.axis2.description.*;
import org.apache.axis2.transport.TransportUtils;
+import org.apache.axis2.transport.base.BaseConstants;
+import org.apache.axis2.transport.base.BaseUtils;
+import org.apache.axis2.transport.base.AbstractPollingTransportListener;
+import org.apache.axis2.transport.base.ManagementSupport;
+import org.apache.axis2.transport.base.ParamUtils;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.MessageContext;
import org.apache.commons.vfs.*;
Modified:
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/vfs/VFSTransportSender.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/vfs/VFSTransportSender.java?rev=697954&r1=697953&r2=697954&view=diff
==============================================================================
---
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/vfs/VFSTransportSender.java
(original)
+++
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/vfs/VFSTransportSender.java
Mon Sep 22 12:23:51 2008
@@ -18,9 +18,9 @@
*/
package org.apache.synapse.transport.vfs;
-import org.apache.synapse.transport.base.*;
import org.apache.axis2.transport.OutTransportInfo;
import org.apache.axis2.transport.MessageFormatter;
+import org.apache.axis2.transport.base.*;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.AxisFault;
Modified:
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/vfs/VFSUtils.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/vfs/VFSUtils.java?rev=697954&r1=697953&r2=697954&view=diff
==============================================================================
---
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/vfs/VFSUtils.java
(original)
+++
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/vfs/VFSUtils.java
Mon Sep 22 12:23:51 2008
@@ -18,9 +18,9 @@
*/
package org.apache.synapse.transport.vfs;
-import org.apache.synapse.transport.base.BaseUtils;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.description.Parameter;
+import org.apache.axis2.transport.base.BaseUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.commons.vfs.FileContent;
Modified:
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/format/PlainTextFormatterTest.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/format/PlainTextFormatterTest.java?rev=697954&r1=697953&r2=697954&view=diff
==============================================================================
---
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/format/PlainTextFormatterTest.java
(original)
+++
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/format/PlainTextFormatterTest.java
Mon Sep 22 12:23:51 2008
@@ -20,6 +20,8 @@
import java.io.ByteArrayOutputStream;
+import junit.framework.TestCase;
+
import org.apache.axiom.om.OMAbstractFactory;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMOutputFormat;
@@ -27,9 +29,8 @@
import org.apache.axiom.soap.SOAPFactory;
import org.apache.axis2.AxisFault;
import org.apache.axis2.context.MessageContext;
-import org.apache.synapse.transport.base.BaseConstants;
-
-import junit.framework.TestCase;
+import org.apache.axis2.format.PlainTextFormatter;
+import org.apache.axis2.transport.base.BaseConstants;
public class PlainTextFormatterTest extends TestCase {
private static final String testString = "\u00e0 peine arriv\u00e9s
nous entr\u00e2mes dans sa chambre";
Modified:
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/UtilsTransportServer.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/UtilsTransportServer.java?rev=697954&r1=697953&r2=697954&view=diff
==============================================================================
---
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/UtilsTransportServer.java
(original)
+++
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/UtilsTransportServer.java
Mon Sep 22 12:23:51 2008
@@ -36,11 +36,11 @@
import org.apache.axis2.description.TransportOutDescription;
import org.apache.axis2.engine.AxisConfiguration;
import org.apache.axis2.engine.ListenerManager;
+import org.apache.axis2.format.BinaryBuilder;
+import org.apache.axis2.format.PlainTextBuilder;
import org.apache.axis2.receivers.RawXMLINOnlyMessageReceiver;
import org.apache.axis2.receivers.RawXMLINOutMessageReceiver;
import org.apache.axis2.wsdl.WSDLConstants;
-import org.apache.synapse.format.BinaryBuilder;
-import org.apache.synapse.format.PlainTextBuilder;
/**
* Base class for transport util servers used in unit testing
Modified:
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSAxisTestClientSetup.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSAxisTestClientSetup.java?rev=697954&r1=697953&r2=697954&view=diff
==============================================================================
---
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSAxisTestClientSetup.java
(original)
+++
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSAxisTestClientSetup.java
Mon Sep 22 12:23:51 2008
@@ -21,6 +21,7 @@
import org.apache.axis2.AxisFault;
import org.apache.axis2.context.MessageContext;
+import org.apache.axis2.transport.jms.JMSConstants;
import org.apache.synapse.transport.testkit.client.axis2.AxisTestClientSetup;
import org.apache.synapse.transport.testkit.name.Key;
Modified:
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSChannel.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSChannel.java?rev=697954&r1=697953&r2=697954&view=diff
==============================================================================
---
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSChannel.java
(original)
+++
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSChannel.java
Mon Sep 22 12:23:51 2008
@@ -31,6 +31,7 @@
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.name.Key;
import
org.apache.synapse.transport.testkit.server.axis2.AxisServiceConfigurator;
Modified:
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSClient.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSClient.java?rev=697954&r1=697953&r2=697954&view=diff
==============================================================================
---
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSClient.java
(original)
+++
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSClient.java
Mon Sep 22 12:23:51 2008
@@ -27,7 +27,7 @@
import javax.jms.Session;
import javax.mail.internet.ContentType;
-import org.apache.synapse.transport.base.BaseConstants;
+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;
Modified:
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSRequestResponseChannel.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSRequestResponseChannel.java?rev=697954&r1=697953&r2=697954&view=diff
==============================================================================
---
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSRequestResponseChannel.java
(original)
+++
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSRequestResponseChannel.java
Mon Sep 22 12:23:51 2008
@@ -24,6 +24,7 @@
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.client.axis2.AxisTestClientSetup;
import org.apache.synapse.transport.testkit.listener.RequestResponseChannel;
import org.apache.synapse.transport.testkit.name.Key;
Modified:
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSTestEnvironment.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSTestEnvironment.java?rev=697954&r1=697953&r2=697954&view=diff
==============================================================================
---
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSTestEnvironment.java
(original)
+++
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSTestEnvironment.java
Mon Sep 22 12:23:51 2008
@@ -24,6 +24,7 @@
import javax.jms.Queue;
import javax.jms.Topic;
+import org.apache.axis2.transport.jms.JMSConstants;
import org.apache.synapse.transport.testkit.name.Key;
@Key("broker")
Modified:
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSTransportDescriptionFactory.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSTransportDescriptionFactory.java?rev=697954&r1=697953&r2=697954&view=diff
==============================================================================
---
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSTransportDescriptionFactory.java
(original)
+++
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSTransportDescriptionFactory.java
Mon Sep 22 12:23:51 2008
@@ -31,6 +31,9 @@
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.TransportDescriptionFactory;
import org.apache.synapse.transport.testkit.name.Key;
import org.mockejb.jndi.MockContextFactory;
Modified:
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSTransportTest.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSTransportTest.java?rev=697954&r1=697953&r2=697954&view=diff
==============================================================================
---
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSTransportTest.java
(original)
+++
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSTransportTest.java
Mon Sep 22 12:23:51 2008
@@ -24,6 +24,7 @@
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.client.axis2.AxisAsyncTestClient;
Modified:
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/LogAspect.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/LogAspect.java?rev=697954&r1=697953&r2=697954&view=diff
==============================================================================
---
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/LogAspect.java
(original)
+++
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/LogAspect.java
Mon Sep 22 12:23:51 2008
@@ -28,6 +28,7 @@
import javax.jms.Message;
import javax.jms.TextMessage;
+import org.apache.axis2.transport.jms.BytesMessageInputStream;
import org.apache.commons.io.IOUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Modified:
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/MockEchoEndpoint.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/MockEchoEndpoint.java?rev=697954&r1=697953&r2=697954&view=diff
==============================================================================
---
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/MockEchoEndpoint.java
(original)
+++
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/MockEchoEndpoint.java
Mon Sep 22 12:23:51 2008
@@ -29,6 +29,8 @@
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.commons.io.IOUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Modified:
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/mail/MailAxisTestClientSetup.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/mail/MailAxisTestClientSetup.java?rev=697954&r1=697953&r2=697954&view=diff
==============================================================================
---
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/mail/MailAxisTestClientSetup.java
(original)
+++
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/mail/MailAxisTestClientSetup.java
Mon Sep 22 12:23:51 2008
@@ -21,6 +21,7 @@
import org.apache.axis2.AxisFault;
import org.apache.axis2.context.MessageContext;
+import org.apache.axis2.transport.mail.MailConstants;
import org.apache.synapse.transport.testkit.client.axis2.AxisTestClientSetup;
import org.apache.synapse.transport.testkit.name.Key;
Modified:
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/mail/MailChannel.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/mail/MailChannel.java?rev=697954&r1=697953&r2=697954&view=diff
==============================================================================
---
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/mail/MailChannel.java
(original)
+++
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/mail/MailChannel.java
Mon Sep 22 12:23:51 2008
@@ -28,6 +28,7 @@
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.description.AxisService;
+import org.apache.axis2.transport.mail.MailConstants;
import org.apache.synapse.transport.testkit.client.axis2.AxisTestClientSetup;
import org.apache.synapse.transport.testkit.listener.AsyncChannel;
import org.apache.synapse.transport.testkit.listener.RequestResponseChannel;
Modified:
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/mail/MailClient.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/mail/MailClient.java?rev=697954&r1=697953&r2=697954&view=diff
==============================================================================
---
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/mail/MailClient.java
(original)
+++
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/mail/MailClient.java
Mon Sep 22 12:23:51 2008
@@ -32,6 +32,7 @@
import javax.mail.util.ByteArrayDataSource;
import org.apache.axiom.om.util.UUIDGenerator;
+import org.apache.axis2.transport.mail.MailConstants;
import org.apache.synapse.transport.testkit.client.ClientOptions;
import org.apache.synapse.transport.testkit.client.TestClient;
import org.apache.synapse.transport.testkit.name.Name;
Modified:
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/mail/MailRequestResponseClient.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/mail/MailRequestResponseClient.java?rev=697954&r1=697953&r2=697954&view=diff
==============================================================================
---
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/mail/MailRequestResponseClient.java
(original)
+++
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/mail/MailRequestResponseClient.java
Mon Sep 22 12:23:51 2008
@@ -32,6 +32,7 @@
import junit.framework.Assert;
+import org.apache.axis2.transport.mail.MailConstants;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.synapse.transport.testkit.client.ClientOptions;
Modified:
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/mail/MailTestEnvironment.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/mail/MailTestEnvironment.java?rev=697954&r1=697953&r2=697954&view=diff
==============================================================================
---
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/mail/MailTestEnvironment.java
(original)
+++
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/mail/MailTestEnvironment.java
Mon Sep 22 12:23:51 2008
@@ -24,6 +24,9 @@
import org.apache.axis2.description.Parameter;
import org.apache.axis2.description.TransportInDescription;
import org.apache.axis2.description.TransportOutDescription;
+import org.apache.axis2.transport.mail.MailConstants;
+import org.apache.axis2.transport.mail.MailTransportListener;
+import org.apache.axis2.transport.mail.MailTransportSender;
import org.apache.synapse.transport.testkit.TransportDescriptionFactory;
import org.apache.synapse.transport.testkit.name.Key;
Modified:
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/mail/MailTransportListenerTest.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/mail/MailTransportListenerTest.java?rev=697954&r1=697953&r2=697954&view=diff
==============================================================================
---
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/mail/MailTransportListenerTest.java
(original)
+++
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/mail/MailTransportListenerTest.java
Mon Sep 22 12:23:51 2008
@@ -22,6 +22,7 @@
import junit.framework.TestCase;
import junit.framework.TestSuite;
+import org.apache.axis2.transport.mail.MailConstants;
import org.apache.synapse.transport.testkit.TransportTestSuite;
import org.apache.synapse.transport.testkit.TransportTestSuiteBuilder;
import org.apache.synapse.transport.testkit.client.axis2.AxisAsyncTestClient;
Modified:
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/client/axis2/AxisTestClientContext.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/client/axis2/AxisTestClientContext.java?rev=697954&r1=697953&r2=697954&view=diff
==============================================================================
---
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/client/axis2/AxisTestClientContext.java
(original)
+++
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/client/axis2/AxisTestClientContext.java
Mon Sep 22 12:23:51 2008
@@ -25,8 +25,8 @@
import org.apache.axis2.context.ConfigurationContextFactory;
import org.apache.axis2.description.TransportOutDescription;
import org.apache.axis2.engine.AxisConfiguration;
-import org.apache.synapse.format.BinaryFormatter;
-import org.apache.synapse.format.PlainTextFormatter;
+import org.apache.axis2.format.BinaryFormatter;
+import org.apache.axis2.format.PlainTextFormatter;
import org.apache.synapse.transport.testkit.TransportDescriptionFactory;
public class AxisTestClientContext {
Modified:
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/client/axis2/LogAspect.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/client/axis2/LogAspect.java?rev=697954&r1=697953&r2=697954&view=diff
==============================================================================
---
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/client/axis2/LogAspect.java
(original)
+++
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/client/axis2/LogAspect.java
Mon Sep 22 12:23:51 2008
@@ -57,7 +57,7 @@
}
@AfterReturning(
- pointcut="call(javax.activation.DataSource
org.apache.synapse.format.MessageFormatterEx.getDataSource(..))",
+ pointcut="call(javax.activation.DataSource
org.apache.axis2.format.MessageFormatterEx.getDataSource(..))",
returning="dataSource")
public void afterGetDataSource(DataSource dataSource) {
try {
Modified:
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/message/MessageDecoder.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/message/MessageDecoder.java?rev=697954&r1=697953&r2=697954&view=diff
==============================================================================
---
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/message/MessageDecoder.java
(original)
+++
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/message/MessageDecoder.java
Mon Sep 22 12:23:51 2008
@@ -40,7 +40,7 @@
import org.apache.axiom.om.util.StAXUtils;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.soap.impl.builder.StAXSOAPModelBuilder;
-import org.apache.synapse.transport.base.BaseConstants;
+import org.apache.axis2.transport.base.BaseConstants;
import org.apache.synapse.transport.testkit.message.RESTMessage.Parameter;
public interface MessageDecoder<T,U> {
Modified:
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/message/MessageEncoder.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/message/MessageEncoder.java?rev=697954&r1=697953&r2=697954&view=diff
==============================================================================
---
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/message/MessageEncoder.java
(original)
+++
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/message/MessageEncoder.java
Mon Sep 22 12:23:51 2008
@@ -33,7 +33,7 @@
import org.apache.axiom.soap.SOAP12Constants;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.soap.SOAPFactory;
-import org.apache.synapse.transport.base.BaseConstants;
+import org.apache.axis2.transport.base.BaseConstants;
import org.apache.synapse.transport.testkit.client.ClientOptions;
import org.apache.synapse.transport.testkit.util.ContentTypeUtil;
Modified:
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/util/tcpmon/Relay.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/util/tcpmon/Relay.java?rev=697954&r1=697953&r2=697954&view=diff
==============================================================================
---
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/util/tcpmon/Relay.java
(original)
+++
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/util/tcpmon/Relay.java
Mon Sep 22 12:23:51 2008
@@ -23,10 +23,10 @@
import java.io.InputStream;
import java.io.OutputStream;
+import org.apache.axis2.transport.base.datagram.Utils;
import org.apache.commons.io.IOUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.synapse.transport.base.datagram.Utils;
public class Relay implements Runnable {
private static final Log log = LogFactory.getLog(Relay.class);
