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 am...@apache.org on 2007/07/01 11:04:06 UTC
svn commit: r552263 - in /webservices/axis2/trunk/java/modules:
codegen/src/org/apache/axis2/wsdl/codegen/emitter/AxisServiceBasedMultiLanguageEmitter.java
kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java
Author: amilas
Date: Sun Jul 1 02:04:02 2007
New Revision: 552263
URL: http://svn.apache.org/viewvc?view=rev&rev=552263
Log:
used the correct method to get the type map for AXIS2-2881 and remove the return part renaming to
make it compatible wiht WCF
Modified:
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/AxisServiceBasedMultiLanguageEmitter.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java
Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/AxisServiceBasedMultiLanguageEmitter.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/AxisServiceBasedMultiLanguageEmitter.java?view=diff&rev=552263&r1=552262&r2=552263
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/AxisServiceBasedMultiLanguageEmitter.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/AxisServiceBasedMultiLanguageEmitter.java Sun Jul 1 02:04:02 2007
@@ -395,12 +395,11 @@
containsKey(faultMessage.getName())) {
//make a name
String className = makeJavaClassName(faultMessage.getName());
-// FIXME: TODO: the following lines were for fixing Axis2-2881 (svn revision 552106), but causes build break.
-// QName faultQName = new QName(codeGenConfiguration.getTargetNamespace(), faultMessage.getName());
-// if (this.mapper.getTypeMappingName(faultQName) != null) {
-// // i.e we already have an entry
-// className = makeJavaClassName(className + (uniqueFaultNameCounter++));
-// }
+ QName faultQName = new QName(codeGenConfiguration.getTargetNamespace(), faultMessage.getName());
+ if (this.mapper.getTypeMappingObject(faultQName) != null) {
+ // i.e we already have an entry
+ className = makeJavaClassName(className + (uniqueFaultNameCounter++));
+ }
while (fullyQualifiedFaultClassNameMap.containsValue(className)) {
className = makeJavaClassName(className + (uniqueFaultNameCounter++));
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java?view=diff&rev=552263&r1=552262&r2=552263
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java Sun Jul 1 02:04:02 2007
@@ -1745,7 +1745,7 @@
part = (Part) partsMap.values().iterator().next();
// change the name of this part
// this is the return type and its name should be result
- part.setName("result");
+// part.setName("result");
addPartToElement(part,
document,
xsdPrefix,
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org