Author: veithen
Date: Mon Mar 11 08:33:32 2013
New Revision: 1455050
URL: http://svn.apache.org/r1455050
Log:
Eliminated usage of deprecated Axiom class.
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/builder/BuilderUtil.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/DeploymentClassLoader.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/util/XMLPrettyPrinter.java
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/builder/BuilderUtil.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/builder/BuilderUtil.java?rev=1455050&r1=1455049&r2=1455050&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/builder/BuilderUtil.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/builder/BuilderUtil.java
Mon Mar 11 08:33:32 2013
@@ -22,7 +22,6 @@ package org.apache.axis2.builder;
import org.apache.axiom.attachments.Attachments;
import org.apache.axiom.attachments.lifecycle.LifecycleManager;
import org.apache.axiom.attachments.lifecycle.impl.LifecycleManagerImpl;
-import org.apache.axiom.attachments.utils.IOUtils;
import org.apache.axiom.om.OMAttribute;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMException;
@@ -60,6 +59,7 @@ import org.apache.axis2.util.JavaUtils;
import org.apache.axis2.util.MessageProcessorSelector;
import org.apache.axis2.util.MultipleEntryHashMap;
import org.apache.axis2.wsdl.WSDLConstants;
+import org.apache.commons.io.IOUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.ws.commons.schema.XmlSchemaAll;
@@ -617,7 +617,7 @@ public class BuilderUtil {
log.info("OMException in getSOAPBuilder", e);
try {
log.info("Remaining input stream :[" +
- new String(IOUtils.getStreamAsByteArray(in),
encoding) + "]");
+ new String(IOUtils.toByteArray(in), encoding) + "]");
} catch (IOException e1) {
// Nothing here?
}
@@ -638,7 +638,7 @@ public class BuilderUtil {
log.info("OMException in getSOAPBuilder", e);
try {
log.info("Remaining input stream :[" +
- new String(IOUtils.getStreamAsByteArray(inStream),
charSetEnc) + "]");
+ new String(IOUtils.toByteArray(inStream), charSetEnc)
+ "]");
} catch (IOException e1) {
// Nothing here?
}
@@ -658,7 +658,7 @@ public class BuilderUtil {
log.info("OMException in getSOAPBuilder", e);
try {
log.info("Remaining input stream :[" +
- new String(IOUtils.getStreamAsByteArray(inStream)) +
"]");
+ new String(IOUtils.toByteArray(inStream)) + "]");
} catch (IOException e1) {
// Nothing here?
}
@@ -679,7 +679,7 @@ public class BuilderUtil {
log.info("OMException in getSOAPBuilder", e);
try {
log.info("Remaining input stream :[" +
- new String(IOUtils.getStreamAsByteArray(inStream),
charSetEnc) + "]");
+ new String(IOUtils.toByteArray(inStream), charSetEnc)
+ "]");
} catch (IOException e1) {
// Nothing here?
}
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/DeploymentClassLoader.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/DeploymentClassLoader.java?rev=1455050&r1=1455049&r2=1455050&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/DeploymentClassLoader.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/DeploymentClassLoader.java
Mon Mar 11 08:33:32 2013
@@ -19,9 +19,9 @@
package org.apache.axis2.deployment;
-import org.apache.axiom.attachments.utils.IOUtils;
import org.apache.axis2.classloader.BeanInfoCache;
import org.apache.axis2.classloader.BeanInfoCachingClassLoader;
+import org.apache.commons.io.IOUtils;
import java.io.ByteArrayInputStream;
import java.io.IOException;
@@ -122,7 +122,7 @@ public class DeploymentClassLoader exten
entryName = entry.getName();
if (entryName != null &&
entryName.endsWith(resource)) {
- byte[] raw = IOUtils.getStreamAsByteArray(zin);
+ byte[] raw = IOUtils.toByteArray(zin);
return new URL("jar", "", -1, urls[0] + "!/" +
libjar_name + "!/" + entryName,
new ByteUrlStreamHandler(raw));
}
@@ -160,7 +160,7 @@ public class DeploymentClassLoader exten
entryName = entry.getName();
if (entryName != null &&
entryName.endsWith(resource)) {
- byte[] raw = IOUtils.getStreamAsByteArray(zin);
+ byte[] raw = IOUtils.toByteArray(zin);
resources.add(new URL("jar", "", -1, urls[0] + "!/" +
libjar_name + "!/" + entryName,
new ByteUrlStreamHandler(raw)));
}
@@ -209,7 +209,7 @@ public class DeploymentClassLoader exten
entryName = entry.getName();
if (entryName != null &&
entryName.endsWith(resource)) {
- byte[] raw = IOUtils.getStreamAsByteArray(zin);
+ byte[] raw = IOUtils.toByteArray(zin);
zin.close();
return raw;
}
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/util/XMLPrettyPrinter.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/util/XMLPrettyPrinter.java?rev=1455050&r1=1455049&r2=1455050&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/util/XMLPrettyPrinter.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/util/XMLPrettyPrinter.java
Mon Mar 11 08:33:32 2013
@@ -19,8 +19,8 @@
package org.apache.axis2.util;
-import org.apache.axiom.attachments.utils.IOUtils;
import org.apache.axiom.om.OMElement;
+import org.apache.commons.io.IOUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -59,7 +59,7 @@ public class XMLPrettyPrinter {
byte[] byteArray = null;
try {
FileInputStream fin = new FileInputStream(file);
- byteArray = IOUtils.getStreamAsByteArray(fin);
+ byteArray = IOUtils.toByteArray(fin);
fin.close();
inputStream = new ByteArrayInputStream(byteArray);
outputStream = new FileOutputStream(file);
