Author: veithen
Date: Wed May 25 06:20:20 2016
New Revision: 1745426

URL: http://svn.apache.org/viewvc?rev=1745426&view=rev
Log:
AXIS2-4791: Reimplement the invalid character filter as an MTOMXMLStreamWriter 
wrapper. This is possible since MTOMXMLStreamWriter is now an abstract class.

Added:
    
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/datasource/jaxb/XMLStreamWriterFilterBase.java
   (contents, props changed)
      - copied, changed from r1745407, 
webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/util/XMLStreamWriterFilterBase.java
    
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/datasource/jaxb/XMLStreamWriterRemoveIllegalChars.java
   (contents, props changed)
      - copied, changed from r1745407, 
webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/util/XMLStreamWriterRemoveIllegalChars.java
Modified:
    
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/datasource/jaxb/JAXBDSContext.java

Modified: 
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/datasource/jaxb/JAXBDSContext.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/datasource/jaxb/JAXBDSContext.java?rev=1745426&r1=1745425&r2=1745426&view=diff
==============================================================================
--- 
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/datasource/jaxb/JAXBDSContext.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/datasource/jaxb/JAXBDSContext.java
 Wed May 25 06:20:20 2016
@@ -21,7 +21,6 @@ package org.apache.axis2.datasource.jaxb
 
 import org.apache.axiom.om.OMException;
 import org.apache.axiom.om.impl.MTOMXMLStreamWriter;
-import org.apache.axiom.om.util.XMLStreamWriterRemoveIllegalChars;
 import org.apache.axiom.util.stax.XMLStreamReaderUtils;
 import org.apache.axiom.util.stax.xop.XOPEncodedStream;
 import org.apache.axiom.util.stax.xop.XOPUtils;
@@ -360,90 +359,83 @@ public class JAXBDSContext {
         if (log.isDebugEnabled()) {
             log.debug("enter marshal");
         }
-        boolean installedFilter = false;
 
-        try {
-            // There may be a preferred classloader that should be used
-            ClassLoader cl = getClassLoader();
+        // There may be a preferred classloader that should be used
+        ClassLoader cl = getClassLoader();
 
 
-            // Very easy, use the Context to get the Marshaller.
-            // Use the marshaller to write the object.
-            JAXBContext jbc = getJAXBContext(cl);
-            Marshaller m = JAXBUtils.getJAXBMarshaller(jbc);
-            if (writer instanceof MTOMXMLStreamWriter && 
((MTOMXMLStreamWriter) writer).getOutputFormat() != null) {
-                String encoding = ((MTOMXMLStreamWriter) 
writer).getOutputFormat().getCharSetEncoding();
-
-                String marshallerEncoding = (String) 
m.getProperty(Marshaller.JAXB_ENCODING);
-
-                // Make sure that the marshaller respects the encoding of the 
message.
-                // This is accomplished by setting the encoding on the 
Marshaller's JAXB_ENCODING property.
-                if (encoding == null && marshallerEncoding == null) {
+        // Very easy, use the Context to get the Marshaller.
+        // Use the marshaller to write the object.
+        JAXBContext jbc = getJAXBContext(cl);
+        Marshaller m = JAXBUtils.getJAXBMarshaller(jbc);
+        if (writer instanceof MTOMXMLStreamWriter && ((MTOMXMLStreamWriter) 
writer).getOutputFormat() != null) {
+            String encoding = ((MTOMXMLStreamWriter) 
writer).getOutputFormat().getCharSetEncoding();
+
+            String marshallerEncoding = (String) 
m.getProperty(Marshaller.JAXB_ENCODING);
+
+            // Make sure that the marshaller respects the encoding of the 
message.
+            // This is accomplished by setting the encoding on the 
Marshaller's JAXB_ENCODING property.
+            if (encoding == null && marshallerEncoding == null) {
+                if (log.isDebugEnabled()) {
+                    log.debug("The encoding and the marshaller's JAXB_ENCODING 
are both set to the default (UTF-8)");
+                }
+            } else {
+                // Must set the encoding to an actual String to set it on the 
Marshaller
+                if (encoding == null) {
+                    encoding = "UTF-8";
+                }
+                if (!encoding.equalsIgnoreCase(marshallerEncoding)) {
                     if (log.isDebugEnabled()) {
-                        log.debug("The encoding and the marshaller's 
JAXB_ENCODING are both set to the default (UTF-8)");
+                        log.debug("The Marshaller.JAXB_ENCODING is " + 
marshallerEncoding);
+                        log.debug("The Marshaller.JAXB_ENCODING is changed to 
the message encoding " + 
+                                encoding);
                     }
+                    m.setProperty(Marshaller.JAXB_ENCODING, encoding);
                 } else {
-                    // Must set the encoding to an actual String to set it on 
the Marshaller
-                    if (encoding == null) {
-                        encoding = "UTF-8";
-                    }
-                    if (!encoding.equalsIgnoreCase(marshallerEncoding)) {
-                        if (log.isDebugEnabled()) {
-                            log.debug("The Marshaller.JAXB_ENCODING is " + 
marshallerEncoding);
-                            log.debug("The Marshaller.JAXB_ENCODING is changed 
to the message encoding " + 
-                                    encoding);
-                        }
-                        m.setProperty(Marshaller.JAXB_ENCODING, encoding);
-                    } else {
-                        if (log.isDebugEnabled()) {
-                            log.debug("The encoding and the marshaller's 
JAXB_ENCODING are both set to:" + 
-                                    marshallerEncoding);
-                        }
+                    if (log.isDebugEnabled()) {
+                        log.debug("The encoding and the marshaller's 
JAXB_ENCODING are both set to:" + 
+                                marshallerEncoding);
                     }
                 }
             }
+        }
 
-            AttachmentMarshaller am = new 
JAXBAttachmentMarshaller(createAttachmentContext(), writer);
-            if (am != null) {
-                if (DEBUG_ENABLED) {
-                    log.debug("Adding JAXBAttachmentMarshaller to Marshaller");
-                }
-                m.setAttachmentMarshaller(am);
+        AttachmentMarshaller am = new 
JAXBAttachmentMarshaller(createAttachmentContext(), writer);
+        if (am != null) {
+            if (DEBUG_ENABLED) {
+                log.debug("Adding JAXBAttachmentMarshaller to Marshaller");
             }
+            m.setAttachmentMarshaller(am);
+        }
 
-            MessageContext mc = getMessageContext();
-
-            // If requested install a filter to remove illegal characters
-            installedFilter = installFilter(mc, writer);
+        MessageContext mc = getMessageContext();
 
+        // If requested install a filter to remove illegal characters
+        if (writer instanceof MTOMXMLStreamWriter && 
ContextUtils.isJAXBRemoveIllegalChars(mc)) {
+            writer = new 
XMLStreamWriterRemoveIllegalChars((MTOMXMLStreamWriter)writer);
+        }
 
-            // Marshal the object
-            if (getProcessType() == null) {
-                marshalByElement(obj, 
-                        m, 
-                        writer, 
-                        true);
-                //!am.isXOPPackage());
-            } else {
-                marshalByType(obj,
-                        m,
-                        writer,
-                        getProcessType(),
-                        isxmlList(),
-                        getConstructionType(),
-                        true); // Attempt to optimize by writing to 
OutputStream
-            }
+        // Marshal the object
+        if (getProcessType() == null) {
+            marshalByElement(obj, 
+                    m, 
+                    writer, 
+                    true);
+            //!am.isXOPPackage());
+        } else {
+            marshalByType(obj,
+                    m,
+                    writer,
+                    getProcessType(),
+                    isxmlList(),
+                    getConstructionType(),
+                    true); // Attempt to optimize by writing to OutputStream
+        }
 
-            JAXBUtils.releaseJAXBMarshaller(jbc, m);
+        JAXBUtils.releaseJAXBMarshaller(jbc, m);
 
-            if (log.isDebugEnabled()) {
-                log.debug("exit marshal");
-            }
-        } finally {
-            // Make sure the filter is uninstalled
-            if (installedFilter) {
-                uninstallFilter(writer);
-            }
+        if (log.isDebugEnabled()) {
+            log.debug("exit marshal");
         }
     }
     
@@ -1093,37 +1085,4 @@ public class JAXBDSContext {
             throw new OMException(t);
         }
     }
-    
-
-    /**
-     * Install a JAXB filter if requested
-     * @param mc
-     * @param writer
-     * @return true if filter installed
-     */
-    private boolean installFilter(MessageContext mc, XMLStreamWriter writer) {
-        if (!(writer instanceof MTOMXMLStreamWriter)) {
-            return false;
-        }
-        if (!ContextUtils.isJAXBRemoveIllegalChars(mc)) {
-            return false;
-        }
-        
-         
-        MTOMXMLStreamWriter mtomWriter = (MTOMXMLStreamWriter) writer;
-        mtomWriter.setFilter(new XMLStreamWriterRemoveIllegalChars());
-        return true;
-    }
-    
-    /**
-     * UninstallInstall a JAXB filter if requested
-     * @param mc
-     * @param writer
-     * @return true if filter installed
-     */
-    private void uninstallFilter(XMLStreamWriter writer) {
-        MTOMXMLStreamWriter mtomWriter = (MTOMXMLStreamWriter) writer;
-        mtomWriter.removeFilter();
-    }
-
 }

Copied: 
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/datasource/jaxb/XMLStreamWriterFilterBase.java
 (from r1745407, 
webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/util/XMLStreamWriterFilterBase.java)
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/datasource/jaxb/XMLStreamWriterFilterBase.java?p2=axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/datasource/jaxb/XMLStreamWriterFilterBase.java&p1=webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/util/XMLStreamWriterFilterBase.java&r1=1745407&r2=1745426&rev=1745426&view=diff
==============================================================================
--- 
webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/util/XMLStreamWriterFilterBase.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/datasource/jaxb/XMLStreamWriterFilterBase.java
 Wed May 25 06:20:20 2016
@@ -16,14 +16,20 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.axiom.om.util;
+package org.apache.axis2.datasource.jaxb;
 
+import java.io.OutputStream;
+
+import javax.activation.DataHandler;
 import javax.xml.namespace.NamespaceContext;
 import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamWriter;
+
+import org.apache.axiom.om.OMOutputFormat;
+import org.apache.axiom.om.impl.MTOMXMLStreamWriter;
+import org.apache.axiom.om.util.XMLStreamWriterFilter;
 
 /**
- * The base class for classes that are XMLStreamWriterFilters
+ * The base class for classes that are MTOMXMLStreamWriter filters.
  * Each of the XMLStreamWriter events is intercepted and passed to the 
delegate XMLStreamWriter
  * 
  * Character data is sent to the xmlData abstract method.  Derived classes may 
@@ -31,73 +37,79 @@ import javax.xml.stream.XMLStreamWriter;
  * 
  * @see XMLStreamWriterRemoveIllegalChars
  */
-public abstract class XMLStreamWriterFilterBase implements 
XMLStreamWriterFilter {
-
-    XMLStreamWriter delegate = null;
+public abstract class XMLStreamWriterFilterBase extends MTOMXMLStreamWriter {
 
-    public XMLStreamWriterFilterBase() {
-    }
-    
-    public void setDelegate(XMLStreamWriter writer) {
-        this.delegate = writer;
-    }
+    private final MTOMXMLStreamWriter delegate;
 
-    public XMLStreamWriter getDelegate() {
-        return delegate;
+    public XMLStreamWriterFilterBase(MTOMXMLStreamWriter delegate) {
+        this.delegate = delegate;
     }
 
+    @Override
     public void close() throws XMLStreamException {
         delegate.close();
     }
 
+    @Override
     public void flush() throws XMLStreamException {
         delegate.flush();
     }
 
+    @Override
     public NamespaceContext getNamespaceContext() {
         return delegate.getNamespaceContext();
     }
 
+    @Override
     public String getPrefix(String uri) throws XMLStreamException {
         return delegate.getPrefix(uri);
     }
 
+    @Override
     public Object getProperty(String name) throws IllegalArgumentException {
         return delegate.getProperty(name);
     }
 
+    @Override
     public void setDefaultNamespace(String uri) throws XMLStreamException {
         delegate.setDefaultNamespace(uri);
     }
 
+    @Override
     public void setNamespaceContext(NamespaceContext context)
             throws XMLStreamException {
         delegate.setNamespaceContext(context);
     }
 
+    @Override
     public void setPrefix(String prefix, String uri) throws XMLStreamException 
{
         delegate.setPrefix(prefix, uri);
     }
 
+    @Override
     public void writeAttribute(String prefix, String namespaceURI,
             String localName, String value) throws XMLStreamException {
         delegate.writeAttribute(prefix, namespaceURI, localName, 
xmlData(value));
     }
 
+    @Override
     public void writeAttribute(String namespaceURI, String localName,
             String value) throws XMLStreamException {
         delegate.writeAttribute(namespaceURI, localName, xmlData(value));
     }
 
+    @Override
     public void writeAttribute(String localName, String value)
             throws XMLStreamException {
         delegate.writeAttribute(localName, xmlData(value));
     }
 
+    @Override
     public void writeCData(String data) throws XMLStreamException {
         delegate.writeCData(xmlData(data));
     }
 
+    @Override
     public void writeCharacters(char[] text, int start, int len)
             throws XMLStreamException {
         // Adapt to writeCharacters that takes a String value
@@ -105,91 +117,151 @@ public abstract class XMLStreamWriterFil
         writeCharacters(value);
     }
 
+    @Override
     public void writeCharacters(String text) throws XMLStreamException {
         delegate.writeCharacters(xmlData(text));
     }
 
+    @Override
     public void writeComment(String data) throws XMLStreamException {
         delegate.writeComment(data);
     }
 
+    @Override
     public void writeDTD(String dtd) throws XMLStreamException {
         delegate.writeDTD(dtd);
     }
 
+    @Override
     public void writeDefaultNamespace(String namespaceURI)
             throws XMLStreamException {
         delegate.writeDefaultNamespace(namespaceURI);
     }
 
+    @Override
     public void writeEmptyElement(String prefix, String localName,
             String namespaceURI) throws XMLStreamException {
         delegate.writeEmptyElement(prefix, localName, namespaceURI);
     }
 
+    @Override
     public void writeEmptyElement(String namespaceURI, String localName)
             throws XMLStreamException {
         delegate.writeEmptyElement(namespaceURI, localName);
     }
 
+    @Override
     public void writeEmptyElement(String localName) throws XMLStreamException {
         delegate.writeEmptyElement(localName);
     }
 
+    @Override
     public void writeEndDocument() throws XMLStreamException {
         delegate.writeEndDocument();
     }
 
+    @Override
     public void writeEndElement() throws XMLStreamException {
         delegate.writeEndElement();
     }
 
+    @Override
     public void writeEntityRef(String name) throws XMLStreamException {
         delegate.writeEntityRef(name);
     }
 
+    @Override
     public void writeNamespace(String prefix, String namespaceURI)
             throws XMLStreamException {
         delegate.writeNamespace(prefix, namespaceURI);
     }
 
+    @Override
     public void writeProcessingInstruction(String target, String data)
             throws XMLStreamException {
         delegate.writeProcessingInstruction(target, data);
     }
 
+    @Override
     public void writeProcessingInstruction(String target)
             throws XMLStreamException {
         delegate.writeProcessingInstruction(target);
     }
 
+    @Override
     public void writeStartDocument() throws XMLStreamException {
         delegate.writeStartDocument();
     }
 
+    @Override
     public void writeStartDocument(String encoding, String version)
             throws XMLStreamException {
         delegate.writeStartDocument(encoding, version);
     }
 
+    @Override
     public void writeStartDocument(String version) throws XMLStreamException {
         delegate.writeStartDocument(version);
     }
 
+    @Override
     public void writeStartElement(String prefix, String localName,
             String namespaceURI) throws XMLStreamException {
         delegate.writeStartElement(prefix, localName, namespaceURI);
     }
 
+    @Override
     public void writeStartElement(String namespaceURI, String localName)
             throws XMLStreamException {
         delegate.writeStartElement(namespaceURI, localName);
     }
 
+    @Override
     public void writeStartElement(String localName) throws XMLStreamException {
         delegate.writeStartElement(localName);
     }
 
+    @Override
+    public boolean isOptimized() {
+        return delegate.isOptimized();
+    }
+
+    @Override
+    public String prepareDataHandler(DataHandler dataHandler) {
+        return delegate.prepareDataHandler(dataHandler);
+    }
+
+    @Override
+    public String getCharSetEncoding() {
+        return delegate.getCharSetEncoding();
+    }
+
+    @Override
+    public OMOutputFormat getOutputFormat() {
+        return delegate.getOutputFormat();
+    }
+
+    @Override
+    public void setOutputFormat(OMOutputFormat format) {
+        delegate.setOutputFormat(format);
+    }
+
+    @Override
+    public OutputStream getOutputStream() throws XMLStreamException {
+        // Since the filter may modify the data, we can't allow access to the 
raw output stream
+        return null;
+    }
+
+    @Override
+    public void setFilter(XMLStreamWriterFilter filter) {
+        delegate.setFilter(filter);
+    }
+
+    @Override
+    public XMLStreamWriterFilter removeFilter() {
+        return delegate.removeFilter();
+    }
+
     /**
      * Derived classes extend the method.  A derived class may log or modify 
the xml data
      * @param value

Propchange: 
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/datasource/jaxb/XMLStreamWriterFilterBase.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: 
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/datasource/jaxb/XMLStreamWriterFilterBase.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed May 25 06:20:20 2016
@@ -0,0 +1,17 @@
+/webservices/axiom/branches/AXIOM-201/axiom-api/src/main/java/org/apache/axiom/om/util/XMLStreamWriterFilterBase.java:1183599-1433135
+/webservices/axiom/branches/AXIOM-399/axiom-api/src/main/java/org/apache/axiom/om/util/XMLStreamWriterFilterBase.java:1329379-1331100
+/webservices/axiom/branches/AXIOM-412/axiom-api/src/main/java/org/apache/axiom/om/util/XMLStreamWriterFilterBase.java:1311325-1325526
+/webservices/axiom/branches/AXIOM-420/axiom-api/src/main/java/org/apache/axiom/om/util/XMLStreamWriterFilterBase.java:1334121-1336372
+/webservices/axiom/branches/AXIOM-435/axiom-api/src/main/java/org/apache/axiom/om/util/XMLStreamWriterFilterBase.java:1361507-1366198
+/webservices/axiom/branches/AXIOM-437/axiom-api/src/main/java/org/apache/axiom/om/util/XMLStreamWriterFilterBase.java:1364041-1364239
+/webservices/axiom/branches/AXIOM-476/axiom-api/src/main/java/org/apache/axiom/om/util/XMLStreamWriterFilterBase.java:1718738-1718932
+/webservices/axiom/branches/CHECK_PARENT_BUG/axiom-api/src/main/java/org/apache/axiom/om/util/XMLStreamWriterFilterBase.java:1338398-1338886
+/webservices/axiom/branches/CLONE/axiom-api/src/main/java/org/apache/axiom/om/util/XMLStreamWriterFilterBase.java:1337822-1339011
+/webservices/axiom/branches/CLONE_NODE/axiom-api/src/main/java/org/apache/axiom/om/util/XMLStreamWriterFilterBase.java:1346607-1353106
+/webservices/axiom/branches/DOXIA-492/axiom-api/src/main/java/org/apache/axiom/om/util/XMLStreamWriterFilterBase.java:1715574-1716528
+/webservices/axiom/branches/JAXB2_DS/axiom-api/src/main/java/org/apache/axiom/om/util/XMLStreamWriterFilterBase.java:1366463-1367737
+/webservices/axiom/branches/attrs-aspects/axiom-api/src/main/java/org/apache/axiom/om/util/XMLStreamWriterFilterBase.java:1685218-1686663
+/webservices/axiom/branches/maven-site-plugin-3.5/axiom-api/src/main/java/org/apache/axiom/om/util/XMLStreamWriterFilterBase.java:1731125-1732708
+/webservices/axiom/branches/namespaceURIInterning/axiom-api/src/main/java/org/apache/axiom/om/util/XMLStreamWriterFilterBase.java:1293148-1293587
+/webservices/axiom/branches/osgi-redesign/axiom-api/src/main/java/org/apache/axiom/om/util/XMLStreamWriterFilterBase.java:1180368-1180596
+/webservices/axiom/branches/stax-stream/axiom-api/src/main/java/org/apache/axiom/om/util/XMLStreamWriterFilterBase.java:1733528-1733796

Copied: 
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/datasource/jaxb/XMLStreamWriterRemoveIllegalChars.java
 (from r1745407, 
webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/util/XMLStreamWriterRemoveIllegalChars.java)
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/datasource/jaxb/XMLStreamWriterRemoveIllegalChars.java?p2=axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/datasource/jaxb/XMLStreamWriterRemoveIllegalChars.java&p1=webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/util/XMLStreamWriterRemoveIllegalChars.java&r1=1745407&r2=1745426&rev=1745426&view=diff
==============================================================================
--- 
webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/util/XMLStreamWriterRemoveIllegalChars.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/datasource/jaxb/XMLStreamWriterRemoveIllegalChars.java
 Wed May 25 06:20:20 2016
@@ -16,13 +16,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.axiom.om.util;
+package org.apache.axis2.datasource.jaxb;
 
+import org.apache.axiom.om.impl.MTOMXMLStreamWriter;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
 /**
- * This is an XMLStreamWriterFilter that removes illegal characters.
+ * This is an MTOMXMLStreamWriter filter that removes illegal characters.
  * 
  * Valid and invalid character ranges are defined by:
  * http://www.w3.org/TR/2008/REC-xml-20081126/#NT-Char
@@ -34,8 +35,8 @@ public class XMLStreamWriterRemoveIllega
 
     private static final Log log = 
LogFactory.getLog(XMLStreamWriterRemoveIllegalChars.class);
     
-    public XMLStreamWriterRemoveIllegalChars() {
-        super();
+    public XMLStreamWriterRemoveIllegalChars(MTOMXMLStreamWriter delegate) {
+        super(delegate);
         if (log.isDebugEnabled()) {
             log.debug("Creating XMLStreamWriterRemoveIllegalChars object " + 
this);
         }

Propchange: 
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/datasource/jaxb/XMLStreamWriterRemoveIllegalChars.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: 
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/datasource/jaxb/XMLStreamWriterRemoveIllegalChars.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed May 25 06:20:20 2016
@@ -0,0 +1,17 @@
+/webservices/axiom/branches/AXIOM-201/axiom-api/src/main/java/org/apache/axiom/om/util/XMLStreamWriterRemoveIllegalChars.java:1183599-1433135
+/webservices/axiom/branches/AXIOM-399/axiom-api/src/main/java/org/apache/axiom/om/util/XMLStreamWriterRemoveIllegalChars.java:1329379-1331100
+/webservices/axiom/branches/AXIOM-412/axiom-api/src/main/java/org/apache/axiom/om/util/XMLStreamWriterRemoveIllegalChars.java:1311325-1325526
+/webservices/axiom/branches/AXIOM-420/axiom-api/src/main/java/org/apache/axiom/om/util/XMLStreamWriterRemoveIllegalChars.java:1334121-1336372
+/webservices/axiom/branches/AXIOM-435/axiom-api/src/main/java/org/apache/axiom/om/util/XMLStreamWriterRemoveIllegalChars.java:1361507-1366198
+/webservices/axiom/branches/AXIOM-437/axiom-api/src/main/java/org/apache/axiom/om/util/XMLStreamWriterRemoveIllegalChars.java:1364041-1364239
+/webservices/axiom/branches/AXIOM-476/axiom-api/src/main/java/org/apache/axiom/om/util/XMLStreamWriterRemoveIllegalChars.java:1718738-1718932
+/webservices/axiom/branches/CHECK_PARENT_BUG/axiom-api/src/main/java/org/apache/axiom/om/util/XMLStreamWriterRemoveIllegalChars.java:1338398-1338886
+/webservices/axiom/branches/CLONE/axiom-api/src/main/java/org/apache/axiom/om/util/XMLStreamWriterRemoveIllegalChars.java:1337822-1339011
+/webservices/axiom/branches/CLONE_NODE/axiom-api/src/main/java/org/apache/axiom/om/util/XMLStreamWriterRemoveIllegalChars.java:1346607-1353106
+/webservices/axiom/branches/DOXIA-492/axiom-api/src/main/java/org/apache/axiom/om/util/XMLStreamWriterRemoveIllegalChars.java:1715574-1716528
+/webservices/axiom/branches/JAXB2_DS/axiom-api/src/main/java/org/apache/axiom/om/util/XMLStreamWriterRemoveIllegalChars.java:1366463-1367737
+/webservices/axiom/branches/attrs-aspects/axiom-api/src/main/java/org/apache/axiom/om/util/XMLStreamWriterRemoveIllegalChars.java:1685218-1686663
+/webservices/axiom/branches/maven-site-plugin-3.5/axiom-api/src/main/java/org/apache/axiom/om/util/XMLStreamWriterRemoveIllegalChars.java:1731125-1732708
+/webservices/axiom/branches/namespaceURIInterning/axiom-api/src/main/java/org/apache/axiom/om/util/XMLStreamWriterRemoveIllegalChars.java:1293148-1293587
+/webservices/axiom/branches/osgi-redesign/axiom-api/src/main/java/org/apache/axiom/om/util/XMLStreamWriterRemoveIllegalChars.java:1180368-1180596
+/webservices/axiom/branches/stax-stream/axiom-api/src/main/java/org/apache/axiom/om/util/XMLStreamWriterRemoveIllegalChars.java:1733528-1733796


Reply via email to