Author: veithen
Date: Thu Aug 1 20:10:19 2013
New Revision: 1509409
URL: http://svn.apache.org/r1509409
Log:
Avoid the dependency on JavaMail (which is no longer a dependency of Axiom; see
AXIOM-418).
Modified:
axis/axis2/java/core/trunk/modules/adb-codegen/pom.xml
axis/axis2/java/core/trunk/modules/adb/pom.xml
axis/axis2/java/core/trunk/modules/kernel/pom.xml
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/builder/DataSourceBuilder.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/builder/MIMEBuilder.java
axis/axis2/java/core/trunk/modules/transport/base/src/main/java/org/apache/axis2/format/TextMessageBuilderAdapter.java
axis/axis2/java/core/trunk/modules/transport/testkit/pom.xml
Modified: axis/axis2/java/core/trunk/modules/adb-codegen/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/adb-codegen/pom.xml?rev=1509409&r1=1509408&r2=1509409&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/adb-codegen/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/adb-codegen/pom.xml Thu Aug 1 20:10:19
2013
@@ -64,6 +64,10 @@
<artifactId>xmlunit</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-javamail_1.4_spec</artifactId>
+ </dependency>
</dependencies>
<url>http://axis.apache.org/axis2/java/core/</url>
<scm>
Modified: axis/axis2/java/core/trunk/modules/adb/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/adb/pom.xml?rev=1509409&r1=1509408&r2=1509409&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/adb/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/adb/pom.xml Thu Aug 1 20:10:19 2013
@@ -62,6 +62,11 @@
<artifactId>xmlunit</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-javamail_1.4_spec</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
Modified: axis/axis2/java/core/trunk/modules/kernel/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/pom.xml?rev=1509409&r1=1509408&r2=1509409&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/kernel/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/kernel/pom.xml Thu Aug 1 20:10:19 2013
@@ -96,6 +96,11 @@
<artifactId>xmlunit</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-javamail_1.4_spec</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<url>http://axis.apache.org/axis2/java/core/</url>
<scm>
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/builder/DataSourceBuilder.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/builder/DataSourceBuilder.java?rev=1509409&r1=1509408&r2=1509409&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/builder/DataSourceBuilder.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/builder/DataSourceBuilder.java
Thu Aug 1 20:10:19 2013
@@ -28,6 +28,7 @@ import javax.xml.stream.XMLStreamExcepti
import javax.xml.stream.XMLStreamReader;
import javax.xml.stream.XMLStreamWriter;
+import org.apache.axiom.attachments.ByteArrayDataSource;
import org.apache.axiom.attachments.impl.BufferUtils;
import org.apache.axiom.om.OMAbstractFactory;
import org.apache.axiom.om.OMDataSource;
@@ -60,7 +61,7 @@ public class DataSourceBuilder implement
return factory.createOMElement(ds, "dummy", ns);
}
- public class ByteArrayDataSourceEx extends
javax.mail.util.ByteArrayDataSource implements OMDataSource {
+ public class ByteArrayDataSourceEx extends ByteArrayDataSource implements
OMDataSource {
private byte[] bytes;
public ByteArrayDataSourceEx(byte[] bytes, String s) {
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/builder/MIMEBuilder.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/builder/MIMEBuilder.java?rev=1509409&r1=1509408&r2=1509409&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/builder/MIMEBuilder.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/builder/MIMEBuilder.java
Thu Aug 1 20:10:19 2013
@@ -20,6 +20,7 @@
package org.apache.axis2.builder;
import org.apache.axiom.attachments.Attachments;
+import org.apache.axiom.mime.ContentType;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMException;
import org.apache.axis2.AxisFault;
@@ -27,9 +28,8 @@ import org.apache.axis2.Constants;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.util.MessageProcessorSelector;
-import javax.mail.internet.ContentType;
-import javax.mail.internet.ParseException;
import java.io.InputStream;
+import java.text.ParseException;
public class MIMEBuilder implements Builder {
Modified:
axis/axis2/java/core/trunk/modules/transport/base/src/main/java/org/apache/axis2/format/TextMessageBuilderAdapter.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/transport/base/src/main/java/org/apache/axis2/format/TextMessageBuilderAdapter.java?rev=1509409&r1=1509408&r2=1509409&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/transport/base/src/main/java/org/apache/axis2/format/TextMessageBuilderAdapter.java
(original)
+++
axis/axis2/java/core/trunk/modules/transport/base/src/main/java/org/apache/axis2/format/TextMessageBuilderAdapter.java
Thu Aug 1 20:10:19 2013
@@ -22,10 +22,9 @@ package org.apache.axis2.format;
import java.io.InputStream;
import java.io.Reader;
import java.io.StringReader;
+import java.text.ParseException;
-import javax.mail.internet.ContentType;
-import javax.mail.internet.ParseException;
-
+import org.apache.axiom.mime.ContentType;
import org.apache.axiom.om.OMElement;
import org.apache.axis2.AxisFault;
import org.apache.axis2.Constants;
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=1509409&r1=1509408&r2=1509409&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/transport/testkit/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/transport/testkit/pom.xml Thu Aug 1
20:10:19 2013
@@ -83,6 +83,10 @@
<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>
