Author: jsdelfino
Date: Mon Sep 10 18:39:17 2007
New Revision: 574423
URL: http://svn.apache.org/viewvc?rev=574423&view=rev
Log:
Workaround for JIRA TUSCANY-1673.
Modified:
incubator/tuscany/java/sca/modules/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/WSDL2JavaGenerator.java
Modified:
incubator/tuscany/java/sca/modules/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/WSDL2JavaGenerator.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/WSDL2JavaGenerator.java?rev=574423&r1=574422&r2=574423&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/WSDL2JavaGenerator.java
(original)
+++
incubator/tuscany/java/sca/modules/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/WSDL2JavaGenerator.java
Mon Sep 10 18:39:17 2007
@@ -217,6 +217,7 @@
XSD2JavaGenerator.GeneratedPackage.PackageClassInfo
classInfo =
(XSD2JavaGenerator.GeneratedPackage.PackageClassInfo)iterClass.next();
SDODataBindingTypeMappingEntry typeMappingEntry;
if ((genOptions & DYNAMIC_SDO)==0){
+
typeMappingEntry = new
SDODataBindingTypeMappingEntry(classInfo.getClassName(),
classInfo.getAnonymous(), classInfo.getProperties());
} else {
// TO DO implement dynamic sdo case
@@ -224,7 +225,15 @@
System.out.println();
}
QName qname = new
QName(packageInfo.getNamespace(),classInfo.getName());
- typeMapping.put(qname, typeMappingEntry);
+
+ //FIXME Workaround for JIRA TUSCANY-1673
+ // Do not overwrite a typemapping entry describing a
element typed by an anonymous
+ // complex type with a typemapping entry describing a
complex type named like the
+ // element
+ SDODataBindingTypeMappingEntry existingTypeMapping =
typeMapping.get(qname);
+ if (existingTypeMapping == null ||
!existingTypeMapping.isAnonymous()) {
+ typeMapping.put(qname, typeMappingEntry);
+ }
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
