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 sa...@apache.org on 2007/03/22 06:41:07 UTC

svn commit: r521123 - in /webservices/axis2/trunk/java: ./ modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/ modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/eclipse/ modules/too...

Author: sandakith
Date: Wed Mar 21 22:41:06 2007
New Revision: 521123

URL: http://svn.apache.org/viewvc?view=rev&rev=521123
Log:
fix the eclipse plugin skeliton generation 

Modified:
    webservices/axis2/trunk/java/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/WSDL2JavaGenerator.java
    webservices/axis2/trunk/java/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/eclipse/CodeGenWizard.java
    webservices/axis2/trunk/java/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/eclipse/util/WSDLPropertyReader.java
    webservices/axis2/trunk/java/pom.xml

Modified: webservices/axis2/trunk/java/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/WSDL2JavaGenerator.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/WSDL2JavaGenerator.java?view=diff&rev=521123&r1=521122&r2=521123
==============================================================================
--- webservices/axis2/trunk/java/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/WSDL2JavaGenerator.java (original)
+++ webservices/axis2/trunk/java/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/WSDL2JavaGenerator.java Wed Mar 21 22:41:06 2007
@@ -199,6 +199,7 @@
 			WSDL11ToAxisServiceBuilder builder = new WSDL11ToAxisServiceBuilder(url.openConnection().getInputStream());
 					
 			builder.setBaseUri(getBaseUri(wsdlURI));
+			builder.setCodegen(true);
 			return builder.populateService();
     }
 

Modified: webservices/axis2/trunk/java/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/eclipse/CodeGenWizard.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/eclipse/CodeGenWizard.java?view=diff&rev=521123&r1=521122&r2=521123
==============================================================================
--- webservices/axis2/trunk/java/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/eclipse/CodeGenWizard.java (original)
+++ webservices/axis2/trunk/java/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/eclipse/CodeGenWizard.java Wed Mar 21 22:41:06 2007
@@ -26,6 +26,8 @@
 import java.util.HashMap;
 import java.util.Map;
 
+import javax.wsdl.Definition;
+
 import org.apache.axis2.description.AxisService;
 import org.apache.axis2.tool.codegen.WSDL2JavaGenerator;
 import org.apache.axis2.tool.codegen.eclipse.plugin.CodegenWizardPlugin;
@@ -39,6 +41,7 @@
 import org.apache.axis2.tool.codegen.eclipse.ui.WSDLFileSelectionPage;
 import org.apache.axis2.tool.codegen.eclipse.util.SettingsConstants;
 import org.apache.axis2.tool.codegen.eclipse.util.UIConstants;
+import org.apache.axis2.tool.codegen.eclipse.util.WSDLPropertyReader;
 import org.apache.axis2.tool.core.JarFileWriter;
 import org.apache.axis2.tool.core.SrcCompiler;
 import org.apache.axis2.util.CommandLineOptionConstants;
@@ -246,7 +249,14 @@
                  //Fix for the CodeGenConfiguration Contructor Change
                  //CodeGenConfiguration codegenConfig = new CodeGenConfiguration(service, optionsMap);
                  CodeGenConfiguration codegenConfig = new CodeGenConfiguration(optionsMap);
-                 codegenConfig.setAxisService(service);
+                 codegenConfig.addAxisService(service);
+                 
+                 //set the wsdl definision for codegen config for skeleton generarion.
+                 WSDLPropertyReader reader = new WSDLPropertyReader();
+                 reader.readWSDL(wsdlSelectionPage.getFileName());
+                 Definition wsdlDefinition = reader.getWsdlDefinition();
+                 codegenConfig.setWsdlDefinition(wsdlDefinition);
+                 
                  //set the baseURI
                  codegenConfig.setBaseURI(generator.getBaseUri(wsdlSelectionPage.getFileName()));
                  monitor.worked(1);

Modified: webservices/axis2/trunk/java/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/eclipse/util/WSDLPropertyReader.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/eclipse/util/WSDLPropertyReader.java?view=diff&rev=521123&r1=521122&r2=521123
==============================================================================
--- webservices/axis2/trunk/java/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/eclipse/util/WSDLPropertyReader.java (original)
+++ webservices/axis2/trunk/java/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/eclipse/util/WSDLPropertyReader.java Wed Mar 21 22:41:06 2007
@@ -109,4 +109,12 @@
 		
 		return returnList;
 	}
+
+	/**
+	 * public method to get loaded wsdl Definition
+	 * @return
+	 */
+	public Definition getWsdlDefinition() {
+		return wsdlDefinition;
+	}
 }

Modified: webservices/axis2/trunk/java/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/pom.xml?view=diff&rev=521123&r1=521122&r2=521123
==============================================================================
--- webservices/axis2/trunk/java/pom.xml (original)
+++ webservices/axis2/trunk/java/pom.xml Wed Mar 21 22:41:06 2007
@@ -32,8 +32,8 @@
 	<modules>
 		<module>modules/tool/axis2-aar-maven-plugin</module>
 		<module>modules/tool/axis2-ant-plugin</module>
-		<!--<module>modules/tool/axis2-eclipse-codegen-plugin</module>-->
-		<!--<module>modules/tool/axis2-eclipse-service-plugin</module>-->
+		<module>modules/tool/axis2-eclipse-codegen-plugin</module>
+		<module>modules/tool/axis2-eclipse-service-plugin</module>
 		<module>modules/tool/axis2-idea-plugin</module>
 		<module>modules/tool/axis2-java2wsdl-maven-plugin</module>
 		<module>modules/tool/axis2-wsdl2code-maven-plugin</module>



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