You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by di...@apache.org on 2005/12/01 03:37:02 UTC
svn commit: r350108 - in /webservices/axis2/trunk/java/modules:
core/src/org/apache/axis2/transport/
core/src/org/apache/axis2/transport/http/
saaj/src/org/apache/axis2/om/impl/dom/ saaj/src/org/apache/axis2/saaj/
saaj/src/org/apache/axis2/soap/impl/do...
Author: dims
Date: Wed Nov 30 18:36:42 2005
New Revision: 350108
URL: http://svn.apache.org/viewcvs?rev=350108&view=rev
Log:
Fix for AXIS2-252 - OMNode, OMDocument use OMOutputImpl - violating package encapsulation
Notes:
- Introduce OMOutputFormat with get/set for all the options that is usually set in OMOutputImpl. Need to clean it up though. Right now it is a cut-n-paste of what was in OMOutputImpl
- Methods with OMOutputImpl have been moved to OMNodeEx from OMNode and added typecasts in all the code that uses them (internal usages)
- Methods with OMOutputImpl has been removed from OMDocument.
- In both OMNode and OMDocument additional methods have been added where one can specify OMOutputFormat
- Minor spelling/javadoc cleanup
TODO:
- Cleanup OMOutputFormat
- Review OMOutputImpl usages again to see if things can be simplified further.
Added:
webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/OMOutputFormat.java
Modified:
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/AbstractTransportSender.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/CommonsHTTPTransportSender.java
webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/om/impl/dom/DocumentImpl.java
webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/om/impl/dom/ElementImpl.java
webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/om/impl/dom/NodeImpl.java
webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPMessageImpl.java
webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/soap/impl/dom/SOAPFaultImpl.java
webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/soap/impl/dom/SOAPMessageImpl.java
webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/soap/impl/dom/soap12/SOAP12FaultImpl.java
webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/writer/WOMtoWSDL11Writer.java
webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/OMDocument.java
webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/OMNode.java
webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/OMNodeEx.java
webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/OMOutputImpl.java
webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMDocumentImpl.java
webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMElementImpl.java
webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMNodeImpl.java
webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMSerializerUtil.java
webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPFaultCodeImpl.java
webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPFaultDetailImpl.java
webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPFaultImpl.java
webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPFaultNodeImpl.java
webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPFaultReasonImpl.java
webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPFaultRoleImpl.java
webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPMessageImpl.java
webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/soap11/SOAP11FaultDetailImpl.java
webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/soap12/SOAP12FaultImpl.java
webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/attachments/ImageSampleTest.java
webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/om/AbstractOMSerializationTest.java
webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/om/impl/llom/OMDocumentSerilizationTest.java
webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/om/impl/llom/OMOutputTest.java
webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/soap/impl/llom/CharacterEncodingTest.java
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/AbstractTransportSender.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/AbstractTransportSender.java?rev=350108&r1=350107&r2=350108&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/AbstractTransportSender.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/AbstractTransportSender.java Wed Nov 30 18:36:42 2005
@@ -28,6 +28,7 @@
import org.apache.axis2.i18n.Messages;
import org.apache.axis2.om.OMElement;
import org.apache.axis2.om.impl.OMOutputImpl;
+import org.apache.axis2.om.impl.OMNodeEx;
import org.apache.axis2.soap.SOAPEnvelope;
import org.apache.axis2.transport.http.HTTPTransportUtils;
import org.apache.commons.logging.Log;
@@ -138,7 +139,7 @@
.getProperty(MessageContext.CHARACTER_SET_ENCODING);
omOutput.setOutputStream(out, msgContext.isDoingMTOM());
omOutput.setCharSetEncoding(charSetEnc);
- outputMessage.serializeAndConsume(omOutput);
+ ((OMNodeEx)outputMessage).serializeAndConsume(omOutput);
omOutput.flush();
out.flush();
} catch (Exception e) {
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/CommonsHTTPTransportSender.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/CommonsHTTPTransportSender.java?rev=350108&r1=350107&r2=350108&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/CommonsHTTPTransportSender.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/CommonsHTTPTransportSender.java Wed Nov 30 18:36:42 2005
@@ -32,6 +32,7 @@
import org.apache.axis2.om.OMAttribute;
import org.apache.axis2.om.OMElement;
import org.apache.axis2.om.impl.OMOutputImpl;
+import org.apache.axis2.om.impl.OMNodeEx;
import org.apache.axis2.soap.SOAP11Constants;
import org.apache.axis2.soap.SOAP12Constants;
import org.apache.axis2.transport.TransportSender;
@@ -252,7 +253,7 @@
}
}
omOutput.setOutputStream(out, msgContext.isDoingMTOM());
- dataOut.serializeAndConsume(omOutput);
+ ((OMNodeEx)dataOut).serializeAndConsume(omOutput);
omOutput.flush();
}
if (msgContext.getOperationContext() != null) {
@@ -269,9 +270,6 @@
}
}
- /**
- * @return
- */
private String findContentType(boolean isRest, MessageContext msgContext) {
if (isRest) {
if (msgContext.getProperty(HTTPConstants.HTTP_CONTENT_TYPE) != null) {
@@ -413,14 +411,14 @@
charSetEnc);
OMOutputImpl output = new OMOutputImpl(outputWriter);
output.setCharSetEncoding(charSetEnc);
- element.serializeAndConsume(output);
+ ((OMNodeEx)element).serializeAndConsume(output);
output.flush();
return bytesOut.toByteArray();
} else {
omOutput.setCharSetEncoding(charSetEnc);
omOutput.setOutputStream(bytesOut, true); //changed...
- element.serializeAndConsume(omOutput);
+ ((OMNodeEx)element).serializeAndConsume(omOutput);
omOutput.flush();
return bytesOut.toByteArray();
}
@@ -434,7 +432,7 @@
private void handleOMOutput(OutputStream out, boolean doingMTOM)
throws XMLStreamException {
omOutput.setOutputStream(out, doingMTOM);
- element.serializeAndConsume(omOutput);
+ ((OMNodeEx)element).serializeAndConsume(omOutput);
omOutput.flush();
}
Modified: webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/om/impl/dom/DocumentImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/om/impl/dom/DocumentImpl.java?rev=350108&r1=350107&r2=350108&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/om/impl/dom/DocumentImpl.java (original)
+++ webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/om/impl/dom/DocumentImpl.java Wed Nov 30 18:36:42 2005
@@ -15,16 +15,12 @@
*/
package org.apache.axis2.om.impl.dom;
-import java.util.Hashtable;
-
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamWriter;
-
import org.apache.axis2.om.OMContainer;
import org.apache.axis2.om.OMDocument;
import org.apache.axis2.om.OMElement;
import org.apache.axis2.om.OMException;
import org.apache.axis2.om.OMNode;
+import org.apache.axis2.om.OMOutputFormat;
import org.apache.axis2.om.OMXMLParserWrapper;
import org.apache.axis2.om.impl.OMOutputImpl;
import org.apache.axis2.om.impl.dom.util.XMLChar;
@@ -45,6 +41,11 @@
import org.w3c.dom.ProcessingInstruction;
import org.w3c.dom.Text;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamWriter;
+import java.io.OutputStream;
+import java.util.Hashtable;
+
/**
* @author Ruchith Fernando (ruchith.fernando@gmail.com)
*/
@@ -353,9 +354,19 @@
throw new UnsupportedOperationException("TODO");
}
- public void setXMLVersion(String version) {
- this.xmlVersion = version;
- }
+ public void serializeAndConsume(OutputStream output, OMOutputFormat format) throws XMLStreamException {
+ //TODO
+ throw new UnsupportedOperationException("TODO");
+ }
+
+ public void serialize(OutputStream output, OMOutputFormat format) throws XMLStreamException {
+ //TODO
+ throw new UnsupportedOperationException("TODO");
+ }
+
+ public void setXMLVersion(String version) {
+ this.xmlVersion = version;
+ }
/**
* Returns the document element
Modified: webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/om/impl/dom/ElementImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/om/impl/dom/ElementImpl.java?rev=350108&r1=350107&r2=350108&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/om/impl/dom/ElementImpl.java (original)
+++ webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/om/impl/dom/ElementImpl.java Wed Nov 30 18:36:42 2005
@@ -33,6 +33,7 @@
import org.apache.axis2.om.OMText;
import org.apache.axis2.om.OMXMLParserWrapper;
import org.apache.axis2.om.impl.OMOutputImpl;
+import org.apache.axis2.om.impl.OMNodeEx;
import org.apache.axis2.om.impl.llom.OMSerializerUtil;
import org.apache.axis2.om.impl.llom.traverse.OMChildElementIterator;
import org.apache.axis2.om.impl.llom.util.EmptyIterator;
@@ -803,7 +804,7 @@
//serilize children
Iterator children = this.getChildren();
while (children.hasNext()) {
- ((OMNode) children.next()).serialize(omOutput);
+ ((OMNodeEx) children.next()).serialize(omOutput);
}
OMSerializerUtil.serializeEndpart(omOutput);
@@ -816,7 +817,7 @@
Iterator children = this.getChildren();
while (children.hasNext()) {
//A call to the Serialize or the serializeAndConsume wont make a difference here
- ((OMNode) children.next()).serializeAndConsume(omOutput);
+ ((OMNodeEx) children.next()).serializeAndConsume(omOutput);
}
OMSerializerUtil.serializeEndpart(omOutput);
} else {
@@ -984,7 +985,7 @@
/**
* return the namespace uri, given the prefix
* @param prefix
- * @return
+ * @return namespace
*/
public String getNamespaceURI(String prefix) {
return ((OMNamespace)this.namespaces.get(prefix)).getName();
Modified: webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/om/impl/dom/NodeImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/om/impl/dom/NodeImpl.java?rev=350108&r1=350107&r2=350108&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/om/impl/dom/NodeImpl.java (original)
+++ webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/om/impl/dom/NodeImpl.java Wed Nov 30 18:36:42 2005
@@ -23,6 +23,7 @@
import org.apache.axis2.om.OMException;
import org.apache.axis2.om.OMNode;
import org.apache.axis2.om.OMXMLParserWrapper;
+import org.apache.axis2.om.OMOutputFormat;
import org.apache.axis2.om.impl.OMNodeEx;
import org.apache.axis2.om.impl.OMOutputImpl;
import org.w3c.dom.DOMException;
@@ -304,7 +305,7 @@
* @see ParentNode
*
* @return org.w3c.dom.Node
- * @param Index int
+ * @param index
*/
public Node item(int index) {
return null;
@@ -560,5 +561,29 @@
public void serializeAndConsume(Writer writer) throws XMLStreamException {
serializeAndConsume(XMLOutputFactory.newInstance().createXMLStreamWriter(writer));
+ }
+
+ public void serialize(OutputStream output, OMOutputFormat format) throws XMLStreamException {
+ OMOutputImpl omOutput = new OMOutputImpl(output, false);
+ omOutput.setOutputFormat(format);
+ serialize(omOutput);
+ }
+
+ public void serialize(Writer writer, OMOutputFormat format) throws XMLStreamException {
+ OMOutputImpl omOutput = new OMOutputImpl(XMLOutputFactory.newInstance().createXMLStreamWriter(writer));
+ omOutput.setOutputFormat(format);
+ serialize(omOutput);
+ }
+
+ public void serializeAndConsume(OutputStream output, OMOutputFormat format) throws XMLStreamException {
+ OMOutputImpl omOutput = new OMOutputImpl(output, false);
+ omOutput.setOutputFormat(format);
+ serializeAndConsume(omOutput);
+ }
+
+ public void serializeAndConsume(Writer writer, OMOutputFormat format) throws XMLStreamException {
+ OMOutputImpl omOutput = new OMOutputImpl(XMLOutputFactory.newInstance().createXMLStreamWriter(writer));
+ omOutput.setOutputFormat(format);
+ serializeAndConsume(omOutput);
}
}
Modified: webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPMessageImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPMessageImpl.java?rev=350108&r1=350107&r2=350108&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPMessageImpl.java (original)
+++ webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPMessageImpl.java Wed Nov 30 18:36:42 2005
@@ -16,6 +16,7 @@
package org.apache.axis2.saaj;
import org.apache.axis2.om.impl.OMOutputImpl;
+import org.apache.axis2.om.impl.OMNodeEx;
import org.apache.axis2.transport.http.HTTPConstants;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -251,7 +252,7 @@
}
output.setOutputStream(out, false);
//the writeTo method forces the elements to be built!!!
- ((SOAPEnvelopeImpl) mSOAPPart.getEnvelope()).getOMEnvelope()
+ ((OMNodeEx)((SOAPEnvelopeImpl) mSOAPPart.getEnvelope()).getOMEnvelope())
.serialize(output);
output.flush();
} catch (Exception e) {
Modified: webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/soap/impl/dom/SOAPFaultImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/soap/impl/dom/SOAPFaultImpl.java?rev=350108&r1=350107&r2=350108&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/soap/impl/dom/SOAPFaultImpl.java (original)
+++ webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/soap/impl/dom/SOAPFaultImpl.java Wed Nov 30 18:36:42 2005
@@ -26,6 +26,7 @@
import org.apache.axis2.om.impl.dom.ParentNode;
import org.apache.axis2.om.impl.llom.OMSerializerUtil;
import org.apache.axis2.om.impl.llom.serialize.StreamWriterToContentHandlerConverter;
+import org.apache.axis2.om.impl.OMNodeEx;
import org.apache.axis2.soap.SOAP12Constants;
import org.apache.axis2.soap.SOAPBody;
import org.apache.axis2.soap.SOAPConstants;
@@ -211,23 +212,23 @@
OMSerializerUtil.serializeStartpart(this, omOutput);
SOAPFaultCode faultCode = getCode();
if (faultCode != null) {
- faultCode.serialize(omOutput);
+ ((OMNodeEx)faultCode).serialize(omOutput);
}
SOAPFaultReason faultReason = getReason();
if (faultReason != null) {
- faultReason.serialize(omOutput);
+ ((OMNodeEx)faultReason).serialize(omOutput);
}
serializeFaultNode(omOutput);
SOAPFaultRole faultRole = getRole();
if (faultRole != null) {
- faultRole.serialize(omOutput);
+ ((OMNodeEx)faultRole).serialize(omOutput);
}
SOAPFaultDetail faultDetail = getDetail();
if (faultDetail != null) {
- faultDetail.serialize(omOutput);
+ ((OMNodeEx)faultDetail).serialize(omOutput);
}
OMSerializerUtil.serializeEndpart(omOutput);
Modified: webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/soap/impl/dom/SOAPMessageImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/soap/impl/dom/SOAPMessageImpl.java?rev=350108&r1=350107&r2=350108&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/soap/impl/dom/SOAPMessageImpl.java (original)
+++ webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/soap/impl/dom/SOAPMessageImpl.java Wed Nov 30 18:36:42 2005
@@ -21,6 +21,7 @@
import org.apache.axis2.om.OMElement;
import org.apache.axis2.om.OMXMLParserWrapper;
import org.apache.axis2.om.impl.OMOutputImpl;
+import org.apache.axis2.om.impl.OMNodeEx;
import org.apache.axis2.om.impl.dom.DocumentImpl;
import org.apache.axis2.soap.SOAPEnvelope;
import org.apache.axis2.soap.SOAPMessage;
@@ -52,9 +53,9 @@
protected void serialize(OMOutputImpl omOutput, boolean cache, boolean includeXMLDeclaration) throws XMLStreamException {
if (cache) {
- ((OMElement)this.ownerNode.getDocumentElement()).serialize(omOutput);
+ ((OMNodeEx)this.ownerNode.getDocumentElement()).serialize(omOutput);
} else {
- ((OMElement)this.ownerNode.getDocumentElement()).serializeAndConsume(omOutput);
+ ((OMNodeEx)this.ownerNode.getDocumentElement()).serializeAndConsume(omOutput);
}
}
}
Modified: webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/soap/impl/dom/soap12/SOAP12FaultImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/soap/impl/dom/soap12/SOAP12FaultImpl.java?rev=350108&r1=350107&r2=350108&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/soap/impl/dom/soap12/SOAP12FaultImpl.java (original)
+++ webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/soap/impl/dom/soap12/SOAP12FaultImpl.java Wed Nov 30 18:36:42 2005
@@ -18,6 +18,7 @@
import org.apache.axis2.om.OMElement;
import org.apache.axis2.om.OMXMLParserWrapper;
+import org.apache.axis2.om.impl.OMNodeEx;
import org.apache.axis2.soap.SOAPBody;
import org.apache.axis2.soap.SOAPFault;
import org.apache.axis2.soap.SOAPFaultCode;
@@ -43,7 +44,6 @@
* This is a convenience method for the SOAP Fault Impl.
*
* @param parent
- * @param e
*/
public SOAP12FaultImpl(SOAPBody parent) throws SOAPProcessingException {
super(parent);
@@ -105,7 +105,7 @@
protected void serializeFaultNode(org.apache.axis2.om.impl.OMOutputImpl omOutput) throws XMLStreamException {
SOAPFaultNode faultNode = getNode();
if (faultNode != null) {
- faultNode.serialize(omOutput);
+ ((OMNodeEx)faultNode).serialize(omOutput);
}
}
}
Modified: webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/writer/WOMtoWSDL11Writer.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/writer/WOMtoWSDL11Writer.java?rev=350108&r1=350107&r2=350108&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/writer/WOMtoWSDL11Writer.java (original)
+++ webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/writer/WOMtoWSDL11Writer.java Wed Nov 30 18:36:42 2005
@@ -4,7 +4,6 @@
import org.apache.axis2.om.OMAbstractFactory;
import org.apache.axis2.om.OMElement;
import org.apache.axis2.om.OMFactory;
-import org.apache.axis2.om.impl.OMOutputImpl;
import org.apache.axis2.om.impl.llom.builder.StAXOMBuilder;
import org.apache.axis2.wsdl.WSDLVersionWrapper;
import org.apache.wsdl.*;
@@ -540,13 +539,13 @@
protected void handleExtensibiltyElements(List extElementList) throws XMLStreamException, IOException {
int extensibilityElementCount = extElementList.size();
for (int i = 0; i < extensibilityElementCount; i++) {
- writeExtensibiltyElement((WSDLExtensibilityElement) extElementList.get(i));
+ writeExtensibilityElement((WSDLExtensibilityElement) extElementList.get(i));
}
}
//to write scheam types into output straem
- private void writeScheams(Element element) throws XMLStreamException {
+ private void writeSchemas(Element element) throws XMLStreamException {
writer.flush();
String scheamTypes = DOM2Writer.nodeToString(element);
XMLStreamReader xmlReader = XMLInputFactory.newInstance().createXMLStreamReader(new
@@ -555,20 +554,19 @@
StAXOMBuilder staxOMBuilder = new StAXOMBuilder(fac, xmlReader);
OMElement scheamElement = staxOMBuilder.getDocumentElement();
- scheamElement.serialize(new OMOutputImpl(writer));
- // writer.flush();
+ scheamElement.serialize(writer);
}
/**
* @param extElement
* @throws IOException
*/
- protected void writeExtensibiltyElement(WSDLExtensibilityElement extElement) throws IOException, XMLStreamException {
+ protected void writeExtensibilityElement(WSDLExtensibilityElement extElement) throws IOException, XMLStreamException {
if (extElement instanceof Schema) {
Element element = ((Schema) extElement).getElement();
// if (element.getNodeValue() != null) {
- writeScheams(element);
+ writeSchemas(element);
// rawWriter.write(element.toString()); //quick hack for crimson
// }
} else if (extElement instanceof SOAPAddress) {
Modified: webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/OMDocument.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/OMDocument.java?rev=350108&r1=350107&r2=350108&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/OMDocument.java (original)
+++ webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/OMDocument.java Wed Nov 30 18:36:42 2005
@@ -82,17 +82,19 @@
/**
* Serialize the OMDocument
- * @param omOutput
+ * @param output
+ * @param format
* @throws XMLStreamException
*/
- public void serializeAndConsume(OMOutputImpl omOutput) throws XMLStreamException;
+ public void serializeAndConsume(OutputStream output, OMOutputFormat format) throws XMLStreamException;
/**
* Serializa the document with cache on
- * @param omOutput
+ * @param output
+ * @param format
* @throws XMLStreamException
*/
- public void serialize(OMOutputImpl omOutput) throws XMLStreamException;
+ public void serialize(OutputStream output, OMOutputFormat format) throws XMLStreamException;
/**
* Serialize the OMDocument
Modified: webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/OMNode.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/OMNode.java?rev=350108&r1=350107&r2=350108&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/OMNode.java (original)
+++ webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/OMNode.java Wed Nov 30 18:36:42 2005
@@ -180,7 +180,6 @@
*
* @param xmlWriter
* @throws XMLStreamException
- * @see #serialize(org.apache.axis2.om.impl.OMOutputImpl)
*/
public void serialize(XMLStreamWriter xmlWriter)
throws XMLStreamException;
@@ -188,69 +187,82 @@
/**
* Serialize the node with caching
*
- * @param omOutput
+ * @param output
+ * @throws XMLStreamException
+ */
+ public void serialize(OutputStream output)
+ throws XMLStreamException;
+
+ /**
+ * Serialize the node with caching
+ *
+ * @param writer
* @throws XMLStreamException
- * @see #serialize(org.apache.axis2.om.impl.OMOutputImpl)
*/
- public void serialize(org.apache.axis2.om.impl.OMOutputImpl omOutput)
+ public void serialize(Writer writer)
throws XMLStreamException;
/**
* Serialize the node with caching
*
* @param output
+ * @param format
* @throws XMLStreamException
- * @see #serialize(org.apache.axis2.om.impl.OMOutputImpl)
*/
- public void serialize(OutputStream output)
+ public void serialize(OutputStream output, OMOutputFormat format)
throws XMLStreamException;
/**
* Serialize the node with caching
*
* @param writer
+ * @param format
* @throws XMLStreamException
- * @see #serialize(org.apache.axis2.om.impl.OMOutputImpl)
*/
- public void serialize(Writer writer)
+ public void serialize(Writer writer, OMOutputFormat format)
throws XMLStreamException;
-
-
+
/**
* Serialize the node without caching
*
* @param xmlWriter
* @throws XMLStreamException
- * @see #serializeAndConsume(org.apache.axis2.om.impl.OMOutputImpl)
*/
public void serializeAndConsume(XMLStreamWriter xmlWriter) throws XMLStreamException;
/**
* Serialize the node without caching
*
- * @param omOutput
+ * @param output
* @throws XMLStreamException
- * @see #serializeAndConsume(org.apache.axis2.om.impl.OMOutputImpl)
*/
- public void serializeAndConsume(OMOutputImpl omOutput) throws XMLStreamException;
+ public void serializeAndConsume(OutputStream output) throws XMLStreamException;
+
+ /**
+ * Serialize the node without caching
+ *
+ * @param writer
+ * @throws XMLStreamException
+ */
+ public void serializeAndConsume(Writer writer) throws XMLStreamException;
/**
* Serialize the node without caching
*
* @param output
+ * @param format
* @throws XMLStreamException
- * @see #serializeAndConsume(org.apache.axis2.om.impl.OMOutputImpl)
*/
- public void serializeAndConsume(OutputStream output) throws XMLStreamException;
+ public void serializeAndConsume(OutputStream output, OMOutputFormat format) throws XMLStreamException;
/**
* Serialize the node without caching
*
* @param writer
+ * @param format
* @throws XMLStreamException
- * @see #serializeAndConsume(org.apache.axis2.om.impl.OMOutputImpl)
*/
- public void serializeAndConsume(Writer writer) throws XMLStreamException;
+ public void serializeAndConsume(Writer writer, OMOutputFormat format) throws XMLStreamException;
/**
* Builds itself
Added: webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/OMOutputFormat.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/OMOutputFormat.java?rev=350108&view=auto
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/OMOutputFormat.java (added)
+++ webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/OMOutputFormat.java Wed Nov 30 18:36:42 2005
@@ -0,0 +1,142 @@
+/*
+ * Copyright 2004,2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.axis2.om;
+
+import org.apache.axis2.om.impl.MIMEOutputUtils;
+import org.apache.axis2.soap.SOAP11Constants;
+import org.apache.axis2.soap.SOAP12Constants;
+import org.apache.axis2.util.UUIDGenerator;
+
+
+/**
+ * Format options for OM Output
+ */
+public class OMOutputFormat {
+ private String mimeBoundary = null;
+ private String rootContentId = null;
+ private int nextid = 0;
+ private boolean doOptimize;
+ private boolean isSoap11 = true;
+
+ /**
+ * Field DEFAULT_CHAR_SET_ENCODING specifies the default
+ * character encoding scheme to be used
+ */
+ public static final String DEFAULT_CHAR_SET_ENCODING = "utf-8";
+
+ private String charSetEncoding;
+ private String xmlVersion;
+ private boolean ignoreXMLDeclaration = false;
+
+
+ public OMOutputFormat() {
+ }
+
+ public boolean isOptimized() {
+ return doOptimize;
+ }
+
+ public String getContentType() {
+ String SOAPContentType;
+ if (isOptimized()) {
+ if (isSoap11) {
+ SOAPContentType = SOAP11Constants.SOAP_11_CONTENT_TYPE;
+ } else {
+ SOAPContentType = SOAP12Constants.SOAP_12_CONTENT_TYPE;
+ }
+ return MIMEOutputUtils.getContentTypeForMime(
+ getMimeBoundary(),
+ getRootContentId(),
+ this.getCharSetEncoding(), SOAPContentType);
+ } else {
+ if (!isSoap11) {
+ return SOAP12Constants.SOAP_12_CONTENT_TYPE;
+ } else {
+ return SOAP11Constants.SOAP_11_CONTENT_TYPE;
+ }
+ }
+ }
+
+ public String getMimeBoundary() {
+ if (mimeBoundary == null) {
+ mimeBoundary =
+ "MIMEBoundary"
+ + UUIDGenerator.getUUID();
+ }
+ return mimeBoundary;
+ }
+
+ public String getRootContentId() {
+ if (rootContentId == null) {
+ rootContentId =
+ "0."
+ + UUIDGenerator.getUUID()
+ + "@apache.org";
+ }
+ return rootContentId;
+ }
+
+ public String getNextContentId() {
+ nextid++;
+ return nextid
+ + "."
+ + UUIDGenerator.getUUID()
+ + "@apache.org";
+ }
+
+ /**
+ * Returns the character set endocing scheme If the value of the
+ * charSetEncoding is not set then the default will be returned
+ *
+ * @return encoding
+ */
+ public String getCharSetEncoding() {
+ return this.charSetEncoding;
+ }
+
+ public void setCharSetEncoding(String charSetEncoding) {
+ this.charSetEncoding = charSetEncoding;
+ }
+
+ public String getXmlVersion() {
+ return xmlVersion;
+ }
+
+ public void setXmlVersion(String xmlVersion) {
+ this.xmlVersion = xmlVersion;
+ }
+
+ public void setSSOAP11(boolean b) {
+ isSoap11 = b;
+ }
+
+ public boolean isSOAP11() {
+ return isSoap11;
+ }
+
+ public boolean isIgnoreXMLDeclaration() {
+ return ignoreXMLDeclaration;
+ }
+
+ public void setIgnoreXMLDeclaration(boolean ignoreXMLDeclaration) {
+ this.ignoreXMLDeclaration = ignoreXMLDeclaration;
+ }
+
+ public void setDoOptimize(boolean b) {
+ doOptimize = b;
+ }
+}
Modified: webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/OMNodeEx.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/OMNodeEx.java?rev=350108&r1=350107&r2=350108&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/OMNodeEx.java (original)
+++ webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/OMNodeEx.java Wed Nov 30 18:36:42 2005
@@ -20,6 +20,8 @@
import org.apache.axis2.om.OMException;
import org.apache.axis2.om.OMNode;
+import javax.xml.stream.XMLStreamException;
+
/**
* Interface OMNodeEx
*
@@ -36,4 +38,22 @@
public void setComplete(boolean state);
public void setType(int nodeType) throws OMException;
+
+ /**
+ * Serialize the node with caching
+ *
+ * @param omOutput
+ * @throws javax.xml.stream.XMLStreamException
+ * @see #serialize(org.apache.axis2.om.impl.OMOutputImpl)
+ */
+ public void serialize(org.apache.axis2.om.impl.OMOutputImpl omOutput)
+ throws XMLStreamException;
+
+ /**
+ * Serialize the node without caching
+ *
+ * @param omOutput
+ * @throws XMLStreamException
+ */
+ public void serializeAndConsume(OMOutputImpl omOutput) throws XMLStreamException;
}
Modified: webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/OMOutputImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/OMOutputImpl.java?rev=350108&r1=350107&r2=350108&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/OMOutputImpl.java (original)
+++ webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/OMOutputImpl.java Wed Nov 30 18:36:42 2005
@@ -17,9 +17,9 @@
package org.apache.axis2.om.impl;
import org.apache.axis2.om.OMText;
+import org.apache.axis2.om.OMOutputFormat;
import org.apache.axis2.soap.SOAP11Constants;
import org.apache.axis2.soap.SOAP12Constants;
-import org.apache.axis2.util.UUIDGenerator;
import javax.xml.stream.FactoryConfigurationError;
import javax.xml.stream.XMLOutputFactory;
@@ -37,25 +37,10 @@
*/
public class OMOutputImpl {
private XMLStreamWriter xmlWriter;
- private boolean doOptimize;
private OutputStream outStream;
private LinkedList binaryNodeList;
private ByteArrayOutputStream bufferedSoapOutStream;
- private String mimeBoundary = null;
- private String rootContentId = null;
- private int nextid = 0;
- private boolean isSoap11 = true;
-
- /**
- * Field DEFAULT_CHAR_SET_ENCODING specifies the default
- * character encoding scheme to be used
- */
- public static final String DEFAULT_CHAR_SET_ENCODING = "utf-8";
-
- private String charSetEncoding;
- private String xmlVersion;
- private boolean ignoreXMLDeclaration = false;
-
+ private OMOutputFormat format = new OMOutputFormat();
public OMOutputImpl() {
}
@@ -66,69 +51,67 @@
/**
* This creates a new OMOutputImpl with default encoding
- * @see OMOutputImpl#DEFAULT_CHAR_SET_ENCODING
+ *
* @param outStream
* @param doOptimize
* @throws XMLStreamException
* @throws FactoryConfigurationError
+ * @see OMOutputFormat#DEFAULT_CHAR_SET_ENCODING
*/
public OMOutputImpl(OutputStream outStream, boolean doOptimize)
- throws XMLStreamException, FactoryConfigurationError {
+ throws XMLStreamException, FactoryConfigurationError {
setOutputStream(outStream, doOptimize);
}
public void setOutputStream(OutputStream outStream, boolean doOptimize)
- throws XMLStreamException, FactoryConfigurationError {
+ throws XMLStreamException, FactoryConfigurationError {
- this.doOptimize = doOptimize;
+ format.setDoOptimize(doOptimize);
this.outStream = outStream;
- if (charSetEncoding == null) //Default encoding is UTF-8
- this.charSetEncoding = DEFAULT_CHAR_SET_ENCODING;
+ if (format.getCharSetEncoding() == null) //Default encoding is UTF-8
+ format.setCharSetEncoding(OMOutputFormat.DEFAULT_CHAR_SET_ENCODING);
XMLOutputFactory factory = XMLOutputFactory.newInstance();
//factory.setProperty("javax.xml.stream.isRepairingNamespaces", Boolean.TRUE);
if (doOptimize) {
bufferedSoapOutStream = new ByteArrayOutputStream();
xmlWriter = factory.createXMLStreamWriter(bufferedSoapOutStream,
- this.charSetEncoding);
+ format.getCharSetEncoding());
binaryNodeList = new LinkedList();
} else {
xmlWriter = factory.createXMLStreamWriter(outStream,
- this.charSetEncoding);
+ format.getCharSetEncoding());
}
}
public void flush() throws XMLStreamException {
xmlWriter.flush();
String SOAPContentType;
- if (doOptimize) {
- if (isSoap11)
- {
+ if (format.isOptimized()) {
+ if (format.isSOAP11()) {
SOAPContentType = SOAP11Constants.SOAP_11_CONTENT_TYPE;
- }
- else
- {
+ } else {
SOAPContentType = SOAP12Constants.SOAP_12_CONTENT_TYPE;
}
MIMEOutputUtils.complete(
- outStream,
- bufferedSoapOutStream,
- binaryNodeList,
- getMimeBoundary(),
- getRootContentId(),
- this.charSetEncoding,SOAPContentType);
+ outStream,
+ bufferedSoapOutStream,
+ binaryNodeList,
+ getMimeBoundary(),
+ getRootContentId(),
+ format.getCharSetEncoding(), SOAPContentType);
}
}
public boolean isOptimized() {
- return doOptimize;
+ return format.isOptimized();
}
public String getContentType() {
String SOAPContentType;
if (isOptimized()) {
- if (isSoap11) {
+ if (format.isSOAP11()) {
SOAPContentType = SOAP11Constants.SOAP_11_CONTENT_TYPE;
} else {
SOAPContentType = SOAP12Constants.SOAP_12_CONTENT_TYPE;
@@ -138,7 +121,7 @@
getRootContentId(),
this.getCharSetEncoding(), SOAPContentType);
} else {
- if (!isSoap11) {
+ if (!format.isSOAP11()) {
return SOAP12Constants.SOAP_12_CONTENT_TYPE;
} else {
return SOAP11Constants.SOAP_11_CONTENT_TYPE;
@@ -159,67 +142,52 @@
}
public String getMimeBoundary() {
- if (mimeBoundary == null) {
- mimeBoundary =
- "MIMEBoundary"
- + UUIDGenerator.getUUID();
- }
- return mimeBoundary;
+ return format.getMimeBoundary();
}
public String getRootContentId() {
- if (rootContentId == null) {
- rootContentId =
- "0."
- + UUIDGenerator.getUUID()
- + "@apache.org";
- }
- return rootContentId;
+ return format.getRootContentId();
}
public String getNextContentId() {
- nextid++;
- return nextid
- + "."
- + UUIDGenerator.getUUID()
- + "@apache.org";
+ return format.getNextContentId();
}
/**
* Returns the character set endocing scheme If the value of the
* charSetEncoding is not set then the default will be returned
- *
- * @return
+ *
+ * @return encoding
*/
public String getCharSetEncoding() {
- return this.charSetEncoding;
+ return format.getCharSetEncoding();
}
public void setCharSetEncoding(String charSetEncoding) {
- this.charSetEncoding = charSetEncoding;
+ format.setCharSetEncoding(charSetEncoding);
}
public String getXmlVersion() {
- return xmlVersion;
+ return format.getXmlVersion();
}
public void setXmlVersion(String xmlVersion) {
- this.xmlVersion = xmlVersion;
+ format.setXmlVersion(xmlVersion);
}
/**
* @param b
*/
public void setSoap11(boolean b) {
- isSoap11 = b;
+ format.setSSOAP11(b);
}
public boolean isIgnoreXMLDeclaration() {
- return ignoreXMLDeclaration;
+ return format.isIgnoreXMLDeclaration();
}
public void setIgnoreXMLDeclaration(boolean ignoreXMLDeclaration) {
- this.ignoreXMLDeclaration = ignoreXMLDeclaration;
+ format.setIgnoreXMLDeclaration(ignoreXMLDeclaration);
}
@@ -227,6 +195,14 @@
* @param b
*/
public void setDoOptimize(boolean b) {
- doOptimize = b;
+ format.setDoOptimize(b);
+ }
+
+ public OMOutputFormat getOutputFormat() {
+ return format;
+ }
+
+ public void setOutputFormat(OMOutputFormat format) {
+ this.format = format;
}
}
Modified: webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMDocumentImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMDocumentImpl.java?rev=350108&r1=350107&r2=350108&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMDocumentImpl.java (original)
+++ webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMDocumentImpl.java Wed Nov 30 18:36:42 2005
@@ -21,6 +21,7 @@
import org.apache.axis2.om.OMException;
import org.apache.axis2.om.OMNode;
import org.apache.axis2.om.OMXMLParserWrapper;
+import org.apache.axis2.om.OMOutputFormat;
import org.apache.axis2.om.impl.OMContainerEx;
import org.apache.axis2.om.impl.OMNodeEx;
import org.apache.axis2.om.impl.OMOutputImpl;
@@ -305,8 +306,6 @@
/**
* Serialize the document with cache
- *
- * @see org.apache.axis2.om.OMDocument#serialize(org.apache.axis2.om.impl.OMOutputImpl)
*/
public void serialize(OMOutputImpl omOutput) throws XMLStreamException {
serialize(omOutput, true, !omOutput.isIgnoreXMLDeclaration());
@@ -338,6 +337,34 @@
}
/**
+ * Serialize the document directly to the outputstream with Caching disabled
+ *
+ * @param output
+ * @param format
+ * @throws XMLStreamException
+ */
+ public void serializeAndConsume(OutputStream output, OMOutputFormat format) throws XMLStreamException {
+ OMOutputImpl omOutput = new OMOutputImpl(output,false);
+ omOutput.setOutputFormat(format);
+ serializeAndConsume(omOutput);
+ omOutput.flush();
+ }
+
+ /**
+ * Serialize the document directly to the outputstream with Caching enabled
+ *
+ * @param output
+ * @param format
+ * @throws XMLStreamException
+ */
+ public void serialize(OutputStream output, OMOutputFormat format) throws XMLStreamException {
+ OMOutputImpl omOutput = new OMOutputImpl(output,false);
+ omOutput.setOutputFormat(format);
+ serialize(omOutput);
+ omOutput.flush();
+ }
+
+ /**
* Serialize the document with cache
*/
public void serialize(OMOutputImpl omOutput, boolean includeXMLDeclaration) throws XMLStreamException {
@@ -363,12 +390,12 @@
if (cache) {
while (children.hasNext()) {
- OMNode omNode = (OMNode) children.next();
+ OMNodeEx omNode = (OMNodeEx) children.next();
omNode.serialize(omOutput);
}
} else {
while (children.hasNext()) {
- OMNode omNode = (OMNode) children.next();
+ OMNodeEx omNode = (OMNodeEx) children.next();
omNode.serializeAndConsume(omOutput);
}
}
Modified: webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMElementImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMElementImpl.java?rev=350108&r1=350107&r2=350108&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMElementImpl.java (original)
+++ webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMElementImpl.java Wed Nov 30 18:36:42 2005
@@ -678,10 +678,10 @@
//in this case we don't care whether the elements are built or not
//we just call the serializeAndConsume methods
OMSerializerUtil.serializeStartpart(this, omOutput);
-//serilize children
+ //serialize children
Iterator children = this.getChildren();
while (children.hasNext()) {
- ((OMNode) children.next()).serialize(omOutput);
+ ((OMNodeEx) children.next()).serialize(omOutput);
}
OMSerializerUtil.serializeEndpart(omOutput);
@@ -690,11 +690,11 @@
//has nothing to do if the element is already built!
if (this.done) {
OMSerializerUtil.serializeStartpart(this, omOutput);
-//serializeAndConsume children
+ //serializeAndConsume children
Iterator children = this.getChildren();
while (children.hasNext()) {
//A call to the Serialize or the serializeAndConsume wont make a difference here
- ((OMNode) children.next()).serializeAndConsume(omOutput);
+ ((OMNodeEx) children.next()).serializeAndConsume(omOutput);
}
OMSerializerUtil.serializeEndpart(omOutput);
} else {
Modified: webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMNodeImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMNodeImpl.java?rev=350108&r1=350107&r2=350108&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMNodeImpl.java (original)
+++ webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMNodeImpl.java Wed Nov 30 18:36:42 2005
@@ -20,6 +20,7 @@
import org.apache.axis2.om.OMException;
import org.apache.axis2.om.OMNode;
import org.apache.axis2.om.OMXMLParserWrapper;
+import org.apache.axis2.om.OMOutputFormat;
import org.apache.axis2.om.impl.OMContainerEx;
import org.apache.axis2.om.impl.OMNodeEx;
import org.apache.axis2.om.impl.OMOutputImpl;
@@ -355,4 +356,27 @@
serializeAndConsume(XMLOutputFactory.newInstance().createXMLStreamWriter(writer));
}
+ public void serialize(OutputStream output, OMOutputFormat format) throws XMLStreamException {
+ OMOutputImpl omOutput = new OMOutputImpl(output, false);
+ omOutput.setOutputFormat(format);
+ serialize(omOutput);
+ }
+
+ public void serialize(Writer writer, OMOutputFormat format) throws XMLStreamException {
+ OMOutputImpl omOutput = new OMOutputImpl(XMLOutputFactory.newInstance().createXMLStreamWriter(writer));
+ omOutput.setOutputFormat(format);
+ serialize(omOutput);
+ }
+
+ public void serializeAndConsume(OutputStream output, OMOutputFormat format) throws XMLStreamException {
+ OMOutputImpl omOutput = new OMOutputImpl(output, false);
+ omOutput.setOutputFormat(format);
+ serializeAndConsume(omOutput);
+ }
+
+ public void serializeAndConsume(Writer writer, OMOutputFormat format) throws XMLStreamException {
+ OMOutputImpl omOutput = new OMOutputImpl(XMLOutputFactory.newInstance().createXMLStreamWriter(writer));
+ omOutput.setOutputFormat(format);
+ serializeAndConsume(omOutput);
+ }
}
Modified: webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMSerializerUtil.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMSerializerUtil.java?rev=350108&r1=350107&r2=350108&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMSerializerUtil.java (original)
+++ webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMSerializerUtil.java Wed Nov 30 18:36:42 2005
@@ -21,6 +21,7 @@
import org.apache.axis2.om.OMNamespace;
import org.apache.axis2.om.OMNode;
import org.apache.axis2.om.impl.OMOutputImpl;
+import org.apache.axis2.om.impl.OMNodeEx;
import org.apache.axis2.om.impl.llom.serialize.StreamingOMSerializer;
import javax.xml.stream.XMLStreamException;
@@ -184,9 +185,9 @@
OMNode firstChild = element.getFirstOMChild();
if (firstChild != null) {
if (cache) {
- firstChild.serialize(omOutput);
+ ((OMNodeEx)firstChild).serialize(omOutput);
} else {
- firstChild.serializeAndConsume(omOutput);
+ ((OMNodeEx)firstChild).serializeAndConsume(omOutput);
}
}
serializeEndpart(omOutput);
Modified: webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPFaultCodeImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPFaultCodeImpl.java?rev=350108&r1=350107&r2=350108&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPFaultCodeImpl.java (original)
+++ webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPFaultCodeImpl.java Wed Nov 30 18:36:42 2005
@@ -19,6 +19,7 @@
import org.apache.axis2.om.OMXMLParserWrapper;
import org.apache.axis2.om.util.ElementHelper;
import org.apache.axis2.om.impl.OMOutputImpl;
+import org.apache.axis2.om.impl.OMNodeEx;
import org.apache.axis2.om.impl.llom.OMSerializerUtil;
import org.apache.axis2.om.impl.llom.serialize.StreamWriterToContentHandlerConverter;
import org.apache.axis2.soap.SOAP12Constants;
@@ -93,7 +94,7 @@
//No caching
if (this.firstChild != null) {
OMSerializerUtil.serializeStartpart(this, omOutput);
- firstChild.serializeAndConsume(omOutput);
+ ((OMNodeEx)firstChild).serializeAndConsume(omOutput);
OMSerializerUtil.serializeEndpart(omOutput);
} else if (!this.done) {
if (builderType == PULL_TYPE_BUILDER) {
Modified: webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPFaultDetailImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPFaultDetailImpl.java?rev=350108&r1=350107&r2=350108&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPFaultDetailImpl.java (original)
+++ webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPFaultDetailImpl.java Wed Nov 30 18:36:42 2005
@@ -20,6 +20,7 @@
import org.apache.axis2.om.OMXMLParserWrapper;
import org.apache.axis2.om.impl.llom.OMSerializerUtil;
import org.apache.axis2.om.impl.llom.serialize.StreamWriterToContentHandlerConverter;
+import org.apache.axis2.om.impl.OMNodeEx;
import org.apache.axis2.soap.SOAP12Constants;
import org.apache.axis2.soap.SOAPFault;
import org.apache.axis2.soap.SOAPFaultDetail;
@@ -67,7 +68,7 @@
//No caching
if (this.firstChild != null) {
OMSerializerUtil.serializeStartpart(this, omOutput);
- firstChild.serializeAndConsume(omOutput);
+ ((OMNodeEx)firstChild).serializeAndConsume(omOutput);
OMSerializerUtil.serializeEndpart(omOutput);
} else if (!this.done) {
if (builderType == PULL_TYPE_BUILDER) {
Modified: webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPFaultImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPFaultImpl.java?rev=350108&r1=350107&r2=350108&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPFaultImpl.java (original)
+++ webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPFaultImpl.java Wed Nov 30 18:36:42 2005
@@ -24,6 +24,7 @@
import org.apache.axis2.om.impl.llom.OMElementImpl;
import org.apache.axis2.om.impl.llom.OMSerializerUtil;
import org.apache.axis2.om.impl.llom.serialize.StreamWriterToContentHandlerConverter;
+import org.apache.axis2.om.impl.OMNodeEx;
import org.apache.axis2.soap.SOAP12Constants;
import org.apache.axis2.soap.SOAPBody;
import org.apache.axis2.soap.SOAPConstants;
@@ -208,23 +209,23 @@
OMSerializerUtil.serializeStartpart(this, omOutput);
SOAPFaultCode faultCode = getCode();
if (faultCode != null) {
- faultCode.serialize(omOutput);
+ ((OMNodeEx)faultCode).serialize(omOutput);
}
SOAPFaultReason faultReason = getReason();
if (faultReason != null) {
- faultReason.serialize(omOutput);
+ ((OMNodeEx)faultReason).serialize(omOutput);
}
serializeFaultNode(omOutput);
SOAPFaultRole faultRole = getRole();
if (faultRole != null) {
- faultRole.serialize(omOutput);
+ ((OMNodeEx)faultRole).serialize(omOutput);
}
SOAPFaultDetail faultDetail = getDetail();
if (faultDetail != null) {
- faultDetail.serialize(omOutput);
+ ((OMNodeEx)faultDetail).serialize(omOutput);
}
OMSerializerUtil.serializeEndpart(omOutput);
Modified: webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPFaultNodeImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPFaultNodeImpl.java?rev=350108&r1=350107&r2=350108&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPFaultNodeImpl.java (original)
+++ webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPFaultNodeImpl.java Wed Nov 30 18:36:42 2005
@@ -19,6 +19,7 @@
import org.apache.axis2.om.OMXMLParserWrapper;
import org.apache.axis2.om.impl.llom.OMSerializerUtil;
import org.apache.axis2.om.impl.llom.serialize.StreamWriterToContentHandlerConverter;
+import org.apache.axis2.om.impl.OMNodeEx;
import org.apache.axis2.soap.SOAP12Constants;
import org.apache.axis2.soap.SOAPFault;
import org.apache.axis2.soap.SOAPFaultNode;
@@ -60,7 +61,7 @@
//No caching
if (this.firstChild != null) {
OMSerializerUtil.serializeStartpart(this, omOutput);
- firstChild.serializeAndConsume(omOutput);
+ ((OMNodeEx)firstChild).serializeAndConsume(omOutput);
OMSerializerUtil.serializeEndpart(omOutput);
} else if (!this.done) {
if (builderType == PULL_TYPE_BUILDER) {
Modified: webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPFaultReasonImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPFaultReasonImpl.java?rev=350108&r1=350107&r2=350108&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPFaultReasonImpl.java (original)
+++ webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPFaultReasonImpl.java Wed Nov 30 18:36:42 2005
@@ -21,6 +21,7 @@
import org.apache.axis2.om.util.ElementHelper;
import org.apache.axis2.om.impl.llom.OMSerializerUtil;
import org.apache.axis2.om.impl.llom.serialize.StreamWriterToContentHandlerConverter;
+import org.apache.axis2.om.impl.OMNodeEx;
import org.apache.axis2.soap.SOAP12Constants;
import org.apache.axis2.soap.SOAPFault;
import org.apache.axis2.soap.SOAPFaultReason;
@@ -80,7 +81,7 @@
//No caching
if (this.firstChild != null) {
OMSerializerUtil.serializeStartpart(this, omOutput);
- firstChild.serializeAndConsume(omOutput);
+ ((OMNodeEx)firstChild).serializeAndConsume(omOutput);
OMSerializerUtil.serializeEndpart(omOutput);
} else if (!this.done) {
if (builderType == PULL_TYPE_BUILDER) {
Modified: webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPFaultRoleImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPFaultRoleImpl.java?rev=350108&r1=350107&r2=350108&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPFaultRoleImpl.java (original)
+++ webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPFaultRoleImpl.java Wed Nov 30 18:36:42 2005
@@ -18,6 +18,7 @@
import org.apache.axis2.om.OMXMLParserWrapper;
import org.apache.axis2.om.impl.OMOutputImpl;
+import org.apache.axis2.om.impl.OMNodeEx;
import org.apache.axis2.om.impl.llom.OMSerializerUtil;
import org.apache.axis2.om.impl.llom.serialize.StreamWriterToContentHandlerConverter;
import org.apache.axis2.soap.SOAP12Constants;
@@ -63,7 +64,7 @@
//No caching
if (this.firstChild != null) {
OMSerializerUtil.serializeStartpart(this, omOutput);
- firstChild.serializeAndConsume(omOutput);
+ ((OMNodeEx)firstChild).serializeAndConsume(omOutput);
OMSerializerUtil.serializeEndpart(omOutput);
} else if (!this.done) {
if (builderType == PULL_TYPE_BUILDER) {
Modified: webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPMessageImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPMessageImpl.java?rev=350108&r1=350107&r2=350108&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPMessageImpl.java (original)
+++ webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPMessageImpl.java Wed Nov 30 18:36:42 2005
@@ -20,6 +20,7 @@
import org.apache.axis2.om.OMNode;
import org.apache.axis2.om.OMXMLParserWrapper;
import org.apache.axis2.om.impl.OMOutputImpl;
+import org.apache.axis2.om.impl.OMNodeEx;
import org.apache.axis2.om.impl.llom.OMDocumentImpl;
import org.apache.axis2.soap.SOAPEnvelope;
import org.apache.axis2.soap.SOAPMessage;
@@ -66,9 +67,9 @@
protected void serialize(OMOutputImpl omOutput, boolean cache, boolean includeXMLDeclaration) throws XMLStreamException {
if (cache) {
- this.rootElement.serialize(omOutput);
+ ((OMNodeEx)this.rootElement).serialize(omOutput);
} else {
- this.rootElement.serializeAndConsume(omOutput);
+ ((OMNodeEx)this.rootElement).serializeAndConsume(omOutput);
}
}
}
Modified: webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/soap11/SOAP11FaultDetailImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/soap11/SOAP11FaultDetailImpl.java?rev=350108&r1=350107&r2=350108&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/soap11/SOAP11FaultDetailImpl.java (original)
+++ webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/soap11/SOAP11FaultDetailImpl.java Wed Nov 30 18:36:42 2005
@@ -20,6 +20,7 @@
import org.apache.axis2.om.OMXMLParserWrapper;
import org.apache.axis2.om.impl.llom.OMSerializerUtil;
import org.apache.axis2.om.impl.llom.serialize.StreamWriterToContentHandlerConverter;
+import org.apache.axis2.om.impl.OMNodeEx;
import org.apache.axis2.soap.SOAP11Constants;
import org.apache.axis2.soap.SOAPFault;
import org.apache.axis2.soap.SOAPProcessingException;
@@ -75,7 +76,7 @@
if (firstChild != null) {
- firstChild.serializeAndConsume(omOutput);
+ ((OMNodeEx)firstChild).serializeAndConsume(omOutput);
}
writer.writeEndElement();
}
Modified: webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/soap12/SOAP12FaultImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/soap12/SOAP12FaultImpl.java?rev=350108&r1=350107&r2=350108&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/soap12/SOAP12FaultImpl.java (original)
+++ webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/soap12/SOAP12FaultImpl.java Wed Nov 30 18:36:42 2005
@@ -18,6 +18,7 @@
import org.apache.axis2.om.OMElement;
import org.apache.axis2.om.OMXMLParserWrapper;
+import org.apache.axis2.om.impl.OMNodeEx;
import org.apache.axis2.soap.SOAPBody;
import org.apache.axis2.soap.SOAPFault;
import org.apache.axis2.soap.SOAPFaultCode;
@@ -48,7 +49,6 @@
* This is a convenience method for the SOAP Fault Impl.
*
* @param parent
- * @param e
*/
public SOAP12FaultImpl(SOAPBody parent) throws SOAPProcessingException {
super(parent);
@@ -110,7 +110,7 @@
protected void serializeFaultNode(org.apache.axis2.om.impl.OMOutputImpl omOutput) throws XMLStreamException {
SOAPFaultNode faultNode = getNode();
if (faultNode != null) {
- faultNode.serialize(omOutput);
+ ((OMNodeEx)faultNode).serialize(omOutput);
}
}
}
Modified: webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/attachments/ImageSampleTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/attachments/ImageSampleTest.java?rev=350108&r1=350107&r2=350108&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/attachments/ImageSampleTest.java (original)
+++ webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/attachments/ImageSampleTest.java Wed Nov 30 18:36:42 2005
@@ -22,6 +22,7 @@
import org.apache.axis2.om.OMElement;
import org.apache.axis2.om.OMText;
import org.apache.axis2.om.impl.OMOutputImpl;
+import org.apache.axis2.om.impl.OMNodeEx;
import org.apache.axis2.om.impl.llom.OMElementImpl;
import org.apache.axis2.om.impl.llom.OMNamespaceImpl;
import org.apache.axis2.om.impl.llom.OMTextImpl;
@@ -102,10 +103,10 @@
body.addChild(data);
data.addChild(binaryNode);
- envelope.serializeAndConsume(baseOutput);
+ ((OMNodeEx)envelope).serializeAndConsume(baseOutput);
baseOutput.flush();
- envelope.serializeAndConsume(mtomOutput);
+ ((OMNodeEx)envelope).serializeAndConsume(mtomOutput);
mtomOutput.flush();
}
Modified: webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/om/AbstractOMSerializationTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/om/AbstractOMSerializationTest.java?rev=350108&r1=350107&r2=350108&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/om/AbstractOMSerializationTest.java (original)
+++ webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/om/AbstractOMSerializationTest.java Wed Nov 30 18:36:42 2005
@@ -69,7 +69,6 @@
public String getSerializedOM(String xmlString) throws Exception {
try {
XMLInputFactory factory = XMLInputFactory.newInstance();
-// factory.setProperty("http://java.sun.com/xml/stream/properties/report-cdata-event", Boolean.TRUE);
ByteArrayInputStream byteArrayInputStream = new ByteArrayInputStream(xmlString.getBytes());
StAXOMBuilder staxOMBuilder = OMXMLBuilderFactory.
@@ -80,12 +79,10 @@
ByteArrayOutputStream baos = new ByteArrayOutputStream();
- OMOutputImpl omOutput = new OMOutputImpl(baos, false);
- omOutput.setIgnoreXMLDeclaration(ignoreXMLDeclaration);
+ OMOutputFormat format = new OMOutputFormat();
+ format.setIgnoreXMLDeclaration(ignoreXMLDeclaration);
-// rootElement.serializeAndConsume(omOutput);
- ((OMDocument) rootElement.getParent()).serialize(omOutput);
- omOutput.flush();
+ ((OMDocument) rootElement.getParent()).serialize(baos, format);
return new String(baos.toByteArray());
} catch (Exception e) {
@@ -97,7 +94,6 @@
try {
XMLInputFactory factory = XMLInputFactory.newInstance();
-// factory.setProperty("http://java.sun.com/xml/stream/properties/report-cdata-event", Boolean.TRUE);
StAXOMBuilder staxOMBuilder = OMXMLBuilderFactory.
createStAXOMBuilder(OMAbstractFactory.getOMFactory(),
@@ -120,7 +116,6 @@
Document dom1 = newDocument(inStream);
return compareXML(dom1, dom2);
-// assertXMLEqual(diff, true);
} catch (XMLStreamException e) {
fail(e.getMessage());
throw new Exception(e);
Modified: webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/om/impl/llom/OMDocumentSerilizationTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/om/impl/llom/OMDocumentSerilizationTest.java?rev=350108&r1=350107&r2=350108&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/om/impl/llom/OMDocumentSerilizationTest.java (original)
+++ webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/om/impl/llom/OMDocumentSerilizationTest.java Wed Nov 30 18:36:42 2005
@@ -22,7 +22,7 @@
import org.apache.axis2.om.OMElement;
import org.apache.axis2.om.OMFactory;
import org.apache.axis2.om.OMNamespace;
-import org.apache.axis2.om.impl.OMOutputImpl;
+import org.apache.axis2.om.OMOutputFormat;
import javax.xml.stream.XMLStreamException;
import java.io.ByteArrayOutputStream;
@@ -74,10 +74,9 @@
public void testExcludeXMLDeclaration() throws XMLStreamException {
ByteArrayOutputStream baos = new ByteArrayOutputStream();
- OMOutputImpl output = new OMOutputImpl(baos,false);
- output.setIgnoreXMLDeclaration(true);
- document.serializeAndConsume(output);
- output.flush();
+ OMOutputFormat format = new OMOutputFormat();
+ format.setIgnoreXMLDeclaration(true);
+ document.serializeAndConsume(baos, format);
String xmlDocument = new String(baos.toByteArray());
@@ -100,10 +99,9 @@
public void testCharsetEncodingUTF_16() throws XMLStreamException {
ByteArrayOutputStream baos = new ByteArrayOutputStream();
- OMOutputImpl output = new OMOutputImpl(baos,false);
- output.setCharSetEncoding("UTF-16");
- document.serializeAndConsume(output);
- output.flush();
+ OMOutputFormat format = new OMOutputFormat();
+ format.setCharSetEncoding("UTF-16");
+ document.serializeAndConsume(baos, format);
String xmlDocument = new String(baos.toByteArray());
assertTrue("Charset declaration missing",-1<xmlDocument.indexOf(encoding_UTF16) ||
Modified: webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/om/impl/llom/OMOutputTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/om/impl/llom/OMOutputTest.java?rev=350108&r1=350107&r2=350108&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/om/impl/llom/OMOutputTest.java (original)
+++ webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/om/impl/llom/OMOutputTest.java Wed Nov 30 18:36:42 2005
@@ -20,6 +20,7 @@
import org.apache.axis2.om.AbstractTestCase;
import org.apache.axis2.om.OMAttribute;
import org.apache.axis2.om.OMElement;
+import org.apache.axis2.om.impl.OMNodeEx;
import javax.activation.DataHandler;
import java.io.File;
@@ -104,10 +105,10 @@
org.apache.axis2.om.impl.OMOutputImpl baseOutput = new org.apache.axis2.om.impl.OMOutputImpl(new FileOutputStream(outBase64File),
false);
- envelope.serializeAndConsume(baseOutput);
+ ((OMNodeEx)envelope).serializeAndConsume(baseOutput);
baseOutput.flush();
- envelope.serializeAndConsume(mtomOutput);
+ ((OMNodeEx)envelope).serializeAndConsume(mtomOutput);
mtomOutput.flush();
}
}
Modified: webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/soap/impl/llom/CharacterEncodingTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/soap/impl/llom/CharacterEncodingTest.java?rev=350108&r1=350107&r2=350108&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/soap/impl/llom/CharacterEncodingTest.java (original)
+++ webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/soap/impl/llom/CharacterEncodingTest.java Wed Nov 30 18:36:42 2005
@@ -20,6 +20,7 @@
import org.apache.axis2.om.OMElement;
import org.apache.axis2.om.OMNamespace;
import org.apache.axis2.om.impl.OMOutputImpl;
+import org.apache.axis2.om.impl.OMNodeEx;
import org.apache.axis2.soap.SOAPEnvelope;
import org.apache.axis2.soap.SOAPFactory;
import org.apache.axis2.soap.impl.llom.builder.StAXSOAPModelBuilder;
@@ -67,7 +68,7 @@
.newInstance().createXMLStreamWriter(byteOutStr,UTF_16);
OMOutputImpl outputImpl = new OMOutputImpl(writer);
outputImpl.setCharSetEncoding(UTF_16);
- envelope.serialize(outputImpl);
+ ((OMNodeEx)envelope).serialize(outputImpl);
outputImpl.flush();
ByteArrayInputStream byteInStr = new ByteArrayInputStream(byteOutStr.toByteArray());