This is an automated email from the ASF dual-hosted git repository.
veithen pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ws-axiom.git
The following commit(s) were added to refs/heads/master by this push:
new 4b355ea28 [AXIOM-506] Move BlobDataSource to a package dedicated to
Activation
4b355ea28 is described below
commit 4b355ea28f802e9e6b41d2a2147567a9dbaaf8fe
Author: Andreas Veithen <andreas.veit...@gmail.com>
AuthorDate: Mon Oct 31 22:11:48 2022 +0000
[AXIOM-506] Move BlobDataSource to a package dedicated to Activation
That's needed because ultimately that class should be in a different JAR
(together with other code related to Activation).
---
.../org/apache/axiom/{blob => util/activation}/BlobDataSource.java | 3 ++-
.../src/main/java/org/apache/axiom/util/stax/XMLStreamReaderUtils.java | 2 +-
.../java/org/apache/axiom/om/ds/jaxb/AttachmentMarshallerImpl.java | 2 +-
.../src/main/java/org/apache/axiom/om/impl/intf/TextContent.java | 2 +-
.../main/java/org/apache/axiom/ts/om/sourcedelement/TestGetObject.java | 2 +-
5 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/axiom-api/src/main/java/org/apache/axiom/blob/BlobDataSource.java
b/axiom-api/src/main/java/org/apache/axiom/util/activation/BlobDataSource.java
similarity index 95%
rename from axiom-api/src/main/java/org/apache/axiom/blob/BlobDataSource.java
rename to
axiom-api/src/main/java/org/apache/axiom/util/activation/BlobDataSource.java
index 34950dcdd..7f6468480 100644
--- a/axiom-api/src/main/java/org/apache/axiom/blob/BlobDataSource.java
+++
b/axiom-api/src/main/java/org/apache/axiom/util/activation/BlobDataSource.java
@@ -17,12 +17,13 @@
* under the License.
*/
-package org.apache.axiom.blob;
+package org.apache.axiom.util.activation;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
+import org.apache.axiom.blob.Blob;
import org.apache.axiom.ext.activation.SizeAwareDataSource;
/**
diff --git
a/axiom-api/src/main/java/org/apache/axiom/util/stax/XMLStreamReaderUtils.java
b/axiom-api/src/main/java/org/apache/axiom/util/stax/XMLStreamReaderUtils.java
index 09f511455..966d20246 100644
---
a/axiom-api/src/main/java/org/apache/axiom/util/stax/XMLStreamReaderUtils.java
+++
b/axiom-api/src/main/java/org/apache/axiom/util/stax/XMLStreamReaderUtils.java
@@ -28,12 +28,12 @@ import javax.xml.stream.XMLStreamConstants;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
-import org.apache.axiom.blob.BlobDataSource;
import org.apache.axiom.blob.Blobs;
import org.apache.axiom.blob.MemoryBlob;
import org.apache.axiom.ext.stax.CharacterDataReader;
import org.apache.axiom.ext.stax.DelegatingXMLStreamReader;
import org.apache.axiom.ext.stax.datahandler.DataHandlerReader;
+import org.apache.axiom.util.activation.BlobDataSource;
import org.apache.axiom.util.activation.EmptyDataSource;
import org.apache.axiom.util.base64.Base64DecodingOutputStreamWriter;
import org.apache.commons.logging.Log;
diff --git
a/axiom-jaxb/src/main/java/org/apache/axiom/om/ds/jaxb/AttachmentMarshallerImpl.java
b/axiom-jaxb/src/main/java/org/apache/axiom/om/ds/jaxb/AttachmentMarshallerImpl.java
index 0a3fb3a7f..cf63dca35 100644
---
a/axiom-jaxb/src/main/java/org/apache/axiom/om/ds/jaxb/AttachmentMarshallerImpl.java
+++
b/axiom-jaxb/src/main/java/org/apache/axiom/om/ds/jaxb/AttachmentMarshallerImpl.java
@@ -21,9 +21,9 @@ package org.apache.axiom.om.ds.jaxb;
import javax.activation.DataHandler;
import javax.xml.bind.attachment.AttachmentMarshaller;
-import org.apache.axiom.blob.BlobDataSource;
import org.apache.axiom.blob.Blobs;
import org.apache.axiom.om.impl.MTOMXMLStreamWriter;
+import org.apache.axiom.util.activation.BlobDataSource;
final class AttachmentMarshallerImpl extends AttachmentMarshaller {
private final MTOMXMLStreamWriter out;
diff --git
a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/intf/TextContent.java
b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/intf/TextContent.java
index 45a62c336..71dad3b94 100644
---
a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/intf/TextContent.java
+++
b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/intf/TextContent.java
@@ -22,7 +22,6 @@ import java.io.IOException;
import javax.activation.DataHandler;
-import org.apache.axiom.blob.BlobDataSource;
import org.apache.axiom.blob.Blobs;
import org.apache.axiom.core.ClonePolicy;
import org.apache.axiom.core.CloneableCharacterData;
@@ -32,6 +31,7 @@ import
org.apache.axiom.ext.stax.datahandler.DataHandlerProvider;
import org.apache.axiom.om.OMCloneOptions;
import org.apache.axiom.om.OMException;
import org.apache.axiom.util.UIDGenerator;
+import org.apache.axiom.util.activation.BlobDataSource;
import org.apache.axiom.util.base64.AbstractBase64EncodingOutputStream;
import org.apache.axiom.util.base64.Base64EncodingStringBufferOutputStream;
import org.apache.axiom.util.base64.Base64Utils;
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestGetObject.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestGetObject.java
index 3b21f1ff9..844218766 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestGetObject.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestGetObject.java
@@ -23,7 +23,6 @@ import java.nio.charset.Charset;
import javax.activation.DataSource;
import javax.xml.namespace.QName;
-import org.apache.axiom.blob.BlobDataSource;
import org.apache.axiom.blob.Blobs;
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMMetaFactory;
@@ -32,6 +31,7 @@ import org.apache.axiom.om.ds.StringOMDataSource;
import org.apache.axiom.om.ds.WrappedTextNodeOMDataSource;
import org.apache.axiom.om.ds.WrappedTextNodeOMDataSourceFromDataSource;
import org.apache.axiom.ts.AxiomTestCase;
+import org.apache.axiom.util.activation.BlobDataSource;
public class TestGetObject extends AxiomTestCase {
public TestGetObject(OMMetaFactory metaFactory) {
