Author: veithen
Date: Sun Jul 10 20:41:44 2011
New Revision: 1144957
URL: http://svn.apache.org/viewvc?rev=1144957&view=rev
Log:
Merged a couple of changes to the 1.6 branch to take advantage of the API
introduced by AXIOM-353: r1085173,r1085931,r1088730,r1089225,r1094117.
Added:
axis/axis2/java/core/branches/1_6/modules/xmlbeans/src/org/apache/axis2/xmlbeans/XmlBeansXMLReader.java
- copied unchanged from r1088730,
axis/axis2/java/core/trunk/modules/xmlbeans/src/org/apache/axis2/xmlbeans/XmlBeansXMLReader.java
Removed:
axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/ADBSOAPModelBuilder.java
axis/axis2/java/core/branches/1_6/modules/adb/test/org/apache/axis2/databinding/ADBSOAPModelBuilderTest.java
Modified:
axis/axis2/java/core/branches/1_6/ (props changed)
axis/axis2/java/core/branches/1_6/modules/adb-codegen/test/org/apache/axis2/schema/AbstractTestCase.java
axis/axis2/java/core/branches/1_6/modules/addressing/test/org/apache/axis2/handlers/addressing/AddressingOutHandlerTest.java
axis/axis2/java/core/branches/1_6/modules/xmlbeans/src/org/apache/axis2/xmlbeans/template/XmlbeansDatabindingTemplate.xsl
Propchange: axis/axis2/java/core/branches/1_6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Jul 10 20:41:44 2011
@@ -1 +1 @@
-/axis/axis2/java/core/trunk:1070439,1072077,1072271,1072499,1072510,1078242,1081563,1081587,1081590,1082316,1082322,1082600,1082702,1082726,1082738,1083180,1083192,1083379,1083381,1083425,1083433,1083446,1084753,1085157,1085514,1085889,1085927,1087073,1088239,1088248-1088249,1088251,1088268,1088904,1091178,1091191,1099385,1099389,1100628,1101037,1103013,1103606,1103760,1128580,1128584,1128618,1128645,1130590,1131425,1134438,1134616,1136156,1136159,1137153,1137159,1138144,1138203,1139448,1139484
+/axis/axis2/java/core/trunk:1070439,1072077,1072271,1072499,1072510,1078242,1081563,1081587,1081590,1082316,1082322,1082600,1082702,1082726,1082738,1083180,1083192,1083379,1083381,1083425,1083433,1083446,1084753,1085157,1085173,1085514,1085889,1085927,1085931,1087073,1088239,1088248-1088249,1088251,1088268,1088730,1088904,1089225,1091178,1091191,1094117,1099385,1099389,1100628,1101037,1103013,1103606,1103760,1128580,1128584,1128618,1128645,1130590,1131425,1134438,1134616,1136156,1136159,1137153,1137159,1138144,1138203,1139448,1139484
Modified:
axis/axis2/java/core/branches/1_6/modules/adb-codegen/test/org/apache/axis2/schema/AbstractTestCase.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/adb-codegen/test/org/apache/axis2/schema/AbstractTestCase.java?rev=1144957&r1=1144956&r2=1144957&view=diff
==============================================================================
---
axis/axis2/java/core/branches/1_6/modules/adb-codegen/test/org/apache/axis2/schema/AbstractTestCase.java
(original)
+++
axis/axis2/java/core/branches/1_6/modules/adb-codegen/test/org/apache/axis2/schema/AbstractTestCase.java
Sun Jul 10 20:41:44 2011
@@ -53,8 +53,7 @@ import org.apache.axiom.mime.impl.javama
import org.apache.axiom.om.OMAbstractFactory;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMOutputFormat;
-import org.apache.axiom.om.impl.OMMultipartWriter;
-import org.apache.axiom.om.impl.builder.StAXOMBuilder;
+import org.apache.axiom.om.OMXMLBuilderFactory;
import org.apache.axiom.om.util.StAXUtils;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.soap.impl.builder.MTOMStAXSOAPModelBuilder;
@@ -343,8 +342,8 @@ public abstract class AbstractTestCase e
private static void testSerializeDeserializeUsingOMStAXWrapper(Object
bean, Object expectedResult) throws Exception {
OMElement omElement = ADBBeanUtil.getOMElement(bean);
String omElementString = omElement.toStringWithConsume();
- OMElement omElement2 = new
StAXOMBuilder(StAXUtils.createXMLStreamReader(
- new StringReader(omElementString))).getDocumentElement();
+ OMElement omElement2 = OMXMLBuilderFactory.createOMBuilder(
+ new StringReader(omElementString)).getDocumentElement();
assertBeanEquals(expectedResult, ADBBeanUtil.parse(bean.getClass(),
omElement2.getXMLStreamReader()));
}
@@ -364,7 +363,7 @@ public abstract class AbstractTestCase e
ADBBeanUtil.serialize(bean, writer);
writer.writeEndElement();
writer.flush();
- OMElement omElement3 = new
StAXOMBuilder(StAXUtils.createXMLStreamReader(new
StringReader(sw.toString()))).getDocumentElement();
+ OMElement omElement3 = OMXMLBuilderFactory.createOMBuilder(new
StringReader(sw.toString())).getDocumentElement();
assertBeanEquals(expectedResult, ADBBeanUtil.parse(bean.getClass(),
omElement3.getFirstElement().getXMLStreamReader()));
}
Modified:
axis/axis2/java/core/branches/1_6/modules/addressing/test/org/apache/axis2/handlers/addressing/AddressingOutHandlerTest.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/addressing/test/org/apache/axis2/handlers/addressing/AddressingOutHandlerTest.java?rev=1144957&r1=1144956&r2=1144957&view=diff
==============================================================================
---
axis/axis2/java/core/branches/1_6/modules/addressing/test/org/apache/axis2/handlers/addressing/AddressingOutHandlerTest.java
(original)
+++
axis/axis2/java/core/branches/1_6/modules/addressing/test/org/apache/axis2/handlers/addressing/AddressingOutHandlerTest.java
Sun Jul 10 20:41:44 2011
@@ -19,13 +19,11 @@
package org.apache.axis2.handlers.addressing;
-import junit.framework.TestCase;
import org.apache.axiom.om.OMAbstractFactory;
import org.apache.axiom.om.OMAttribute;
import org.apache.axiom.om.OMNamespace;
import org.apache.axiom.om.OMXMLParserWrapper;
import org.apache.axiom.om.impl.OMNamespaceImpl;
-import org.apache.axiom.om.impl.llom.util.XMLComparator;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.soap.SOAPFactory;
import org.apache.axiom.soap.SOAPHeaderBlock;
@@ -47,7 +45,6 @@ import javax.xml.namespace.QName;
import java.io.File;
import java.util.ArrayList;
import java.util.Iterator;
-import java.util.List;
public class AddressingOutHandlerTest extends XMLTestCase implements
AddressingConstants {
private AddressingOutHandler outHandler;
Modified:
axis/axis2/java/core/branches/1_6/modules/xmlbeans/src/org/apache/axis2/xmlbeans/template/XmlbeansDatabindingTemplate.xsl
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/xmlbeans/src/org/apache/axis2/xmlbeans/template/XmlbeansDatabindingTemplate.xsl?rev=1144957&r1=1144956&r2=1144957&view=diff
==============================================================================
---
axis/axis2/java/core/branches/1_6/modules/xmlbeans/src/org/apache/axis2/xmlbeans/template/XmlbeansDatabindingTemplate.xsl
(original)
+++
axis/axis2/java/core/branches/1_6/modules/xmlbeans/src/org/apache/axis2/xmlbeans/template/XmlbeansDatabindingTemplate.xsl
Sun Jul 10 20:41:44 2011
@@ -64,15 +64,14 @@
private org.apache.axiom.om.OMElement toOM(final <xsl:value-of
select="@type"/> param)
throws org.apache.axis2.AxisFault {
- org.apache.axiom.om.impl.builder.SAXOMBuilder builder = new
org.apache.axiom.om.impl.builder.SAXOMBuilder();
org.apache.xmlbeans.XmlOptions xmlOptions = new
org.apache.xmlbeans.XmlOptions();
xmlOptions.setSaveNoXmlDecl();
xmlOptions.setSaveAggressiveNamespaces();
xmlOptions.setSaveNamespacesFirst();
+ org.apache.axiom.om.OMXMLParserWrapper builder =
org.apache.axiom.om.OMXMLBuilderFactory.createOMBuilder(
+ new javax.xml.transform.sax.SAXSource(new
org.apache.axis2.xmlbeans.XmlBeansXMLReader(param, xmlOptions), new
org.xml.sax.InputSource()));
try {
- param.save(builder, builder, xmlOptions);
- org.apache.axiom.om.OMElement element =
builder.getRootElement();
- return element;
+ return builder.getDocumentElement(true);
} catch (java.lang.Exception e) {
throw org.apache.axis2.AxisFault.makeFault(e);
}
