You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by ve...@apache.org on 2015/05/17 22:03:20 UTC
svn commit: r1679895 - in /webservices/axiom/trunk: modules/axiom-api/ modules/axiom-api/src/test/java/org/apache/axiom/attachments/ modules/axiom-api/src/test/java/org/apache/axiom/om/ modules/axiom-compat/ testing/axiom-testsuite/src/main/java/org/ap...

Author: veithen
Date: Sun May 17 20:03:19 2015
New Revision: 1679895

URL: http://svn.apache.org/r1679895
Log:
Move MIMEResource to soap-testsuite.

Added:
    webservices/axiom/trunk/testing/soap-testsuite/src/main/java/org/apache/axiom/ts/soap/MIMEResource.java
      - copied, changed from r1679893, webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/om/MIMEResource.java
Removed:
    webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/om/MIMEResource.java
Modified:
    webservices/axiom/trunk/modules/axiom-api/pom.xml
    webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/attachments/AttachmentsTest.java
    webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/om/TestConstants.java
    webservices/axiom/trunk/modules/axiom-compat/pom.xml
    webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/xop/TestSerialize.java
    webservices/axiom/trunk/testing/soap-testsuite/pom.xml

Modified: webservices/axiom/trunk/modules/axiom-api/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-api/pom.xml?rev=1679895&r1=1679894&r2=1679895&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-api/pom.xml (original)
+++ webservices/axiom/trunk/modules/axiom-api/pom.xml Sun May 17 20:03:19 2015
@@ -106,6 +106,12 @@
             <scope>test</scope>
         </dependency>
         <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>soap-testsuite</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
             <scope>test</scope>

Modified: webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/attachments/AttachmentsTest.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/attachments/AttachmentsTest.java?rev=1679895&r1=1679894&r2=1679895&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/attachments/AttachmentsTest.java (original)
+++ webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/attachments/AttachmentsTest.java Sun May 17 20:03:19 2015
@@ -45,13 +45,13 @@ import javax.mail.util.ByteArrayDataSour
 import org.apache.axiom.attachments.lifecycle.DataHandlerExt;
 import org.apache.axiom.ext.activation.SizeAwareDataSource;
 import org.apache.axiom.om.AbstractTestCase;
-import org.apache.axiom.om.MIMEResource;
 import org.apache.axiom.om.OMException;
 import org.apache.axiom.om.TestConstants;
 import org.apache.axiom.om.impl.MTOMConstants;
 import org.apache.axiom.testutils.activation.RandomDataSource;
 import org.apache.axiom.testutils.io.ExceptionInputStream;
 import org.apache.axiom.testutils.io.IOTestUtils;
+import org.apache.axiom.ts.soap.MIMEResource;
 import org.apache.axiom.util.UIDGenerator;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.io.output.NullOutputStream;

Modified: webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/om/TestConstants.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/om/TestConstants.java?rev=1679895&r1=1679894&r2=1679895&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/om/TestConstants.java (original)
+++ webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/om/TestConstants.java Sun May 17 20:03:19 2015
@@ -19,6 +19,8 @@
 
 package org.apache.axiom.om;
 
+import org.apache.axiom.ts.soap.MIMEResource;
+
 /** All the various files created 03-Nov-2005 12:02:12 */
 
 public class TestConstants {

Modified: webservices/axiom/trunk/modules/axiom-compat/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-compat/pom.xml?rev=1679895&r1=1679894&r2=1679895&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-compat/pom.xml (original)
+++ webservices/axiom/trunk/modules/axiom-compat/pom.xml Sun May 17 20:03:19 2015
@@ -67,6 +67,12 @@
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
+            <artifactId>soap-testsuite</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
             <artifactId>axiom-impl</artifactId>
             <version>${project.version}</version>
             <scope>test</scope>

Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/xop/TestSerialize.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/xop/TestSerialize.java?rev=1679895&r1=1679894&r2=1679895&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/xop/TestSerialize.java (original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/xop/TestSerialize.java Sun May 17 20:03:19 2015
@@ -22,7 +22,6 @@ import java.io.ByteArrayOutputStream;
 import java.io.InputStream;
 
 import org.apache.axiom.attachments.Attachments;
-import org.apache.axiom.om.MIMEResource;
 import org.apache.axiom.om.OMElement;
 import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.om.OMOutputFormat;
@@ -32,6 +31,7 @@ import org.apache.axiom.om.TestConstants
 import org.apache.axiom.om.impl.MTOMXMLStreamWriter;
 import org.apache.axiom.om.util.StAXParserConfiguration;
 import org.apache.axiom.ts.AxiomTestCase;
+import org.apache.axiom.ts.soap.MIMEResource;
 
 public class TestSerialize extends AxiomTestCase {
     private final boolean base64;

Modified: webservices/axiom/trunk/testing/soap-testsuite/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/soap-testsuite/pom.xml?rev=1679895&r1=1679894&r2=1679895&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/soap-testsuite/pom.xml (original)
+++ webservices/axiom/trunk/testing/soap-testsuite/pom.xml Sun May 17 20:03:19 2015
@@ -40,6 +40,10 @@
             <version>${project.version}</version>
         </dependency>
         <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-javamail_1.4_spec</artifactId>
+        </dependency>
+        <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <scope>test</scope>

Copied: webservices/axiom/trunk/testing/soap-testsuite/src/main/java/org/apache/axiom/ts/soap/MIMEResource.java (from r1679893, webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/om/MIMEResource.java)
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/soap-testsuite/src/main/java/org/apache/axiom/ts/soap/MIMEResource.java?p2=webservices/axiom/trunk/testing/soap-testsuite/src/main/java/org/apache/axiom/ts/soap/MIMEResource.java&p1=webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/om/MIMEResource.java&r1=1679893&r2=1679895&rev=1679895&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/om/MIMEResource.java (original)
+++ webservices/axiom/trunk/testing/soap-testsuite/src/main/java/org/apache/axiom/ts/soap/MIMEResource.java Sun May 17 20:03:19 2015
@@ -16,12 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.axiom.om;
+package org.apache.axiom.ts.soap;
 
 import java.io.InputStream;
-import java.text.ParseException;
 
-import org.apache.axiom.mime.ContentType;
+import javax.mail.internet.ContentType;
+import javax.mail.internet.ParseException;
 
 public class MIMEResource {
     private final String name;