Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/transport/local/src/org/apache/axis2/transport/local/LocalResponder.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/transport/local/src/org/apache/axis2/transport/local/LocalResponder.java?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/transport/local/src/org/apache/axis2/transport/local/LocalResponder.java (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/transport/local/src/org/apache/axis2/transport/local/LocalResponder.java Sun Dec 17 22:34:08 2017 @@ -20,40 +20,32 @@ package org.apache.axis2.transport.local; -import org.apache.axiom.om.OMXMLParserWrapper; -import org.apache.axiom.soap.SOAPEnvelope; import org.apache.axis2.AxisFault; -import org.apache.axis2.Constants; import org.apache.axis2.addressing.EndpointReference; -import org.apache.axis2.addressing.RelatesTo; -import org.apache.axis2.builder.BuilderUtil; import org.apache.axis2.context.ConfigurationContext; import org.apache.axis2.context.MessageContext; import org.apache.axis2.description.TransportOutDescription; -import org.apache.axis2.description.WSDL2Constants; -import org.apache.axis2.engine.AxisEngine; import org.apache.axis2.handlers.AbstractHandler; import org.apache.axis2.transport.TransportSender; import org.apache.axis2.transport.TransportUtils; -import org.apache.axis2.wsdl.WSDLConstants; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import javax.xml.stream.XMLStreamException; -import java.io.*; -import java.util.Map; +import java.io.ByteArrayOutputStream; +import java.io.OutputStream; /** * LocalResponder */ public class LocalResponder extends AbstractHandler implements TransportSender { protected static final Log log = LogFactory.getLog(LocalResponder.class); - + + // fixed for Executing LocalTransport in MulthThread. private OutputStream out; public LocalResponder(OutputStream response) { - this.out = response; + this.out = response; } public void init(ConfigurationContext confContext, TransportOutDescription transportOut) @@ -95,38 +87,13 @@ public class LocalResponder extends Abst TransportUtils.writeMessage(msgContext, out); } } else { - if (/*(msgContext != null) &&*/ (msgContext.getOperationContext() != null) && - (msgContext.getOperationContext().getMessageContexts() != null)) { - MessageContext proxyInMessageContext = msgContext. - getOperationContext().getMessageContext(WSDL2Constants.MESSAGE_LABEL_IN); - - if (proxyInMessageContext != null) { - MessageContext initialMessageContext = (MessageContext) proxyInMessageContext. - getProperty(LocalTransportReceiver.IN_MESSAGE_CONTEXT); - - if (initialMessageContext != null) { - handleResponse(msgContext, initialMessageContext); - } else { - out = (OutputStream) msgContext.getProperty(MessageContext.TRANSPORT_OUT); - - if (out != null) { - TransportUtils.writeMessage(msgContext, out); - } else { - throw new AxisFault( - "Both the TO and Property MessageContext.TRANSPORT_OUT is Null, No where to send"); - } + out = (OutputStream) msgContext.getProperty(MessageContext.TRANSPORT_OUT); - } - } + if (out != null) { + TransportUtils.writeMessage(msgContext, out); } else { - out = (OutputStream) msgContext.getProperty(MessageContext.TRANSPORT_OUT); - - if (out != null) { - TransportUtils.writeMessage(msgContext, out); - } else { - throw new AxisFault( - "Both the TO and Property MessageContext.TRANSPORT_OUT is Null, No where to send"); - } + throw new AxisFault( + "Both the TO and Property MessageContext.TRANSPORT_OUT is Null, No where to send"); } } } catch (AxisFault axisFault) { @@ -136,95 +103,7 @@ public class LocalResponder extends Abst } TransportUtils.setResponseWritten(msgContext, true); - + return InvocationResponse.CONTINUE; } - - /** - * Retrieves the properties from the proxyOutMessageContext and sets the values to the - * inMessageContext. - * - * @param proxyOutMessageContext the active message context - * @param initialMessageContext the initial message context, which was stored as a property - * in the proxyOutMessageContext - * @throws AxisFault AxisFault - */ - private void handleResponse(MessageContext proxyOutMessageContext, MessageContext initialMessageContext) throws AxisFault { - MessageContext inMessageContext = initialMessageContext.getOperationContext(). - getMessageContext(WSDL2Constants.MESSAGE_LABEL_IN); - - // setting the properties - Map<String, Object> initialPropertyMap = initialMessageContext.getProperties(); - initialMessageContext.setProperties(initialPropertyMap); - - inMessageContext.setEnvelope(getEnvelope(proxyOutMessageContext)); - inMessageContext.setAxisServiceGroup(initialMessageContext.getAxisServiceGroup()); - inMessageContext.setAxisService(initialMessageContext.getAxisService()); - inMessageContext.setAxisOperation(initialMessageContext.getAxisOperation()); - inMessageContext.setAxisMessage(initialMessageContext.getAxisOperation().getMessage( - WSDLConstants.MESSAGE_LABEL_OUT_VALUE)); - inMessageContext.setIncomingTransportName(Constants.TRANSPORT_LOCAL); - inMessageContext.setServiceContext(initialMessageContext.getServiceContext()); - - // set properties on response - inMessageContext.setServerSide(true); - inMessageContext.setProperty(MessageContext.TRANSPORT_OUT, - initialMessageContext.getProperty(MessageContext.TRANSPORT_OUT)); - inMessageContext.setProperty(Constants.OUT_TRANSPORT_INFO, - initialMessageContext.getProperty(Constants.OUT_TRANSPORT_INFO)); - inMessageContext.setTransportIn(initialMessageContext.getTransportIn()); - inMessageContext.setTransportOut(initialMessageContext.getTransportOut()); - - if (log.isDebugEnabled()) { - log.debug("Setting AxisServiceGroup - " + initialMessageContext.getAxisServiceGroup()); - log.debug("Setting AxisService - " + initialMessageContext.getAxisService()); - log.debug("Setting AxisOperation - " + initialMessageContext.getAxisOperation()); - log.debug("Setting AxisMessage - " + initialMessageContext.getAxisOperation(). - getMessage(WSDLConstants.MESSAGE_LABEL_OUT_VALUE)); - log.debug("Setting Incoming Transport name - " + Constants.TRANSPORT_LOCAL); - log.debug("Setting Service Context " + initialMessageContext.getServiceGroupContext().toString()); - - log.debug("Setting ServerSide to true"); - log.debug("Setting " + MessageContext.TRANSPORT_OUT + " property to " + - initialMessageContext.getProperty(MessageContext.TRANSPORT_OUT)); - log.debug("Setting " + Constants.OUT_TRANSPORT_INFO + " property to " + - initialMessageContext.getProperty(Constants.OUT_TRANSPORT_INFO)); - log.debug("Setting TransportIn - " + initialMessageContext.getTransportIn()); - log.debug("Setting TransportOut - " + initialMessageContext.getTransportOut()); - - log.debug("Setting ReplyTo - " + initialMessageContext.getReplyTo()); - log.debug("Setting FaultTo - " + initialMessageContext.getFaultTo()); - } - - // copy the message type property that is used by the out message to the response message - inMessageContext.setProperty(Constants.Configuration.MESSAGE_TYPE, - initialMessageContext.getProperty(Constants.Configuration.MESSAGE_TYPE)); - - if (initialMessageContext.getMessageID() != null) { - inMessageContext.setRelationships( - new RelatesTo[]{new RelatesTo(initialMessageContext.getMessageID())}); - } - - inMessageContext.setReplyTo(initialMessageContext.getReplyTo()); - inMessageContext.setFaultTo(initialMessageContext.getFaultTo()); - - AxisEngine.receive(inMessageContext); - } - - private SOAPEnvelope getEnvelope(MessageContext messageContext) throws AxisFault { - ByteArrayOutputStream out = new ByteArrayOutputStream(); - TransportUtils.writeMessage(messageContext, out); - - ByteArrayInputStream bs = new ByteArrayInputStream(out.toByteArray()); - InputStreamReader streamReader = new InputStreamReader(bs); - OMXMLParserWrapper builder; - - try { - builder = BuilderUtil.getBuilder(streamReader); - } catch (XMLStreamException e) { - throw AxisFault.makeFault(e); - } - - return (SOAPEnvelope) builder.getDocumentElement(); - } }
Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/transport/local/src/org/apache/axis2/transport/local/LocalTransportReceiver.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/transport/local/src/org/apache/axis2/transport/local/LocalTransportReceiver.java?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/transport/local/src/org/apache/axis2/transport/local/LocalTransportReceiver.java (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/transport/local/src/org/apache/axis2/transport/local/LocalTransportReceiver.java Sun Dec 17 22:34:08 2017 @@ -20,39 +20,27 @@ package org.apache.axis2.transport.local; -import org.apache.axiom.om.OMXMLParserWrapper; +import org.apache.axiom.om.OMXMLBuilderFactory; import org.apache.axiom.soap.SOAPEnvelope; import org.apache.axis2.AxisFault; import org.apache.axis2.Constants; import org.apache.axis2.addressing.EndpointReference; -import org.apache.axis2.builder.BuilderUtil; import org.apache.axis2.context.ConfigurationContext; import org.apache.axis2.context.MessageContext; -import org.apache.axis2.context.SessionContext; import org.apache.axis2.description.TransportInDescription; import org.apache.axis2.description.TransportOutDescription; import org.apache.axis2.engine.AxisEngine; -import org.apache.axis2.transport.TransportListener; import org.apache.axis2.transport.http.HTTPConstants; import org.apache.axis2.util.MessageContextBuilder; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import javax.xml.stream.XMLStreamException; import java.io.InputStream; import java.io.InputStreamReader; import java.io.OutputStream; -public class LocalTransportReceiver implements TransportListener { - protected static final Log log = LogFactory.getLog(LocalTransportReceiver.class); - +public class LocalTransportReceiver { public static ConfigurationContext CONFIG_CONTEXT; private ConfigurationContext confContext; private MessageContext inMessageContext; - /** Whether the call is blocking or non-blocking */ - private boolean nonBlocking = false; - /** If the call is non-blocking the in message context will be stored in this property */ - public static final String IN_MESSAGE_CONTEXT = "IN_MESSAGE_CONTEXT"; public LocalTransportReceiver(ConfigurationContext configContext) { confContext = configContext; @@ -62,11 +50,6 @@ public class LocalTransportReceiver impl this(CONFIG_CONTEXT); } - public LocalTransportReceiver(LocalTransportSender sender, boolean nonBlocking) { - this(CONFIG_CONTEXT); - this.nonBlocking = nonBlocking; - } - public void processMessage(MessageContext inMessageContext, InputStream in, OutputStream response) throws AxisFault { @@ -94,27 +77,12 @@ public class LocalTransportReceiver impl OutputStream response) throws AxisFault { MessageContext msgCtx = confContext.createMessageContext(); - - if (this.nonBlocking) { - if (log.isDebugEnabled()) { - log.debug("Setting the in-message context as a property(" + IN_MESSAGE_CONTEXT + - ") to the current message context"); - } - // Set the in-message context as a property to the current message context. - msgCtx.setProperty(IN_MESSAGE_CONTEXT, inMessageContext); - } - if (inMessageContext != null) { - if (log.isDebugEnabled()) { - log.debug("Setting the property " + HTTPConstants.MC_HTTP_SERVLETREQUEST + " to " + - inMessageContext.getProperty(HTTPConstants.MC_HTTP_SERVLETREQUEST)); - log.debug("Setting the property " + MessageContext.REMOTE_ADDR + " to " + - inMessageContext.getProperty(MessageContext.REMOTE_ADDR)); - } msgCtx.setProperty(HTTPConstants.MC_HTTP_SERVLETREQUEST, inMessageContext.getProperty(HTTPConstants.MC_HTTP_SERVLETREQUEST)); msgCtx.setProperty(MessageContext.REMOTE_ADDR, inMessageContext.getProperty(MessageContext.REMOTE_ADDR)); + } TransportInDescription tIn = confContext.getAxisConfiguration().getTransportIn( @@ -144,25 +112,10 @@ public class LocalTransportReceiver impl msgCtx.setServerSide(true); InputStreamReader streamReader = new InputStreamReader(in); - OMXMLParserWrapper builder; - try { - builder = BuilderUtil.getBuilder(streamReader); - } catch (XMLStreamException e) { - throw AxisFault.makeFault(e); - } - SOAPEnvelope envelope = (SOAPEnvelope) builder.getDocumentElement(); + SOAPEnvelope envelope = OMXMLBuilderFactory.createSOAPModelBuilder(streamReader).getSOAPEnvelope(); msgCtx.setEnvelope(envelope); - if (log.isDebugEnabled()) { - log.debug("Setting incoming Transport name - " + Constants.TRANSPORT_LOCAL); - log.debug("Setting TransportIn - " + tIn); - log.debug("Setting TransportOut - " + localTransportResOut); - log.debug("Setting To address - " + to); - log.debug("Setting WSAction - " + action); - log.debug("Setting Envelope - " + envelope.toString()); - } - AxisEngine.receive(msgCtx); } catch (AxisFault e) { // write the fault back. @@ -172,10 +125,6 @@ public class LocalTransportReceiver impl faultContext.setTransportOut(localTransportResOut); faultContext.setProperty(MessageContext.TRANSPORT_OUT, response); - if(log.isDebugEnabled()) { - log.debug("Setting FaultContext's TransportOut - " + localTransportResOut); - } - AxisEngine.sendFault(faultContext); } catch (AxisFault axisFault) { // can't handle this, so just throw it @@ -183,28 +132,4 @@ public class LocalTransportReceiver impl } } } - - public void init(ConfigurationContext axisConf, TransportInDescription transprtIn) throws AxisFault { - } - - public void start() throws AxisFault { - } - - public void stop() throws AxisFault { - } - - public EndpointReference getEPRForService(String serviceName, String ip) throws AxisFault { - return null; - } - - public EndpointReference[] getEPRsForService(String serviceName, String ip) throws AxisFault { - return new EndpointReference[0]; - } - - public SessionContext getSessionContext(MessageContext messageContext) { - return null; - } - - public void destroy() { - } } Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/transport/local/src/org/apache/axis2/transport/local/LocalTransportSender.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/transport/local/src/org/apache/axis2/transport/local/LocalTransportSender.java?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/transport/local/src/org/apache/axis2/transport/local/LocalTransportSender.java (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/transport/local/src/org/apache/axis2/transport/local/LocalTransportSender.java Sun Dec 17 22:34:08 2017 @@ -98,7 +98,7 @@ public class LocalTransportSender extend InputStream in = new ByteArrayInputStream(out.toByteArray()); ByteArrayOutputStream response = new ByteArrayOutputStream(); - LocalTransportReceiver localTransportReceiver = new LocalTransportReceiver(this, isNonBlocking()); + LocalTransportReceiver localTransportReceiver = new LocalTransportReceiver(this); localTransportReceiver.processMessage(msgContext, in, response); in.close(); @@ -111,11 +111,4 @@ public class LocalTransportSender extend throw AxisFault.makeFault(e); } } - - protected boolean isNonBlocking() { - if (log.isDebugEnabled()) { - log.debug("Local Transport Sender Selected"); - } - return false; - } } Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/transport/mail/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/transport/mail/pom.xml?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/transport/mail/pom.xml (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/transport/mail/pom.xml Sun Dec 17 22:34:08 2017 @@ -22,9 +22,9 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.axis2</groupId> - <artifactId>axis2-parent</artifactId> - <version>1.7.0-SNAPSHOT</version> - <relativePath>../../parent/pom.xml</relativePath> + <artifactId>axis2</artifactId> + <version>1.8.0-SNAPSHOT</version> + <relativePath>../../../pom.xml</relativePath> </parent> <groupId>org.apache.axis2</groupId> @@ -45,7 +45,6 @@ <plugin> <groupId>org.apache.felix</groupId> <artifactId>maven-bundle-plugin</artifactId> - <version>1.4.0</version> <extensions>true</extensions> <configuration> <instructions> @@ -110,49 +109,26 @@ <dependencies> <dependency> - <groupId>javax.mail</groupId> - <artifactId>mail</artifactId> - <version>1.4.1</version> + <groupId>com.sun.mail</groupId> + <artifactId>javax.mail</artifactId> </dependency> <dependency> <groupId>org.apache.axis2</groupId> <artifactId>axis2-transport-base</artifactId> <version>${project.version}</version> - <exclusions> - <!-- We want to choose the JavaMail implementation ourselves --> - <exclusion> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-javamail_1.4_spec</artifactId> - </exclusion> - </exclusions> - </dependency> <dependency> <groupId>org.apache.axis2</groupId> <artifactId>axis2-transport-testkit</artifactId> <version>${project.version}</version> <scope>test</scope> - <exclusions> - <!-- We want to choose the JavaMail implementation ourselves --> - <exclusion> - <groupId>javax.mail</groupId> - <artifactId>mail</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>com.icegreen</groupId> <artifactId>greenmail</artifactId> <version>1.3</version> <scope>test</scope> - <exclusions> - <!-- We want to choose the JavaMail implementation ourselves --> - <exclusion> - <groupId>javax.mail</groupId> - <artifactId>mail</artifactId> - </exclusion> - </exclusions> </dependency> </dependencies> </project> Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/transport/mail/src/test/java/org/apache/axis2/transport/mail/MailAsyncClient.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/transport/mail/src/test/java/org/apache/axis2/transport/mail/MailAsyncClient.java?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/transport/mail/src/test/java/org/apache/axis2/transport/mail/MailAsyncClient.java (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/transport/mail/src/test/java/org/apache/axis2/transport/mail/MailAsyncClient.java Sun Dec 17 22:34:08 2017 @@ -19,8 +19,7 @@ package org.apache.axis2.transport.mail; -import javax.mail.internet.ContentType; - +import org.apache.axiom.mime.ContentType; import org.apache.axis2.transport.testkit.client.AsyncTestClient; import org.apache.axis2.transport.testkit.client.ClientOptions; Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/transport/mail/src/test/java/org/apache/axis2/transport/mail/MailClient.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/transport/mail/src/test/java/org/apache/axis2/transport/mail/MailClient.java?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/transport/mail/src/test/java/org/apache/axis2/transport/mail/MailClient.java (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/transport/mail/src/test/java/org/apache/axis2/transport/mail/MailClient.java Sun Dec 17 22:34:08 2017 @@ -26,11 +26,11 @@ import javax.activation.DataHandler; import javax.mail.Message; import javax.mail.Session; import javax.mail.Transport; -import javax.mail.internet.ContentType; import javax.mail.internet.InternetAddress; import javax.mail.internet.MimeMessage; import javax.mail.util.ByteArrayDataSource; +import org.apache.axiom.mime.ContentType; import org.apache.axiom.util.UIDGenerator; import org.apache.axis2.transport.testkit.client.ClientOptions; import org.apache.axis2.transport.testkit.client.TestClient; Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/transport/mail/src/test/java/org/apache/axis2/transport/mail/MailRequestResponseClient.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/transport/mail/src/test/java/org/apache/axis2/transport/mail/MailRequestResponseClient.java?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/transport/mail/src/test/java/org/apache/axis2/transport/mail/MailRequestResponseClient.java (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/transport/mail/src/test/java/org/apache/axis2/transport/mail/MailRequestResponseClient.java Sun Dec 17 22:34:08 2017 @@ -28,12 +28,12 @@ import javax.mail.Message; import javax.mail.MessagingException; import javax.mail.Session; import javax.mail.Store; -import javax.mail.internet.ContentType; import javax.mail.internet.InternetAddress; import javax.mail.internet.MimeMessage; import junit.framework.Assert; +import org.apache.axiom.mime.ContentType; import org.apache.axis2.transport.testkit.client.ClientOptions; import org.apache.axis2.transport.testkit.client.RequestResponseTestClient; import org.apache.axis2.transport.testkit.message.IncomingMessage; Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/transport/tcp/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/transport/tcp/pom.xml?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/transport/tcp/pom.xml (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/transport/tcp/pom.xml Sun Dec 17 22:34:08 2017 @@ -23,9 +23,9 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.axis2</groupId> - <artifactId>axis2-parent</artifactId> - <version>1.7.0-SNAPSHOT</version> - <relativePath>../../parent/pom.xml</relativePath> + <artifactId>axis2</artifactId> + <version>1.8.0-SNAPSHOT</version> + <relativePath>../../../pom.xml</relativePath> </parent> <artifactId>axis2-transport-tcp</artifactId> <name>Apache Axis2 - Transport - TCP</name> @@ -83,7 +83,6 @@ <plugin> <groupId>org.apache.felix</groupId> <artifactId>maven-bundle-plugin</artifactId> - <version>1.4.0</version> <extensions>true</extensions> <configuration> <instructions> Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/transport/tcp/test/org/apache/axis2/transport/tcp/TCPEchoRawXMLTest.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/transport/tcp/test/org/apache/axis2/transport/tcp/TCPEchoRawXMLTest.java?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/transport/tcp/test/org/apache/axis2/transport/tcp/TCPEchoRawXMLTest.java (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/transport/tcp/test/org/apache/axis2/transport/tcp/TCPEchoRawXMLTest.java Sun Dec 17 22:34:08 2017 @@ -25,7 +25,6 @@ import org.apache.axiom.om.OMAbstractFac import org.apache.axiom.om.OMElement; import org.apache.axiom.om.OMFactory; import org.apache.axiom.om.OMNamespace; -import org.apache.axiom.om.util.StAXUtils; import org.apache.axiom.soap.SOAPEnvelope; import org.apache.axiom.soap.SOAPFactory; import org.apache.axis2.AxisFault; @@ -115,8 +114,7 @@ public class TCPEchoRawXMLTest extends T AxisCallback callback = new AxisCallback() { public void onComplete(MessageContext msgCtx) { try { - msgCtx.getEnvelope().serialize(StAXUtils - .createXMLStreamWriter(System.out)); + msgCtx.getEnvelope().serialize(System.out); } catch (XMLStreamException e) { onError(e); } finally { @@ -171,8 +169,7 @@ public class TCPEchoRawXMLTest extends T sender.setOptions(options); OMElement result = sender.sendReceive(operationName, payload); - result.serialize(StAXUtils.createXMLStreamWriter( - System.out)); + result.serialize(System.out); sender.cleanup(); } @@ -195,8 +192,7 @@ public class TCPEchoRawXMLTest extends T sender.setOptions(options); OMElement result = sender.sendReceive(operationName, payloadElement); - result.serialize(StAXUtils.createXMLStreamWriter( - System.out)); + result.serialize(System.out); sender.cleanup(); } @@ -235,8 +231,7 @@ public class TCPEchoRawXMLTest extends T MessageContext response = opClient.getMessageContext(WSDLConstants.MESSAGE_LABEL_IN_VALUE); SOAPEnvelope env = response.getEnvelope(); assertNotNull(env); - env.getBody().serialize(StAXUtils.createXMLStreamWriter( - System.out)); + env.getBody().serialize(System.out); sender.cleanup(); } Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/transport/tcp/test/org/apache/axis2/transport/tcp/TCPTwoChannelEchoRawXMLTest.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/transport/tcp/test/org/apache/axis2/transport/tcp/TCPTwoChannelEchoRawXMLTest.java?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/transport/tcp/test/org/apache/axis2/transport/tcp/TCPTwoChannelEchoRawXMLTest.java (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/transport/tcp/test/org/apache/axis2/transport/tcp/TCPTwoChannelEchoRawXMLTest.java Sun Dec 17 22:34:08 2017 @@ -25,7 +25,6 @@ import org.apache.axiom.om.OMAbstractFac import org.apache.axiom.om.OMElement; import org.apache.axiom.om.OMFactory; import org.apache.axiom.om.OMNamespace; -import org.apache.axiom.om.util.StAXUtils; import org.apache.axis2.AxisFault; import org.apache.axis2.Constants; import org.apache.axis2.addressing.EndpointReference; @@ -102,8 +101,7 @@ public class TCPTwoChannelEchoRawXMLTest AxisCallback callback = new AxisCallback() { public void onComplete(MessageContext msgCtx) { try { - msgCtx.getEnvelope().serializeAndConsume(StAXUtils - .createXMLStreamWriter(System.out)); + msgCtx.getEnvelope().serializeAndConsume(System.out); } catch (XMLStreamException e) { onError(e); } finally { Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/transport/testkit/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/transport/testkit/pom.xml?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/transport/testkit/pom.xml (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/transport/testkit/pom.xml Sun Dec 17 22:34:08 2017 @@ -23,9 +23,9 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.axis2</groupId> - <artifactId>axis2-parent</artifactId> - <version>1.7.0-SNAPSHOT</version> - <relativePath>../../parent/pom.xml</relativePath> + <artifactId>axis2</artifactId> + <version>1.8.0-SNAPSHOT</version> + <relativePath>../../../pom.xml</relativePath> </parent> <artifactId>axis2-transport-testkit</artifactId> <name>Apache Axis2 - Transport - testkit</name> @@ -83,10 +83,6 @@ <artifactId>jetty</artifactId> <version>5.1.10</version> </dependency> - <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-javamail_1.4_spec</artifactId> - </dependency> </dependencies> <profiles> @@ -126,6 +122,24 @@ </dependency> </dependencies> </profile> + <profile> + <id>default-tools.jar-3</id> + <activation> + <property> + <name>java.vendor</name> + <value>Oracle Corporation</value> + </property> + </activation> + <dependencies> + <dependency> + <groupId>com.sun</groupId> + <artifactId>tools</artifactId> + <version>1.5.0</version> + <scope>system</scope> + <systemPath>${java.home}/../lib/tools.jar</systemPath> + </dependency> + </dependencies> + </profile> </profiles> <build> @@ -139,81 +153,39 @@ </resources> <plugins> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <version>2.0</version> + <groupId>org.apache.axis2</groupId> + <artifactId>axis2-repo-maven-plugin</artifactId> <executions> <execution> - <id>copy</id> <phase>generate-resources</phase> <goals> - <goal>copy</goal> - </goals> - <configuration> - <stripVersion>true</stripVersion> - <artifactItems> - <artifactItem> - <groupId>org.apache.axis2</groupId> - <artifactId>addressing</artifactId> - <version>${axis2.version}</version> - <type>mar</type> - <outputDirectory> - target/generated-resources/org/apache/axis2/transport/repo/modules - </outputDirectory> - </artifactItem> - </artifactItems> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <artifactId>maven-javadoc-plugin</artifactId> - <executions> - <execution> - <id>extract-resource-info</id> - <phase>pre-site</phase> - <goals> - <goal>javadoc</goal> - </goals> - <configuration> - <docletArtifacts> - <docletArtifact> - <groupId>${project.groupId}</groupId> - <artifactId>${project.artifactId}</artifactId> - <version>${project.version}</version> - </docletArtifact> - </docletArtifacts> - <doclet>org.apache.axis2.transport.testkit.doclet.ResourceInfoDoclet</doclet> - <useStandardDocletOptions>false</useStandardDocletOptions> - <show>private</show> - <additionalparam>-out ${project.build.directory}/resource-info.dat</additionalparam> - </configuration> - </execution> - <execution> - <id>generate-javadoc</id> - <phase>site</phase> - <goals> - <goal>javadoc</goal> + <goal>create-repository</goal> </goals> <configuration> - <docletArtifacts> - <docletArtifact> - <groupId>${project.groupId}</groupId> - <artifactId>${project.artifactId}</artifactId> - <version>${project.version}</version> - </docletArtifact> - </docletArtifacts> - <doclet>org.apache.axis2.transport.testkit.doclet.TestkitJavadocDoclet</doclet> - <useStandardDocletOptions>true</useStandardDocletOptions> - <additionalparam> - -resource-info ${project.build.directory}/resource-info.dat - -link http://java.sun.com/j2se/1.5.0/docs/api/ - -link http://java.sun.com/j2ee/1.4/docs/api/ - -link http://ws.apache.org/axis2/1_4_1/api/ - -link http://ws.apache.org/commons/axiom/apidocs/ - -link http://junit.org/junit/javadoc/3.8.1/ - -link http://www.eclipse.org/aspectj/doc/released/runtime-api/ - </additionalparam> + <outputDirectory>${project.build.directory}/generated-resources/org/apache/axis2/transport/repo</outputDirectory> + <generateFileLists>true</generateFileLists> + <generatedAxis2xml> + <messageFormatters> + <messageFormatter> + <contentType>text/plain</contentType> + <className>org.apache.axis2.format.PlainTextFormatter</className> + </messageFormatter> + <messageFormatter> + <contentType>application/octet-stream</contentType> + <className>org.apache.axis2.format.BinaryFormatter</className> + </messageFormatter> + </messageFormatters> + <messageBuilders> + <messageBuilder> + <contentType>text/plain</contentType> + <className>org.apache.axis2.format.PlainTextBuilder</className> + </messageBuilder> + <messageBuilder> + <contentType>application/octet-stream</contentType> + <className>org.apache.axis2.format.BinaryBuilder</className> + </messageBuilder> + </messageBuilders> + </generatedAxis2xml> </configuration> </execution> </executions> Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/transport/testkit/src/main/java/org/apache/axis2/transport/AbstractTransportTest.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/transport/testkit/src/main/java/org/apache/axis2/transport/AbstractTransportTest.java?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/transport/testkit/src/main/java/org/apache/axis2/transport/AbstractTransportTest.java (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/transport/testkit/src/main/java/org/apache/axis2/transport/AbstractTransportTest.java Sun Dec 17 22:34:08 2017 @@ -27,8 +27,8 @@ import org.apache.axiom.om.OMAbstractFac import org.apache.axiom.om.OMElement; import org.apache.axiom.om.OMFactory; import org.apache.axiom.om.OMNamespace; +import org.apache.axiom.om.OMXMLBuilderFactory; import org.apache.axiom.soap.SOAPEnvelope; -import org.apache.axiom.soap.impl.builder.StAXSOAPModelBuilder; import org.apache.axis2.context.ConfigurationContext; import org.apache.axis2.engine.AxisConfiguration; import org.apache.axis2.transport.UtilsTransportServer; @@ -89,7 +89,7 @@ public abstract class AbstractTransportT } protected void assertSOAPEchoResponse(String textValue, XMLStreamReader reader) { - SOAPEnvelope env = new StAXSOAPModelBuilder(reader).getSOAPEnvelope(); + SOAPEnvelope env = OMXMLBuilderFactory.createStAXSOAPModelBuilder(reader).getSOAPEnvelope(); assertEchoResponse(textValue, env.getBody().getFirstElement()); } Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/transport/testkit/src/main/java/org/apache/axis2/transport/CustomAxisConfigurator.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/transport/testkit/src/main/java/org/apache/axis2/transport/CustomAxisConfigurator.java?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/transport/testkit/src/main/java/org/apache/axis2/transport/CustomAxisConfigurator.java (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/transport/testkit/src/main/java/org/apache/axis2/transport/CustomAxisConfigurator.java Sun Dec 17 22:34:08 2017 @@ -21,7 +21,6 @@ package org.apache.axis2.transport; import java.io.IOException; import java.io.InputStream; -import java.net.MalformedURLException; import java.net.URL; import org.apache.axis2.AxisFault; @@ -32,19 +31,16 @@ import org.apache.axis2.util.Loader; public class CustomAxisConfigurator extends DeploymentEngine implements AxisConfigurator { public AxisConfiguration getAxisConfiguration() throws AxisFault { - InputStream configStream = Loader.getResourceAsStream("org/apache/axis2/transport/axis2.xml"); + URL axis2Url = Loader.getResource("org/apache/axis2/transport/repo/axis2.xml"); try { - axisConfig = populateAxisConfiguration(configStream); - } finally { + InputStream configStream = axis2Url.openStream(); try { + axisConfig = populateAxisConfiguration(configStream); + } finally { configStream.close(); - } catch (IOException ex) { - throw AxisFault.makeFault(ex); } - } - try { - loadRepositoryFromURL(new URL(Loader.getResource("org/apache/axis2/transport/repo/__root__"), ".")); - } catch (MalformedURLException ex) { + loadRepositoryFromURL(new URL(axis2Url, ".")); + } catch (IOException ex) { throw AxisFault.makeFault(ex); } axisConfig.setConfigurator(this); Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/LogAspect.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/LogAspect.java?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/LogAspect.java (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/LogAspect.java Sun Dec 17 22:34:08 2017 @@ -48,12 +48,16 @@ public class LogAspect { public void aroundWriteTo(ProceedingJoinPoint proceedingJoinPoint, MessageContext msgContext, OMOutputFormat format, OutputStream out, boolean preserve) throws Throwable { - OutputStream log = LogManager.INSTANCE.createLog("formatter"); - try { - OutputStream tee = new TeeOutputStream(out, log); - proceedingJoinPoint.proceed(new Object[] { msgContext, format, tee, preserve }); - } finally { - log.close(); + if (LogManager.INSTANCE.isLoggingEnabled()) { + OutputStream log = LogManager.INSTANCE.createLog("formatter"); + try { + OutputStream tee = new TeeOutputStream(out, log); + proceedingJoinPoint.proceed(new Object[] { msgContext, format, tee, preserve }); + } finally { + log.close(); + } + } else { + proceedingJoinPoint.proceed(); } } @@ -61,20 +65,22 @@ public class LogAspect { pointcut="call(javax.activation.DataSource org.apache.axis2.format.MessageFormatterEx.getDataSource(..))", returning="dataSource") public void afterGetDataSource(DataSource dataSource) { - try { - OutputStream out = LogManager.INSTANCE.createLog("formatter"); + if (LogManager.INSTANCE.isLoggingEnabled()) { try { - InputStream in = dataSource.getInputStream(); + OutputStream out = LogManager.INSTANCE.createLog("formatter"); try { - IOUtils.copy(in, out); + InputStream in = dataSource.getInputStream(); + try { + IOUtils.copy(in, out); + } finally { + in.close(); + } } finally { - in.close(); + out.close(); } - } finally { - out.close(); + } catch (Throwable ex) { + log.error("Unable to dump message", ex); } - } catch (Throwable ex) { - log.error("Unable to dump message", ex); } } @@ -83,16 +89,20 @@ public class LogAspect { " && args(in, contentType, msgContext)") public Object aroundProcessDocument(ProceedingJoinPoint proceedingJoinPoint, InputStream in, String contentType, MessageContext msgContext) throws Throwable { - InputStream tee; - if (in == null) { - tee = null; + if (LogManager.INSTANCE.isLoggingEnabled()) { + InputStream tee; + if (in == null) { + tee = null; + } else { + OutputStream log = LogManager.INSTANCE.createLog("builder"); + // Note: We can't close the log right after the method execution because the + // message builder may use streaming. LogManager will take care of closing the + // log for us if anything goes wrong. + tee = new TeeInputStream(in, log, true); + } + return proceedingJoinPoint.proceed(new Object[] { tee, contentType, msgContext }); } else { - OutputStream log = LogManager.INSTANCE.createLog("builder"); - // Note: We can't close the log right after the method execution because the - // message builder may use streaming. LogManager will take care of closing the - // log for us if anything goes wrong. - tee = new TeeInputStream(in, log, true); + return proceedingJoinPoint.proceed(); } - return proceedingJoinPoint.proceed(new Object[] { tee, contentType, msgContext }); } } Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/client/AxisAsyncTestClient.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/client/AxisAsyncTestClient.java?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/client/AxisAsyncTestClient.java (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/client/AxisAsyncTestClient.java Sun Dec 17 22:34:08 2017 @@ -19,8 +19,7 @@ package org.apache.axis2.transport.testkit.axis2.client; -import javax.mail.internet.ContentType; - +import org.apache.axiom.mime.ContentType; import org.apache.axis2.client.ServiceClient; import org.apache.axis2.transport.testkit.client.AsyncTestClient; import org.apache.axis2.transport.testkit.client.ClientOptions; Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/client/AxisRequestResponseTestClient.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/client/AxisRequestResponseTestClient.java?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/client/AxisRequestResponseTestClient.java (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/client/AxisRequestResponseTestClient.java Sun Dec 17 22:34:08 2017 @@ -19,10 +19,9 @@ package org.apache.axis2.transport.testkit.axis2.client; -import javax.mail.internet.ContentType; - import junit.framework.Assert; +import org.apache.axiom.mime.ContentType; import org.apache.axis2.client.ServiceClient; import org.apache.axis2.context.MessageContext; import org.apache.axis2.transport.testkit.axis2.MessageContextValidator; Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/client/AxisTestClient.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/client/AxisTestClient.java?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/client/AxisTestClient.java (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/client/AxisTestClient.java Sun Dec 17 22:34:08 2017 @@ -19,13 +19,13 @@ package org.apache.axis2.transport.testkit.axis2.client; -import javax.mail.internet.ContentType; import javax.xml.namespace.QName; import junit.framework.Assert; import junit.framework.AssertionFailedError; import org.apache.axiom.attachments.Attachments; +import org.apache.axiom.mime.ContentType; import org.apache.axis2.Constants; import org.apache.axis2.client.OperationClient; import org.apache.axis2.client.Options; @@ -44,7 +44,6 @@ import org.apache.axis2.transport.testki import org.apache.axis2.transport.testkit.tests.Setup; import org.apache.axis2.transport.testkit.tests.TearDown; import org.apache.axis2.transport.testkit.tests.Transient; -import org.apache.axis2.transport.testkit.util.ContentTypeUtil; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -77,12 +76,12 @@ public class AxisTestClient implements T public ContentType getContentType(ClientOptions options, ContentType contentType) { // TODO: this may be incorrect in some cases + ContentType.Builder builder = contentType.toBuilder(); String charset = options.getCharset(); if (charset == null) { - return contentType; - } else { - return ContentTypeUtil.addCharset(contentType, options.getCharset()); + builder.setParameter("charset", charset); } + return builder.build(); } public void beforeSend() throws Exception { Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/client/AxisTestClientContext.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/client/AxisTestClientContext.java?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/client/AxisTestClientContext.java (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/client/AxisTestClientContext.java Sun Dec 17 22:34:08 2017 @@ -35,15 +35,6 @@ import org.apache.axis2.transport.testki /** * Resource maintaining the {@link ConfigurationContext} for {@link AxisTestClient} * instances. - * <p> - * Dependencies: - * <dl> - * <dt>{@link TransportDescriptionFactory} (1)</dt> - * <dd>Used to create transport descriptions.</dd> - * <dt>{@link AxisTestClientContextConfigurator} (0..*)</dt> - * <dd>Used to determine whether a transport listener is required and to - * configure the transport.</dd> - * </dl> */ public class AxisTestClientContext { public static final AxisTestClientContext INSTANCE = new AxisTestClientContext(); Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/client/AxisTestClientContextConfigurator.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/client/AxisTestClientContextConfigurator.java?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/client/AxisTestClientContextConfigurator.java (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/client/AxisTestClientContextConfigurator.java Sun Dec 17 22:34:08 2017 @@ -22,6 +22,10 @@ package org.apache.axis2.transport.testk import org.apache.axis2.description.TransportInDescription; import org.apache.axis2.description.TransportOutDescription; +/** + * Resource used to determine whether a transport listener is required and to configure the + * transport. + */ public interface AxisTestClientContextConfigurator { /** * Determine whether a transport listener is required on client side. Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/endpoint/ContentTypeServiceConfigurator.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/endpoint/ContentTypeServiceConfigurator.java?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/endpoint/ContentTypeServiceConfigurator.java (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/endpoint/ContentTypeServiceConfigurator.java Sun Dec 17 22:34:08 2017 @@ -19,8 +19,7 @@ package org.apache.axis2.transport.testkit.axis2.endpoint; -import javax.mail.internet.ContentType; - +import org.apache.axiom.mime.ContentType; import org.apache.axis2.description.AxisService; import org.apache.axis2.transport.testkit.axis2.AxisServiceConfigurator; import org.apache.axis2.transport.testkit.client.ClientOptions; Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/client/AsyncTestClient.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/client/AsyncTestClient.java?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/client/AsyncTestClient.java (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/client/AsyncTestClient.java Sun Dec 17 22:34:08 2017 @@ -19,7 +19,7 @@ package org.apache.axis2.transport.testkit.client; -import javax.mail.internet.ContentType; +import org.apache.axiom.mime.ContentType; public interface AsyncTestClient<M> extends TestClient { void sendMessage(ClientOptions options, ContentType contentType, M message) throws Exception; Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/client/AsyncTestClientAdapter.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/client/AsyncTestClientAdapter.java?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/client/AsyncTestClientAdapter.java (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/client/AsyncTestClientAdapter.java Sun Dec 17 22:34:08 2017 @@ -19,8 +19,7 @@ package org.apache.axis2.transport.testkit.client; -import javax.mail.internet.ContentType; - +import org.apache.axiom.mime.ContentType; import org.apache.axis2.transport.testkit.Adapter; import org.apache.axis2.transport.testkit.message.MessageEncoder; Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/client/ClientOptions.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/client/ClientOptions.java?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/client/ClientOptions.java (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/client/ClientOptions.java Sun Dec 17 22:34:08 2017 @@ -19,8 +19,7 @@ package org.apache.axis2.transport.testkit.client; -import javax.mail.internet.ContentType; - +import org.apache.axiom.mime.ContentType; import org.apache.axiom.util.UIDGenerator; public class ClientOptions { Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/client/RequestResponseTestClient.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/client/RequestResponseTestClient.java?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/client/RequestResponseTestClient.java (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/client/RequestResponseTestClient.java Sun Dec 17 22:34:08 2017 @@ -19,8 +19,7 @@ package org.apache.axis2.transport.testkit.client; -import javax.mail.internet.ContentType; - +import org.apache.axiom.mime.ContentType; import org.apache.axis2.transport.testkit.message.IncomingMessage; public interface RequestResponseTestClient<M,N> extends TestClient { Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/client/RequestResponseTestClientAdapter.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/client/RequestResponseTestClientAdapter.java?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/client/RequestResponseTestClientAdapter.java (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/client/RequestResponseTestClientAdapter.java Sun Dec 17 22:34:08 2017 @@ -19,8 +19,7 @@ package org.apache.axis2.transport.testkit.client; -import javax.mail.internet.ContentType; - +import org.apache.axiom.mime.ContentType; import org.apache.axis2.transport.testkit.Adapter; import org.apache.axis2.transport.testkit.message.IncomingMessage; import org.apache.axis2.transport.testkit.message.MessageDecoder; Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/client/TestClient.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/client/TestClient.java?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/client/TestClient.java (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/client/TestClient.java Sun Dec 17 22:34:08 2017 @@ -19,8 +19,7 @@ package org.apache.axis2.transport.testkit.client; -import javax.mail.internet.ContentType; - +import org.apache.axiom.mime.ContentType; import org.apache.axis2.transport.testkit.name.Key; @Key("client") Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/doclet/TestkitJavadocDoclet.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/doclet/TestkitJavadocDoclet.java?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/doclet/TestkitJavadocDoclet.java (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/doclet/TestkitJavadocDoclet.java Sun Dec 17 22:34:08 2017 @@ -60,7 +60,9 @@ public class TestkitJavadocDoclet { Resource resource = resourceInfo.getResource(qualifiedName); List<Dependency> dependencies = resource == null ? null : resource.getDependencies(); if (dependencies != null || usedBy != null) { - StringBuilder buffer = new StringBuilder(clazz.getRawCommentText()); + String rawCommentText = clazz.getRawCommentText(); + StringBuilder buffer = new StringBuilder( + rawCommentText.trim().isEmpty() ? "No documentation available." : rawCommentText); buffer.append("<h2>Resource information</h2>"); if (usedBy != null) { buffer.append("This resource is used by: "); Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/endpoint/AsyncEndpointAdapter.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/endpoint/AsyncEndpointAdapter.java?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/endpoint/AsyncEndpointAdapter.java (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/endpoint/AsyncEndpointAdapter.java Sun Dec 17 22:34:08 2017 @@ -19,8 +19,7 @@ package org.apache.axis2.transport.testkit.endpoint; -import javax.mail.internet.ContentType; - +import org.apache.axiom.mime.ContentType; import org.apache.axis2.transport.testkit.Adapter; import org.apache.axis2.transport.testkit.message.IncomingMessage; import org.apache.axis2.transport.testkit.message.MessageDecoder; Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/endpoint/InOnlyEndpointSupport.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/endpoint/InOnlyEndpointSupport.java?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/endpoint/InOnlyEndpointSupport.java (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/endpoint/InOnlyEndpointSupport.java Sun Dec 17 22:34:08 2017 @@ -23,8 +23,7 @@ import java.util.concurrent.BlockingQueu import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.TimeUnit; -import javax.mail.internet.ContentType; - +import org.apache.axiom.mime.ContentType; import org.apache.axis2.transport.testkit.message.IncomingMessage; public class InOnlyEndpointSupport<M> { Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/http/JavaNetClient.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/http/JavaNetClient.java?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/http/JavaNetClient.java (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/http/JavaNetClient.java Sun Dec 17 22:34:08 2017 @@ -26,8 +26,8 @@ import java.net.HttpURLConnection; import java.net.URL; import java.net.URLConnection; -import javax.mail.internet.ContentType; - +import org.apache.axiom.mime.ContentType; +import org.apache.axiom.mime.MediaType; import org.apache.axis2.transport.testkit.client.AsyncTestClient; import org.apache.axis2.transport.testkit.client.ClientOptions; import org.apache.axis2.transport.testkit.name.Name; @@ -60,7 +60,7 @@ public class JavaNetClient implements As connection.setDoOutput(true); connection.setDoInput(true); connection.setRequestProperty("Content-Type", contentType.toString()); - if(contentType.getBaseType().equals("text/xml")){ + if(contentType.getMediaType().equals(MediaType.TEXT_XML)){ connection.setRequestProperty("SOAPAction", ""); } OutputStream out = connection.getOutputStream(); Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/http/JavaNetRESTClient.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/http/JavaNetRESTClient.java?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/http/JavaNetRESTClient.java (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/http/JavaNetRESTClient.java Sun Dec 17 22:34:08 2017 @@ -23,8 +23,7 @@ import java.io.InputStream; import java.net.URL; import java.net.URLConnection; -import javax.mail.internet.ContentType; - +import org.apache.axiom.mime.ContentType; import org.apache.axis2.transport.testkit.client.AsyncTestClient; import org.apache.axis2.transport.testkit.client.ClientOptions; import org.apache.axis2.transport.testkit.message.RESTMessage; Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/http/JettyByteArrayAsyncEndpoint.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/http/JettyByteArrayAsyncEndpoint.java?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/http/JettyByteArrayAsyncEndpoint.java (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/http/JettyByteArrayAsyncEndpoint.java Sun Dec 17 22:34:08 2017 @@ -23,11 +23,10 @@ import java.io.IOException; import java.io.OutputStream; import java.io.OutputStreamWriter; import java.io.PrintWriter; +import java.text.ParseException; import java.util.Enumeration; -import javax.mail.internet.ContentType; -import javax.mail.internet.ParseException; - +import org.apache.axiom.mime.ContentType; import org.apache.axis2.transport.testkit.message.IncomingMessage; import org.apache.axis2.transport.testkit.tests.Setup; import org.apache.axis2.transport.testkit.tests.Transient; Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/message/IncomingMessage.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/message/IncomingMessage.java?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/message/IncomingMessage.java (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/message/IncomingMessage.java Sun Dec 17 22:34:08 2017 @@ -19,7 +19,7 @@ package org.apache.axis2.transport.testkit.message; -import javax.mail.internet.ContentType; +import org.apache.axiom.mime.ContentType; public class IncomingMessage<M> { private final ContentType contentType; Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/message/MessageDecoder.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/message/MessageDecoder.java?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/message/MessageDecoder.java (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/message/MessageDecoder.java Sun Dec 17 22:34:08 2017 @@ -27,11 +27,11 @@ import java.util.LinkedList; import java.util.List; import javax.activation.DataHandler; -import javax.mail.internet.ContentType; import junit.framework.Assert; import org.apache.axiom.attachments.Attachments; +import org.apache.axiom.mime.ContentType; import org.apache.axiom.om.OMElement; import org.apache.axiom.om.OMNode; import org.apache.axiom.om.OMText; Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/message/MessageEncoder.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/message/MessageEncoder.java?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/message/MessageEncoder.java (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/message/MessageEncoder.java Sun Dec 17 22:34:08 2017 @@ -24,10 +24,10 @@ import java.io.OutputStream; import java.io.StringWriter; import javax.activation.DataHandler; -import javax.mail.internet.ContentType; import org.apache.axiom.attachments.Attachments; import org.apache.axiom.attachments.ByteArrayDataSource; +import org.apache.axiom.mime.ContentType; import org.apache.axiom.om.OMAbstractFactory; import org.apache.axiom.om.OMElement; import org.apache.axiom.om.OMOutputFormat; @@ -37,7 +37,6 @@ import org.apache.axiom.soap.SOAPEnvelop import org.apache.axiom.soap.SOAPFactory; import org.apache.axis2.transport.base.BaseConstants; import org.apache.axis2.transport.testkit.client.ClientOptions; -import org.apache.axis2.transport.testkit.util.ContentTypeUtil; public interface MessageEncoder<T,U> { MessageEncoder<XMLMessage,AxisMessage> XML_TO_AXIS = @@ -71,13 +70,13 @@ public interface MessageEncoder<T,U> { new MessageEncoder<XMLMessage,byte[]>() { public ContentType getContentType(ClientOptions options, ContentType contentType) throws Exception { - if (contentType.getBaseType().equals(XMLMessage.Type.SWA.getContentType().getBaseType())) { + if (contentType.getMediaType().equals(XMLMessage.Type.SWA.getContentType())) { OMOutputFormat outputFormat = new OMOutputFormat(); outputFormat.setMimeBoundary(options.getMimeBoundary()); outputFormat.setRootContentId(options.getRootContentId()); return new ContentType(outputFormat.getContentTypeForSwA(SOAP12Constants.SOAP_12_CONTENT_TYPE)); } else { - return ContentTypeUtil.addCharset(contentType, options.getCharset()); + return contentType.toBuilder().setParameter("charset", options.getCharset()).build(); } } @@ -169,7 +168,7 @@ public interface MessageEncoder<T,U> { new MessageEncoder<String,byte[]>() { public ContentType getContentType(ClientOptions options, ContentType contentType) { - return ContentTypeUtil.addCharset(contentType, options.getCharset()); + return contentType.toBuilder().setParameter("charset", options.getCharset()).build(); } public byte[] encode(ClientOptions options, String message) throws Exception { Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/message/XMLMessage.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/message/XMLMessage.java?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/message/XMLMessage.java (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/message/XMLMessage.java Sun Dec 17 22:34:08 2017 @@ -19,37 +19,29 @@ package org.apache.axis2.transport.testkit.message; -import javax.mail.internet.ContentType; -import javax.mail.internet.ParseException; - import org.apache.axiom.attachments.Attachments; +import org.apache.axiom.mime.ContentType; +import org.apache.axiom.mime.MediaType; import org.apache.axiom.om.OMAbstractFactory; import org.apache.axiom.om.OMElement; -import org.apache.axiom.soap.SOAP11Constants; -import org.apache.axiom.soap.SOAP12Constants; import org.apache.axiom.soap.SOAPEnvelope; import org.apache.axiom.soap.SOAPFactory; -import org.apache.axis2.transport.http.HTTPConstants; public class XMLMessage { public enum Type { - SOAP11(SOAP11Constants.SOAP_11_CONTENT_TYPE), - SOAP12(SOAP12Constants.SOAP_12_CONTENT_TYPE), - POX("application/xml"), - SWA(HTTPConstants.MEDIA_TYPE_MULTIPART_RELATED); + SOAP11(MediaType.TEXT_XML), + SOAP12(MediaType.APPLICATION_SOAP_XML), + POX(MediaType.APPLICATION_XML), + SWA(MediaType.MULTIPART_RELATED); - private final String contentType; + private final MediaType contentType; - private Type(String contentType) { + private Type(MediaType contentType) { this.contentType = contentType; } - public ContentType getContentType() { - try { - return new ContentType(contentType); - } catch (ParseException ex) { - throw new Error(ex); - } + public MediaType getContentType() { + return contentType; } } @@ -96,10 +88,10 @@ public class XMLMessage { } public static Type getTypeFromContentType(ContentType contentType) { - String baseType = contentType.getBaseType(); + MediaType baseType = contentType.getMediaType(); Type type = null; for (Type candidate : Type.values()) { - if (candidate.getContentType().getBaseType().equalsIgnoreCase(baseType)) { + if (candidate.getContentType().equals(baseType)) { type = candidate; break; } Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/MessageTestCase.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/MessageTestCase.java?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/MessageTestCase.java (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/MessageTestCase.java Sun Dec 17 22:34:08 2017 @@ -19,8 +19,7 @@ package org.apache.axis2.transport.testkit.tests; -import javax.mail.internet.ContentType; - +import org.apache.axiom.mime.ContentType; import org.apache.axis2.transport.testkit.Adapter; import org.apache.axis2.transport.testkit.MessageExchangeValidator; import org.apache.axis2.transport.testkit.client.ClientOptions; Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/async/AsyncMessageTestCase.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/async/AsyncMessageTestCase.java?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/async/AsyncMessageTestCase.java (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/async/AsyncMessageTestCase.java Sun Dec 17 22:34:08 2017 @@ -19,8 +19,7 @@ package org.apache.axis2.transport.testkit.tests.async; -import javax.mail.internet.ContentType; - +import org.apache.axiom.mime.ContentType; import org.apache.axis2.transport.testkit.channel.AsyncChannel; import org.apache.axis2.transport.testkit.client.AsyncTestClient; import org.apache.axis2.transport.testkit.endpoint.AsyncEndpoint; Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/async/BinaryTestCase.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/async/BinaryTestCase.java?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/async/BinaryTestCase.java (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/async/BinaryTestCase.java Sun Dec 17 22:34:08 2017 @@ -22,8 +22,8 @@ package org.apache.axis2.transport.testk import java.util.Arrays; import java.util.Random; -import javax.mail.internet.ContentType; - +import org.apache.axiom.mime.ContentType; +import org.apache.axiom.mime.MediaType; import org.apache.axis2.transport.testkit.channel.AsyncChannel; import org.apache.axis2.transport.testkit.client.AsyncTestClient; import org.apache.axis2.transport.testkit.endpoint.AsyncEndpoint; @@ -34,7 +34,7 @@ public class BinaryTestCase extends Asyn private static final Random random = new Random(); public BinaryTestCase(AsyncChannel channel, AsyncTestClient<byte[]> client, AsyncEndpoint<byte[]> endpoint, Object... resources) { - super(channel, client, endpoint, new ContentType("application", "octet-stream", null), null, resources); + super(channel, client, endpoint, new ContentType(MediaType.APPLICATION_OCTET_STREAM), null, resources); } @Override Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/async/LargeSOAPAsyncMessageTestCase.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/async/LargeSOAPAsyncMessageTestCase.java?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/async/LargeSOAPAsyncMessageTestCase.java (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/async/LargeSOAPAsyncMessageTestCase.java Sun Dec 17 22:34:08 2017 @@ -23,6 +23,7 @@ import java.util.Iterator; import javax.xml.namespace.QName; +import org.apache.axiom.mime.ContentType; import org.apache.axiom.om.OMAbstractFactory; import org.apache.axiom.om.OMElement; import org.apache.axiom.om.OMFactory; @@ -36,7 +37,7 @@ import org.apache.axis2.transport.testki // TODO: maybe we should use XMLUnit to construct these kind of tests public class LargeSOAPAsyncMessageTestCase extends AsyncMessageTestCase<XMLMessage> { public LargeSOAPAsyncMessageTestCase(AsyncChannel channel, AsyncTestClient<XMLMessage> client, AsyncEndpoint<XMLMessage> endpoint, Object... resources) { - super(channel, client, endpoint, XMLMessage.Type.SOAP11.getContentType(), "UTF-8", resources); + super(channel, client, endpoint, new ContentType(XMLMessage.Type.SOAP11.getContentType()), "UTF-8", resources); } @Override Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/async/SwATestCase.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/async/SwATestCase.java?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/async/SwATestCase.java (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/async/SwATestCase.java Sun Dec 17 22:34:08 2017 @@ -28,6 +28,7 @@ import javax.xml.namespace.QName; import org.apache.axiom.attachments.Attachments; import org.apache.axiom.attachments.ByteArrayDataSource; +import org.apache.axiom.mime.ContentType; import org.apache.axiom.om.OMAbstractFactory; import org.apache.axiom.om.OMElement; import org.apache.axiom.om.OMFactory; @@ -46,7 +47,7 @@ public class SwATestCase extends AsyncMe private String contentID; public SwATestCase(AsyncChannel channel, AsyncTestClient<XMLMessage> client, AsyncEndpoint<XMLMessage> endpoint, Object... resources) { - super(channel, client, endpoint, XMLMessage.Type.SWA.getContentType(), "UTF-8", resources); + super(channel, client, endpoint, new ContentType(XMLMessage.Type.SWA.getContentType()), "UTF-8", resources); } @Override Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/async/TextPlainTestCase.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/async/TextPlainTestCase.java?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/async/TextPlainTestCase.java (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/async/TextPlainTestCase.java Sun Dec 17 22:34:08 2017 @@ -19,8 +19,8 @@ package org.apache.axis2.transport.testkit.tests.async; -import javax.mail.internet.ContentType; - +import org.apache.axiom.mime.ContentType; +import org.apache.axiom.mime.MediaType; import org.apache.axis2.transport.testkit.MessageTestData; import org.apache.axis2.transport.testkit.channel.AsyncChannel; import org.apache.axis2.transport.testkit.client.AsyncTestClient; @@ -33,7 +33,7 @@ public class TextPlainTestCase extends A private final MessageTestData data; public TextPlainTestCase(AsyncChannel channel, AsyncTestClient<String> client, AsyncEndpoint<String> endpoint, MessageTestData data, Object... resources) { - super(channel, client, endpoint, new ContentType("text", "plain", null), data.getCharset(), resources); + super(channel, client, endpoint, new ContentType(MediaType.TEXT_PLAIN), data.getCharset(), resources); this.data = data; } Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/async/XMLAsyncMessageTestCase.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/async/XMLAsyncMessageTestCase.java?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/async/XMLAsyncMessageTestCase.java (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/async/XMLAsyncMessageTestCase.java Sun Dec 17 22:34:08 2017 @@ -21,6 +21,7 @@ package org.apache.axis2.transport.testk import javax.xml.namespace.QName; +import org.apache.axiom.mime.ContentType; import org.apache.axiom.om.OMAbstractFactory; import org.apache.axiom.om.OMElement; import org.apache.axiom.om.OMFactory; @@ -39,7 +40,7 @@ public class XMLAsyncMessageTestCase ext private final MessageTestData data; public XMLAsyncMessageTestCase(AsyncChannel channel, AsyncTestClient<XMLMessage> client, AsyncEndpoint<XMLMessage> endpoint, XMLMessage.Type xmlMessageType, MessageTestData data, Object... resources) { - super(channel, client, endpoint, xmlMessageType.getContentType(), data.getCharset(), resources); + super(channel, client, endpoint, new ContentType(xmlMessageType.getContentType()), data.getCharset(), resources); this.xmlMessageType = xmlMessageType; this.data = data; }
