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 2013/07/31 19:09:39 UTC
svn commit: r1508961 - in /webservices/axiom/trunk/modules: axiom-dom/
axiom-impl/ axiom-jaxb/
axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/
axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/
Author: veithen
Date: Wed Jul 31 17:09:38 2013
New Revision: 1508961
URL: http://svn.apache.org/r1508961
Log:
AXIOM-418: Also removed the JavaMail dependency from the implementations (LLOM and DOOM).
Modified:
webservices/axiom/trunk/modules/axiom-dom/pom.xml
webservices/axiom/trunk/modules/axiom-impl/pom.xml
webservices/axiom/trunk/modules/axiom-jaxb/pom.xml
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestGetObject.java
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteDataHandlerProviderScenario.java
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteDataHandlerScenario.java
Modified: webservices/axiom/trunk/modules/axiom-dom/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-dom/pom.xml?rev=1508961&r1=1508960&r2=1508961&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-dom/pom.xml (original)
+++ webservices/axiom/trunk/modules/axiom-dom/pom.xml Wed Jul 31 17:09:38 2013
@@ -53,10 +53,6 @@
<artifactId>geronimo-activation_1.1_spec</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-javamail_1.4_spec</artifactId>
- </dependency>
- <dependency>
<groupId>${stax.impl.groupid}</groupId>
<artifactId>${stax.impl.artifact}</artifactId>
</dependency>
Modified: webservices/axiom/trunk/modules/axiom-impl/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-impl/pom.xml?rev=1508961&r1=1508960&r2=1508961&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-impl/pom.xml (original)
+++ webservices/axiom/trunk/modules/axiom-impl/pom.xml Wed Jul 31 17:09:38 2013
@@ -53,10 +53,6 @@
<artifactId>geronimo-activation_1.1_spec</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-javamail_1.4_spec</artifactId>
- </dependency>
- <dependency>
<groupId>${stax.impl.groupid}</groupId>
<artifactId>${stax.impl.artifact}</artifactId>
</dependency>
Modified: webservices/axiom/trunk/modules/axiom-jaxb/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-jaxb/pom.xml?rev=1508961&r1=1508960&r2=1508961&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-jaxb/pom.xml (original)
+++ webservices/axiom/trunk/modules/axiom-jaxb/pom.xml Wed Jul 31 17:09:38 2013
@@ -68,6 +68,12 @@
<artifactId>commons-io</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <!-- Necessary for some tests that construct a DataHandler form an object with content type text/plain -->
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-javamail_1.4_spec</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
<plugins>
Modified: webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestGetObject.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestGetObject.java?rev=1508961&r1=1508960&r2=1508961&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestGetObject.java (original)
+++ webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestGetObject.java Wed Jul 31 17:09:38 2013
@@ -20,10 +20,10 @@ package org.apache.axiom.ts.om.sourcedel
import java.nio.charset.Charset;
-import javax.activation.DataHandler;
import javax.activation.DataSource;
import javax.xml.namespace.QName;
+import org.apache.axiom.attachments.ByteArrayDataSource;
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMMetaFactory;
import org.apache.axiom.om.OMSourcedElement;
@@ -39,7 +39,7 @@ public class TestGetObject extends Axiom
protected void runTest() throws Throwable {
OMFactory factory = metaFactory.getOMFactory();
- DataSource ds = new DataHandler("test", "text/plain; charset=utf-8").getDataSource();
+ DataSource ds = new ByteArrayDataSource("test".getBytes("utf-8"), "text/plain; charset=utf-8");
OMSourcedElement element = factory.createOMElement(new WrappedTextNodeOMDataSourceFromDataSource(new QName("wrapper"), ds, Charset.forName("utf-8")));
// getObject returns null if the data source is not of the expected type
assertNull(element.getObject(CharArrayDataSource.class));
Modified: webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteDataHandlerProviderScenario.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteDataHandlerProviderScenario.java?rev=1508961&r1=1508960&r2=1508961&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteDataHandlerProviderScenario.java (original)
+++ webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteDataHandlerProviderScenario.java Wed Jul 31 17:09:38 2013
@@ -30,6 +30,7 @@ import org.apache.axiom.ext.stax.datahan
import org.apache.axiom.ext.stax.datahandler.DataHandlerWriter;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMText;
+import org.apache.axiom.testutils.activation.RandomDataSource;
import org.apache.axiom.testutils.io.IOTestUtils;
import org.apache.axiom.testutils.suite.MatrixTestCase;
import org.apache.axiom.util.stax.XMLStreamWriterUtils;
@@ -40,7 +41,7 @@ import org.junit.Assert;
* creates an {@link OMText} backed by a {@link DataHandlerProvider}.
*/
public class WriteDataHandlerProviderScenario implements PushOMDataSourceScenario {
- private final DataHandler dh = new DataHandler("test", "text/plain");
+ private final DataHandler dh = new DataHandler(new RandomDataSource(1024));
private final DataHandlerProvider dhp = new DataHandlerProvider() {
public boolean isLoaded() {
return true;
Modified: webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteDataHandlerScenario.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteDataHandlerScenario.java?rev=1508961&r1=1508960&r2=1508961&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteDataHandlerScenario.java (original)
+++ webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteDataHandlerScenario.java Wed Jul 31 17:09:38 2013
@@ -29,6 +29,7 @@ import javax.xml.stream.XMLStreamWriter;
import org.apache.axiom.ext.stax.datahandler.DataHandlerWriter;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMText;
+import org.apache.axiom.testutils.activation.RandomDataSource;
import org.apache.axiom.testutils.io.IOTestUtils;
import org.apache.axiom.testutils.suite.MatrixTestCase;
import org.apache.axiom.util.stax.XMLStreamWriterUtils;
@@ -39,7 +40,7 @@ import org.junit.Assert;
* {@link OMText} backed by a {@link DataHandler}.
*/
public class WriteDataHandlerScenario implements PushOMDataSourceScenario {
- private final DataHandler dh = new DataHandler("test", "text/plain");
+ private final DataHandler dh = new DataHandler(new RandomDataSource(1024));
public void addTestParameters(MatrixTestCase testCase) {
testCase.addTestParameter("scenario", "writeDataHandler");