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/26 21:52:13 UTC

svn commit: r1745656 - in /webservices/axiom/trunk/aspects/om-aspects: ./ src/main/java/org/apache/axiom/om/impl/stream/ds/ src/main/java/org/apache/axiom/om/impl/stream/stax/

Author: veithen
Date: Thu May 26 21:52:13 2016
New Revision: 1745656

URL: http://svn.apache.org/viewvc?rev=1745656&view=rev
Log:
Move MTOMXMLStreamWriterImpl to the right package; it is now exclusively used when serializing/expanding an OMDataSource.

Added:
    webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/stream/ds/MTOMXMLStreamWriterImpl.java
      - copied, changed from r1745652, webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/stream/stax/MTOMXMLStreamWriterImpl.java
Removed:
    webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/stream/stax/MTOMXMLStreamWriterImpl.java
Modified:
    webservices/axiom/trunk/aspects/om-aspects/pom.xml
    webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/stream/ds/PushOMDataSourceReader.java

Modified: webservices/axiom/trunk/aspects/om-aspects/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/pom.xml?rev=1745656&r1=1745655&r2=1745656&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/pom.xml (original)
+++ webservices/axiom/trunk/aspects/om-aspects/pom.xml Thu May 26 21:52:13 2016
@@ -82,7 +82,6 @@
                         <configuration>
                             <ignore>
                                 <!-- TODO -->
-                                org.apache.axiom.om.impl.stream.stax.MTOMXMLStreamWriterImpl -> org.apache.axiom.om.impl.stream.ds.PushOMDataSourceStreamWriter,
                                 org.apache.axiom.om.impl.intf.AxiomContainer$AxiomContainerSupport$2 -> org.apache.axiom.om.impl.stream.xop.XOPEncodingFilterHandler
                             </ignore>
                         </configuration>

Copied: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/stream/ds/MTOMXMLStreamWriterImpl.java (from r1745652, webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/stream/stax/MTOMXMLStreamWriterImpl.java)
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/stream/ds/MTOMXMLStreamWriterImpl.java?p2=webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/stream/ds/MTOMXMLStreamWriterImpl.java&p1=webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/stream/stax/MTOMXMLStreamWriterImpl.java&r1=1745652&r2=1745656&rev=1745656&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/stream/stax/MTOMXMLStreamWriterImpl.java (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/stream/ds/MTOMXMLStreamWriterImpl.java Thu May 26 21:52:13 2016
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.axiom.om.impl.stream.stax;
+package org.apache.axiom.om.impl.stream.ds;
 
 import java.io.OutputStream;
 
@@ -36,19 +36,19 @@ import org.apache.axiom.om.OMOutputForma
 import org.apache.axiom.om.impl.MTOMXMLStreamWriter;
 import org.apache.axiom.om.impl.common.serializer.push.XmlDeclarationRewriterHandler;
 import org.apache.axiom.om.impl.common.serializer.push.XsiTypeFilterHandler;
-import org.apache.axiom.om.impl.stream.ds.PushOMDataSourceStreamWriter;
+import org.apache.axiom.om.impl.stream.stax.XmlHandlerStreamWriter;
 import org.apache.axiom.om.impl.stream.xop.XOPEncodingFilterHandler;
 import org.apache.axiom.om.impl.stream.xop.XOPHandler;
 import org.apache.axiom.om.util.CommonUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-public class MTOMXMLStreamWriterImpl extends MTOMXMLStreamWriter {
+final class MTOMXMLStreamWriterImpl extends MTOMXMLStreamWriter {
     private static final Log log = LogFactory.getLog(MTOMXMLStreamWriterImpl.class);
     private final XMLStreamWriter xmlWriter;
     private final OMOutputFormat format;
 
-    public MTOMXMLStreamWriterImpl(XMLStreamWriter xmlWriter, OMOutputFormat format) {
+    MTOMXMLStreamWriterImpl(XMLStreamWriter xmlWriter, OMOutputFormat format) {
         this.xmlWriter = xmlWriter;
         if (log.isDebugEnabled()) {
             log.debug("Creating MTOMXMLStreamWriter");

Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/stream/ds/PushOMDataSourceReader.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/stream/ds/PushOMDataSourceReader.java?rev=1745656&r1=1745655&r2=1745656&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/stream/ds/PushOMDataSourceReader.java (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/stream/ds/PushOMDataSourceReader.java Thu May 26 21:52:13 2016
@@ -34,7 +34,6 @@ import org.apache.axiom.om.OMNamespace;
 import org.apache.axiom.om.OMOutputFormat;
 import org.apache.axiom.om.impl.common.serializer.push.XmlDeclarationRewriterHandler;
 import org.apache.axiom.om.impl.intf.AxiomSourcedElement;
-import org.apache.axiom.om.impl.stream.stax.MTOMXMLStreamWriterImpl;
 import org.apache.axiom.om.impl.stream.stax.XmlHandlerStreamWriter;
 
 final class PushOMDataSourceReader implements XmlReader {