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 ve...@apache.org on 2009/07/20 19:51:01 UTC
svn commit: r795935 [4/4] - in /webservices/axis2/trunk/java/modules:
adb-codegen/src/org/apache/axis2/schema/template/
adb-codegen/test/org/apache/axis2/schema/
adb-codegen/test/org/apache/axis2/schema/defaultnamespaces/
adb/src/org/apache/axis2/datab...
Modified: webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/databinding/utils/writer/MTOMAwareOMBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/databinding/utils/writer/MTOMAwareOMBuilder.java?rev=795935&r1=795934&r2=795935&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/databinding/utils/writer/MTOMAwareOMBuilder.java (original)
+++ webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/databinding/utils/writer/MTOMAwareOMBuilder.java Mon Jul 20 17:50:58 2009
@@ -19,6 +19,8 @@
package org.apache.axis2.databinding.utils.writer;
+import org.apache.axiom.ext.stax.datahandler.DataHandlerProvider;
+import org.apache.axiom.ext.stax.datahandler.DataHandlerWriter;
import org.apache.axiom.om.OMAbstractFactory;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
@@ -28,12 +30,15 @@
import javax.activation.DataHandler;
import javax.xml.namespace.NamespaceContext;
import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamWriter;
+
+import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
import java.util.Stack;
-public class MTOMAwareOMBuilder implements MTOMAwareXMLStreamWriter {
+public class MTOMAwareOMBuilder implements XMLStreamWriter, DataHandlerWriter {
// this is the om Element we are going to create
private OMElement rootElement;
private OMFactory omFactory;
@@ -232,12 +237,26 @@
return this.omStreamNamespaceContext;
}
- public Object getProperty(String string) throws IllegalArgumentException {
- throw new UnsupportedOperationException("this method has not yet been implemented");
+ public Object getProperty(String name) throws IllegalArgumentException {
+ if (DataHandlerWriter.PROPERTY.equals(name)) {
+ return this;
+ } else {
+ throw new IllegalArgumentException("Property " + name + " not supported");
+ }
+ }
+
+ public void writeDataHandler(DataHandler dataHandler, String contentID, boolean optimize)
+ throws IOException, XMLStreamException {
+ OMText omText = omFactory.createOMText(dataHandler, optimize);
+ if (contentID != null) {
+ omText.setContentID(contentID);
+ }
+ currentOMElement.addChild(omText);
}
- public void writeDataHandler(DataHandler dataHandler) throws XMLStreamException {
- OMText omText = omFactory.createOMText(dataHandler, true);
+ public void writeDataHandler(DataHandlerProvider dataHandlerProvider, String contentID,
+ boolean optimize) throws IOException, XMLStreamException {
+ OMText omText = omFactory.createOMText(contentID, dataHandlerProvider, optimize);
currentOMElement.addChild(omText);
}
}
Modified: webservices/axis2/trunk/java/modules/adb/test/org/apache/axis2/databinding/ADBSOAPModelBuilderTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/adb/test/org/apache/axis2/databinding/ADBSOAPModelBuilderTest.java?rev=795935&r1=795934&r2=795935&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/adb/test/org/apache/axis2/databinding/ADBSOAPModelBuilderTest.java (original)
+++ webservices/axis2/trunk/java/modules/adb/test/org/apache/axis2/databinding/ADBSOAPModelBuilderTest.java Mon Jul 20 17:50:58 2009
@@ -29,7 +29,6 @@
import org.apache.axiom.soap.impl.builder.StAXSOAPModelBuilder;
import org.apache.axis2.databinding.utils.PrintEvents;
import org.apache.axis2.databinding.utils.reader.ADBXMLStreamReaderImpl;
-import org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter;
import org.custommonkey.xmlunit.XMLTestCase;
import org.w3c.dom.Document;
import org.xml.sax.SAXException;
@@ -40,6 +39,8 @@
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
+import javax.xml.stream.XMLStreamWriter;
+
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.StringReader;
@@ -198,13 +199,13 @@
}
public void serialize(final QName parentQName,
- MTOMAwareXMLStreamWriter xmlWriter)
+ XMLStreamWriter xmlWriter)
throws XMLStreamException, ADBException {
serialize(parentQName,xmlWriter,false);
}
public void serialize(final QName parentQName,
- MTOMAwareXMLStreamWriter xmlWriter,
+ XMLStreamWriter xmlWriter,
boolean serializeType)
throws XMLStreamException, ADBException {
throw new UnsupportedOperationException("Unimplemented method");
Modified: webservices/axis2/trunk/java/modules/adb/test/org/apache/axis2/databinding/ClientInfo.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/adb/test/org/apache/axis2/databinding/ClientInfo.java?rev=795935&r1=795934&r2=795935&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/adb/test/org/apache/axis2/databinding/ClientInfo.java (original)
+++ webservices/axis2/trunk/java/modules/adb/test/org/apache/axis2/databinding/ClientInfo.java Mon Jul 20 17:50:58 2009
@@ -28,10 +28,10 @@
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
-import org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter;
import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamWriter;
/** ClientInfo bean class */
@@ -130,13 +130,13 @@
}
public void serialize(final QName parentQName,
- MTOMAwareXMLStreamWriter xmlWriter)
+ XMLStreamWriter xmlWriter)
throws XMLStreamException, ADBException {
serialize(parentQName,xmlWriter,false);
}
public void serialize(final QName parentQName,
- MTOMAwareXMLStreamWriter xmlWriter,
+ XMLStreamWriter xmlWriter,
boolean serializeType)
throws XMLStreamException, ADBException {
throw new UnsupportedOperationException("Unimplemented method");
Modified: webservices/axis2/trunk/java/modules/adb/test/org/apache/axis2/databinding/CreateAccountRequest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/adb/test/org/apache/axis2/databinding/CreateAccountRequest.java?rev=795935&r1=795934&r2=795935&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/adb/test/org/apache/axis2/databinding/CreateAccountRequest.java (original)
+++ webservices/axis2/trunk/java/modules/adb/test/org/apache/axis2/databinding/CreateAccountRequest.java Mon Jul 20 17:50:58 2009
@@ -28,10 +28,10 @@
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
-import org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter;
import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamWriter;
/** CreateAccountRequest bean class */
@@ -111,13 +111,13 @@
}
public void serialize(final QName parentQName,
- MTOMAwareXMLStreamWriter xmlWriter)
+ XMLStreamWriter xmlWriter)
throws XMLStreamException, ADBException {
serialize(parentQName,xmlWriter,false);
}
public void serialize(final QName parentQName,
- MTOMAwareXMLStreamWriter xmlWriter,
+ XMLStreamWriter xmlWriter,
boolean serializeType)
throws XMLStreamException, ADBException {
throw new UnsupportedOperationException("Unimplemented method");
Modified: webservices/axis2/trunk/java/modules/adb/test/org/apache/axis2/databinding/utils/reader/ADBXMLStreamReaderTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/adb/test/org/apache/axis2/databinding/utils/reader/ADBXMLStreamReaderTest.java?rev=795935&r1=795934&r2=795935&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/adb/test/org/apache/axis2/databinding/utils/reader/ADBXMLStreamReaderTest.java (original)
+++ webservices/axis2/trunk/java/modules/adb/test/org/apache/axis2/databinding/utils/reader/ADBXMLStreamReaderTest.java Mon Jul 20 17:50:58 2009
@@ -31,7 +31,6 @@
import org.apache.axis2.databinding.ADBBean;
import org.apache.axis2.databinding.ADBException;
import org.apache.axis2.databinding.utils.Constants;
-import org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter;
import org.apache.axis2.util.StreamWrapper;
import org.custommonkey.xmlunit.XMLTestCase;
import org.w3c.dom.Document;
@@ -318,13 +317,13 @@
}
public void serialize(final QName parentQName,
- MTOMAwareXMLStreamWriter xmlWriter)
+ XMLStreamWriter xmlWriter)
throws XMLStreamException, ADBException {
serialize(parentQName,xmlWriter,false);
}
public void serialize(final QName parentQName,
- MTOMAwareXMLStreamWriter xmlWriter,
+ XMLStreamWriter xmlWriter,
boolean serializeType)
throws XMLStreamException, ADBException {
throw new UnsupportedOperationException("Unimplemented method");
Modified: webservices/axis2/trunk/java/modules/jaxws-integration/test/server/EchoString.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws-integration/test/server/EchoString.java?rev=795935&r1=795934&r2=795935&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws-integration/test/server/EchoString.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws-integration/test/server/EchoString.java Mon Jul 20 17:50:58 2009
@@ -29,10 +29,10 @@
import org.apache.axiom.om.OMFactory;
import org.apache.axis2.databinding.ADBException;
- import org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter;
import javax.xml.namespace.QName;
- import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamWriter;
/**
* EchoString bean class
@@ -117,25 +117,20 @@
org.apache.axiom.om.OMDataSource dataSource =
- new org.apache.axis2.databinding.ADBDataSource(this,MY_QNAME){
-
- public void serialize(org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
- EchoString.this.serialize(MY_QNAME,xmlWriter);
- }
- };
+ new org.apache.axis2.databinding.ADBDataSource(this,MY_QNAME);
return new org.apache.axiom.om.impl.llom.OMSourcedElementImpl(
MY_QNAME,factory,dataSource);
}
public void serialize(final QName parentQName,
- MTOMAwareXMLStreamWriter xmlWriter)
+ XMLStreamWriter xmlWriter)
throws XMLStreamException, ADBException {
serialize(parentQName, xmlWriter, false);
}
public void serialize(final QName parentQName,
- MTOMAwareXMLStreamWriter xmlWriter,
+ XMLStreamWriter xmlWriter,
boolean serializeType)
throws XMLStreamException, ADBException {
throw new UnsupportedOperationException("Un implemented method");
Modified: webservices/axis2/trunk/java/modules/jaxws-integration/test/server/EchoStringResponse.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws-integration/test/server/EchoStringResponse.java?rev=795935&r1=795934&r2=795935&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws-integration/test/server/EchoStringResponse.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws-integration/test/server/EchoStringResponse.java Mon Jul 20 17:50:58 2009
@@ -27,10 +27,10 @@
import org.apache.axiom.om.OMFactory;
import org.apache.axis2.databinding.ADBException;
-import org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter;
import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamWriter;
/**
* EchoStringResponse bean class
@@ -99,25 +99,20 @@
org.apache.axiom.om.OMDataSource dataSource =
- new org.apache.axis2.databinding.ADBDataSource(this,MY_QNAME){
-
- public void serialize(org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
- EchoStringResponse.this.serialize(MY_QNAME,xmlWriter);
- }
- };
+ new org.apache.axis2.databinding.ADBDataSource(this,MY_QNAME);
return new org.apache.axiom.om.impl.llom.OMSourcedElementImpl(
MY_QNAME,factory,dataSource);
}
public void serialize(final QName parentQName,
- MTOMAwareXMLStreamWriter xmlWriter)
+ XMLStreamWriter xmlWriter)
throws XMLStreamException, ADBException {
serialize(parentQName, xmlWriter, false);
}
public void serialize(final QName parentQName,
- MTOMAwareXMLStreamWriter xmlWriter,
+ XMLStreamWriter xmlWriter,
boolean serializeType)
throws XMLStreamException, ADBException {
throw new UnsupportedOperationException("Un implemented method");