You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by an...@apache.org on 2007/05/03 17:52:25 UTC

svn commit: r534914 - in /incubator/tuscany/java/sca/modules/wsdl2java/src: main/java/org/apache/tuscany/tools/wsdl2java/generate/JavaInterfaceGenerator.java test/java/org/apache/tuscany/tools/wsdl2java/generate/WSDL2JavaGeneratorTestCase.java

Author: antelder
Date: Thu May  3 08:52:24 2007
New Revision: 534914

URL: http://svn.apache.org/viewvc?view=rev&rev=534914
Log:
Apply fix from Scott Kurz to get WSDL2Java going again with Axis 1.2

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

Modified: incubator/tuscany/java/sca/modules/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/JavaInterfaceGenerator.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/JavaInterfaceGenerator.java?view=diff&rev=534914&r1=534913&r2=534914
==============================================================================
--- incubator/tuscany/java/sca/modules/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/JavaInterfaceGenerator.java (original)
+++ incubator/tuscany/java/sca/modules/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/JavaInterfaceGenerator.java Thu May  3 08:52:24 2007
@@ -101,12 +101,17 @@
                 for (Map.Entry<QName, SDODataBindingTypeMappingEntry> e : typeMapping.entrySet()) {
                     typeMapper.addTypeMappingObject(e.getKey(), e.getValue());
                 }
+
+                WSDL11ToAxisServiceBuilder builder = new WSDL11ToAxisServiceBuilder(definition, serviceQname, port.getName());
+                builder.setCodegen(true);
+
                 AxisService axisService;
                 try {
-                    axisService = new WSDL11ToAxisServiceBuilder(definition, serviceQname, port.getName()).populateService();
+                    axisService = builder.populateService();
                 } catch (AxisFault e) {
                     throw new CodeGenerationException(e);
                 }
+
                 axisService.setName(port.getBinding().getPortType().getQName().getLocalPart());
                 CodeGenConfiguration codegenConfiguration = new CodeGenConfiguration(Collections.EMPTY_MAP);
                 codegenConfigurations.add(codegenConfiguration);

Modified: incubator/tuscany/java/sca/modules/wsdl2java/src/test/java/org/apache/tuscany/tools/wsdl2java/generate/WSDL2JavaGeneratorTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/wsdl2java/src/test/java/org/apache/tuscany/tools/wsdl2java/generate/WSDL2JavaGeneratorTestCase.java?view=diff&rev=534914&r1=534913&r2=534914
==============================================================================
--- incubator/tuscany/java/sca/modules/wsdl2java/src/test/java/org/apache/tuscany/tools/wsdl2java/generate/WSDL2JavaGeneratorTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/wsdl2java/src/test/java/org/apache/tuscany/tools/wsdl2java/generate/WSDL2JavaGeneratorTestCase.java Thu May  3 08:52:24 2007
@@ -36,8 +36,7 @@
                 "-javaPackage", "org.apache.tuscany.tools.wsdl2java.generate.account",
                 basedir + "/src/test/resources/AccountService.wsdl"};
 
-// TODO: broken with Axis2 1.2
-//        WSDL2JavaGenerator.main(args);
+        WSDL2JavaGenerator.main(args);
         
     }
     



---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org