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 2016/05/14 15:24:27 UTC
svn commit: r1743832 - in /webservices/axiom/trunk/aspects/core-aspects/src:
main/java/org/apache/axiom/core/stream/serializer/
main/java/org/apache/axiom/core/stream/serializer/writer/
test/java/org/apache/axiom/core/stream/serializer/ test/java/org/a...
Author: veithen
Date: Sat May 14 15:24:27 2016
New Revision: 1743832
URL: http://svn.apache.org/viewvc?rev=1743832&view=rev
Log:
Move the XmlWriter API to a separate package.
Added:
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/writer/
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/writer/AbstractXmlWriter.java
- copied, changed from r1743828, webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/AbstractXmlWriter.java
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/writer/Latin1XmlWriter.java
- copied, changed from r1743828, webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/Latin1XmlWriter.java
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/writer/OutputStreamXmlWriter.java
- copied, changed from r1743819, webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/OutputStreamXmlWriter.java
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/writer/UTF8XmlWriter.java
- copied, changed from r1743828, webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/UTF8XmlWriter.java
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/writer/UnmappableCharacterHandler.java
- copied, changed from r1743819, webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/UnmappableCharacterHandler.java
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/writer/WriterXmlWriter.java
- copied, changed from r1743819, webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/WriterXmlWriter.java
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/writer/XmlWriter.java
- copied, changed from r1743819, webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/XmlWriter.java
webservices/axiom/trunk/aspects/core-aspects/src/test/java/org/apache/axiom/core/stream/serializer/writer/
webservices/axiom/trunk/aspects/core-aspects/src/test/java/org/apache/axiom/core/stream/serializer/writer/OutputStreamXmlWriterTest.java
- copied, changed from r1743819, webservices/axiom/trunk/aspects/core-aspects/src/test/java/org/apache/axiom/core/stream/serializer/OutputStreamXmlWriterTest.java
Removed:
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/AbstractXmlWriter.java
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/Latin1XmlWriter.java
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/OutputStreamXmlWriter.java
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/UTF8XmlWriter.java
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/UnmappableCharacterHandler.java
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/WriterXmlWriter.java
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/XmlWriter.java
webservices/axiom/trunk/aspects/core-aspects/src/test/java/org/apache/axiom/core/stream/serializer/OutputStreamXmlWriterTest.java
Modified:
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/Serializer.java
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/SerializerBase.java
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/ToStream.java
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/ToXMLStream.java
Modified: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/Serializer.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/Serializer.java?rev=1743832&r1=1743831&r2=1743832&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/Serializer.java (original)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/Serializer.java Sat May 14 15:24:27 2016
@@ -24,6 +24,8 @@ import java.io.OutputStream;
import java.io.Writer;
import java.util.Properties;
+import org.apache.axiom.core.stream.serializer.writer.XmlWriter;
+
/**
* The Serializer interface is implemented by a serializer to enable users to:
* <ul>
Modified: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/SerializerBase.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/SerializerBase.java?rev=1743832&r1=1743831&r2=1743832&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/SerializerBase.java (original)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/SerializerBase.java Sat May 14 15:24:27 2016
@@ -27,6 +27,7 @@ import javax.xml.transform.OutputKeys;
import javax.xml.transform.SourceLocator;
import org.apache.axiom.core.stream.StreamException;
+import org.apache.axiom.core.stream.serializer.writer.XmlWriter;
import org.xml.sax.Locator;
/**
Modified: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/ToStream.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/ToStream.java?rev=1743832&r1=1743831&r2=1743832&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/ToStream.java (original)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/ToStream.java Sat May 14 15:24:27 2016
@@ -36,6 +36,10 @@ import javax.xml.transform.OutputKeys;
import org.apache.axiom.core.stream.StreamException;
import org.apache.axiom.core.stream.serializer.utils.MsgKey;
import org.apache.axiom.core.stream.serializer.utils.Utils;
+import org.apache.axiom.core.stream.serializer.writer.Latin1XmlWriter;
+import org.apache.axiom.core.stream.serializer.writer.UTF8XmlWriter;
+import org.apache.axiom.core.stream.serializer.writer.WriterXmlWriter;
+import org.apache.axiom.core.stream.serializer.writer.XmlWriter;
/**
* This abstract class is a base class for other stream
Modified: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/ToXMLStream.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/ToXMLStream.java?rev=1743832&r1=1743831&r2=1743832&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/ToXMLStream.java (original)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/ToXMLStream.java Sat May 14 15:24:27 2016
@@ -27,6 +27,7 @@ import javax.xml.transform.Result;
import org.apache.axiom.core.stream.StreamException;
import org.apache.axiom.core.stream.serializer.utils.MsgKey;
import org.apache.axiom.core.stream.serializer.utils.Utils;
+import org.apache.axiom.core.stream.serializer.writer.XmlWriter;
/**
* This class converts SAX or SAX-like calls to a
Copied: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/writer/AbstractXmlWriter.java (from r1743828, webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/AbstractXmlWriter.java)
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/writer/AbstractXmlWriter.java?p2=webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/writer/AbstractXmlWriter.java&p1=webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/AbstractXmlWriter.java&r1=1743828&r2=1743832&rev=1743832&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/AbstractXmlWriter.java (original)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/writer/AbstractXmlWriter.java Sat May 14 15:24:27 2016
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.axiom.core.stream.serializer;
+package org.apache.axiom.core.stream.serializer.writer;
import java.io.IOException;
import java.io.OutputStream;
@@ -41,7 +41,7 @@ abstract class AbstractXmlWriter extends
}
@Override
- final void write(char c) throws IOException {
+ public final void write(char c) throws IOException {
if (highSurrogate != 0) {
if (Character.isLowSurrogate(c)) {
writeCharacter(Character.toCodePoint(highSurrogate, c));
@@ -57,21 +57,21 @@ abstract class AbstractXmlWriter extends
}
@Override
- final void write(String s) throws IOException {
+ public final void write(String s) throws IOException {
for (int i=0, len=s.length(); i<len; i++) {
write(s.charAt(i));
}
}
@Override
- final void write(char[] chars, int start, int length) throws IOException {
+ public final void write(char[] chars, int start, int length) throws IOException {
for (int i=0; i<length; i++) {
write(chars[i]);
}
}
@Override
- final void flushBuffer() throws IOException {
+ public final void flushBuffer() throws IOException {
out.write(buffer, 0, len);
len = 0;
}
Copied: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/writer/Latin1XmlWriter.java (from r1743828, webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/Latin1XmlWriter.java)
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/writer/Latin1XmlWriter.java?p2=webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/writer/Latin1XmlWriter.java&p1=webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/Latin1XmlWriter.java&r1=1743828&r2=1743832&rev=1743832&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/Latin1XmlWriter.java (original)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/writer/Latin1XmlWriter.java Sat May 14 15:24:27 2016
@@ -16,22 +16,22 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.axiom.core.stream.serializer;
+package org.apache.axiom.core.stream.serializer.writer;
import java.io.IOException;
import java.io.OutputStream;
-final class Latin1XmlWriter extends AbstractXmlWriter {
+public final class Latin1XmlWriter extends AbstractXmlWriter {
private final int maxChar;
private UnmappableCharacterHandler unmappableCharacterHandler = UnmappableCharacterHandler.THROW_EXCEPTION;
- Latin1XmlWriter(OutputStream out, int maxChar) {
+ public Latin1XmlWriter(OutputStream out, int maxChar) {
super(out);
this.maxChar = maxChar;
}
@Override
- void setUnmappableCharacterHandler(UnmappableCharacterHandler unmappableCharacterHandler) throws IOException {
+ public void setUnmappableCharacterHandler(UnmappableCharacterHandler unmappableCharacterHandler) throws IOException {
this.unmappableCharacterHandler = unmappableCharacterHandler;
}
Copied: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/writer/OutputStreamXmlWriter.java (from r1743819, webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/OutputStreamXmlWriter.java)
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/writer/OutputStreamXmlWriter.java?p2=webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/writer/OutputStreamXmlWriter.java&p1=webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/OutputStreamXmlWriter.java&r1=1743819&r2=1743832&rev=1743832&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/OutputStreamXmlWriter.java (original)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/writer/OutputStreamXmlWriter.java Sat May 14 15:24:27 2016
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.axiom.core.stream.serializer;
+package org.apache.axiom.core.stream.serializer.writer;
import java.io.IOException;
import java.io.OutputStream;
@@ -26,7 +26,7 @@ import java.nio.charset.Charset;
import java.nio.charset.CharsetEncoder;
import java.nio.charset.CoderResult;
-final class OutputStreamXmlWriter extends XmlWriter {
+public final class OutputStreamXmlWriter extends XmlWriter {
private final OutputStream out;
private final CharBuffer encoderIn;
private final ByteBuffer encoderOut;
@@ -35,7 +35,7 @@ final class OutputStreamXmlWriter extend
private boolean processingUnmappableCharacter;
private CharBuffer encoderInAlt;
- OutputStreamXmlWriter(OutputStream out, Charset charset) {
+ public OutputStreamXmlWriter(OutputStream out, Charset charset) {
this.out = out;
encoderIn = CharBuffer.allocate(4096);
encoderOut = ByteBuffer.allocate(4096);
@@ -93,7 +93,7 @@ final class OutputStreamXmlWriter extend
}
@Override
- void setUnmappableCharacterHandler(UnmappableCharacterHandler unmappableCharacterHandler) throws IOException {
+ public void setUnmappableCharacterHandler(UnmappableCharacterHandler unmappableCharacterHandler) throws IOException {
if (unmappableCharacterHandler != this.unmappableCharacterHandler) {
flush(encoderIn);
this.unmappableCharacterHandler = unmappableCharacterHandler;
@@ -101,7 +101,7 @@ final class OutputStreamXmlWriter extend
}
@Override
- void write(char c) throws IOException {
+ public void write(char c) throws IOException {
CharBuffer encoderIn = getEncoderIn();
if (!encoderIn.hasRemaining()) {
flush(encoderIn);
@@ -110,7 +110,7 @@ final class OutputStreamXmlWriter extend
}
@Override
- void write(String src) throws IOException {
+ public void write(String src) throws IOException {
CharBuffer encoderIn = getEncoderIn();
int offset = 0;
int length = src.length();
@@ -126,7 +126,7 @@ final class OutputStreamXmlWriter extend
}
@Override
- void write(char[] src, int offset, int length) throws IOException {
+ public void write(char[] src, int offset, int length) throws IOException {
CharBuffer encoderIn = getEncoderIn();
while (length > 0) {
if (!encoderIn.hasRemaining()) {
@@ -140,7 +140,7 @@ final class OutputStreamXmlWriter extend
}
@Override
- void flushBuffer() throws IOException {
+ public void flushBuffer() throws IOException {
flush(encoderIn);
flushEncodingOut();
}
Copied: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/writer/UTF8XmlWriter.java (from r1743828, webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/UTF8XmlWriter.java)
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/writer/UTF8XmlWriter.java?p2=webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/writer/UTF8XmlWriter.java&p1=webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/UTF8XmlWriter.java&r1=1743828&r2=1743832&rev=1743832&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/UTF8XmlWriter.java (original)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/writer/UTF8XmlWriter.java Sat May 14 15:24:27 2016
@@ -16,18 +16,18 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.axiom.core.stream.serializer;
+package org.apache.axiom.core.stream.serializer.writer;
import java.io.IOException;
import java.io.OutputStream;
-final class UTF8XmlWriter extends AbstractXmlWriter {
- UTF8XmlWriter(OutputStream out) {
+public final class UTF8XmlWriter extends AbstractXmlWriter {
+ public UTF8XmlWriter(OutputStream out) {
super(out);
}
@Override
- void setUnmappableCharacterHandler(UnmappableCharacterHandler unmappableCharacterHandler) {
+ public void setUnmappableCharacterHandler(UnmappableCharacterHandler unmappableCharacterHandler) {
// There are no unmappable characters in UTF-8
}
Copied: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/writer/UnmappableCharacterHandler.java (from r1743819, webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/UnmappableCharacterHandler.java)
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/writer/UnmappableCharacterHandler.java?p2=webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/writer/UnmappableCharacterHandler.java&p1=webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/UnmappableCharacterHandler.java&r1=1743819&r2=1743832&rev=1743832&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/UnmappableCharacterHandler.java (original)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/writer/UnmappableCharacterHandler.java Sat May 14 15:24:27 2016
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.axiom.core.stream.serializer;
+package org.apache.axiom.core.stream.serializer.writer;
import java.io.IOException;
Copied: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/writer/WriterXmlWriter.java (from r1743819, webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/WriterXmlWriter.java)
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/writer/WriterXmlWriter.java?p2=webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/writer/WriterXmlWriter.java&p1=webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/WriterXmlWriter.java&r1=1743819&r2=1743832&rev=1743832&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/WriterXmlWriter.java (original)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/writer/WriterXmlWriter.java Sat May 14 15:24:27 2016
@@ -16,41 +16,41 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.axiom.core.stream.serializer;
+package org.apache.axiom.core.stream.serializer.writer;
import java.io.IOException;
import java.io.Writer;
-final class WriterXmlWriter extends XmlWriter {
+public final class WriterXmlWriter extends XmlWriter {
private final Writer out;
private final boolean flushWriter;
- WriterXmlWriter(Writer out, boolean flushWriter) {
+ public WriterXmlWriter(Writer out, boolean flushWriter) {
this.out = out;
this.flushWriter = flushWriter;
}
@Override
- void setUnmappableCharacterHandler(UnmappableCharacterHandler unmappableCharacterHandler) {
+ public void setUnmappableCharacterHandler(UnmappableCharacterHandler unmappableCharacterHandler) {
}
@Override
- void write(char c) throws IOException {
+ public void write(char c) throws IOException {
out.write(c);
}
@Override
- void write(String s) throws IOException {
+ public void write(String s) throws IOException {
out.write(s);
}
@Override
- void write(char[] chars, int start, int length) throws IOException {
+ public void write(char[] chars, int start, int length) throws IOException {
out.write(chars, start, length);
}
@Override
- void flushBuffer() throws IOException {
+ public void flushBuffer() throws IOException {
if (flushWriter) {
out.flush();
}
Copied: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/writer/XmlWriter.java (from r1743819, webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/XmlWriter.java)
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/writer/XmlWriter.java?p2=webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/writer/XmlWriter.java&p1=webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/XmlWriter.java&r1=1743819&r2=1743832&rev=1743832&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/XmlWriter.java (original)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/writer/XmlWriter.java Sat May 14 15:24:27 2016
@@ -16,24 +16,24 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.axiom.core.stream.serializer;
+package org.apache.axiom.core.stream.serializer.writer;
import java.io.IOException;
-abstract class XmlWriter {
- abstract void setUnmappableCharacterHandler(UnmappableCharacterHandler unmappableCharacterHandler) throws IOException;
- abstract void write(char c) throws IOException;
- abstract void write(String s) throws IOException;
- abstract void write(char chars[], int start, int length) throws IOException;
+public abstract class XmlWriter {
+ public abstract void setUnmappableCharacterHandler(UnmappableCharacterHandler unmappableCharacterHandler) throws IOException;
+ public abstract void write(char c) throws IOException;
+ public abstract void write(String s) throws IOException;
+ public abstract void write(char chars[], int start, int length) throws IOException;
/**
* Write any pending data to the underlying stream, without flushing the stream itself.
*
* @throws IOException
*/
- abstract void flushBuffer() throws IOException;
+ public abstract void flushBuffer() throws IOException;
- final void writeCharacterReference(int codePoint) throws IOException {
+ public final void writeCharacterReference(int codePoint) throws IOException {
write("&#");
// TODO: optimize this
write(Integer.toString(codePoint));
Copied: webservices/axiom/trunk/aspects/core-aspects/src/test/java/org/apache/axiom/core/stream/serializer/writer/OutputStreamXmlWriterTest.java (from r1743819, webservices/axiom/trunk/aspects/core-aspects/src/test/java/org/apache/axiom/core/stream/serializer/OutputStreamXmlWriterTest.java)
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/test/java/org/apache/axiom/core/stream/serializer/writer/OutputStreamXmlWriterTest.java?p2=webservices/axiom/trunk/aspects/core-aspects/src/test/java/org/apache/axiom/core/stream/serializer/writer/OutputStreamXmlWriterTest.java&p1=webservices/axiom/trunk/aspects/core-aspects/src/test/java/org/apache/axiom/core/stream/serializer/OutputStreamXmlWriterTest.java&r1=1743819&r2=1743832&rev=1743832&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/test/java/org/apache/axiom/core/stream/serializer/OutputStreamXmlWriterTest.java (original)
+++ webservices/axiom/trunk/aspects/core-aspects/src/test/java/org/apache/axiom/core/stream/serializer/writer/OutputStreamXmlWriterTest.java Sat May 14 15:24:27 2016
@@ -16,13 +16,16 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.axiom.core.stream.serializer;
+package org.apache.axiom.core.stream.serializer.writer;
import static com.google.common.truth.Truth.assertThat;
import java.io.ByteArrayOutputStream;
import java.nio.charset.Charset;
+import org.apache.axiom.core.stream.serializer.writer.OutputStreamXmlWriter;
+import org.apache.axiom.core.stream.serializer.writer.UnmappableCharacterHandler;
+import org.apache.axiom.core.stream.serializer.writer.XmlWriter;
import org.junit.Test;
public class OutputStreamXmlWriterTest {