scheu 02/02/06 08:55:54
Modified: java/src/org/apache/axis/wsdl/toJava JavaDeployWriter.java
Log:
I changed WSDL2Java to emit the <typeMapping> stanzas within the
<service> stanza in the deploy.wsdd.
Previously the <typeMapping> stanzas were emitted into the deploy
scope, which cause the <typeMapping> stanzas for different services to
collide.
Revision Changes Path
1.16 +14 -13
xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaDeployWriter.java
Index: JavaDeployWriter.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaDeployWriter.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- JavaDeployWriter.java 31 Jan 2002 21:53:22 -0000 1.15
+++ JavaDeployWriter.java 6 Feb 2002 16:55:54 -0000 1.16
@@ -105,7 +105,6 @@
*/
protected void writeFileBody() throws IOException {
writeDeployServices();
- writeDeployTypes();
pw.println("</deployment>");
pw.close();
} // writeFileBody
@@ -150,24 +149,24 @@
if (type.getBaseType() == null && type.isReferenced()
&& !type.isOnlyLiteralReferenced()
&& !(type instanceof CollectionType)) {
- pw.println(" <typeMapping");
- pw.println(" xmlns:ns=\"" + type.getQName().getNamespaceURI() +
"\"");
- pw.println(" qname=\"ns:" + type.getQName().getLocalPart() +
'"');
- pw.println(" type=\"java:" + type.getName() + '"');
+ pw.println(" <typeMapping");
+ pw.println(" xmlns:ns=\"" +
type.getQName().getNamespaceURI() + "\"");
+ pw.println(" qname=\"ns:" + type.getQName().getLocalPart() +
'"');
+ pw.println(" type=\"java:" + type.getName() + '"');
if (type.getName().endsWith("[]")) {
- pw.println("
serializer=\"org.apache.axis.encoding.ser.ArraySerializerFactory\"");
- pw.println("
deserializer=\"org.apache.axis.encoding.ser.ArrayDeserializerFactory\"");
+ pw.println("
serializer=\"org.apache.axis.encoding.ser.ArraySerializerFactory\"");
+ pw.println("
deserializer=\"org.apache.axis.encoding.ser.ArrayDeserializerFactory\"");
} else if (type.getNode() != null &&
SchemaUtils.getEnumerationBaseAndValues(
type.getNode(), emitter.getSymbolTable()) != null) {
- pw.println("
serializer=\"org.apache.axis.encoding.ser.EnumSerializerFactory\"");
- pw.println("
deserializer=\"org.apache.axis.encoding.ser.EnumDeserializerFactory\"");
+ pw.println("
serializer=\"org.apache.axis.encoding.ser.EnumSerializerFactory\"");
+ pw.println("
deserializer=\"org.apache.axis.encoding.ser.EnumDeserializerFactory\"");
} else {
- pw.println("
serializer=\"org.apache.axis.encoding.ser.BeanSerializerFactory\"");
- pw.println("
deserializer=\"org.apache.axis.encoding.ser.BeanDeserializerFactory\"");
+ pw.println("
serializer=\"org.apache.axis.encoding.ser.BeanSerializerFactory\"");
+ pw.println("
deserializer=\"org.apache.axis.encoding.ser.BeanDeserializerFactory\"");
}
- pw.println(" encodingStyle=\""+
Constants.URI_CURRENT_SOAP_ENC+"\"");
- pw.println(" />");
+ pw.println(" encodingStyle=\""+
Constants.URI_CURRENT_SOAP_ENC+"\"");
+ pw.println(" />");
}
}
} //writeDeployTypes
@@ -187,6 +186,8 @@
+ "\" provider=\"" + (isRPC ? prefix +":RPC" : prefix +":MSG") +
"\">");
writeDeployBinding(binding);
+ writeDeployTypes();
+
pw.println(" </service>");
} //writeDeployPort
