Author: veithen
Date: Tue Jan 3 19:42:22 2017
New Revision: 1777207
URL: http://svn.apache.org/viewvc?rev=1777207&view=rev
Log:
Remove the dependency of axis2-transport-testkit on JavaMail.
Modified:
axis/axis2/java/core/trunk/modules/transport/jms/src/test/java/org/apache/axis2/transport/jms/JMSAsyncClient.java
axis/axis2/java/core/trunk/modules/transport/jms/src/test/java/org/apache/axis2/transport/jms/JMSClient.java
axis/axis2/java/core/trunk/modules/transport/jms/src/test/java/org/apache/axis2/transport/jms/JMSRequestResponseClient.java
axis/axis2/java/core/trunk/modules/transport/mail/src/test/java/org/apache/axis2/transport/mail/MailAsyncClient.java
axis/axis2/java/core/trunk/modules/transport/mail/src/test/java/org/apache/axis2/transport/mail/MailClient.java
axis/axis2/java/core/trunk/modules/transport/mail/src/test/java/org/apache/axis2/transport/mail/MailRequestResponseClient.java
axis/axis2/java/core/trunk/modules/transport/testkit/pom.xml
axis/axis2/java/core/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/client/AxisAsyncTestClient.java
axis/axis2/java/core/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/client/AxisRequestResponseTestClient.java
axis/axis2/java/core/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/client/AxisTestClient.java
axis/axis2/java/core/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/endpoint/ContentTypeServiceConfigurator.java
axis/axis2/java/core/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/client/AsyncTestClient.java
axis/axis2/java/core/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/client/AsyncTestClientAdapter.java
axis/axis2/java/core/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/client/ClientOptions.java
axis/axis2/java/core/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/client/RequestResponseTestClient.java
axis/axis2/java/core/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/client/RequestResponseTestClientAdapter.java
axis/axis2/java/core/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/client/TestClient.java
axis/axis2/java/core/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/endpoint/AsyncEndpointAdapter.java
axis/axis2/java/core/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/endpoint/InOnlyEndpointSupport.java
axis/axis2/java/core/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/http/JavaNetClient.java
axis/axis2/java/core/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/http/JavaNetRESTClient.java
axis/axis2/java/core/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/http/JettyByteArrayAsyncEndpoint.java
axis/axis2/java/core/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/message/IncomingMessage.java
axis/axis2/java/core/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/message/MessageDecoder.java
axis/axis2/java/core/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/message/MessageEncoder.java
axis/axis2/java/core/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/message/XMLMessage.java
axis/axis2/java/core/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/MessageTestCase.java
axis/axis2/java/core/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/async/AsyncMessageTestCase.java
axis/axis2/java/core/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/async/BinaryTestCase.java
axis/axis2/java/core/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/async/LargeSOAPAsyncMessageTestCase.java
axis/axis2/java/core/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/async/SwATestCase.java
axis/axis2/java/core/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/async/TextPlainTestCase.java
axis/axis2/java/core/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/async/XMLAsyncMessageTestCase.java
axis/axis2/java/core/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/echo/RequestResponseMessageTestCase.java
axis/axis2/java/core/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/echo/XMLRequestResponseMessageTestCase.java
axis/axis2/java/core/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/misc/MinConcurrencyTest.java
axis/axis2/java/core/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/util/ContentTypeUtil.java
Modified:
axis/axis2/java/core/trunk/modules/transport/jms/src/test/java/org/apache/axis2/transport/jms/JMSAsyncClient.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/transport/jms/src/test/java/org/apache/axis2/transport/jms/JMSAsyncClient.java?rev=1777207&r1=1777206&r2=1777207&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/transport/jms/src/test/java/org/apache/axis2/transport/jms/JMSAsyncClient.java
(original)
+++
axis/axis2/java/core/trunk/modules/transport/jms/src/test/java/org/apache/axis2/transport/jms/JMSAsyncClient.java
Tue Jan 3 19:42:22 2017
@@ -19,8 +19,7 @@
package org.apache.axis2.transport.jms;
-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/trunk/modules/transport/jms/src/test/java/org/apache/axis2/transport/jms/JMSClient.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/transport/jms/src/test/java/org/apache/axis2/transport/jms/JMSClient.java?rev=1777207&r1=1777206&r2=1777207&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/transport/jms/src/test/java/org/apache/axis2/transport/jms/JMSClient.java
(original)
+++
axis/axis2/java/core/trunk/modules/transport/jms/src/test/java/org/apache/axis2/transport/jms/JMSClient.java
Tue Jan 3 19:42:22 2017
@@ -25,8 +25,8 @@ import javax.jms.Destination;
import javax.jms.Message;
import javax.jms.MessageProducer;
import javax.jms.Session;
-import javax.mail.internet.ContentType;
+import org.apache.axiom.mime.ContentType;
import org.apache.axis2.transport.base.BaseConstants;
import org.apache.axis2.transport.testkit.client.ClientOptions;
import org.apache.axis2.transport.testkit.client.TestClient;
Modified:
axis/axis2/java/core/trunk/modules/transport/jms/src/test/java/org/apache/axis2/transport/jms/JMSRequestResponseClient.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/transport/jms/src/test/java/org/apache/axis2/transport/jms/JMSRequestResponseClient.java?rev=1777207&r1=1777206&r2=1777207&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/transport/jms/src/test/java/org/apache/axis2/transport/jms/JMSRequestResponseClient.java
(original)
+++
axis/axis2/java/core/trunk/modules/transport/jms/src/test/java/org/apache/axis2/transport/jms/JMSRequestResponseClient.java
Tue Jan 3 19:42:22 2017
@@ -25,8 +25,8 @@ import javax.jms.Destination;
import javax.jms.Message;
import javax.jms.MessageConsumer;
import javax.jms.Session;
-import javax.mail.internet.ContentType;
+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/trunk/modules/transport/mail/src/test/java/org/apache/axis2/transport/mail/MailAsyncClient.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/transport/mail/src/test/java/org/apache/axis2/transport/mail/MailAsyncClient.java?rev=1777207&r1=1777206&r2=1777207&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/transport/mail/src/test/java/org/apache/axis2/transport/mail/MailAsyncClient.java
(original)
+++
axis/axis2/java/core/trunk/modules/transport/mail/src/test/java/org/apache/axis2/transport/mail/MailAsyncClient.java
Tue Jan 3 19:42:22 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/trunk/modules/transport/mail/src/test/java/org/apache/axis2/transport/mail/MailClient.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/transport/mail/src/test/java/org/apache/axis2/transport/mail/MailClient.java?rev=1777207&r1=1777206&r2=1777207&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/transport/mail/src/test/java/org/apache/axis2/transport/mail/MailClient.java
(original)
+++
axis/axis2/java/core/trunk/modules/transport/mail/src/test/java/org/apache/axis2/transport/mail/MailClient.java
Tue Jan 3 19:42:22 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/trunk/modules/transport/mail/src/test/java/org/apache/axis2/transport/mail/MailRequestResponseClient.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/transport/mail/src/test/java/org/apache/axis2/transport/mail/MailRequestResponseClient.java?rev=1777207&r1=1777206&r2=1777207&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/transport/mail/src/test/java/org/apache/axis2/transport/mail/MailRequestResponseClient.java
(original)
+++
axis/axis2/java/core/trunk/modules/transport/mail/src/test/java/org/apache/axis2/transport/mail/MailRequestResponseClient.java
Tue Jan 3 19:42:22 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/trunk/modules/transport/testkit/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/transport/testkit/pom.xml?rev=1777207&r1=1777206&r2=1777207&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/transport/testkit/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/transport/testkit/pom.xml Tue Jan 3
19:42:22 2017
@@ -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>
Modified:
axis/axis2/java/core/trunk/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/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/client/AxisAsyncTestClient.java?rev=1777207&r1=1777206&r2=1777207&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/client/AxisAsyncTestClient.java
(original)
+++
axis/axis2/java/core/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/client/AxisAsyncTestClient.java
Tue Jan 3 19:42:22 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/trunk/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/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/client/AxisRequestResponseTestClient.java?rev=1777207&r1=1777206&r2=1777207&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/client/AxisRequestResponseTestClient.java
(original)
+++
axis/axis2/java/core/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/client/AxisRequestResponseTestClient.java
Tue Jan 3 19:42:22 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/trunk/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/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/client/AxisTestClient.java?rev=1777207&r1=1777206&r2=1777207&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/client/AxisTestClient.java
(original)
+++
axis/axis2/java/core/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/client/AxisTestClient.java
Tue Jan 3 19:42:22 2017
@@ -19,13 +19,14 @@
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.axiom.mime.ContentTypeBuilder;
import org.apache.axis2.Constants;
import org.apache.axis2.client.OperationClient;
import org.apache.axis2.client.Options;
@@ -44,7 +45,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 +77,12 @@ public class AxisTestClient implements T
public ContentType getContentType(ClientOptions options, ContentType
contentType) {
// TODO: this may be incorrect in some cases
+ ContentTypeBuilder builder = new ContentTypeBuilder(contentType);
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/trunk/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/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/endpoint/ContentTypeServiceConfigurator.java?rev=1777207&r1=1777206&r2=1777207&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/endpoint/ContentTypeServiceConfigurator.java
(original)
+++
axis/axis2/java/core/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/endpoint/ContentTypeServiceConfigurator.java
Tue Jan 3 19:42:22 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/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/client/AsyncTestClient.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/client/AsyncTestClient.java?rev=1777207&r1=1777206&r2=1777207&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/client/AsyncTestClient.java
(original)
+++
axis/axis2/java/core/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/client/AsyncTestClient.java
Tue Jan 3 19:42:22 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/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/client/AsyncTestClientAdapter.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/client/AsyncTestClientAdapter.java?rev=1777207&r1=1777206&r2=1777207&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/client/AsyncTestClientAdapter.java
(original)
+++
axis/axis2/java/core/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/client/AsyncTestClientAdapter.java
Tue Jan 3 19:42:22 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/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/client/ClientOptions.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/client/ClientOptions.java?rev=1777207&r1=1777206&r2=1777207&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/client/ClientOptions.java
(original)
+++
axis/axis2/java/core/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/client/ClientOptions.java
Tue Jan 3 19:42:22 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/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/client/RequestResponseTestClient.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/client/RequestResponseTestClient.java?rev=1777207&r1=1777206&r2=1777207&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/client/RequestResponseTestClient.java
(original)
+++
axis/axis2/java/core/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/client/RequestResponseTestClient.java
Tue Jan 3 19:42:22 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/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/client/RequestResponseTestClientAdapter.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/client/RequestResponseTestClientAdapter.java?rev=1777207&r1=1777206&r2=1777207&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/client/RequestResponseTestClientAdapter.java
(original)
+++
axis/axis2/java/core/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/client/RequestResponseTestClientAdapter.java
Tue Jan 3 19:42:22 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/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/client/TestClient.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/client/TestClient.java?rev=1777207&r1=1777206&r2=1777207&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/client/TestClient.java
(original)
+++
axis/axis2/java/core/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/client/TestClient.java
Tue Jan 3 19:42:22 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/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/endpoint/AsyncEndpointAdapter.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/endpoint/AsyncEndpointAdapter.java?rev=1777207&r1=1777206&r2=1777207&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/endpoint/AsyncEndpointAdapter.java
(original)
+++
axis/axis2/java/core/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/endpoint/AsyncEndpointAdapter.java
Tue Jan 3 19:42:22 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/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/endpoint/InOnlyEndpointSupport.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/endpoint/InOnlyEndpointSupport.java?rev=1777207&r1=1777206&r2=1777207&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/endpoint/InOnlyEndpointSupport.java
(original)
+++
axis/axis2/java/core/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/endpoint/InOnlyEndpointSupport.java
Tue Jan 3 19:42:22 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/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/http/JavaNetClient.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/http/JavaNetClient.java?rev=1777207&r1=1777206&r2=1777207&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/http/JavaNetClient.java
(original)
+++
axis/axis2/java/core/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/http/JavaNetClient.java
Tue Jan 3 19:42:22 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/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/http/JavaNetRESTClient.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/http/JavaNetRESTClient.java?rev=1777207&r1=1777206&r2=1777207&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/http/JavaNetRESTClient.java
(original)
+++
axis/axis2/java/core/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/http/JavaNetRESTClient.java
Tue Jan 3 19:42:22 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/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/http/JettyByteArrayAsyncEndpoint.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/http/JettyByteArrayAsyncEndpoint.java?rev=1777207&r1=1777206&r2=1777207&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/http/JettyByteArrayAsyncEndpoint.java
(original)
+++
axis/axis2/java/core/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/http/JettyByteArrayAsyncEndpoint.java
Tue Jan 3 19:42:22 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/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/message/IncomingMessage.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/message/IncomingMessage.java?rev=1777207&r1=1777206&r2=1777207&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/message/IncomingMessage.java
(original)
+++
axis/axis2/java/core/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/message/IncomingMessage.java
Tue Jan 3 19:42:22 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/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/message/MessageDecoder.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/message/MessageDecoder.java?rev=1777207&r1=1777206&r2=1777207&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/message/MessageDecoder.java
(original)
+++
axis/axis2/java/core/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/message/MessageDecoder.java
Tue Jan 3 19:42:22 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/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/message/MessageEncoder.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/message/MessageEncoder.java?rev=1777207&r1=1777206&r2=1777207&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/message/MessageEncoder.java
(original)
+++
axis/axis2/java/core/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/message/MessageEncoder.java
Tue Jan 3 19:42:22 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;
@@ -71,7 +71,7 @@ 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());
Modified:
axis/axis2/java/core/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/message/XMLMessage.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/message/XMLMessage.java?rev=1777207&r1=1777206&r2=1777207&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/message/XMLMessage.java
(original)
+++
axis/axis2/java/core/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/message/XMLMessage.java
Tue Jan 3 19:42:22 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/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/MessageTestCase.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/MessageTestCase.java?rev=1777207&r1=1777206&r2=1777207&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/MessageTestCase.java
(original)
+++
axis/axis2/java/core/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/MessageTestCase.java
Tue Jan 3 19:42:22 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/trunk/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/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/async/AsyncMessageTestCase.java?rev=1777207&r1=1777206&r2=1777207&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/async/AsyncMessageTestCase.java
(original)
+++
axis/axis2/java/core/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/async/AsyncMessageTestCase.java
Tue Jan 3 19:42:22 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/trunk/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/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/async/BinaryTestCase.java?rev=1777207&r1=1777206&r2=1777207&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/async/BinaryTestCase.java
(original)
+++
axis/axis2/java/core/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/async/BinaryTestCase.java
Tue Jan 3 19:42:22 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/trunk/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/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/async/LargeSOAPAsyncMessageTestCase.java?rev=1777207&r1=1777206&r2=1777207&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/async/LargeSOAPAsyncMessageTestCase.java
(original)
+++
axis/axis2/java/core/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/async/LargeSOAPAsyncMessageTestCase.java
Tue Jan 3 19:42:22 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/trunk/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/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/async/SwATestCase.java?rev=1777207&r1=1777206&r2=1777207&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/async/SwATestCase.java
(original)
+++
axis/axis2/java/core/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/async/SwATestCase.java
Tue Jan 3 19:42:22 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/trunk/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/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/async/TextPlainTestCase.java?rev=1777207&r1=1777206&r2=1777207&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/async/TextPlainTestCase.java
(original)
+++
axis/axis2/java/core/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/async/TextPlainTestCase.java
Tue Jan 3 19:42:22 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/trunk/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/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/async/XMLAsyncMessageTestCase.java?rev=1777207&r1=1777206&r2=1777207&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/async/XMLAsyncMessageTestCase.java
(original)
+++
axis/axis2/java/core/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/async/XMLAsyncMessageTestCase.java
Tue Jan 3 19:42:22 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;
}
Modified:
axis/axis2/java/core/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/echo/RequestResponseMessageTestCase.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/echo/RequestResponseMessageTestCase.java?rev=1777207&r1=1777206&r2=1777207&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/echo/RequestResponseMessageTestCase.java
(original)
+++
axis/axis2/java/core/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/echo/RequestResponseMessageTestCase.java
Tue Jan 3 19:42:22 2017
@@ -19,8 +19,7 @@
package org.apache.axis2.transport.testkit.tests.echo;
-import javax.mail.internet.ContentType;
-
+import org.apache.axiom.mime.ContentType;
import org.apache.axis2.transport.testkit.channel.RequestResponseChannel;
import org.apache.axis2.transport.testkit.client.RequestResponseTestClient;
import org.apache.axis2.transport.testkit.endpoint.InOutEndpoint;
Modified:
axis/axis2/java/core/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/echo/XMLRequestResponseMessageTestCase.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/echo/XMLRequestResponseMessageTestCase.java?rev=1777207&r1=1777206&r2=1777207&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/echo/XMLRequestResponseMessageTestCase.java
(original)
+++
axis/axis2/java/core/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/echo/XMLRequestResponseMessageTestCase.java
Tue Jan 3 19:42:22 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 XMLRequestResponseMessageTe
private final MessageTestData data;
public XMLRequestResponseMessageTestCase(RequestResponseChannel channel,
RequestResponseTestClient<XMLMessage,XMLMessage> client, InOutEndpoint
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;
}
Modified:
axis/axis2/java/core/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/misc/MinConcurrencyTest.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/misc/MinConcurrencyTest.java?rev=1777207&r1=1777206&r2=1777207&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/misc/MinConcurrencyTest.java
(original)
+++
axis/axis2/java/core/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/misc/MinConcurrencyTest.java
Tue Jan 3 19:42:22 2017
@@ -22,9 +22,9 @@ package org.apache.axis2.transport.testk
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
-import javax.mail.internet.ContentType;
import javax.xml.namespace.QName;
+import org.apache.axiom.mime.ContentType;
import org.apache.axiom.om.OMAbstractFactory;
import org.apache.axiom.soap.SOAP11Constants;
import org.apache.axiom.soap.SOAPEnvelope;
Modified:
axis/axis2/java/core/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/util/ContentTypeUtil.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/util/ContentTypeUtil.java?rev=1777207&r1=1777206&r2=1777207&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/util/ContentTypeUtil.java
(original)
+++
axis/axis2/java/core/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/util/ContentTypeUtil.java
Tue Jan 3 19:42:22 2017
@@ -19,36 +19,21 @@
package org.apache.axis2.transport.testkit.util;
-import java.util.Enumeration;
-
-import javax.mail.internet.ContentType;
-import javax.mail.internet.ParameterList;
+import org.apache.axiom.mime.ContentType;
+import org.apache.axiom.mime.ContentTypeBuilder;
public class ContentTypeUtil {
private ContentTypeUtil() {}
public static ContentType addCharset(ContentType contentType, String
charset) {
- ParameterList orgParamList = contentType.getParameterList();
- ParameterList paramList = new ParameterList();
- if (orgParamList != null) {
- for (Enumeration<?> e = orgParamList.getNames();
e.hasMoreElements(); ) {
- String name = (String)e.nextElement();
- paramList.set(name, orgParamList.get(name));
- }
- }
- paramList.set("charset", charset);
- return new ContentType(contentType.getPrimaryType(),
contentType.getSubType(), paramList);
+ ContentTypeBuilder builder = new ContentTypeBuilder(contentType);
+ builder.setParameter("charset", charset);
+ return builder.build();
}
public static ContentType removeCharset(ContentType contentType) {
- ParameterList orgParamList = contentType.getParameterList();
- ParameterList paramList = new ParameterList();
- for (Enumeration<?> e = orgParamList.getNames(); e.hasMoreElements();
) {
- String name = (String)e.nextElement();
- if (!name.equalsIgnoreCase("charset")) {
- paramList.set(name, orgParamList.get(name));
- }
- }
- return new ContentType(contentType.getPrimaryType(),
contentType.getSubType(), paramList);
+ ContentTypeBuilder builder = new ContentTypeBuilder(contentType);
+ builder.removeParameter("charset");
+ return builder.build();
}
}
