You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by js...@apache.org on 2006/03/04 10:17:26 UTC

svn commit: r383082 - in /incubator/tuscany/java/sca/tools/src/main/java/org/apache/tuscany/tools/wsdl2java/generate: JavaInterfaceGenerator.java WSDL2JavaGenerator.java

Author: jsdelfino
Date: Sat Mar  4 01:17:24 2006
New Revision: 383082

URL: http://svn.apache.org/viewcvs?rev=383082&view=rev
Log:
Fixed WSDL2Java generator to generate the correct method signatures for doc-wrapper style operations

Modified:
    incubator/tuscany/java/sca/tools/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/JavaInterfaceGenerator.java
    incubator/tuscany/java/sca/tools/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/WSDL2JavaGenerator.java

Modified: incubator/tuscany/java/sca/tools/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/JavaInterfaceGenerator.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/tools/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/JavaInterfaceGenerator.java?rev=383082&r1=383081&r2=383082&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tools/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/JavaInterfaceGenerator.java (original)
+++ incubator/tuscany/java/sca/tools/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/JavaInterfaceGenerator.java Sat Mar  4 01:17:24 2006
@@ -75,7 +75,7 @@
         codegenConfiguration.setOutputLanguage("java");
         codegenConfiguration.setOutputLocation(new File(outputLocation));
         codegenConfiguration.setPackageName(packageName);
-        codegenConfiguration.setPackClasses(true);
+        codegenConfiguration.setPackClasses(false);
         codegenConfiguration.setPolicyMap(new HashMap());
         codegenConfiguration.setPortName(null);
         codegenConfiguration.setServerSide(false);

Modified: incubator/tuscany/java/sca/tools/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/WSDL2JavaGenerator.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/tools/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/WSDL2JavaGenerator.java?rev=383082&r1=383081&r2=383082&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tools/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/WSDL2JavaGenerator.java (original)
+++ incubator/tuscany/java/sca/tools/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/WSDL2JavaGenerator.java Sat Mar  4 01:17:24 2006
@@ -178,6 +178,11 @@
             if (documentRoot!=null) {
                 for (EStructuralFeature element  : (List<EStructuralFeature>)extendedMetaData.getElements(documentRoot)) {
                     EClassifier elementType=element.getEType();
+                    if (extendedMetaData.isAnonymous(elementType)) {
+                        EClass eClass=(EClass)elementType;
+                        EStructuralFeature feature=(EStructuralFeature)eClass.getEStructuralFeatures().get(0);
+                        elementType=feature.getEType();
+                    }
                     if (elementType instanceof EClass) {
                         GenClass genClass=genClasses.get(elementType);
                         QName qname=new QName(extendedMetaData.getNamespace(currentEPackage), extendedMetaData.getName(element));