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 gd...@apache.org on 2005/02/21 22:37:09 UTC
cvs commit: ws-axis/java/test/wsdl/roundtrip2 build.xml
gdaniels 2005/02/21 13:37:09
Modified: java/src/org/apache/axis/wsdl/fromJava Emitter.java
java/test/wsdl/roundtrip2 build.xml
Log:
First cut at fix for roundtrip2 - this doesn't really solve the problem since it
re-creates the dependence on SOAP encoding whenver the typemapping
is "1.3". Working on a better fix but having some issues, so checking this
in, since it doesn't do anything worse than it did with the original
SOAPENC-derived JAXRPCTypeMappingImpl
Revision Changes Path
1.139 +2 -1 ws-axis/java/src/org/apache/axis/wsdl/fromJava/Emitter.java
Index: Emitter.java
===================================================================
RCS file: /home/cvs/ws-axis/java/src/org/apache/axis/wsdl/fromJava/Emitter.java,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -r1.138 -r1.139
--- Emitter.java 12 Feb 2005 04:41:21 -0000 1.138
+++ Emitter.java 21 Feb 2005 21:37:08 -0000 1.139
@@ -2552,7 +2552,8 @@
} else if (typeMappingVersion.equals("1.2")) {
defaultTM=DefaultSOAPEncodingTypeMappingImpl.create();
} else if (typeMappingVersion.equals("1.3")) {
- defaultTM=DefaultJAXRPC11TypeMappingImpl.create();
+ defaultTM=DefaultSOAPEncodingTypeMappingImpl.getSingleton();
+ defaultTM.setDelegate(DefaultJAXRPC11TypeMappingImpl.create());
} else {
throw new RuntimeException(org.apache.axis.utils.Messages.getMessage("j2wBadTypeMapping00"));
}
1.2 +0 -2 ws-axis/java/test/wsdl/roundtrip2/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/ws-axis/java/test/wsdl/roundtrip2/build.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build.xml 21 Feb 2005 03:04:45 -0000 1.1
+++ build.xml 21 Feb 2005 21:37:09 -0000 1.2
@@ -68,10 +68,8 @@
<java classname="org.apache.axis.wsdl.Java2WSDL" fork="true"
classpathref="classpath">
- <!-- please uncomment the following block to recreate the problem
<arg value="-T"/>
<arg value="1.3"/>
- -->
<arg value="-o"/>
<arg value="${axis.home}/build/work/test/wsdl/roundtrip2/roundtrip2.wsdl"/>
<arg value="--location"/>