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/06 18:18:57 UTC
svn commit: r1742578 - in /webservices/axiom/trunk: aspects/core-aspects/
aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/
aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/dom3/
aspects/core-aspects/...
Author: veithen
Date: Fri May 6 18:18:56 2016
New Revision: 1742578
URL: http://svn.apache.org/viewvc?rev=1742578&view=rev
Log:
Import parts of the Xalan serializer code as a starting point for our own serializer.
Added:
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/
- copied from r1742481, xalan/java/trunk/src/org/apache/xml/serializer/
webservices/axiom/trunk/aspects/core-aspects/src/main/resources/org/
webservices/axiom/trunk/aspects/core-aspects/src/main/resources/org/apache/
webservices/axiom/trunk/aspects/core-aspects/src/main/resources/org/apache/axiom/
webservices/axiom/trunk/aspects/core-aspects/src/main/resources/org/apache/axiom/core/
webservices/axiom/trunk/aspects/core-aspects/src/main/resources/org/apache/axiom/core/stream/
webservices/axiom/trunk/aspects/core-aspects/src/main/resources/org/apache/axiom/core/stream/serializer/
webservices/axiom/trunk/aspects/core-aspects/src/main/resources/org/apache/axiom/core/stream/serializer/Encodings.properties
- copied unchanged from r1742481, xalan/java/trunk/src/org/apache/xml/serializer/Encodings.properties
webservices/axiom/trunk/aspects/core-aspects/src/main/resources/org/apache/axiom/core/stream/serializer/XMLEntities.properties
- copied unchanged from r1742481, xalan/java/trunk/src/org/apache/xml/serializer/XMLEntities.properties
webservices/axiom/trunk/aspects/core-aspects/src/main/resources/org/apache/axiom/core/stream/serializer/output_xml.properties
- copied unchanged from r1742481, xalan/java/trunk/src/org/apache/xml/serializer/output_xml.properties
webservices/axiom/trunk/aspects/core-aspects/src/test/
webservices/axiom/trunk/aspects/core-aspects/src/test/java/
webservices/axiom/trunk/aspects/core-aspects/src/test/java/org/
webservices/axiom/trunk/aspects/core-aspects/src/test/java/org/apache/
webservices/axiom/trunk/aspects/core-aspects/src/test/java/org/apache/axiom/
webservices/axiom/trunk/aspects/core-aspects/src/test/java/org/apache/axiom/core/
webservices/axiom/trunk/aspects/core-aspects/src/test/java/org/apache/axiom/core/stream/
webservices/axiom/trunk/aspects/core-aspects/src/test/java/org/apache/axiom/core/stream/serializer/
webservices/axiom/trunk/aspects/core-aspects/src/test/java/org/apache/axiom/core/stream/serializer/SerializerTest.java (with props)
Removed:
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/DOM3Serializer.java
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/DOMSerializer.java
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/EmptySerializer.java
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/Encodings.properties
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/HTMLEntities.properties
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/OutputPropertyUtils.java
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/SerializerFactory.java
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/ToHTMLSAXHandler.java
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/ToHTMLStream.java
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/ToSAXHandler.java
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/ToTextSAXHandler.java
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/ToTextStream.java
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/ToUnknownStream.java
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/ToXMLSAXHandler.java
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/TransformStateSetter.java
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/TreeWalker.java
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/Version.java
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/Version.src
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/XMLEntities.properties
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/dom3/
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/output_html.properties
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/output_text.properties
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/output_unknown.properties
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/output_xml.properties
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/package.html
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/utils/AttList.java
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/utils/BoolStack.java
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/utils/DOM2Helper.java
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/utils/SerializerMessages_ca.java
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/utils/SerializerMessages_cs.java
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/utils/SerializerMessages_de.java
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/utils/SerializerMessages_es.java
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/utils/SerializerMessages_fr.java
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/utils/SerializerMessages_hu.java
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/utils/SerializerMessages_it.java
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/utils/SerializerMessages_ja.java
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/utils/SerializerMessages_ko.java
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/utils/SerializerMessages_pl.java
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/utils/SerializerMessages_pt_BR.java
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/utils/SerializerMessages_ru.java
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/utils/SerializerMessages_sk.java
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/utils/SerializerMessages_sl.java
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/utils/SerializerMessages_sv.java
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/utils/SerializerMessages_tr.java
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/utils/SerializerMessages_zh.java
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/utils/SerializerMessages_zh_CN.java
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/utils/SerializerMessages_zh_TW.java
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/utils/XML11Char.java
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/utils/XMLChar.java
Modified:
webservices/axiom/trunk/aspects/core-aspects/pom.xml
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/AttributesImplSerializer.java
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/CharInfo.java
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/ElemContext.java
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/ElemDesc.java
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/EncodingInfo.java
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/Encodings.java
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/ExtendedContentHandler.java
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/ExtendedLexicalHandler.java
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/Method.java
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/NamespaceMappings.java
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/ObjectFactory.java
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/OutputPropertiesFactory.java
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/SecuritySupport.java
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/SerializationHandler.java
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/SerializerConstants.java
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/SerializerTrace.java
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/SerializerTraceWriter.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
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/WriterChain.java
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/WriterToASCI.java
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/WriterToUTF8Buffered.java
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/XSLOutputAttributes.java
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/utils/Messages.java
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/utils/MsgKey.java
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/utils/SerializerMessages.java
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/utils/SerializerMessages_en.java
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/utils/StringToIntTable.java
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/utils/SystemIDResolver.java
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/utils/URI.java
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/utils/Utils.java
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/utils/WrappedRuntimeException.java
webservices/axiom/trunk/code-coverage/pom.xml
webservices/axiom/trunk/testing/xml-testsuite/src/main/java/org/apache/axiom/ts/xml/XMLSample.java
Modified: webservices/axiom/trunk/aspects/core-aspects/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/pom.xml?rev=1742578&r1=1742577&r2=1742578&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/pom.xml (original)
+++ webservices/axiom/trunk/aspects/core-aspects/pom.xml Fri May 6 18:18:56 2016
@@ -41,5 +41,28 @@
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>testutils</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>xml-testsuite</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>xml-truth</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
Modified: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/AttributesImplSerializer.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/AttributesImplSerializer.java?rev=1742578&r1=1742481&r2=1742578&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/AttributesImplSerializer.java (original)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/AttributesImplSerializer.java Fri May 6 18:18:56 2016
@@ -19,7 +19,7 @@
* $Id$
*/
-package org.apache.xml.serializer;
+package org.apache.axiom.core.stream.serializer;
import java.util.Hashtable;
Modified: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/CharInfo.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/CharInfo.java?rev=1742578&r1=1742481&r2=1742578&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/CharInfo.java (original)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/CharInfo.java Fri May 6 18:18:56 2016
@@ -18,7 +18,7 @@
/*
* $Id$
*/
-package org.apache.xml.serializer;
+package org.apache.axiom.core.stream.serializer;
import java.io.BufferedReader;
import java.io.InputStream;
@@ -35,10 +35,10 @@ import java.security.PrivilegedAction;
import javax.xml.transform.TransformerException;
-import org.apache.xml.serializer.utils.MsgKey;
-import org.apache.xml.serializer.utils.SystemIDResolver;
-import org.apache.xml.serializer.utils.Utils;
-import org.apache.xml.serializer.utils.WrappedRuntimeException;
+import org.apache.axiom.core.stream.serializer.utils.MsgKey;
+import org.apache.axiom.core.stream.serializer.utils.SystemIDResolver;
+import org.apache.axiom.core.stream.serializer.utils.Utils;
+import org.apache.axiom.core.stream.serializer.utils.WrappedRuntimeException;
/**
* This class provides services that tell if a character should have
@@ -56,13 +56,6 @@ final class CharInfo
private HashMap m_charToString;
/**
- * The name of the HTML entities file.
- * If specified, the file will be resource loaded with the default class loader.
- */
- public static final String HTML_ENTITIES_RESOURCE =
- SerializerBase.PKG_NAME+".HTMLEntities";
-
- /**
* The name of the XML entities file.
* If specified, the file will be resource loaded with the default class loader.
*/
Modified: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/ElemContext.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/ElemContext.java?rev=1742578&r1=1742481&r2=1742578&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/ElemContext.java (original)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/ElemContext.java Fri May 6 18:18:56 2016
@@ -18,7 +18,7 @@
/*
* $Id$
*/
-package org.apache.xml.serializer;
+package org.apache.axiom.core.stream.serializer;
/**
* This class is a stack frame that consists of
Modified: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/ElemDesc.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/ElemDesc.java?rev=1742578&r1=1742481&r2=1742578&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/ElemDesc.java (original)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/ElemDesc.java Fri May 6 18:18:56 2016
@@ -18,9 +18,9 @@
/*
* $Id$
*/
-package org.apache.xml.serializer;
+package org.apache.axiom.core.stream.serializer;
-import org.apache.xml.serializer.utils.StringToIntTable;
+import org.apache.axiom.core.stream.serializer.utils.StringToIntTable;
/**
* This class has a series of flags (bit values) that describe an HTML element
Modified: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/EncodingInfo.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/EncodingInfo.java?rev=1742578&r1=1742481&r2=1742578&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/EncodingInfo.java (original)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/EncodingInfo.java Fri May 6 18:18:56 2016
@@ -18,7 +18,7 @@
/*
* $Id$
*/
-package org.apache.xml.serializer;
+package org.apache.axiom.core.stream.serializer;
/**
Modified: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/Encodings.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/Encodings.java?rev=1742578&r1=1742481&r2=1742578&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/Encodings.java (original)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/Encodings.java Fri May 6 18:18:56 2016
@@ -18,7 +18,7 @@
/*
* $Id$
*/
-package org.apache.xml.serializer;
+package org.apache.axiom.core.stream.serializer;
import java.io.InputStream;
import java.io.OutputStream;
@@ -383,11 +383,11 @@ public final class Encodings extends Obj
}
catch (java.net.MalformedURLException mue)
{
- throw new org.apache.xml.serializer.utils.WrappedRuntimeException(mue);
+ throw new org.apache.axiom.core.stream.serializer.utils.WrappedRuntimeException(mue);
}
catch (java.io.IOException ioe)
{
- throw new org.apache.xml.serializer.utils.WrappedRuntimeException(ioe);
+ throw new org.apache.axiom.core.stream.serializer.utils.WrappedRuntimeException(ioe);
}
}
Modified: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/ExtendedContentHandler.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/ExtendedContentHandler.java?rev=1742578&r1=1742481&r2=1742578&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/ExtendedContentHandler.java (original)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/ExtendedContentHandler.java Fri May 6 18:18:56 2016
@@ -18,7 +18,7 @@
/*
* $Id$
*/
-package org.apache.xml.serializer;
+package org.apache.axiom.core.stream.serializer;
import javax.xml.transform.SourceLocator;
Modified: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/ExtendedLexicalHandler.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/ExtendedLexicalHandler.java?rev=1742578&r1=1742481&r2=1742578&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/ExtendedLexicalHandler.java (original)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/ExtendedLexicalHandler.java Fri May 6 18:18:56 2016
@@ -18,7 +18,7 @@
/*
* $Id$
*/
-package org.apache.xml.serializer;
+package org.apache.axiom.core.stream.serializer;
import org.xml.sax.SAXException;
Modified: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/Method.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/Method.java?rev=1742578&r1=1742481&r2=1742578&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/Method.java (original)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/Method.java Fri May 6 18:18:56 2016
@@ -18,7 +18,7 @@
/*
* $Id$
*/
-package org.apache.xml.serializer;
+package org.apache.axiom.core.stream.serializer;
/**
* This class defines the constants which are the names of the four default
Modified: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/NamespaceMappings.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/NamespaceMappings.java?rev=1742578&r1=1742481&r2=1742578&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/NamespaceMappings.java (original)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/NamespaceMappings.java Fri May 6 18:18:56 2016
@@ -18,7 +18,7 @@
/*
* $Id$
*/
-package org.apache.xml.serializer;
+package org.apache.axiom.core.stream.serializer;
import java.util.Enumeration;
import java.util.Hashtable;
Modified: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/ObjectFactory.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/ObjectFactory.java?rev=1742578&r1=1742481&r2=1742578&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/ObjectFactory.java (original)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/ObjectFactory.java Fri May 6 18:18:56 2016
@@ -19,7 +19,7 @@
* $Id$
*/
-package org.apache.xml.serializer;
+package org.apache.axiom.core.stream.serializer;
import java.io.BufferedReader;
import java.io.File;
Modified: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/OutputPropertiesFactory.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/OutputPropertiesFactory.java?rev=1742578&r1=1742481&r2=1742578&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/OutputPropertiesFactory.java (original)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/OutputPropertiesFactory.java Fri May 6 18:18:56 2016
@@ -18,7 +18,7 @@
/*
* $Id$
*/
-package org.apache.xml.serializer;
+package org.apache.axiom.core.stream.serializer;
import java.io.BufferedInputStream;
import java.io.IOException;
@@ -30,9 +30,9 @@ import java.util.Properties;
import javax.xml.transform.OutputKeys;
-import org.apache.xml.serializer.utils.MsgKey;
-import org.apache.xml.serializer.utils.Utils;
-import org.apache.xml.serializer.utils.WrappedRuntimeException;
+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.utils.WrappedRuntimeException;
/**
* This class is a factory to generate a set of default properties
Modified: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/SecuritySupport.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/SecuritySupport.java?rev=1742578&r1=1742481&r2=1742578&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/SecuritySupport.java (original)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/SecuritySupport.java Fri May 6 18:18:56 2016
@@ -19,7 +19,7 @@
* $Id$
*/
-package org.apache.xml.serializer;
+package org.apache.axiom.core.stream.serializer;
import java.io.File;
import java.io.FileInputStream;
Modified: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/SerializationHandler.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/SerializationHandler.java?rev=1742578&r1=1742481&r2=1742578&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/SerializationHandler.java (original)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/SerializationHandler.java Fri May 6 18:18:56 2016
@@ -18,13 +18,12 @@
/*
* $Id$
*/
-package org.apache.xml.serializer;
+package org.apache.axiom.core.stream.serializer;
import java.io.IOException;
import javax.xml.transform.Transformer;
-import org.w3c.dom.Node;
import org.xml.sax.ContentHandler;
import org.xml.sax.ErrorHandler;
import org.xml.sax.SAXException;
@@ -48,7 +47,6 @@ public interface SerializationHandler
DeclHandler,
org.xml.sax.DTDHandler,
ErrorHandler,
- DOMSerializer,
Serializer
{
/**
@@ -63,14 +61,6 @@ public interface SerializationHandler
public void close();
/**
- * Notify that the serializer should take this DOM node as input to be
- * serialized.
- *
- * @param node the DOM node to be serialized.
- * @throws IOException
- */
- public void serialize(Node node) throws IOException;
- /**
* Turns special character escaping on/off.
*
* Note that characters will
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=1742578&r1=1742481&r2=1742578&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 Fri May 6 18:18:56 2016
@@ -18,7 +18,7 @@
/*
* $Id$
*/
-package org.apache.xml.serializer;
+package org.apache.axiom.core.stream.serializer;
import java.io.IOException;
import java.io.OutputStream;
import java.io.Writer;
@@ -192,22 +192,6 @@ public interface Serializer {
public ContentHandler asContentHandler() throws IOException;
/**
- * Return a {@link DOMSerializer} interface into this serializer.
- * Through the returned object the document to be serialized,
- * a DOM, can be provided to the serializer.
- * If the serializer does not support the {@link DOMSerializer}
- * interface, it should return null.
- * <p>
- * In principle only one of asDOMSerializer() or asContentHander()
- * should be called.
- *
- * @return A {@link DOMSerializer} interface into this serializer,
- * or null if the serializer is not DOM capable
- * @throws IOException An I/O exception occured
- */
- public DOMSerializer asDOMSerializer() throws IOException;
-
- /**
* This method resets the serializer.
* If this method returns true, the
* serializer may be used for subsequent serialization of new
@@ -218,21 +202,5 @@ public interface Serializer {
* @return True if serializer has been reset and can be reused
*/
public boolean reset();
-
- /**
- * Return an Object into this serializer to be cast to a DOM3Serializer.
- * Through the returned object the document to be serialized,
- * a DOM (Level 3), can be provided to the serializer.
- * If the serializer does not support casting to a {@link DOM3Serializer}
- * interface, it should return null.
- * <p>
- * In principle only one of asDOM3Serializer() or asContentHander()
- * should be called.
- *
- * @return An Object to be cast to a DOM3Serializer interface into this serializer,
- * or null if the serializer is not DOM capable
- * @throws IOException An I/O exception occured
- */
- public Object asDOM3Serializer() throws IOException;
}
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=1742578&r1=1742481&r2=1742578&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 Fri May 6 18:18:56 2016
@@ -18,7 +18,7 @@
/*
* $Id$
*/
-package org.apache.xml.serializer;
+package org.apache.axiom.core.stream.serializer;
import java.io.IOException;
import java.util.HashMap;
@@ -28,8 +28,8 @@ import javax.xml.transform.OutputKeys;
import javax.xml.transform.SourceLocator;
import javax.xml.transform.Transformer;
-import org.apache.xml.serializer.utils.MsgKey;
-import org.apache.xml.serializer.utils.Utils;
+import org.apache.axiom.core.stream.serializer.utils.MsgKey;
+import org.apache.axiom.core.stream.serializer.utils.Utils;
import org.xml.sax.Attributes;
import org.xml.sax.ContentHandler;
import org.xml.sax.Locator;
@@ -780,21 +780,6 @@ public abstract class SerializerBase
}
/**
- * Return a {@link DOMSerializer} interface into this serializer. If the
- * serializer does not support the {@link DOMSerializer} interface, it should
- * return null.
- *
- * @return A {@link DOMSerializer} interface into this serializer, or null
- * if the serializer is not DOM capable
- * @throws IOException An I/O exception occured
- * @see Serializer#asDOMSerializer()
- */
- public DOMSerializer asDOMSerializer() throws IOException
- {
- return this;
- }
-
- /**
* Tell if two strings are equal, without worry if the first string is null.
*
* @param p String reference, which may be null.
@@ -1570,20 +1555,6 @@ public abstract class SerializerBase
}
/**
- * Return a {@link DOM3Serializer} interface into this serializer. If the
- * serializer does not support the {@link DOM3Serializer} interface, it should
- * return null.
- *
- * @return A {@link DOM3Serializer} interface into this serializer, or null
- * if the serializer is not DOM capable
- * @throws IOException An I/O exception occured
- * @see org.apache.xml.serializer.Serializer#asDOM3Serializer()
- */
- public Object asDOM3Serializer() throws IOException
- {
- return new org.apache.xml.serializer.dom3.DOM3SerializerImpl(this);
- }
- /**
* Get the default value of an xsl:output property,
* which would be null only if no default value exists
* for the property.
Modified: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/SerializerConstants.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/SerializerConstants.java?rev=1742578&r1=1742481&r2=1742578&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/SerializerConstants.java (original)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/SerializerConstants.java Fri May 6 18:18:56 2016
@@ -18,7 +18,7 @@
/*
* $Id$
*/
-package org.apache.xml.serializer;
+package org.apache.axiom.core.stream.serializer;
/**
* Constants used in serialization, such as the string "xmlns"
Modified: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/SerializerTrace.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/SerializerTrace.java?rev=1742578&r1=1742481&r2=1742578&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/SerializerTrace.java (original)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/SerializerTrace.java Fri May 6 18:18:56 2016
@@ -18,7 +18,7 @@
/*
* $Id$
*/
-package org.apache.xml.serializer;
+package org.apache.axiom.core.stream.serializer;
import org.xml.sax.Attributes;
Modified: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/SerializerTraceWriter.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/SerializerTraceWriter.java?rev=1742578&r1=1742481&r2=1742578&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/SerializerTraceWriter.java (original)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/SerializerTraceWriter.java Fri May 6 18:18:56 2016
@@ -18,7 +18,7 @@
/*
* $Id$
*/
-package org.apache.xml.serializer;
+package org.apache.axiom.core.stream.serializer;
import java.io.IOException;
import java.io.OutputStream;
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=1742578&r1=1742481&r2=1742578&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 Fri May 6 18:18:56 2016
@@ -18,7 +18,7 @@
/*
* $Id$
*/
-package org.apache.xml.serializer;
+package org.apache.axiom.core.stream.serializer;
import java.io.IOException;
import java.io.OutputStream;
@@ -38,9 +38,9 @@ import javax.xml.transform.OutputKeys;
import javax.xml.transform.Transformer;
import javax.xml.transform.TransformerException;
-import org.apache.xml.serializer.utils.MsgKey;
-import org.apache.xml.serializer.utils.Utils;
-import org.apache.xml.serializer.utils.WrappedRuntimeException;
+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.utils.WrappedRuntimeException;
import org.w3c.dom.Node;
import org.xml.sax.Attributes;
import org.xml.sax.ContentHandler;
@@ -202,29 +202,6 @@ abstract public class ToStream extends S
}
}
- /**
- * Serializes the DOM node. Throws an exception only if an I/O
- * exception occured while serializing.
- *
- * @param node Node to serialize.
- * @throws IOException An I/O exception occured while serializing
- */
- public void serialize(Node node) throws IOException
- {
-
- try
- {
- TreeWalker walker =
- new TreeWalker(this);
-
- walker.traverse(node);
- }
- catch (org.xml.sax.SAXException se)
- {
- throw new WrappedRuntimeException(se);
- }
- }
-
/**
* Taken from XSLTC
*/
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=1742578&r1=1742481&r2=1742578&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 Fri May 6 18:18:56 2016
@@ -18,7 +18,7 @@
/*
* $Id$
*/
- package org.apache.xml.serializer;
+package org.apache.axiom.core.stream.serializer;
import java.io.IOException;
@@ -27,8 +27,8 @@ import javax.xml.transform.Result;
import javax.xml.transform.Transformer;
import javax.xml.transform.TransformerException;
-import org.apache.xml.serializer.utils.MsgKey;
-import org.apache.xml.serializer.utils.Utils;
+import org.apache.axiom.core.stream.serializer.utils.MsgKey;
+import org.apache.axiom.core.stream.serializer.utils.Utils;
import org.xml.sax.SAXException;
/**
Modified: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/WriterChain.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/WriterChain.java?rev=1742578&r1=1742481&r2=1742578&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/WriterChain.java (original)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/WriterChain.java Fri May 6 18:18:56 2016
@@ -18,7 +18,7 @@
/*
* $Id$
*/
-package org.apache.xml.serializer;
+package org.apache.axiom.core.stream.serializer;
import java.io.IOException;
Modified: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/WriterToASCI.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/WriterToASCI.java?rev=1742578&r1=1742481&r2=1742578&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/WriterToASCI.java (original)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/WriterToASCI.java Fri May 6 18:18:56 2016
@@ -18,7 +18,7 @@
/*
* $Id$
*/
-package org.apache.xml.serializer;
+package org.apache.axiom.core.stream.serializer;
import java.io.IOException;
import java.io.OutputStream;
Modified: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/WriterToUTF8Buffered.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/WriterToUTF8Buffered.java?rev=1742578&r1=1742481&r2=1742578&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/WriterToUTF8Buffered.java (original)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/WriterToUTF8Buffered.java Fri May 6 18:18:56 2016
@@ -18,7 +18,7 @@
/*
* $Id$
*/
-package org.apache.xml.serializer;
+package org.apache.axiom.core.stream.serializer;
import java.io.IOException;
import java.io.OutputStream;
Modified: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/XSLOutputAttributes.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/XSLOutputAttributes.java?rev=1742578&r1=1742481&r2=1742578&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/XSLOutputAttributes.java (original)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/XSLOutputAttributes.java Fri May 6 18:18:56 2016
@@ -18,7 +18,7 @@
/*
* $Id$
*/
-package org.apache.xml.serializer;
+package org.apache.axiom.core.stream.serializer;
import java.util.Vector;
Modified: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/utils/Messages.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/utils/Messages.java?rev=1742578&r1=1742481&r2=1742578&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/utils/Messages.java (original)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/utils/Messages.java Fri May 6 18:18:56 2016
@@ -18,7 +18,7 @@
/*
* $Id$
*/
-package org.apache.xml.serializer.utils;
+package org.apache.axiom.core.stream.serializer.utils;
import java.util.ListResourceBundle;
import java.util.Locale;
Modified: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/utils/MsgKey.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/utils/MsgKey.java?rev=1742578&r1=1742481&r2=1742578&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/utils/MsgKey.java (original)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/utils/MsgKey.java Fri May 6 18:18:56 2016
@@ -18,7 +18,7 @@
/*
* $Id$
*/
-package org.apache.xml.serializer.utils;
+package org.apache.axiom.core.stream.serializer.utils;
/**
* This class is not a public API,
Modified: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/utils/SerializerMessages.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/utils/SerializerMessages.java?rev=1742578&r1=1742481&r2=1742578&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/utils/SerializerMessages.java (original)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/utils/SerializerMessages.java Fri May 6 18:18:56 2016
@@ -18,7 +18,7 @@
/*
* $Id$
*/
-package org.apache.xml.serializer.utils;
+package org.apache.axiom.core.stream.serializer.utils;
import java.util.ListResourceBundle;
import java.util.Locale;
Modified: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/utils/SerializerMessages_en.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/utils/SerializerMessages_en.java?rev=1742578&r1=1742481&r2=1742578&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/utils/SerializerMessages_en.java (original)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/utils/SerializerMessages_en.java Fri May 6 18:18:56 2016
@@ -18,7 +18,7 @@
/*
* $Id$
*/
-package org.apache.xml.serializer.utils;
+package org.apache.axiom.core.stream.serializer.utils;
/**
Modified: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/utils/StringToIntTable.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/utils/StringToIntTable.java?rev=1742578&r1=1742481&r2=1742578&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/utils/StringToIntTable.java (original)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/utils/StringToIntTable.java Fri May 6 18:18:56 2016
@@ -18,7 +18,7 @@
/*
* $Id$
*/
-package org.apache.xml.serializer.utils;
+package org.apache.axiom.core.stream.serializer.utils;
/**
* A very simple lookup table that stores a list of strings, the even
Modified: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/utils/SystemIDResolver.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/utils/SystemIDResolver.java?rev=1742578&r1=1742481&r2=1742578&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/utils/SystemIDResolver.java (original)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/utils/SystemIDResolver.java Fri May 6 18:18:56 2016
@@ -18,13 +18,13 @@
/*
* $Id$
*/
-package org.apache.xml.serializer.utils;
+package org.apache.axiom.core.stream.serializer.utils;
import java.io.File;
import javax.xml.transform.TransformerException;
-import org.apache.xml.serializer.utils.URI.MalformedURIException;
+import org.apache.axiom.core.stream.serializer.utils.URI.MalformedURIException;
/**
* This class is used to resolve relative URIs and SystemID
Modified: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/utils/URI.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/utils/URI.java?rev=1742578&r1=1742481&r2=1742578&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/utils/URI.java (original)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/utils/URI.java Fri May 6 18:18:56 2016
@@ -18,7 +18,7 @@
/*
* $Id$
*/
-package org.apache.xml.serializer.utils;
+package org.apache.axiom.core.stream.serializer.utils;
import java.io.IOException;
import java.io.Serializable;
Modified: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/utils/Utils.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/utils/Utils.java?rev=1742578&r1=1742481&r2=1742578&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/utils/Utils.java (original)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/utils/Utils.java Fri May 6 18:18:56 2016
@@ -18,7 +18,7 @@
/*
* $Id$
*/
-package org.apache.xml.serializer.utils;
+package org.apache.axiom.core.stream.serializer.utils;
/**
* This class contains utilities used by the serializer.
Modified: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/utils/WrappedRuntimeException.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/utils/WrappedRuntimeException.java?rev=1742578&r1=1742481&r2=1742578&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/utils/WrappedRuntimeException.java (original)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/utils/WrappedRuntimeException.java Fri May 6 18:18:56 2016
@@ -18,7 +18,7 @@
/*
* $Id$
*/
-package org.apache.xml.serializer.utils;
+package org.apache.axiom.core.stream.serializer.utils;
/**
* This class is for throwing important checked exceptions
Added: webservices/axiom/trunk/aspects/core-aspects/src/test/java/org/apache/axiom/core/stream/serializer/SerializerTest.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/test/java/org/apache/axiom/core/stream/serializer/SerializerTest.java?rev=1742578&view=auto
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/test/java/org/apache/axiom/core/stream/serializer/SerializerTest.java (added)
+++ webservices/axiom/trunk/aspects/core-aspects/src/test/java/org/apache/axiom/core/stream/serializer/SerializerTest.java Fri May 6 18:18:56 2016
@@ -0,0 +1,77 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.axiom.core.stream.serializer;
+
+import static com.google.common.truth.Truth.assertAbout;
+import static org.apache.axiom.testing.multiton.Multiton.getInstances;
+import static org.apache.axiom.truth.xml.XMLTruth.xml;
+
+import java.io.StringReader;
+import java.io.StringWriter;
+
+import org.apache.axiom.core.stream.XmlReader;
+import org.apache.axiom.core.stream.dom.DOMInput;
+import org.apache.axiom.core.stream.sax.ContentHandlerXmlHandler;
+import org.apache.axiom.testutils.suite.MatrixTestCase;
+import org.apache.axiom.testutils.suite.MatrixTestSuiteBuilder;
+import org.apache.axiom.ts.xml.XMLSample;
+import org.w3c.dom.Document;
+import org.xml.sax.InputSource;
+
+import junit.framework.TestSuite;
+
+public class SerializerTest extends MatrixTestCase {
+ private final XMLSample sample;
+
+ public SerializerTest(XMLSample sample) {
+ this.sample = sample;
+ addTestParameter("sample", sample.getName());
+ }
+
+ @Override
+ protected void runTest() throws Throwable {
+ Document document = sample.getDocument();
+ SerializationHandler serializer = new ToXMLStream();
+ StringWriter sw = new StringWriter();
+ serializer.setWriter(sw);
+ XmlReader reader = new DOMInput(document, false).createReader(
+ new ContentHandlerXmlHandler(serializer, serializer));
+ while (!reader.proceed()) {
+ // Just loop
+ }
+ InputSource is = new InputSource(new StringReader(sw.toString()));
+ is.setSystemId(sample.getUrl().toString());
+ assertAbout(xml())
+ .that(is)
+ .ignoringWhitespaceInPrologAndEpilog()
+ .treatingElementContentWhitespaceAsText() // TODO
+ .hasSameContentAs(document);
+ }
+
+ public static TestSuite suite() {
+ return new MatrixTestSuiteBuilder() {
+ @Override
+ protected void addTests() {
+ for (XMLSample sample : getInstances(XMLSample.class)) {
+ addTest(new SerializerTest(sample));
+ }
+ }
+ }.build();
+ }
+}
Propchange: webservices/axiom/trunk/aspects/core-aspects/src/test/java/org/apache/axiom/core/stream/serializer/SerializerTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: webservices/axiom/trunk/code-coverage/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/code-coverage/pom.xml?rev=1742578&r1=1742577&r2=1742578&view=diff
==============================================================================
--- webservices/axiom/trunk/code-coverage/pom.xml (original)
+++ webservices/axiom/trunk/code-coverage/pom.xml Fri May 6 18:18:56 2016
@@ -66,6 +66,25 @@
<dependency>
<groupId>${project.groupId}</groupId>
+ <artifactId>core-aspects</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>core-aspects</artifactId>
+ <version>${project.version}</version>
+ <classifier>sources</classifier>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>core-aspects</artifactId>
+ <version>${project.version}</version>
+ <classifier>jacoco</classifier>
+ <type>exec</type>
+ </dependency>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
<artifactId>om-aspects</artifactId>
<version>${project.version}</version>
</dependency>
Modified: webservices/axiom/trunk/testing/xml-testsuite/src/main/java/org/apache/axiom/ts/xml/XMLSample.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/xml-testsuite/src/main/java/org/apache/axiom/ts/xml/XMLSample.java?rev=1742578&r1=1742577&r2=1742578&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/xml-testsuite/src/main/java/org/apache/axiom/ts/xml/XMLSample.java (original)
+++ webservices/axiom/trunk/testing/xml-testsuite/src/main/java/org/apache/axiom/ts/xml/XMLSample.java Fri May 6 18:18:56 2016
@@ -20,7 +20,6 @@ package org.apache.axiom.ts.xml;
import java.io.BufferedReader;
import java.io.IOException;
-import java.io.InputStream;
import java.io.InputStreamReader;
import java.util.ArrayList;
import java.util.List;
@@ -104,12 +103,7 @@ public class XMLSample extends MessageSa
public final Document getDocument() {
try {
- InputStream in = getInputStream();
- try {
- return documentBuilder.parse(in);
- } finally {
- in.close();
- }
+ return documentBuilder.parse(getUrl().toString());
} catch (Exception ex) {
throw new Error(ex);
}