Author: veithen
Date: Fri May 14 21:39:16 2010
New Revision: 944489
URL: http://svn.apache.org/viewvc?rev=944489&view=rev
Log:
Renamed some classes in org.apache.axiom.util.base64 to give them more explicit
names. Note that there is no compatibility issue here: these classes have been
introduced after the 1.2.8 release.
Added:
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/util/base64/AbstractBase64EncodingOutputStream.java
- copied, changed from r944181,
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/util/base64/AbstractBase64OutputStream.java
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/util/base64/Base64EncodingStringBufferOutputStream.java
- copied, changed from r944181,
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/util/base64/Base64StringBufferOutputStream.java
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/util/base64/Base64EncodingWriterOutputStream.java
- copied, changed from r944181,
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/util/base64/Base64WriterOutputStream.java
Removed:
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/util/base64/AbstractBase64OutputStream.java
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/util/base64/Base64StringBufferOutputStream.java
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/util/base64/Base64WriterOutputStream.java
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/util/base64/Base64Utils.java
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/util/stax/XMLStreamWriterUtils.java
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/test/java/org/apache/axiom/util/stax/XMLStreamReaderUtilsTest.java
Copied:
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/util/base64/AbstractBase64EncodingOutputStream.java
(from r944181,
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/util/base64/AbstractBase64OutputStream.java)
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/util/base64/AbstractBase64EncodingOutputStream.java?p2=webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/util/base64/AbstractBase64EncodingOutputStream.java&p1=webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/util/base64/AbstractBase64OutputStream.java&r1=944181&r2=944489&rev=944489&view=diff
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/util/base64/AbstractBase64OutputStream.java
(original)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/util/base64/AbstractBase64EncodingOutputStream.java
Fri May 14 21:39:16 2010
@@ -25,7 +25,7 @@ import java.io.OutputStream;
/**
* Base class for {...@link OutputStream} implementations that encode data in
base64.
*/
-public abstract class AbstractBase64OutputStream extends OutputStream {
+public abstract class AbstractBase64EncodingOutputStream extends OutputStream {
private final byte[] in = new byte[3];
private final byte[] out = new byte[4];
private int rest; // Number of bytes remaining in the inBuffer
Copied:
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/util/base64/Base64EncodingStringBufferOutputStream.java
(from r944181,
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/util/base64/Base64StringBufferOutputStream.java)
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/util/base64/Base64EncodingStringBufferOutputStream.java?p2=webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/util/base64/Base64EncodingStringBufferOutputStream.java&p1=webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/util/base64/Base64StringBufferOutputStream.java&r1=944181&r2=944489&rev=944489&view=diff
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/util/base64/Base64StringBufferOutputStream.java
(original)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/util/base64/Base64EncodingStringBufferOutputStream.java
Fri May 14 21:39:16 2010
@@ -25,7 +25,7 @@ import java.io.OutputStream;
/**
* {...@link OutputStream} implementation that writes base64 encoded data to a
{...@link StringBuffer}.
*/
-public class Base64StringBufferOutputStream extends AbstractBase64OutputStream
{
+public class Base64EncodingStringBufferOutputStream extends
AbstractBase64EncodingOutputStream {
private final StringBuffer buffer;
/**
@@ -33,7 +33,7 @@ public class Base64StringBufferOutputStr
*
* @param buffer the buffer to append the encoded data to
*/
- public Base64StringBufferOutputStream(StringBuffer buffer) {
+ public Base64EncodingStringBufferOutputStream(StringBuffer buffer) {
this.buffer = buffer;
}
Copied:
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/util/base64/Base64EncodingWriterOutputStream.java
(from r944181,
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/util/base64/Base64WriterOutputStream.java)
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/util/base64/Base64EncodingWriterOutputStream.java?p2=webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/util/base64/Base64EncodingWriterOutputStream.java&p1=webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/util/base64/Base64WriterOutputStream.java&r1=944181&r2=944489&rev=944489&view=diff
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/util/base64/Base64WriterOutputStream.java
(original)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/util/base64/Base64EncodingWriterOutputStream.java
Fri May 14 21:39:16 2010
@@ -27,7 +27,7 @@ import java.io.Writer;
* {...@link OutputStream} implementation that writes base64 encoded data to a
{...@link Writer}.
* This class internally buffers the data before writing it to the underlying
stream.
*/
-public class Base64WriterOutputStream extends AbstractBase64OutputStream {
+public class Base64EncodingWriterOutputStream extends
AbstractBase64EncodingOutputStream {
private final Writer writer;
private final char[] buffer;
private int len;
@@ -38,7 +38,7 @@ public class Base64WriterOutputStream ex
* @param writer the stream to write the encoded data to
* @param bufferSize the buffer size to use
*/
- public Base64WriterOutputStream(Writer writer, int bufferSize) {
+ public Base64EncodingWriterOutputStream(Writer writer, int bufferSize) {
this.writer = writer;
buffer = new char[bufferSize];
}
@@ -48,7 +48,7 @@ public class Base64WriterOutputStream ex
*
* @param writer the stream to write the encoded data to
*/
- public Base64WriterOutputStream(Writer writer) {
+ public Base64EncodingWriterOutputStream(Writer writer) {
this(writer, 4096);
}
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/util/base64/Base64Utils.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/util/base64/Base64Utils.java?rev=944489&r1=944488&r2=944489&view=diff
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/util/base64/Base64Utils.java
(original)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/util/base64/Base64Utils.java
Fri May 14 21:39:16 2010
@@ -73,7 +73,7 @@ public class Base64Utils {
} else {
buffer = new StringBuffer(getEncodedSize((int)size));
}
- Base64StringBufferOutputStream out = new
Base64StringBufferOutputStream(buffer);
+ Base64EncodingStringBufferOutputStream out = new
Base64EncodingStringBufferOutputStream(buffer);
// Always prefer writeTo, because getInputStream will create a thread
and a pipe if
// the DataHandler was constructed using an object instead of a
DataSource
dh.writeTo(out);
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/util/stax/XMLStreamWriterUtils.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/util/stax/XMLStreamWriterUtils.java?rev=944489&r1=944488&r2=944489&view=diff
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/util/stax/XMLStreamWriterUtils.java
(original)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/util/stax/XMLStreamWriterUtils.java
Fri May 14 21:39:16 2010
@@ -27,7 +27,7 @@ import javax.xml.stream.XMLStreamWriter;
import org.apache.axiom.ext.stax.datahandler.DataHandlerProvider;
import org.apache.axiom.ext.stax.datahandler.DataHandlerWriter;
-import org.apache.axiom.util.base64.Base64WriterOutputStream;
+import org.apache.axiom.util.base64.Base64EncodingWriterOutputStream;
/**
* Contains utility methods to work with {...@link XMLStreamWriter} objects.
@@ -56,7 +56,7 @@ public class XMLStreamWriterUtils {
public static void writeBase64(XMLStreamWriter writer, DataHandler dh)
throws IOException, XMLStreamException {
- Base64WriterOutputStream out = new Base64WriterOutputStream(
+ Base64EncodingWriterOutputStream out = new
Base64EncodingWriterOutputStream(
new XMLStreamWriterWriter(writer));
try {
dh.writeTo(out);
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/test/java/org/apache/axiom/util/stax/XMLStreamReaderUtilsTest.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-api/src/test/java/org/apache/axiom/util/stax/XMLStreamReaderUtilsTest.java?rev=944489&r1=944488&r2=944489&view=diff
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/test/java/org/apache/axiom/util/stax/XMLStreamReaderUtilsTest.java
(original)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/test/java/org/apache/axiom/util/stax/XMLStreamReaderUtilsTest.java
Fri May 14 21:39:16 2010
@@ -30,7 +30,7 @@ import javax.xml.stream.XMLStreamReader;
import junit.framework.TestCase;
import org.apache.axiom.om.util.StAXUtils;
-import org.apache.axiom.util.base64.Base64StringBufferOutputStream;
+import org.apache.axiom.util.base64.Base64EncodingStringBufferOutputStream;
import org.apache.axiom.util.stax.xop.XOPDecodingStreamReader;
import org.apache.commons.io.IOUtils;
@@ -159,7 +159,7 @@ public class XMLStreamReaderUtilsTest ex
// We generate base64 that is sufficiently large to force the parser
to generate
// multiple CHARACTER events
StringBuffer buffer = new StringBuffer("<test>");
- Base64StringBufferOutputStream out = new
Base64StringBufferOutputStream(buffer);
+ Base64EncodingStringBufferOutputStream out = new
Base64EncodingStringBufferOutputStream(buffer);
byte[] data = new byte[65536];
new Random().nextBytes(data);
out.write(data);
