You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by aj...@apache.org on 2005/05/16 07:09:44 UTC
svn commit: r170309 - in /webservices/axis/trunk/java/modules/wsdl:
src/org/apache/axis/wsdl/codegen/CodeGenConfiguration.java
src/org/apache/axis/wsdl/codegen/CodeGenerationEngine.java
src/org/apache/axis/wsdl/codegen/CommandLineOption.java
test/org/apache/wsdl/WOMBuilderTest.java
Author: ajith
Date: Sun May 15 22:09:44 2005
New Revision: 170309
URL: http://svn.apache.org/viewcvs?rev=170309&view=rev
Log:
Updated the Code generator. Introduced a new constructor to the code gen engine as an entry point to the code generator wizard
Modified:
webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/CodeGenConfiguration.java
webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/CodeGenerationEngine.java
webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/CommandLineOption.java
webservices/axis/trunk/java/modules/wsdl/test/org/apache/wsdl/WOMBuilderTest.java
Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/CodeGenConfiguration.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/CodeGenConfiguration.java?rev=170309&r1=170308&r2=170309&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/CodeGenConfiguration.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/CodeGenConfiguration.java Sun May 15 22:09:44 2005
@@ -42,12 +42,14 @@
*/
public CodeGenConfiguration(WSDLDescription wom,
CommandLineOptionParser parser) {
- this.wom = wom;
+ this(wom,parser.getAllOptions());
this.parser = parser;
+ }
- Map optionMap = parser.getAllOptions();
+ public CodeGenConfiguration(WSDLDescription wom,Map optionMap) {
+ this.wom = wom;
- String outputLocation = ((CommandLineOption)optionMap.get(OUTPUT_LOCATION_OPTION)).getOptionValue();
+ String outputLocation = ((CommandLineOption)optionMap.get(OUTPUT_LOCATION_OPTION)).getOptionValue();
this.outputLocation = new File(outputLocation);
advancedCodeGenEnabled = (optionMap.get(ADVANCED_CODEGEN_OPTION)!=null);
@@ -64,7 +66,10 @@
loadLanguge(langOption.getOptionValue());
}
- }
+ }
+
+
+
private void loadLanguge(String langName) {
if (LanguageNames.JAVA.equalsIgnoreCase(langName)){
Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/CodeGenerationEngine.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/CodeGenerationEngine.java?rev=170309&r1=170308&r2=170309&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/CodeGenerationEngine.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/CodeGenerationEngine.java Sun May 15 22:09:44 2005
@@ -44,7 +44,12 @@
private CodeGenConfiguration configuration;
-
+ public CodeGenerationEngine(CodeGenConfiguration config){
+ this.configuration = config;
+ AxisBindingBuilder axisBindingBuilder = new AxisBindingBuilder();
+ axisBindingBuilder.init(this.configuration);
+ axisBindingBuilder.engage();
+ }
public CodeGenerationEngine(CommandLineOptionParser parser) throws CodeGenerationException{
WSDLDescription wom ;
Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/CommandLineOption.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/CommandLineOption.java?rev=170309&r1=170308&r2=170309&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/CommandLineOption.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/CommandLineOption.java Sun May 15 22:09:44 2005
@@ -29,11 +29,14 @@
private boolean invalid = false;
public CommandLineOption(String type, String[] values){
+ if (type.startsWith("-")) type = type.replaceFirst("-","");
+ type = type.toLowerCase();
this.type = type;
ArrayList arrayList = new ArrayList(values.length);
for(int i =0; i< values.length; i++){
arrayList.add(values[i]);
}
+ this.optionValues = arrayList;
}
/**
Modified: webservices/axis/trunk/java/modules/wsdl/test/org/apache/wsdl/WOMBuilderTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/test/org/apache/wsdl/WOMBuilderTest.java?rev=170309&r1=170308&r2=170309&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/test/org/apache/wsdl/WOMBuilderTest.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/test/org/apache/wsdl/WOMBuilderTest.java Sun May 15 22:09:44 2005
@@ -44,11 +44,7 @@
}
private void initialize() throws Exception {
-
-// File file =new File("S.wsdl");
-//
-//
-// new FileOutputStream(file).write(123);
+
if (null == this.womDescription) {
InputStream in = new FileInputStream(this.getTestResourceFile("SeismicService.wsdl"));
this.womDescription = WOMBuilderFactory.getBuilder(WOMBuilderFactory.WSDL11).build(in);