You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by am...@apache.org on 2007/07/25 10:27:00 UTC
svn commit: r559351 - in /webservices/axis2/trunk/java/modules/adb-codegen:
src/org/apache/axis2/schema/template/
test/org/apache/axis2/schema/defaultnamespaces/
test/org/apache/axis2/schema/innerChoice/
test/org/apache/axis2/schema/rampart/
Author: amilas
Date: Wed Jul 25 01:26:56 2007
New Revision: 559351
URL: http://svn.apache.org/viewvc?view=rev&rev=559351
Log:
change the ADB template to support new MTOMAware writer
Modified:
webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate.xsl
webservices/axis2/trunk/java/modules/adb-codegen/test/org/apache/axis2/schema/defaultnamespaces/DefaultNamespacesTest.java
webservices/axis2/trunk/java/modules/adb-codegen/test/org/apache/axis2/schema/innerChoice/InnerChoiceTest.java
webservices/axis2/trunk/java/modules/adb-codegen/test/org/apache/axis2/schema/rampart/RampartTest.java
Modified: webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate.xsl
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate.xsl?view=diff&rev=559351&r1=559350&r2=559351
==============================================================================
--- webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate.xsl (original)
+++ webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate.xsl Wed Jul 25 01:26:56 2007
@@ -710,7 +710,7 @@
org.apache.axiom.om.OMDataSource dataSource =
new org.apache.axis2.databinding.ADBDataSource(this,parentQName){
- public void serialize(javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+ public void serialize(org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
<xsl:value-of select="$name"/>.this.serialize(parentQName,factory,xmlWriter);
}
};
@@ -721,7 +721,7 @@
org.apache.axiom.om.OMDataSource dataSource =
new org.apache.axis2.databinding.ADBDataSource(this,MY_QNAME){
- public void serialize(javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+ public void serialize(org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
<xsl:value-of select="$name"/>.this.serialize(MY_QNAME,factory,xmlWriter);
}
};
@@ -735,7 +735,7 @@
public void serialize(final javax.xml.namespace.QName parentQName,
final org.apache.axiom.om.OMFactory factory,
- javax.xml.stream.XMLStreamWriter xmlWriter)
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter)
throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
<xsl:choose>
@@ -1497,8 +1497,7 @@
<!-- Handling the null byte array -->
if (<xsl:value-of select="$varName"/>!=null)
{
- org.apache.axiom.om.impl.llom.OMTextImpl <xsl:value-of select="$varName"/>_binary = new org.apache.axiom.om.impl.llom.OMTextImpl( <xsl:value-of select="$varName"/>, org.apache.axiom.om.OMAbstractFactory.getOMFactory());
- <xsl:value-of select="$varName"/>_binary.internalSerializeAndConsume(xmlWriter);
+ xmlWriter.writeDataHandler(<xsl:value-of select="$varName"/>);
}
</xsl:when>
<xsl:otherwise>
@@ -1692,8 +1691,7 @@
<!-- Handling the null byte array -->
if (<xsl:value-of select="$varName"/>!=null)
{
- org.apache.axiom.om.impl.llom.OMTextImpl <xsl:value-of select="$varName"/>_binary = new org.apache.axiom.om.impl.llom.OMTextImpl( <xsl:value-of select="$varName"/>, org.apache.axiom.om.OMAbstractFactory.getOMFactory());
- <xsl:value-of select="$varName"/>_binary.internalSerializeAndConsume(xmlWriter);
+ xmlWriter.writeDataHandler(<xsl:value-of select="$varName"/>);
}
</xsl:when>
<xsl:otherwise>
Modified: webservices/axis2/trunk/java/modules/adb-codegen/test/org/apache/axis2/schema/defaultnamespaces/DefaultNamespacesTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/adb-codegen/test/org/apache/axis2/schema/defaultnamespaces/DefaultNamespacesTest.java?view=diff&rev=559351&r1=559350&r2=559351
==============================================================================
--- webservices/axis2/trunk/java/modules/adb-codegen/test/org/apache/axis2/schema/defaultnamespaces/DefaultNamespacesTest.java (original)
+++ webservices/axis2/trunk/java/modules/adb-codegen/test/org/apache/axis2/schema/defaultnamespaces/DefaultNamespacesTest.java Wed Jul 25 01:26:56 2007
@@ -24,6 +24,8 @@
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMAbstractFactory;
import org.apache.axiom.om.util.StAXUtils;
+import org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter;
+import org.apache.axis2.databinding.utils.writer.MTOMAwareXMLSerializer;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
@@ -65,9 +67,9 @@
try {
XMLStreamWriter xmlStreamWriter = StAXUtils.createXMLStreamWriter(stringWriter);
-
+ MTOMAwareXMLStreamWriter mtomAwareXMLStreamWriter = new MTOMAwareXMLSerializer(xmlStreamWriter);
testElement1.getTestElement1().serialize(new QName("http://tempuri.org/defaultnamepaces", "TestElement1", "ns1"),
- OMAbstractFactory.getSOAP11Factory(), xmlStreamWriter);
+ OMAbstractFactory.getSOAP11Factory(), mtomAwareXMLStreamWriter);
xmlStreamWriter.flush();
xmlStreamWriter.close();
String omElementString = stringWriter.toString();
Modified: webservices/axis2/trunk/java/modules/adb-codegen/test/org/apache/axis2/schema/innerChoice/InnerChoiceTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/adb-codegen/test/org/apache/axis2/schema/innerChoice/InnerChoiceTest.java?view=diff&rev=559351&r1=559350&r2=559351
==============================================================================
--- webservices/axis2/trunk/java/modules/adb-codegen/test/org/apache/axis2/schema/innerChoice/InnerChoiceTest.java (original)
+++ webservices/axis2/trunk/java/modules/adb-codegen/test/org/apache/axis2/schema/innerChoice/InnerChoiceTest.java Wed Jul 25 01:26:56 2007
@@ -22,6 +22,8 @@
import org.apache.axiom.om.OMAbstractFactory;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.util.StAXUtils;
+import org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter;
+import org.apache.axis2.databinding.utils.writer.MTOMAwareXMLSerializer;
import test.axis2.apache.org.*;
import javax.xml.stream.XMLStreamReader;
@@ -55,8 +57,9 @@
// writtig result back
XMLStreamWriter xmlStreamWriter = StAXUtils.createXMLStreamWriter(System.out);
+ MTOMAwareXMLStreamWriter mtomAwareXMLStreamWriter = new MTOMAwareXMLSerializer(xmlStreamWriter);
result.serialize(new javax.xml.namespace.QName("org.apache.axis2.test", "TestInnerSequence1", "foo")
- , OMAbstractFactory.getSOAP11Factory(), xmlStreamWriter);
+ , OMAbstractFactory.getSOAP11Factory(), mtomAwareXMLStreamWriter);
xmlStreamWriter.flush();
} catch (Exception e) {
Modified: webservices/axis2/trunk/java/modules/adb-codegen/test/org/apache/axis2/schema/rampart/RampartTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/adb-codegen/test/org/apache/axis2/schema/rampart/RampartTest.java?view=diff&rev=559351&r1=559350&r2=559351
==============================================================================
--- webservices/axis2/trunk/java/modules/adb-codegen/test/org/apache/axis2/schema/rampart/RampartTest.java (original)
+++ webservices/axis2/trunk/java/modules/adb-codegen/test/org/apache/axis2/schema/rampart/RampartTest.java Wed Jul 25 01:26:56 2007
@@ -49,7 +49,7 @@
try {
OMElement omElement = testExtension.getOMElement(TestExtension.MY_QNAME, OMAbstractFactory.getOMFactory());
- String omElementString = omElement.toString();
+ String omElementString = omElement.toStringWithConsume();
System.out.println("OM String " + omElementString);
XMLStreamReader xmlReader = StAXUtils.createXMLStreamReader(new ByteArrayInputStream(omElementString.getBytes()));
TestExtension result = TestExtension.Factory.parse(xmlReader);
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org