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/10 11:10:51 UTC
svn commit: r1678541 - in /webservices/axiom/trunk:
modules/axiom-api/src/main/java/org/apache/axiom/blob/
modules/axiom-api/src/main/java/org/apache/axiom/util/blob/
modules/axiom-api/src/main/java/org/apache/axiom/util/stax/
modules/axiom-api/src/tes...
Author: veithen
Date: Sun May 10 09:10:50 2015
New Revision: 1678541
URL: http://svn.apache.org/r1678541
Log:
Move org.apache.axiom.util.blob to org.apache.axiom.blob and keep a copy of the original package in axiom-compat.
Rationale:
* We will modify the blob API in incompatible ways.
* We will use the blob API in the attachments API, but a public API should not depend on a utility API.
Added:
webservices/axiom/trunk/modules/axiom-api/src/main/java/org/apache/axiom/blob/
- copied from r1678528, webservices/axiom/trunk/modules/axiom-api/src/main/java/org/apache/axiom/util/blob/
webservices/axiom/trunk/modules/axiom-api/src/main/java/org/apache/axiom/blob/MemoryBlob.java
- copied, changed from r1678531, webservices/axiom/trunk/modules/axiom-api/src/main/java/org/apache/axiom/util/blob/MemoryBlob.java
webservices/axiom/trunk/modules/axiom-api/src/main/java/org/apache/axiom/blob/OverflowBlob.java
- copied, changed from r1678531, webservices/axiom/trunk/modules/axiom-api/src/main/java/org/apache/axiom/util/blob/OverflowBlob.java
webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/blob/
- copied from r1678528, webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/util/blob/
webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/blob/TestReadFromCommitted.java
- copied, changed from r1678531, webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/util/blob/TestReadFromCommitted.java
webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/blob/WritableBlobTestSuiteBuilder.java
- copied, changed from r1678531, webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/util/blob/WritableBlobTestSuiteBuilder.java
webservices/axiom/trunk/modules/axiom-compat/src/main/java/org/apache/axiom/util/
webservices/axiom/trunk/modules/axiom-compat/src/main/java/org/apache/axiom/util/blob/ (props changed)
- copied from r1435922, webservices/axiom/trunk/modules/axiom-api/src/main/java/org/apache/axiom/util/blob/
Removed:
webservices/axiom/trunk/modules/axiom-api/src/main/java/org/apache/axiom/util/blob/
webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/util/blob/
Modified:
webservices/axiom/trunk/modules/axiom-api/src/main/java/org/apache/axiom/blob/Blob.java
webservices/axiom/trunk/modules/axiom-api/src/main/java/org/apache/axiom/blob/BlobDataSource.java
webservices/axiom/trunk/modules/axiom-api/src/main/java/org/apache/axiom/blob/BlobOutputStream.java
webservices/axiom/trunk/modules/axiom-api/src/main/java/org/apache/axiom/blob/WritableBlob.java
webservices/axiom/trunk/modules/axiom-api/src/main/java/org/apache/axiom/util/stax/XMLStreamReaderUtils.java
webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/blob/MemoryBlobTest.java
webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/blob/OverflowBlobTest.java
webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/blob/TestGetInputStreamNew.java
webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/blob/TestGetInputStreamUncommitted.java
webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/blob/TestGetOutputStreamCommitted.java
webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/blob/TestGetOutputStreamUncommitted.java
webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/blob/TestMarkReset.java
webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/blob/TestRandomReadWrite.java
webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/blob/TestReadFrom.java
webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/blob/WritableBlobFactory.java
webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/blob/WritableBlobTestCase.java
webservices/axiom/trunk/modules/axiom-compat/src/main/java/org/apache/axiom/util/blob/Blob.java
webservices/axiom/trunk/modules/axiom-compat/src/main/java/org/apache/axiom/util/blob/BlobDataSource.java
webservices/axiom/trunk/modules/axiom-compat/src/main/java/org/apache/axiom/util/blob/BlobOutputStream.java
webservices/axiom/trunk/modules/axiom-compat/src/main/java/org/apache/axiom/util/blob/MemoryBlob.java
webservices/axiom/trunk/modules/axiom-compat/src/main/java/org/apache/axiom/util/blob/OverflowBlob.java
webservices/axiom/trunk/modules/axiom-compat/src/main/java/org/apache/axiom/util/blob/WritableBlob.java
webservices/axiom/trunk/systests/integration-tests/src/test/java/org/apache/axiom/om/impl/builder/JAXBCustomBuilderTest.java
Modified: webservices/axiom/trunk/modules/axiom-api/src/main/java/org/apache/axiom/blob/Blob.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-api/src/main/java/org/apache/axiom/blob/Blob.java?rev=1678541&r1=1678528&r2=1678541&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-api/src/main/java/org/apache/axiom/blob/Blob.java (original)
+++ webservices/axiom/trunk/modules/axiom-api/src/main/java/org/apache/axiom/blob/Blob.java Sun May 10 09:10:50 2015
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.axiom.util.blob;
+package org.apache.axiom.blob;
import java.io.IOException;
import java.io.InputStream;
Modified: webservices/axiom/trunk/modules/axiom-api/src/main/java/org/apache/axiom/blob/BlobDataSource.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-api/src/main/java/org/apache/axiom/blob/BlobDataSource.java?rev=1678541&r1=1678528&r2=1678541&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-api/src/main/java/org/apache/axiom/blob/BlobDataSource.java (original)
+++ webservices/axiom/trunk/modules/axiom-api/src/main/java/org/apache/axiom/blob/BlobDataSource.java Sun May 10 09:10:50 2015
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.axiom.util.blob;
+package org.apache.axiom.blob;
import java.io.IOException;
import java.io.InputStream;
Modified: webservices/axiom/trunk/modules/axiom-api/src/main/java/org/apache/axiom/blob/BlobOutputStream.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-api/src/main/java/org/apache/axiom/blob/BlobOutputStream.java?rev=1678541&r1=1678528&r2=1678541&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-api/src/main/java/org/apache/axiom/blob/BlobOutputStream.java (original)
+++ webservices/axiom/trunk/modules/axiom-api/src/main/java/org/apache/axiom/blob/BlobOutputStream.java Sun May 10 09:10:50 2015
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.axiom.util.blob;
+package org.apache.axiom.blob;
import java.io.InputStream;
import java.io.OutputStream;
Copied: webservices/axiom/trunk/modules/axiom-api/src/main/java/org/apache/axiom/blob/MemoryBlob.java (from r1678531, webservices/axiom/trunk/modules/axiom-api/src/main/java/org/apache/axiom/util/blob/MemoryBlob.java)
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-api/src/main/java/org/apache/axiom/blob/MemoryBlob.java?p2=webservices/axiom/trunk/modules/axiom-api/src/main/java/org/apache/axiom/blob/MemoryBlob.java&p1=webservices/axiom/trunk/modules/axiom-api/src/main/java/org/apache/axiom/util/blob/MemoryBlob.java&r1=1678531&r2=1678541&rev=1678541&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-api/src/main/java/org/apache/axiom/util/blob/MemoryBlob.java (original)
+++ webservices/axiom/trunk/modules/axiom-api/src/main/java/org/apache/axiom/blob/MemoryBlob.java Sun May 10 09:10:50 2015
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.axiom.util.blob;
+package org.apache.axiom.blob;
import java.io.IOException;
import java.io.InputStream;
Copied: webservices/axiom/trunk/modules/axiom-api/src/main/java/org/apache/axiom/blob/OverflowBlob.java (from r1678531, webservices/axiom/trunk/modules/axiom-api/src/main/java/org/apache/axiom/util/blob/OverflowBlob.java)
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-api/src/main/java/org/apache/axiom/blob/OverflowBlob.java?p2=webservices/axiom/trunk/modules/axiom-api/src/main/java/org/apache/axiom/blob/OverflowBlob.java&p1=webservices/axiom/trunk/modules/axiom-api/src/main/java/org/apache/axiom/util/blob/OverflowBlob.java&r1=1678531&r2=1678541&rev=1678541&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-api/src/main/java/org/apache/axiom/util/blob/OverflowBlob.java (original)
+++ webservices/axiom/trunk/modules/axiom-api/src/main/java/org/apache/axiom/blob/OverflowBlob.java Sun May 10 09:10:50 2015
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.axiom.util.blob;
+package org.apache.axiom.blob;
import java.io.File;
import java.io.FileInputStream;
Modified: webservices/axiom/trunk/modules/axiom-api/src/main/java/org/apache/axiom/blob/WritableBlob.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-api/src/main/java/org/apache/axiom/blob/WritableBlob.java?rev=1678541&r1=1678528&r2=1678541&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-api/src/main/java/org/apache/axiom/blob/WritableBlob.java (original)
+++ webservices/axiom/trunk/modules/axiom-api/src/main/java/org/apache/axiom/blob/WritableBlob.java Sun May 10 09:10:50 2015
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.axiom.util.blob;
+package org.apache.axiom.blob;
import java.io.IOException;
import java.io.InputStream;
Modified: webservices/axiom/trunk/modules/axiom-api/src/main/java/org/apache/axiom/util/stax/XMLStreamReaderUtils.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-api/src/main/java/org/apache/axiom/util/stax/XMLStreamReaderUtils.java?rev=1678541&r1=1678540&r2=1678541&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-api/src/main/java/org/apache/axiom/util/stax/XMLStreamReaderUtils.java (original)
+++ webservices/axiom/trunk/modules/axiom-api/src/main/java/org/apache/axiom/util/stax/XMLStreamReaderUtils.java Sun May 10 09:10:50 2015
@@ -28,15 +28,15 @@ import javax.xml.stream.XMLStreamConstan
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
+import org.apache.axiom.blob.BlobDataSource;
+import org.apache.axiom.blob.MemoryBlob;
+import org.apache.axiom.blob.WritableBlob;
import org.apache.axiom.ext.stax.CharacterDataReader;
import org.apache.axiom.ext.stax.DelegatingXMLStreamReader;
import org.apache.axiom.ext.stax.datahandler.DataHandlerProvider;
import org.apache.axiom.ext.stax.datahandler.DataHandlerReader;
import org.apache.axiom.util.activation.EmptyDataSource;
import org.apache.axiom.util.base64.Base64DecodingOutputStreamWriter;
-import org.apache.axiom.util.blob.BlobDataSource;
-import org.apache.axiom.util.blob.MemoryBlob;
-import org.apache.axiom.util.blob.WritableBlob;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Modified: webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/blob/MemoryBlobTest.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/blob/MemoryBlobTest.java?rev=1678541&r1=1678528&r2=1678541&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/blob/MemoryBlobTest.java (original)
+++ webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/blob/MemoryBlobTest.java Sun May 10 09:10:50 2015
@@ -16,7 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.axiom.util.blob;
+package org.apache.axiom.blob;
+
+import org.apache.axiom.blob.MemoryBlob;
+import org.apache.axiom.blob.WritableBlob;
import junit.framework.TestCase;
import junit.framework.TestSuite;
Modified: webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/blob/OverflowBlobTest.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/blob/OverflowBlobTest.java?rev=1678541&r1=1678528&r2=1678541&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/blob/OverflowBlobTest.java (original)
+++ webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/blob/OverflowBlobTest.java Sun May 10 09:10:50 2015
@@ -16,7 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.axiom.util.blob;
+package org.apache.axiom.blob;
+
+import org.apache.axiom.blob.OverflowBlob;
+import org.apache.axiom.blob.WritableBlob;
import junit.framework.TestCase;
import junit.framework.TestSuite;
Modified: webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/blob/TestGetInputStreamNew.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/blob/TestGetInputStreamNew.java?rev=1678541&r1=1678528&r2=1678541&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/blob/TestGetInputStreamNew.java (original)
+++ webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/blob/TestGetInputStreamNew.java Sun May 10 09:10:50 2015
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.axiom.util.blob;
+package org.apache.axiom.blob;
import static com.google.common.truth.Truth.assertThat;
@@ -24,6 +24,7 @@ import java.io.InputStream;
import java.io.OutputStream;
import java.util.Random;
+import org.apache.axiom.blob.WritableBlob;
import org.apache.commons.io.IOUtils;
public class TestGetInputStreamNew extends WritableBlobTestCase {
Modified: webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/blob/TestGetInputStreamUncommitted.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/blob/TestGetInputStreamUncommitted.java?rev=1678541&r1=1678528&r2=1678541&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/blob/TestGetInputStreamUncommitted.java (original)
+++ webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/blob/TestGetInputStreamUncommitted.java Sun May 10 09:10:50 2015
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.axiom.util.blob;
+package org.apache.axiom.blob;
import static com.google.common.truth.Truth.assertThat;
@@ -24,6 +24,7 @@ import java.io.InputStream;
import java.io.OutputStream;
import java.util.Random;
+import org.apache.axiom.blob.WritableBlob;
import org.apache.commons.io.IOUtils;
public class TestGetInputStreamUncommitted extends WritableBlobTestCase {
Modified: webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/blob/TestGetOutputStreamCommitted.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/blob/TestGetOutputStreamCommitted.java?rev=1678541&r1=1678528&r2=1678541&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/blob/TestGetOutputStreamCommitted.java (original)
+++ webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/blob/TestGetOutputStreamCommitted.java Sun May 10 09:10:50 2015
@@ -16,10 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.axiom.util.blob;
+package org.apache.axiom.blob;
import java.io.OutputStream;
+import org.apache.axiom.blob.WritableBlob;
+
public class TestGetOutputStreamCommitted extends WritableBlobTestCase {
public TestGetOutputStreamCommitted(WritableBlobFactory factory) {
super(factory);
Modified: webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/blob/TestGetOutputStreamUncommitted.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/blob/TestGetOutputStreamUncommitted.java?rev=1678541&r1=1678528&r2=1678541&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/blob/TestGetOutputStreamUncommitted.java (original)
+++ webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/blob/TestGetOutputStreamUncommitted.java Sun May 10 09:10:50 2015
@@ -16,10 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.axiom.util.blob;
+package org.apache.axiom.blob;
import java.io.OutputStream;
+import org.apache.axiom.blob.WritableBlob;
+
public class TestGetOutputStreamUncommitted extends WritableBlobTestCase {
public TestGetOutputStreamUncommitted(WritableBlobFactory factory) {
super(factory);
Modified: webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/blob/TestMarkReset.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/blob/TestMarkReset.java?rev=1678541&r1=1678528&r2=1678541&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/blob/TestMarkReset.java (original)
+++ webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/blob/TestMarkReset.java Sun May 10 09:10:50 2015
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.axiom.util.blob;
+package org.apache.axiom.blob;
import static com.google.common.truth.Truth.assertThat;
@@ -24,6 +24,8 @@ import java.io.DataInputStream;
import java.io.OutputStream;
import java.util.Random;
+import org.apache.axiom.blob.WritableBlob;
+
public class TestMarkReset extends WritableBlobTestCase {
public TestMarkReset(WritableBlobFactory factory) {
super(factory);
Modified: webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/blob/TestRandomReadWrite.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/blob/TestRandomReadWrite.java?rev=1678541&r1=1678528&r2=1678541&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/blob/TestRandomReadWrite.java (original)
+++ webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/blob/TestRandomReadWrite.java Sun May 10 09:10:50 2015
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.axiom.util.blob;
+package org.apache.axiom.blob;
import static com.google.common.truth.Truth.assertThat;
@@ -24,6 +24,8 @@ import java.io.InputStream;
import java.io.OutputStream;
import java.util.Random;
+import org.apache.axiom.blob.WritableBlob;
+
public class TestRandomReadWrite extends WritableBlobTestCase {
private final int size;
Modified: webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/blob/TestReadFrom.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/blob/TestReadFrom.java?rev=1678541&r1=1678528&r2=1678541&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/blob/TestReadFrom.java (original)
+++ webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/blob/TestReadFrom.java Sun May 10 09:10:50 2015
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.axiom.util.blob;
+package org.apache.axiom.blob;
import static com.google.common.truth.Truth.assertThat;
@@ -24,6 +24,7 @@ import java.io.ByteArrayInputStream;
import java.io.InputStream;
import java.util.Random;
+import org.apache.axiom.blob.WritableBlob;
import org.apache.commons.io.IOUtils;
public class TestReadFrom extends WritableBlobTestCase {
Copied: webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/blob/TestReadFromCommitted.java (from r1678531, webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/util/blob/TestReadFromCommitted.java)
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/blob/TestReadFromCommitted.java?p2=webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/blob/TestReadFromCommitted.java&p1=webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/util/blob/TestReadFromCommitted.java&r1=1678531&r2=1678541&rev=1678541&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/util/blob/TestReadFromCommitted.java (original)
+++ webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/blob/TestReadFromCommitted.java Sun May 10 09:10:50 2015
@@ -16,8 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.axiom.util.blob;
+package org.apache.axiom.blob;
+import org.apache.axiom.blob.WritableBlob;
import org.apache.commons.io.input.NullInputStream;
public class TestReadFromCommitted extends WritableBlobTestCase {
Modified: webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/blob/WritableBlobFactory.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/blob/WritableBlobFactory.java?rev=1678541&r1=1678528&r2=1678541&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/blob/WritableBlobFactory.java (original)
+++ webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/blob/WritableBlobFactory.java Sun May 10 09:10:50 2015
@@ -16,7 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.axiom.util.blob;
+package org.apache.axiom.blob;
+
+import org.apache.axiom.blob.WritableBlob;
public interface WritableBlobFactory {
WritableBlob createBlob();
Modified: webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/blob/WritableBlobTestCase.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/blob/WritableBlobTestCase.java?rev=1678541&r1=1678528&r2=1678541&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/blob/WritableBlobTestCase.java (original)
+++ webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/blob/WritableBlobTestCase.java Sun May 10 09:10:50 2015
@@ -16,8 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.axiom.util.blob;
+package org.apache.axiom.blob;
+import org.apache.axiom.blob.WritableBlob;
import org.apache.axiom.testutils.suite.MatrixTestCase;
public abstract class WritableBlobTestCase extends MatrixTestCase {
Copied: webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/blob/WritableBlobTestSuiteBuilder.java (from r1678531, webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/util/blob/WritableBlobTestSuiteBuilder.java)
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/blob/WritableBlobTestSuiteBuilder.java?p2=webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/blob/WritableBlobTestSuiteBuilder.java&p1=webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/util/blob/WritableBlobTestSuiteBuilder.java&r1=1678531&r2=1678541&rev=1678541&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/util/blob/WritableBlobTestSuiteBuilder.java (original)
+++ webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/blob/WritableBlobTestSuiteBuilder.java Sun May 10 09:10:50 2015
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.axiom.util.blob;
+package org.apache.axiom.blob;
import org.apache.axiom.testutils.suite.MatrixTestSuiteBuilder;
Propchange: webservices/axiom/trunk/modules/axiom-compat/src/main/java/org/apache/axiom/util/blob/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sun May 10 09:10:50 2015
@@ -0,0 +1,12 @@
+/webservices/axiom/branches/AXIOM-201/modules/axiom-api/src/main/java/org/apache/axiom/util/blob:1183599-1433135
+/webservices/axiom/branches/AXIOM-399/modules/axiom-api/src/main/java/org/apache/axiom/util/blob:1329379-1331100
+/webservices/axiom/branches/AXIOM-412/modules/axiom-api/src/main/java/org/apache/axiom/util/blob:1311325-1325526
+/webservices/axiom/branches/AXIOM-420/modules/axiom-api/src/main/java/org/apache/axiom/util/blob:1334121-1336372
+/webservices/axiom/branches/AXIOM-435/modules/axiom-api/src/main/java/org/apache/axiom/util/blob:1361507-1366198
+/webservices/axiom/branches/AXIOM-437/modules/axiom-api/src/main/java/org/apache/axiom/util/blob:1364041-1364239
+/webservices/axiom/branches/CHECK_PARENT_BUG/modules/axiom-api/src/main/java/org/apache/axiom/util/blob:1338398-1338886
+/webservices/axiom/branches/CLONE/modules/axiom-api/src/main/java/org/apache/axiom/util/blob:1337822-1339011
+/webservices/axiom/branches/CLONE_NODE/modules/axiom-api/src/main/java/org/apache/axiom/util/blob:1346607-1353106
+/webservices/axiom/branches/JAXB2_DS/modules/axiom-api/src/main/java/org/apache/axiom/util/blob:1366463-1367737
+/webservices/axiom/branches/namespaceURIInterning/modules/axiom-api/src/main/java/org/apache/axiom/util/blob:1293148-1293587
+/webservices/axiom/branches/osgi-redesign/modules/axiom-api/src/main/java/org/apache/axiom/util/blob:1180368-1180596
Modified: webservices/axiom/trunk/modules/axiom-compat/src/main/java/org/apache/axiom/util/blob/Blob.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-compat/src/main/java/org/apache/axiom/util/blob/Blob.java?rev=1678541&r1=1435922&r2=1678541&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-compat/src/main/java/org/apache/axiom/util/blob/Blob.java (original)
+++ webservices/axiom/trunk/modules/axiom-compat/src/main/java/org/apache/axiom/util/blob/Blob.java Sun May 10 09:10:50 2015
@@ -31,6 +31,8 @@ import org.apache.axiom.ext.io.StreamCop
* Not that blobs are not thread safe. While they support requesting multiple concurrent input
* streams, these streams must be used in the same thread, unless appropriate synchronization or
* locking is done.
+ *
+ * @deprecated Use {@link org.apache.axiom.blob.Blob} instead.
*/
public interface Blob {
/**
Modified: webservices/axiom/trunk/modules/axiom-compat/src/main/java/org/apache/axiom/util/blob/BlobDataSource.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-compat/src/main/java/org/apache/axiom/util/blob/BlobDataSource.java?rev=1678541&r1=1435922&r2=1678541&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-compat/src/main/java/org/apache/axiom/util/blob/BlobDataSource.java (original)
+++ webservices/axiom/trunk/modules/axiom-compat/src/main/java/org/apache/axiom/util/blob/BlobDataSource.java Sun May 10 09:10:50 2015
@@ -27,6 +27,8 @@ import org.apache.axiom.ext.activation.S
/**
* Data source backed by a {@link Blob}.
+ *
+ * @deprecated Use {@link org.apache.axiom.blob.BlobDataSource} instead.
*/
public class BlobDataSource implements SizeAwareDataSource {
private final Blob blob;
Modified: webservices/axiom/trunk/modules/axiom-compat/src/main/java/org/apache/axiom/util/blob/BlobOutputStream.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-compat/src/main/java/org/apache/axiom/util/blob/BlobOutputStream.java?rev=1678541&r1=1435922&r2=1678541&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-compat/src/main/java/org/apache/axiom/util/blob/BlobOutputStream.java (original)
+++ webservices/axiom/trunk/modules/axiom-compat/src/main/java/org/apache/axiom/util/blob/BlobOutputStream.java Sun May 10 09:10:50 2015
@@ -28,6 +28,8 @@ import org.apache.axiom.ext.io.StreamCop
/**
* Output stream that is used to write to a blob. Instances of this class are returned by the
* {@link WritableBlob#getOutputStream()} method.
+ *
+ * @deprecated Use {@link org.apache.axiom.blob.BlobOutputStream} instead.
*/
public abstract class BlobOutputStream extends OutputStream implements ReadFromSupport {
/**
Modified: webservices/axiom/trunk/modules/axiom-compat/src/main/java/org/apache/axiom/util/blob/MemoryBlob.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-compat/src/main/java/org/apache/axiom/util/blob/MemoryBlob.java?rev=1678541&r1=1435922&r2=1678541&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-compat/src/main/java/org/apache/axiom/util/blob/MemoryBlob.java (original)
+++ webservices/axiom/trunk/modules/axiom-compat/src/main/java/org/apache/axiom/util/blob/MemoryBlob.java Sun May 10 09:10:50 2015
@@ -29,6 +29,8 @@ import org.apache.axiom.ext.io.StreamCop
/**
* Blob implementation that stores data in memory.
+ *
+ * @deprecated Use {@link org.apache.axiom.blob.MemoryBlob} instead.
*/
public class MemoryBlob implements WritableBlob {
// TODO: this should be configurable
Modified: webservices/axiom/trunk/modules/axiom-compat/src/main/java/org/apache/axiom/util/blob/OverflowBlob.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-compat/src/main/java/org/apache/axiom/util/blob/OverflowBlob.java?rev=1678541&r1=1435922&r2=1678541&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-compat/src/main/java/org/apache/axiom/util/blob/OverflowBlob.java (original)
+++ webservices/axiom/trunk/modules/axiom-compat/src/main/java/org/apache/axiom/util/blob/OverflowBlob.java Sun May 10 09:10:50 2015
@@ -37,6 +37,8 @@ import org.apache.commons.logging.LogFac
* transferred to a temporary file. The buffer is divided into a given number of fixed size chunks
* that are allocated on demand. Since a temporary file may be created it is mandatory to call
* {@link #release()} to discard the blob.
+ *
+ * @deprecated Use {@link org.apache.axiom.blob.OverflowBlob} instead.
*/
public class OverflowBlob implements WritableBlob {
private static final Log log = LogFactory.getLog(OverflowBlob.class);
Modified: webservices/axiom/trunk/modules/axiom-compat/src/main/java/org/apache/axiom/util/blob/WritableBlob.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-compat/src/main/java/org/apache/axiom/util/blob/WritableBlob.java?rev=1678541&r1=1435922&r2=1678541&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-compat/src/main/java/org/apache/axiom/util/blob/WritableBlob.java (original)
+++ webservices/axiom/trunk/modules/axiom-compat/src/main/java/org/apache/axiom/util/blob/WritableBlob.java Sun May 10 09:10:50 2015
@@ -42,6 +42,8 @@ import org.apache.axiom.ext.io.StreamCop
* return value of {@link #isSupportingReadUncommitted()}.
* <p>
* Blobs are not thread safe.
+ *
+ * @deprecated Use {@link org.apache.axiom.blob.WritableBlob} instead.
*/
public interface WritableBlob extends Blob {
/**
Modified: webservices/axiom/trunk/systests/integration-tests/src/test/java/org/apache/axiom/om/impl/builder/JAXBCustomBuilderTest.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/systests/integration-tests/src/test/java/org/apache/axiom/om/impl/builder/JAXBCustomBuilderTest.java?rev=1678541&r1=1678540&r2=1678541&view=diff
==============================================================================
--- webservices/axiom/trunk/systests/integration-tests/src/test/java/org/apache/axiom/om/impl/builder/JAXBCustomBuilderTest.java (original)
+++ webservices/axiom/trunk/systests/integration-tests/src/test/java/org/apache/axiom/om/impl/builder/JAXBCustomBuilderTest.java Sun May 10 09:10:50 2015
@@ -33,6 +33,7 @@ import javax.xml.namespace.QName;
import junit.framework.Assert;
import org.apache.axiom.attachments.Attachments;
+import org.apache.axiom.blob.MemoryBlob;
import org.apache.axiom.om.OMAbstractFactory;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
@@ -40,7 +41,6 @@ import org.apache.axiom.om.OMOutputForma
import org.apache.axiom.testutils.activation.RandomDataSource;
import org.apache.axiom.testutils.activation.TestDataSource;
import org.apache.axiom.testutils.io.IOTestUtils;
-import org.apache.axiom.util.blob.MemoryBlob;
import org.junit.BeforeClass;
import org.junit.Test;