svn commit: r1741954 - in /axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2: datasource/XMLStringDataSource.java jaxws/message/databinding/impl/XMLStringBlockImpl.java

[veithen]

Author: veithen
Date: Mon May  2 10:30:10 2016
New Revision: 1741954

URL: http://svn.apache.org/viewvc?rev=1741954&view=rev
Log:
Remove XMLStringDataSource and use Axiom's StringOMDataSource instead.

Removed:
    
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/datasource/XMLStringDataSource.java
Modified:
    
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/message/databinding/impl/XMLStringBlockImpl.java

Modified: 
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/message/databinding/impl/XMLStringBlockImpl.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/message/databinding/impl/XMLStringBlockImpl.java?rev=1741954&r1=1741953&r2=1741954&view=diff
==============================================================================
--- 
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/message/databinding/impl/XMLStringBlockImpl.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/message/databinding/impl/XMLStringBlockImpl.java
 Mon May  2 10:30:10 2016
@@ -24,8 +24,8 @@ import org.apache.axiom.om.OMDataSourceE
 import org.apache.axiom.om.OMElement;
 import org.apache.axiom.om.OMException;
 import org.apache.axiom.om.OMSourcedElement;
+import org.apache.axiom.om.ds.StringOMDataSource;
 import org.apache.axiom.om.util.StAXUtils;
-import org.apache.axis2.datasource.XMLStringDataSource;
 import org.apache.axis2.jaxws.ExceptionFactory;
 import org.apache.axis2.jaxws.message.databinding.XMLStringBlock;
 import org.apache.axis2.jaxws.message.factory.BlockFactory;
@@ -92,8 +92,8 @@ public class XMLStringBlockImpl extends
         // Shortcut to get business object from existing data source
         if (omElement instanceof OMSourcedElement) {
             OMDataSource ds = ((OMSourcedElement) omElement).getDataSource();
-            if (ds instanceof XMLStringDataSource) {
-                return ((XMLStringDataSource) ds).getObject();
+            if (ds instanceof StringOMDataSource) {
+                return ((StringOMDataSource) ds).getObject();
             }
         }
         return super._getBOFromOM(omElement, busContext);
@@ -152,7 +152,7 @@ public class XMLStringBlockImpl extends
     }
     
     public OMDataSourceExt copy() throws OMException {
-        return new XMLStringDataSource((String) getObject());
+        return new StringOMDataSource((String) getObject());
     }