svn commit: r1737143 - in /axis/axis2/java/core/trunk/modules: jaxws-integration/test/org/apache/axis2/jaxws/xmlhttp/clientTests/dispatch/datasource/ jaxws/src/org/apache/axis2/jaxws/message/databinding/impl/ kernel/src/org/apache/axis2/builder/

[veithen]

Author: veithen
Date: Wed Mar 30 18:27:01 2016
New Revision: 1737143

URL: http://svn.apache.org/viewvc?rev=1737143&view=rev
Log:
Eliminate usage of deprecated Axiom APIs.

Modified:
    
axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/axis2/jaxws/xmlhttp/clientTests/dispatch/datasource/DispatchXMessageDataSourceTests.java
    
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/message/databinding/impl/DataSourceBlockImpl.java
    
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/builder/DataSourceBuilder.java

Modified: 
axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/axis2/jaxws/xmlhttp/clientTests/dispatch/datasource/DispatchXMessageDataSourceTests.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/axis2/jaxws/xmlhttp/clientTests/dispatch/datasource/DispatchXMessageDataSourceTests.java?rev=1737143&r1=1737142&r2=1737143&view=diff
==============================================================================
--- 
axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/axis2/jaxws/xmlhttp/clientTests/dispatch/datasource/DispatchXMessageDataSourceTests.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/axis2/jaxws/xmlhttp/clientTests/dispatch/datasource/DispatchXMessageDataSourceTests.java
 Wed Mar 30 18:27:01 2016
@@ -23,8 +23,8 @@ import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.apache.axis2.jaxws.framework.AbstractTestCase;
 import org.apache.axis2.jaxws.provider.DataSourceImpl;
-import org.apache.axiom.attachments.impl.BufferUtils;
 import org.apache.axiom.util.UIDGenerator;
+import org.apache.axiom.util.io.IOUtils;
 
 import javax.activation.DataSource;
 import javax.activation.FileDataSource;
@@ -188,7 +188,7 @@ public class DispatchXMessageDataSourceT
     
     private byte[] getStreamAsByteArray(InputStream is) throws IOException {
         ByteArrayOutputStream baos = new ByteArrayOutputStream(); 
-        BufferUtils.inputStream2OutputStream(is, baos);
+        IOUtils.copy(is, baos, -1);
         baos.flush();
         return baos.toByteArray();
     }

Modified: 
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/message/databinding/impl/DataSourceBlockImpl.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/message/databinding/impl/DataSourceBlockImpl.java?rev=1737143&r1=1737142&r2=1737143&view=diff
==============================================================================
--- 
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/message/databinding/impl/DataSourceBlockImpl.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/message/databinding/impl/DataSourceBlockImpl.java
 Wed Mar 30 18:27:01 2016
@@ -19,7 +19,6 @@
 
 package org.apache.axis2.jaxws.message.databinding.impl;
 
-import org.apache.axiom.attachments.impl.BufferUtils;
 import org.apache.axiom.om.OMAbstractFactory;
 import org.apache.axiom.om.OMElement;
 import org.apache.axiom.om.OMFactory;
@@ -28,6 +27,7 @@ import org.apache.axiom.om.OMOutputForma
 import org.apache.axiom.om.OMSourcedElement;
 import org.apache.axiom.om.util.StAXUtils;
 import org.apache.axiom.soap.SOAP11Constants;
+import org.apache.axiom.util.io.IOUtils;
 import org.apache.axis2.builder.DataSourceBuilder;
 import org.apache.axis2.java.security.AccessController;
 import org.apache.axis2.jaxws.ExceptionFactory;
@@ -165,7 +165,7 @@ public class DataSourceBlockImpl extends
     
     public void serialize(OutputStream output, OMOutputFormat format) throws 
XMLStreamException {
         try {
-            
BufferUtils.inputStream2OutputStream(((DataSource)busObject).getInputStream(), 
output);
+            IOUtils.copy(((DataSource)busObject).getInputStream(), output, -1);
         } catch (IOException e) {
             throw new XMLStreamException(e);
         }

Modified: 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/builder/DataSourceBuilder.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/builder/DataSourceBuilder.java?rev=1737143&r1=1737142&r2=1737143&view=diff
==============================================================================
--- 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/builder/DataSourceBuilder.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/builder/DataSourceBuilder.java
 Wed Mar 30 18:27:01 2016
@@ -29,13 +29,13 @@ import javax.xml.stream.XMLStreamReader;
 import javax.xml.stream.XMLStreamWriter;
 
 import org.apache.axiom.attachments.ByteArrayDataSource;
-import org.apache.axiom.attachments.impl.BufferUtils;
 import org.apache.axiom.om.OMAbstractFactory;
 import org.apache.axiom.om.OMDataSource;
 import org.apache.axiom.om.OMElement;
 import org.apache.axiom.om.OMFactory;
 import org.apache.axiom.om.OMNamespace;
 import org.apache.axiom.om.OMOutputFormat;
+import org.apache.axiom.util.io.IOUtils;
 import org.apache.axis2.AxisFault;
 import org.apache.axis2.context.MessageContext;
 
@@ -51,7 +51,7 @@ public class DataSourceBuilder implement
         byte[] bytes;
         try {
             ByteArrayOutputStream baos = new ByteArrayOutputStream(); 
-            BufferUtils.inputStream2OutputStream(inputStream, baos);
+            IOUtils.copy(inputStream, baos, -1);
             baos.flush();
             bytes = baos.toByteArray();
         } catch (IOException e) {