svn commit: r1509397 - /axis/axis2/java/core/trunk/modules/transport/http/pom.xml

[veithen]

Author: veithen
Date: Thu Aug  1 19:48:44 2013
New Revision: 1509397

URL: http://svn.apache.org/r1509397
Log:
Removed duplicate dependency declaration. Maven 3 doesn't like that.

Modified:
axis/axis2/java/core/trunk/modules/transport/http/pom.xml

Modified: axis/axis2/java/core/trunk/modules/transport/http/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/transport/http/pom.xml?rev=1509397&r1=1509396&r2=1509397&view=diff
==
--- axis/axis2/java/core/trunk/modules/transport/http/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/transport/http/pom.xml Thu Aug  1 
19:48:44 2013
@@ -114,10 +114,6 @@
 commons-httpclient
 
 
-org.apache.httpcomponents
-httpclient
-
-
 junit
 junit
 test

svn commit: r1509409 - in /axis/axis2/java/core/trunk/modules: adb-codegen/ adb/ kernel/ kernel/src/org/apache/axis2/builder/ transport/base/src/main/java/org/apache/axis2/format/ transport/testkit/

[veithen]

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 @@
 xmlunit
 test
 
+
+org.apache.geronimo.specs
+geronimo-javamail_1.4_spec
+
 
 http://axis.apache.org/axis2/java/core/
 

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 @@
 xmlunit
 test

+
+org.apache.geronimo.specs
+geronimo-javamail_1.4_spec
+test
+
 
 
 

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 @@
xmlunit
 test

+
+org.apache.geronimo.specs
+geronimo-javamail_1.4_spec
+test
+
 
 http://axis.apache.org/axis2/java/core/
 

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;
 im

svn commit: r1509438 - in /axis/axis2/java/core/trunk/modules: adb-codegen/pom.xml saaj/pom.xml transport/jms/src/main/java/org/apache/axis2/transport/jms/JMSUtils.java

[veithen]

Author: veithen
Date: Thu Aug  1 21:45:01 2013
New Revision: 1509438

URL: http://svn.apache.org/r1509438
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/saaj/pom.xml

axis/axis2/java/core/trunk/modules/transport/jms/src/main/java/org/apache/axis2/transport/jms/JMSUtils.java

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=1509438&r1=1509437&r2=1509438&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 21:45:01 
2013
@@ -67,6 +67,7 @@
 
 org.apache.geronimo.specs
 geronimo-javamail_1.4_spec
+test
 
 
 http://axis.apache.org/axis2/java/core/

Modified: axis/axis2/java/core/trunk/modules/saaj/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/saaj/pom.xml?rev=1509438&r1=1509437&r2=1509438&view=diff
==
--- axis/axis2/java/core/trunk/modules/saaj/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/saaj/pom.xml Thu Aug  1 21:45:01 2013
@@ -42,6 +42,10 @@
 geronimo-saaj_1.3_spec
 
 
+org.apache.geronimo.specs
+geronimo-javamail_1.4_spec
+
+
 org.apache.ws.commons.axiom
 axiom-dom
 runtime

Modified: 
axis/axis2/java/core/trunk/modules/transport/jms/src/main/java/org/apache/axis2/transport/jms/JMSUtils.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/transport/jms/src/main/java/org/apache/axis2/transport/jms/JMSUtils.java?rev=1509438&r1=1509437&r2=1509438&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/transport/jms/src/main/java/org/apache/axis2/transport/jms/JMSUtils.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/transport/jms/src/main/java/org/apache/axis2/transport/jms/JMSUtils.java
 Thu Aug  1 21:45:01 2013
@@ -15,6 +15,7 @@
 */
 package org.apache.axis2.transport.jms;
 
+import org.apache.axiom.mime.ContentType;
 import org.apache.axiom.om.OMElement;
 import org.apache.axis2.AxisFault;
 import org.apache.axis2.Constants;
@@ -36,14 +37,13 @@ import org.apache.axis2.transport.jms.io
 
 import javax.jms.*;
 import javax.jms.Queue;
-import javax.mail.internet.ContentType;
-import javax.mail.internet.ParseException;
 import javax.naming.Context;
 import javax.naming.NamingException;
 import javax.naming.Reference;
 import javax.naming.NameNotFoundException;
 
 import java.lang.reflect.Method;
+import java.text.ParseException;
 import java.util.*;
 
 /**