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 ve...@apache.org on 2009/07/20 14:58:24 UTC
svn commit: r795808 - in /webservices/axis2/trunk/java/modules/adb:
src/org/apache/axis2/databinding/utils/writer/
test/org/apache/axis2/databinding/utils/writer/
Author: veithen
Date: Mon Jul 20 12:58:24 2009
New Revision: 795808
URL: http://svn.apache.org/viewvc?rev=795808&view=rev
Log:
Getting rid of some dead and/or duplicate code in ADB.
Added:
webservices/axis2/trunk/java/modules/adb/test/org/apache/axis2/databinding/utils/writer/MTOMAwareOMBuilderTest.java
- copied, changed from r788192, webservices/axis2/trunk/java/modules/adb/test/org/apache/axis2/databinding/utils/writer/OMElementStreamWriterTest.java
Removed:
webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/databinding/utils/writer/OMElementStreamWriter.java
webservices/axis2/trunk/java/modules/adb/test/org/apache/axis2/databinding/utils/writer/OMElementStreamWriterTest.java
Modified:
webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/databinding/utils/writer/MTOMAwareOMBuilder.java
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=795808&r1=795807&r2=795808&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 12:58:24 2009
@@ -142,11 +142,6 @@
}
- public void setDataHandler(DataHandler dataHandler) {
- OMText omText = omFactory.createOMText(dataHandler, true);
- currentOMElement.addChild(omText);
- }
-
public void writeAttribute(String attributeName, String attributeValue) throws XMLStreamException {
writeAttribute(null, null, attributeName, attributeValue);
}
Copied: webservices/axis2/trunk/java/modules/adb/test/org/apache/axis2/databinding/utils/writer/MTOMAwareOMBuilderTest.java (from r788192, webservices/axis2/trunk/java/modules/adb/test/org/apache/axis2/databinding/utils/writer/OMElementStreamWriterTest.java)
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/adb/test/org/apache/axis2/databinding/utils/writer/MTOMAwareOMBuilderTest.java?p2=webservices/axis2/trunk/java/modules/adb/test/org/apache/axis2/databinding/utils/writer/MTOMAwareOMBuilderTest.java&p1=webservices/axis2/trunk/java/modules/adb/test/org/apache/axis2/databinding/utils/writer/OMElementStreamWriterTest.java&r1=788192&r2=795808&rev=795808&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/adb/test/org/apache/axis2/databinding/utils/writer/OMElementStreamWriterTest.java (original)
+++ webservices/axis2/trunk/java/modules/adb/test/org/apache/axis2/databinding/utils/writer/MTOMAwareOMBuilderTest.java Mon Jul 20 12:58:24 2009
@@ -31,37 +31,37 @@
import javax.xml.stream.XMLStreamWriter;
-public class OMElementStreamWriterTest extends TestCase {
+public class MTOMAwareOMBuilderTest extends TestCase {
private int prefixNum;
public void testGetOMElement() {
- OMElementStreamWriter omElementStreamWriter = new OMElementStreamWriter();
+ MTOMAwareOMBuilder writer = new MTOMAwareOMBuilder();
try {
- writeStartElement(null, "test1", omElementStreamWriter);
- writeStartElement("http://apach.temp.uri", "test2", omElementStreamWriter);
- writeStartElement("http://apach.temp.uri1", "test3", omElementStreamWriter);
- omElementStreamWriter.writeCharacters("test string3");
- writeAttribute("http://apach.temp.uri", "attribute1", "attrubteValue1", omElementStreamWriter);
+ writeStartElement(null, "test1", writer);
+ writeStartElement("http://apach.temp.uri", "test2", writer);
+ writeStartElement("http://apach.temp.uri1", "test3", writer);
+ writer.writeCharacters("test string3");
+ writeAttribute("http://apach.temp.uri", "attribute1", "attrubteValue1", writer);
writeQNames(new QName[]{new QName("http://axis2.apach.org1", "testQName"),
- new QName("http://axis2.apach.org2", "testQName2")}, omElementStreamWriter);
- omElementStreamWriter.writeEndElement();
- writeStartElement("http://apach.temp.uri1", "test4", omElementStreamWriter);
- writeAttribute(null, "attribute1", "attrubteValue1", omElementStreamWriter);
- writeAttribute("ns1", "http://apach.temp.uri", "attribute1", "attrubteValue1", omElementStreamWriter);
- omElementStreamWriter.writeCharacters("test string4");
- omElementStreamWriter.writeEndElement();
- writeStartElement("http://temp.new.org", "testattributeElement", omElementStreamWriter);
- writeQNameAttribute(null, "testQname", new QName("http://temp.new.org", "testQName"), omElementStreamWriter);
- writeQName(new QName("http://axis2.apach.org", "testQName"), omElementStreamWriter);
- omElementStreamWriter.writeEndElement();
- omElementStreamWriter.writeEndElement();
- omElementStreamWriter.writeEndElement();
+ new QName("http://axis2.apach.org2", "testQName2")}, writer);
+ writer.writeEndElement();
+ writeStartElement("http://apach.temp.uri1", "test4", writer);
+ writeAttribute(null, "attribute1", "attrubteValue1", writer);
+ writeAttribute("ns1", "http://apach.temp.uri", "attribute1", "attrubteValue1", writer);
+ writer.writeCharacters("test string4");
+ writer.writeEndElement();
+ writeStartElement("http://temp.new.org", "testattributeElement", writer);
+ writeQNameAttribute(null, "testQname", new QName("http://temp.new.org", "testQName"), writer);
+ writeQName(new QName("http://axis2.apach.org", "testQName"), writer);
+ writer.writeEndElement();
+ writer.writeEndElement();
+ writer.writeEndElement();
- OMElement omElement = omElementStreamWriter.getOMElement();
+ OMElement omElement = writer.getOMElement();
System.out.println("OM String ==> " + omElement.toString());
XMLStreamReader xmlReader = omElement.getXMLStreamReader();