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

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 @@
             <artifactId>geronimo-saaj_1.3_spec</artifactId>
         </dependency>
         <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-javamail_1.4_spec</artifactId>
+        </dependency>
+        <dependency>
             <groupId>org.apache.ws.commons.axiom</groupId>
             <artifactId>axiom-dom</artifactId>
             <scope>runtime</scope>

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.*;
 
 /**


Reply via email to