dims 2003/03/18 08:50:38
Modified: java/src/org/apache/axis Constants.java
java/src/org/apache/axis/encoding
DefaultTypeMappingImpl.java
java/src/org/apache/axis/wsdl/fromJava Emitter.java
Added: java/test/wsdl/document build.xml
DocumentTestSoapBindingImpl.java TestService.java
TestServiceServiceTestCase.java
java/src/org/apache/axis/encoding/ser
DocumentDeserializer.java
DocumentDeserializerFactory.java
DocumentSerializer.java
DocumentSerializerFactory.java
Log:
Fix and test case for Bug 18081 - org.w3c.dom.Document Java2WSDL Regression
Notes:
- Added test/wsdl/document test case
- Testcase runs j2w, followed by w2j
Revision Changes Path
1.1 xml-axis/java/test/wsdl/document/build.xml
Index: build.xml
===================================================================
<?xml version="1.0" ?>
<!DOCTYPE project [
<!ENTITY properties SYSTEM "file:../../../xmls/properties.xml">
<!ENTITY paths SYSTEM "file:../../../xmls/path_refs.xml">
<!ENTITY taskdefs SYSTEM "file:../../../xmls/taskdefs.xml">
<!ENTITY taskdefs_post_compile SYSTEM
"file:../../../xmls/taskdefs_post_compile.xml">
<!ENTITY targets SYSTEM "file:../../../xmls/targets.xml">
]>
<!-- ===================================================================
<description>
Test/Sample Component file for Axis
Notes:
This is a build file for use with the Jakarta Ant build tool.
Prerequisites:
jakarta-ant from http://jakarta.apache.org
Build Instructions:
To compile
ant compile
To execute
ant run
Author:
Matt Seibert [EMAIL PROTECTED]
Copyright:
Copyright (c) 2002-2003 Apache Software Foundation.
</description>
==================================================================== -->
<project default="compile">
<property name="axis.home" location="../../.." />
<property name="componentName" value="test/wsdl/document" />
&properties;
&paths;
&taskdefs;
&taskdefs_post_compile;
&targets;
<target name="clean">
<echo message="Removing ${build.dir}/classes/${componentName} and
${build.dir}/work/${componentName}" />
<delete dir="${build.dir}/classes/${componentName}"/>
<delete dir="${build.dir}/work/${componentName}"/>
</target>
<target name="copy" depends="setenv"/>
<target name="compile" depends="copy">
<echo message="Compiling test.wsdl.document"/>
<!-- document Test -->
<!-- To test Java Value Types, copy over the base and subclasses -->
<copy todir="${build.dir}/work/test/wsdl/document" overwrite="yes">
<fileset dir="${test.dir}/wsdl/document">
<include name="TestService.java"/>
</fileset>
</copy>
<!-- Compile the Web Service -->
<javac srcdir="${build.dir}/work" destdir="${build.dest}" debug="${debug}"
fork="${javac.fork}">
<classpath refid="classpath" />
<include name="test/wsdl/document/**.java" />
<exclude name="test/wsdl/document/*TestCase.java" />
<exclude name="test/wsdl/document/*Impl.java" />
</javac>
<!-- Now create the real WSDL file -->
<java2wsdl output="${axis.home}/build/work/test/wsdl/document/document.wsdl"
className= "test.wsdl.document.TestService"
useInheritedMethods="false"
namespace="http://document.wsdl.test";
typeMappingVersion="1.2"
location="http://localhost:8080/axis/services/DocumentTest";>
<mapping namespace="http://document.wsdl.test"; package="test.wsdl.document"/>
</java2wsdl>
<!-- Delete the intermediate files so we recreate over a clean slate -->
<delete dir="${build.dir}/classes/test/wsdl/document"/>
<!-- Recreate Java files from the new WSDL -->
<wsdl2java url="${axis.home}/build/work/test/wsdl/document/document.wsdl"
output="${axis.home}/build/work"
deployscope="session"
serverSide="yes"
skeletonDeploy="no"
noimports="no"
verbose="no"
testcase="yes">
<mapping namespace="http://document.wsdl.test"; package="test.wsdl.document"/>
</wsdl2java>
<copy todir="${build.dir}/work/test/wsdl/document" overwrite="yes">
<fileset dir="${axis.home}/test/wsdl/document">
<include name="*TestCase.java"/>
<include name="*Impl.java"/>
</fileset>
</copy>
<javac srcdir="${build.dir}/work" destdir="${build.dest}" fork="${javac.fork}"
debug="${debug}">
<classpath refid="classpath" />
<include name="test/wsdl/document/*.java" />
<include name="test/wsdl/document/**/*.java" />
</javac>
</target>
<target name="run" >
<antcall target="execute-Component" />
</target>
</project>
1.1
xml-axis/java/test/wsdl/document/DocumentTestSoapBindingImpl.java
Index: DocumentTestSoapBindingImpl.java
===================================================================
/**
* DocumentTestSoapBindingImpl.java
*
* This file was auto-generated from WSDL
* by the Apache Axis WSDL2Java emitter.
*/
package test.wsdl.document;
import org.apache.axis.AxisFault;
import org.apache.axis.utils.XMLUtils;
import java.io.ByteArrayInputStream;
public class DocumentTestSoapBindingImpl implements test.wsdl.document.TestService{
String xml = "<hello>world</hello>";
public org.w3c.dom.Element getElement() throws java.rmi.RemoteException {
try {
return XMLUtils.newDocument(new
ByteArrayInputStream(xml.getBytes())).getDocumentElement();
} catch (Exception e) {
throw AxisFault.makeFault(e);
}
}
public org.w3c.dom.Document getDocument() throws java.rmi.RemoteException {
try {
return XMLUtils.newDocument(new ByteArrayInputStream(xml.getBytes()));
} catch (Exception e) {
throw AxisFault.makeFault(e);
}
}
}
1.1 xml-axis/java/test/wsdl/document/TestService.java
Index: TestService.java
===================================================================
package test.wsdl.document;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
public class TestService {
public Document getDocument() {
return null;
}
public Element getElement() {
return null;
}
}
1.1 xml-axis/java/test/wsdl/document/TestServiceServiceTestCase.java
Index: TestServiceServiceTestCase.java
===================================================================
/**
* TestServiceServiceTestCase.java
*
* This file was auto-generated from WSDL
* by the Apache Axis WSDL2Java emitter.
*/
package test.wsdl.document;
import org.apache.axis.utils.XMLUtils;
import org.w3c.dom.Element;
public class TestServiceServiceTestCase extends junit.framework.TestCase {
String xml = "<hello>world</hello>";
public TestServiceServiceTestCase(java.lang.String name) {
super(name);
}
public void test1DocumentTestGetElement() throws Exception {
test.wsdl.document.DocumentTestSoapBindingStub binding;
try {
binding = (test.wsdl.document.DocumentTestSoapBindingStub)
new
test.wsdl.document.TestServiceServiceLocator().getDocumentTest();
}
catch (javax.xml.rpc.ServiceException jre) {
if(jre.getLinkedCause()!=null)
jre.getLinkedCause().printStackTrace();
throw new junit.framework.AssertionFailedError("JAX-RPC ServiceException
caught: " + jre);
}
assertNotNull("binding is null", binding);
// Time out after a minute
binding.setTimeout(60000);
// Test operation
org.w3c.dom.Element value = null;
value = binding.getElement();
// TBD - validate results
assertTrue(value != null);
assertTrue(XMLUtils.ElementToString(value).indexOf(xml)!=-1);
}
public void test2DocumentTestGetDocument() throws Exception {
test.wsdl.document.DocumentTestSoapBindingStub binding;
try {
binding = (test.wsdl.document.DocumentTestSoapBindingStub)
new
test.wsdl.document.TestServiceServiceLocator().getDocumentTest();
}
catch (javax.xml.rpc.ServiceException jre) {
if(jre.getLinkedCause()!=null)
jre.getLinkedCause().printStackTrace();
throw new junit.framework.AssertionFailedError("JAX-RPC ServiceException
caught: " + jre);
}
assertNotNull("binding is null", binding);
// Time out after a minute
binding.setTimeout(60000);
// Test operation
org.w3c.dom.Document value = null;
value = binding.getDocument();
// TBD - validate results
assertTrue(value != null);
assertTrue(XMLUtils.DocumentToString(value).indexOf(xml)!=-1);
}
}
1.116 +1 -0 xml-axis/java/src/org/apache/axis/Constants.java
Index: Constants.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/Constants.java,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- Constants.java 23 Feb 2003 05:44:21 -0000 1.115
+++ Constants.java 18 Mar 2003 16:50:38 -0000 1.116
@@ -619,6 +619,7 @@
public static final QName SOAP_MAP = new QName(NS_URI_XMLSOAP, "Map");
public static final QName SOAP_ELEMENT = new QName(NS_URI_XMLSOAP, "Element");
+ public static final QName SOAP_DOCUMENT = new QName(NS_URI_XMLSOAP, "Document");
public static final QName SOAP_VECTOR = new QName(NS_URI_XMLSOAP, "Vector");
public static final QName MIME_IMAGE = new QName(NS_URI_XMLSOAP, "Image");
public static final QName MIME_PLAINTEXT = new QName(NS_URI_XMLSOAP,
"PlainText");
1.68 +8 -0
xml-axis/java/src/org/apache/axis/encoding/DefaultTypeMappingImpl.java
Index: DefaultTypeMappingImpl.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/src/org/apache/axis/encoding/DefaultTypeMappingImpl.java,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- DefaultTypeMappingImpl.java 25 Dec 2002 23:28:46 -0000 1.67
+++ DefaultTypeMappingImpl.java 18 Mar 2003 16:50:38 -0000 1.68
@@ -79,6 +79,8 @@
import org.apache.axis.encoding.ser.SimpleSerializerFactory;
import org.apache.axis.encoding.ser.VectorDeserializerFactory;
import org.apache.axis.encoding.ser.VectorSerializerFactory;
+import org.apache.axis.encoding.ser.DocumentDeserializerFactory;
+import org.apache.axis.encoding.ser.DocumentSerializerFactory;
import org.apache.axis.schema.SchemaVersion;
import org.apache.axis.types.HexBinary;
import org.apache.axis.utils.JavaUtils;
@@ -336,6 +338,12 @@
myRegister(Constants.SOAP_ELEMENT, org.w3c.dom.Element.class,
new ElementSerializerFactory(),
new ElementDeserializerFactory());
+
+ // Use the Document Serializeration for Document's
+ myRegister(Constants.SOAP_DOCUMENT, org.w3c.dom.Document.class,
+ new DocumentSerializerFactory(),
+ new DocumentDeserializerFactory());
+
myRegister(Constants.SOAP_VECTOR, java.util.Vector.class,
new VectorSerializerFactory(java.util.Vector.class,
Constants.SOAP_VECTOR),
1.1
xml-axis/java/src/org/apache/axis/encoding/ser/DocumentDeserializer.java
Index: DocumentDeserializer.java
===================================================================
package org.apache.axis.encoding.ser;
/*
* The Apache Software License, Version 1.1
*
*
* Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* 3. The end-user documentation included with the redistribution,
* if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
*
* 4. The names "Axis" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
* software without prior written permission. For written
* permission, please contact [EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*/
import org.apache.axis.MessageContext;
import org.apache.axis.components.logger.LogFactory;
import org.apache.axis.encoding.DeserializationContext;
import org.apache.axis.encoding.DeserializerImpl;
import org.apache.axis.message.MessageElement;
import org.apache.axis.utils.Messages;
import org.apache.commons.logging.Log;
import org.xml.sax.SAXException;
import java.util.ArrayList;
/**
* Deserializer for DOM Document
*
* @author Davanum Srinivas <[EMAIL PROTECTED]>
*/
public class DocumentDeserializer extends DeserializerImpl
{
protected static Log log =
LogFactory.getLog(DocumentDeserializer.class.getName());
public static final String DESERIALIZE_CURRENT_ELEMENT =
"DeserializeCurrentElement";
public final void onEndElement(String namespace, String localName,
DeserializationContext context)
throws SAXException
{
try {
MessageElement msgElem = context.getCurElement();
if ( msgElem != null ) {
MessageContext messageContext = context.getMessageContext();
Boolean currentElement = (Boolean)
messageContext.getProperty(DESERIALIZE_CURRENT_ELEMENT);
if (currentElement != null && currentElement.booleanValue()) {
value = msgElem.getAsDocument();
messageContext.setProperty(DESERIALIZE_CURRENT_ELEMENT,
Boolean.FALSE);
return;
}
ArrayList children = msgElem.getChildren();
if ( children != null ) {
msgElem = (MessageElement) children.get(0);
if ( msgElem != null )
value = msgElem.getAsDocument();
}
}
}
catch( Exception exp ) {
log.error(Messages.getMessage("exception00"), exp);
throw new SAXException( exp );
}
}
}
1.1
xml-axis/java/src/org/apache/axis/encoding/ser/DocumentDeserializerFactory.java
Index: DocumentDeserializerFactory.java
===================================================================
package org.apache.axis.encoding.ser;
/*
* The Apache Software License, Version 1.1
*
*
* Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* 3. The end-user documentation included with the redistribution,
* if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
*
* 4. The names "Axis" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
* software without prior written permission. For written
* permission, please contact [EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*/
import org.apache.axis.encoding.ser.BaseDeserializerFactory;
import org.apache.axis.encoding.ser.ElementDeserializer;
/**
* DeserializerFactory for DOM Document.
*
* @author Davanum Srinivas <[EMAIL PROTECTED]>
*/
public class DocumentDeserializerFactory extends BaseDeserializerFactory {
public DocumentDeserializerFactory() {
super(DocumentDeserializer.class);
}
}
1.1
xml-axis/java/src/org/apache/axis/encoding/ser/DocumentSerializer.java
Index: DocumentSerializer.java
===================================================================
/*
* The Apache Software License, Version 1.1
*
*
* Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* 3. The end-user documentation included with the redistribution,
* if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
*
* 4. The names "Axis" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
* software without prior written permission. For written
* permission, please contact [EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*/
package org.apache.axis.encoding.ser;
import org.apache.axis.Constants;
import org.apache.axis.encoding.SerializationContext;
import org.apache.axis.encoding.Serializer;
import org.apache.axis.utils.Messages;
import org.apache.axis.wsdl.fromJava.Types;
import org.w3c.dom.Element;
import org.w3c.dom.Document;
import org.xml.sax.Attributes;
import javax.xml.namespace.QName;
import java.io.IOException;
/**
* Serializer for DOM Document
*
* @author Davanum Srinivas <[EMAIL PROTECTED]>
*/
public class DocumentSerializer implements Serializer {
/**
* Serialize a DOM Document
*/
public void serialize(QName name, Attributes attributes,
Object value, SerializationContext context)
throws IOException
{
if (!(value instanceof Document))
throw new IOException(Messages.getMessage("cantSerialize01"));
context.startElement(name, attributes);
Document document = (Document)value;
context.writeDOMElement(document.getDocumentElement());
context.endElement();
}
public String getMechanismType() { return Constants.AXIS_SAX; }
/**
* Return XML schema for the specified type, suitable for insertion into
* the <types> element of a WSDL document, or underneath an
* <element> or <attribute> declaration.
*
* @param javaType the Java Class we're writing out schema for
* @param types the Java2WSDL Types object which holds the context
* for the WSDL being generated.
* @return a type element containing a schema simpleType/complexType
* @see Types
*/
public Element writeSchema(Class javaType, Types types) throws Exception {
return null;
}
}
1.1
xml-axis/java/src/org/apache/axis/encoding/ser/DocumentSerializerFactory.java
Index: DocumentSerializerFactory.java
===================================================================
package org.apache.axis.encoding.ser;
/*
* The Apache Software License, Version 1.1
*
*
* Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* 3. The end-user documentation included with the redistribution,
* if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
*
* 4. The names "Axis" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
* software without prior written permission. For written
* permission, please contact [EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*/
import org.apache.axis.encoding.ser.BaseSerializerFactory;
import org.apache.axis.encoding.ser.ElementSerializer;
/**
* SerializerFactory for DOM Document
*
* @author Davanum Srinivas <[EMAIL PROTECTED]>
*/
public class DocumentSerializerFactory extends BaseSerializerFactory {
public DocumentSerializerFactory() {
super(DocumentSerializer.class); // Share DocumentSerializer instance
}
}
1.85 +0 -9 xml-axis/java/src/org/apache/axis/wsdl/fromJava/Emitter.java
Index: Emitter.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/fromJava/Emitter.java,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- Emitter.java 18 Mar 2003 04:34:12 -0000 1.84
+++ Emitter.java 18 Mar 2003 16:50:38 -0000 1.85
@@ -676,15 +676,6 @@
Constants.NS_URI_XMLSOAP);
namespaces.putPrefix(Constants.NS_URI_XMLSOAP,
Constants.NS_PREFIX_XMLSOAP);
-
- // This is a temporary fix to address a regression (from 1.0 to 1.1
- // in the way org.w3c.dom.Document objects are handled. Without
- // this namespace declaration, Java2WSDL throws a fit. We need to
- // find an appropriate mapping for Document objects (they should
- // be treated the same as Element objects) and rework the code
- // accordingly.
- def.addNamespace("w3c", "http://dom.w3c.org";);
- namespaces.putPrefix("http://dom.w3c.org";, "w3c");
}
/**
