Author: dims
Date: Wed Jun 14 06:12:51 2006
New Revision: 414236

URL: http://svn.apache.org/viewvc?rev=414236&view=rev
Log:
Fix for AXIS2-806 - Compilation errors in Axis2 tools package

Modified:
    webservices/axis2/trunk/java/modules/tool/project.xml
    
webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/codegen/WSDL2JavaGenerator.java

Modified: webservices/axis2/trunk/java/modules/tool/project.xml
URL: 
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/tool/project.xml?rev=414236&r1=414235&r2=414236&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/tool/project.xml (original)
+++ webservices/axis2/trunk/java/modules/tool/project.xml Wed Jun 14 06:12:51 
2006
@@ -41,6 +41,11 @@
             <artifactId>axis2-common</artifactId>
             <version>${pom.currentVersion}</version>
         </dependency>
+        <dependency>
+            <groupId>axis2</groupId>
+            <artifactId>axis2-core</artifactId>
+            <version>${pom.currentVersion}</version>
+        </dependency>
 
         <dependency>
             <groupId>axis2</groupId>
@@ -66,7 +71,7 @@
             <sourceModification>
                 <className>fakeClass</className>
                 <excludes>
-                    <exclude>**/codegen/**/*.java</exclude>
+                    <exclude>**/eclipse/**/*.java</exclude>
                     <exclude>**/core/**/*.java</exclude>
                     <exclude>**/service/**/*.java</exclude>
                 </excludes>

Modified: 
webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/codegen/WSDL2JavaGenerator.java
URL: 
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/codegen/WSDL2JavaGenerator.java?rev=414236&r1=414235&r2=414236&view=diff
==============================================================================
--- 
webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/codegen/WSDL2JavaGenerator.java
 (original)
+++ 
webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/codegen/WSDL2JavaGenerator.java
 Wed Jun 14 06:12:51 2006
@@ -17,7 +17,7 @@
 
 
 import org.apache.axis2.description.AxisService;
-import org.apache.axis2.description.WSDL2AxisServiceBuilder;
+import org.apache.axis2.description.WSDL11ToAxisServiceBuilder;
 import org.apache.axis2.wsdl.util.CommandLineOption;
 import org.apache.axis2.wsdl.util.CommandLineOptionConstants;
 
@@ -187,9 +187,16 @@
                                url = new URL(wsdlURI); 
                        }
 
+                       //FIXME @author soi - 
+                   // This quick fix assume that the wsdlURI points to a wsdl 
1.1 version.
+                       // A better fix should be to determine which builder to 
use based on the wsdl version. 
+                       // The current implementation of the wsdl builder 
classes did not allow for this. I will suggest
+                       // that the determination of which builder to use 
should be done in the builder classes, preferably
+                       // in the parent builder class. 
+                       // Accessable through a static reference to a method 
like getBuilderInstance(String wsdlURI) in
+                       // the parent builder class or through a builder 
Abstract Factor or Abstract factory methods.
                        
-                       WSDL2AxisServiceBuilder builder = 
-                               new 
WSDL2AxisServiceBuilder(url.openConnection().getInputStream());
+                       WSDL11ToAxisServiceBuilder builder = new 
WSDL11ToAxisServiceBuilder(url.openConnection().getInputStream());
                                        
                        builder.setBaseUri(getBaseUri(wsdlURI));
                        return builder.populateService();



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to