butek 02/05/10 06:30:35
Modified: java/src/org/apache/axis/wsdl WSDL2Java.java
java/src/org/apache/axis/wsdl/gen Parser.java
java/src/org/apache/axis/wsdl/toJava Emitter.java
JavaBeanWriter.java JavaBindingWriter.java
JavaDeployWriter.java JavaGeneratorFactory.java
JavaServiceWriter.java JavaUndeployWriter.java
JavaWriter.java
java/test/wsdl Wsdl2javaAntTask.java
Log:
Two sets of changes to WSDL2Java:
- I changed Parser/Emitter accessors to follow bean conventions. In
particular, I made sure all boolean accessors followed the model setXXX,
isXXX. (I renamed the XXX in some cases so isXXX looked more
reasonable. If folks can come up with better XXX's, I'm all for it.)
- I moved the addGenerators from Emitter to JavaGeneratorFactory. It
makes more sense there, it could have been a bug where it was, and it's
more extensible now.
Revision Changes Path
1.29 +6 -6 xml-axis/java/src/org/apache/axis/wsdl/WSDL2Java.java
Index: WSDL2Java.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/WSDL2Java.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- WSDL2Java.java 9 May 2002 15:02:58 -0000 1.28
+++ WSDL2Java.java 10 May 2002 13:30:34 -0000 1.29
@@ -189,12 +189,12 @@
case SKELETON_DEPLOY_OPT:
String skeletonDeploy = option.getArgument(0);
if (skeletonDeploy.equalsIgnoreCase("true"))
- emitter.setDeploySkeleton(true);
+ emitter.setSkeletonWanted(true);
else
- emitter.setDeploySkeleton(false);
+ emitter.setSkeletonWanted(false);
case SERVER_OPT:
- emitter.setGenerateServerSide(true);
+ emitter.setServerSide(true);
break;
case NAMESPACE_OPT:
@@ -234,11 +234,11 @@
break;
case TEST_OPT:
- emitter.setGenerateTestCase(true);
+ emitter.setTestCaseWanted(true);
break;
case ALL_OPT:
- emitter.setGenerateAll(true);
+ emitter.setAllWanted(true);
break;
case TYPEMAPPING_OPT:
@@ -278,7 +278,7 @@
super.validateOptions();
// validate argument combinations
- if (emitter.deploySkeleton() && !emitter.generateServerSide()) {
+ if (emitter.isSkeletonWanted() && !emitter.isServerSide()) {
System.out.println(JavaUtils.getMessage("badSkeleton00"));
printUsage();
}
1.3 +7 -7 xml-axis/java/src/org/apache/axis/wsdl/gen/Parser.java
Index: Parser.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/gen/Parser.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Parser.java 9 May 2002 15:25:21 -0000 1.2
+++ Parser.java 10 May 2002 13:30:35 -0000 1.3
@@ -90,25 +90,25 @@
private GeneratorFactory genFactory = null;
private SymbolTable symbolTable = null;
- public boolean debug() {
+ public boolean isDebug() {
return debug;
- } // debug
+ } // isDebug
public void setDebug(boolean debug) {
this.debug = debug;
} // setDebug
- public boolean visitImports() {
+ public boolean isImports() {
return imports;
- } // visitImports
+ } // isImports
public void setImports(boolean imports) {
this.imports = imports;
} // setImports
- public boolean verbose() {
+ public boolean isVerbose() {
return verbose;
- } // verbose
+ } // isVerbose
public void setVerbose(boolean verbose) {
this.verbose = verbose;
@@ -196,7 +196,7 @@
private void generate(SymbolTable symbolTable) throws IOException,
WSDLException {
Definition def = symbolTable.getDefinition();
genFactory.generatorPass(def, symbolTable);
- if (debug()) {
+ if (isDebug()) {
symbolTable.dump(System.out);
}
1.37 +41 -50 xml-axis/java/src/org/apache/axis/wsdl/toJava/Emitter.java
Index: Emitter.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/toJava/Emitter.java,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- Emitter.java 9 May 2002 15:47:38 -0000 1.36
+++ Emitter.java 10 May 2002 13:30:35 -0000 1.37
@@ -134,58 +134,58 @@
* Turn on/off server skeleton creation
* @param value
*/
- public void setGenerateServerSide(boolean value) {
+ public void setServerSide(boolean value) {
this.bEmitServer = value;
- } // setGenerateServerSide
+ } // setServerSide
/**
* Indicate if we should be emitting server side code and deploy/undeploy
*/
- public boolean generateServerSide() {
+ public boolean isServerSide() {
return bEmitServer;
- } // generateServerSide
+ } // isServerSide
/**
* Turn on/off server skeleton deploy
* @param value
*/
- public void setDeploySkeleton(boolean value) {
+ public void setSkeletonWanted(boolean value) {
bDeploySkeleton = value;
- }
+ } // setSkeletonWanted
/**
* Indicate if we should be deploying skeleton or implementation
*/
- public boolean deploySkeleton() {
+ public boolean isSkeletonWanted() {
return bDeploySkeleton;
- }
+ } // isSkeletonWanted
/**
* Turn on/off Helper class generation
* @param value
*/
- public void setGenerateHelper(boolean value) {
+ public void setHelperWanted(boolean value) {
bHelperGeneration = value;
- }
+ } // setHelperWanted
/**
* Indicate if we should be generating Helper classes
*/
- public boolean generateHelper() {
+ public boolean isHelperWanted() {
return bHelperGeneration;
- }
+ } // isHelperWanted
/**
* Turn on/off test case creation
* @param value
*/
- public void setGenerateTestCase(boolean value) {
+ public void setTestCaseWanted(boolean value) {
this.bEmitTestCase = value;
- } // setGenerateTestCase
+ } // setTestCaseWanted
- public boolean generateTestCase() {
+ public boolean isTestCaseWanted() {
return bEmitTestCase;
- } // geneateTestCase
+ } // isTestCaseWanted
/**
* By default, code is generated only for referenced elements.
@@ -194,13 +194,13 @@
* referenced. Scope means: by default, all WSDL files; if
* generateImports(false), then only the immediate WSDL file.
*/
- public void setGenerateAll(boolean all) {
+ public void setAllWanted(boolean all) {
bGenerateAll = all;
- } // setbGenerateAll
+ } // setAllWanted
- public boolean generateAll() {
+ public boolean isAllWanted() {
return bGenerateAll;
- } // bGenerateAll
+ } // isAllWanted
public Namespaces getNamespaces() {
return namespaces;
@@ -415,8 +415,6 @@
} // run
private void setup() {
- addGenerators();
-
if (baseTypeMapping == null) {
setTypeMappingVersion(typeMappingVersion);
}
@@ -438,13 +436,6 @@
}
} // setup
- private void addGenerators() {
- JavaGeneratorFactory factory = (JavaGeneratorFactory) getFactory();
- factory.addGenerator(Definition.class, JavaDefinitionWriter.class); // for
faults
- factory.addGenerator(Definition.class, JavaDeployWriter.class); // for
deploy.wsdd
- factory.addGenerator(Definition.class, JavaUndeployWriter.class); // for
undeploy.wsdd
- } // addGenerators
-
private Timer startTimer() {
// We run a timout thread that can kill this one if it goes too long.
Timer timer = new Timer(Thread.currentThread(), timeoutms);
@@ -583,54 +574,54 @@
} // emit
/**
- * Turn on/off server skeleton creation
+ * Turn on/off server-side binding generation
* @param value
- * @deprecated Use setGenerateServerSide(value)
+ * @deprecated Use setServerSide(value)
*/
public void generateServerSide(boolean value) {
- setGenerateServerSide(value);
+ setServerSide(value);
}
/**
* Indicate if we should be emitting server side code and deploy/undeploy
- * @deprecated Use generateServerSide()
+ * @deprecated Use isServerSide()
*/
public boolean getGenerateServerSide() {
- return generateServerSide();
+ return isServerSide();
}
/**
* Turn on/off server skeleton deploy
* @param value
- * @deprecated Use setbDeploySkeleton(value)
+ * @deprecated Use setSkeletonWanted(value)
*/
public void deploySkeleton(boolean value) {
- setDeploySkeleton(value);
+ setSkeletonWanted(value);
}
/**
* Indicate if we should be deploying skeleton or implementation
- * @deprecated Use bDeploySkeleton()
+ * @deprecated Use isSkeletonWanted()
*/
public boolean getDeploySkeleton() {
- return deploySkeleton();
+ return isSkeletonWanted();
}
/**
* Turn on/off Helper class generation
* @param value
- * @deprecated Use setbHelperGeneration(value)
+ * @deprecated Use setHelperWanted(value)
*/
public void setHelperGeneration(boolean value) {
- setGenerateHelper(value);
+ setHelperWanted(value);
}
/**
* Indicate if we should be generating Helper classes
- * @deprecated Use bHelperGeneration()
+ * @deprecated Use isHelperWanted()
*/
public boolean getHelperGeneration() {
- return generateHelper();
+ return isHelperWanted();
}
/**
@@ -653,10 +644,10 @@
/**
* Return the status of the debug switch.
- * @deprecated Use debug()
+ * @deprecated Use isDebug()
*/
public boolean getDebug() {
- return debug();
+ return isDebug();
} // getDebug
/**
@@ -670,25 +661,25 @@
/**
* Return the status of the verbose switch
- * @deprecated Use verbose()
+ * @deprecated Use isVerbose()
*/
public boolean getVerbose() {
- return verbose();
+ return isVerbose();
}
/**
* Turn on/off test case creation
* @param value
- * @deprecated Use setGenerateTestCase()
+ * @deprecated Use setTestCaseWanted()
*/
public void generateTestCase(boolean value) {
- setGenerateTestCase(value);
+ setTestCaseWanted(value);
}
/**
- * @deprecated Use setbGenerateAll(all)
+ * @deprecated Use setAllWanted(all)
*/
public void generateAll(boolean all) {
- setGenerateAll(all);
+ setAllWanted(all);
} // generateAll
}
1.13 +1 -1
xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaBeanWriter.java
Index: JavaBeanWriter.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaBeanWriter.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- JavaBeanWriter.java 9 May 2002 13:14:28 -0000 1.12
+++ JavaBeanWriter.java 10 May 2002 13:30:35 -0000 1.13
@@ -274,7 +274,7 @@
// Write the meta data into a Helper class or
// embed it in the bean class
- if (emitter.generateHelper()) {
+ if (emitter.isHelperWanted()) {
helper.generate(); // separate Helper Class
} else {
helper.generate(pw); // embed in Bean Class
1.6 +2 -2
xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaBindingWriter.java
Index: JavaBindingWriter.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaBindingWriter.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- JavaBindingWriter.java 9 May 2002 13:14:28 -0000 1.5
+++ JavaBindingWriter.java 10 May 2002 13:30:35 -0000 1.6
@@ -102,8 +102,8 @@
stubWriter = new JavaStubWriter(emitter, bEntry, symbolTable);
// Skeleton and Impl writers
- if (emitter.generateServerSide()) {
- if (emitter.deploySkeleton()) {
+ if (emitter.isServerSide()) {
+ if (emitter.isSkeletonWanted()) {
skelWriter = new JavaSkelWriter(emitter, bEntry, symbolTable);
}
String fileName = Utils.getJavaLocalName(bEntry.getName())
1.41 +3 -3
xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaDeployWriter.java
Index: JavaDeployWriter.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaDeployWriter.java,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- JavaDeployWriter.java 9 May 2002 13:14:28 -0000 1.40
+++ JavaDeployWriter.java 10 May 2002 13:30:35 -0000 1.41
@@ -108,7 +108,7 @@
} // ctor
public void generate() throws IOException {
- if (emitter.generateServerSide()) {
+ if (emitter.isServerSide()) {
super.generate();
}
} // generate
@@ -278,7 +278,7 @@
protected void writeDeployBinding(Binding binding) throws IOException {
BindingEntry bEntry = symbolTable.getBindingEntry(binding.getQName());
String className = bEntry.getName();
- if (emitter.deploySkeleton())
+ if (emitter.isSkeletonWanted())
className += "Skeleton";
else
className += "Impl";
@@ -287,7 +287,7 @@
+ className + "\"/>");
String methodList = "";
- if (!emitter.deploySkeleton()) {
+ if (!emitter.isSkeletonWanted()) {
Iterator operationsIterator = binding.getBindingOperations().iterator();
for (; operationsIterator.hasNext();) {
BindingOperation bindingOper = (BindingOperation)
operationsIterator.next();
1.2 +44 -1
xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaGeneratorFactory.java
Index: JavaGeneratorFactory.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaGeneratorFactory.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JavaGeneratorFactory.java 9 May 2002 13:14:28 -0000 1.1
+++ JavaGeneratorFactory.java 10 May 2002 13:30:35 -0000 1.2
@@ -110,16 +110,59 @@
*/
public JavaGeneratorFactory() {
+ addGenerators();
} // ctor
public JavaGeneratorFactory(Emitter emitter) {
this.emitter = emitter;
+ addGenerators();
} // ctor
public void setEmitter(Emitter emitter) {
this.emitter = emitter;
} // setEmitter
+ private void addGenerators() {
+ addMessageGenerators();
+ addPortTypeGenerators();
+ addBindingGenerators();
+ addServiceGenerators();
+ addTypeGenerators();
+ addDefinitionGenerators();
+ } // addGenerators
+
+ /**
+ * These addXXXGenerators are called by the constructor.
+ * If an extender of this factory wants to CHANGE the set
+ * of generators that are called per WSDL construct, they
+ * should override these addXXXGenerators methods. If all
+ * an extender wants to do is ADD a generator, then the
+ * extension should simply call addGenerator.
+ * (NOTE: It doesn't quite work this way, yet. Only the
+ * Definition generators fit this model at this point in
+ * time.)
+ */
+ protected void addMessageGenerators() {
+ } // addMessageGenerators
+
+ protected void addPortTypeGenerators() {
+ } // addPortTypeGenerators
+
+ protected void addBindingGenerators() {
+ } // addBindingGenerators
+
+ protected void addServiceGenerators() {
+ } // addServiceGenerators
+
+ protected void addTypeGenerators() {
+ } // addTypeGenerators
+
+ protected void addDefinitionGenerators() {
+ addGenerator(Definition.class, JavaDefinitionWriter.class); // for faults
+ addGenerator(Definition.class, JavaDeployWriter.class); // for deploy.wsdd
+ addGenerator(Definition.class, JavaUndeployWriter.class); // for
undeploy.wsdd
+ } // addDefinitionGenerators
+
/**
* Do the Wsdl2java generator pass:
* - resolve name clashes
@@ -129,7 +172,7 @@
this.symbolTable = symbolTable;
javifyNames(symbolTable);
resolveNameClashes(symbolTable);
- if (emitter.generateAll()) {
+ if (emitter.isAllWanted()) {
setAllReferencesToTrue();
}
else {
1.4 +1 -1
xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaServiceWriter.java
Index: JavaServiceWriter.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaServiceWriter.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- JavaServiceWriter.java 9 May 2002 13:14:28 -0000 1.3
+++ JavaServiceWriter.java 10 May 2002 13:30:35 -0000 1.4
@@ -85,7 +85,7 @@
new JavaServiceIfaceWriter(emitter, sEntry, symbolTable);
serviceImplWriter =
new JavaServiceImplWriter(emitter, sEntry, symbolTable);
- if (emitter.generateTestCase()) {
+ if (emitter.isTestCaseWanted()) {
testCaseWriter =
new JavaTestCaseWriter(emitter, sEntry, symbolTable);
}
1.5 +1 -1
xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaUndeployWriter.java
Index: JavaUndeployWriter.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaUndeployWriter.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- JavaUndeployWriter.java 9 May 2002 13:14:28 -0000 1.4
+++ JavaUndeployWriter.java 10 May 2002 13:30:35 -0000 1.5
@@ -91,7 +91,7 @@
} // ctor
public void generate() throws IOException {
- if (emitter.generateServerSide()) {
+ if (emitter.isServerSide()) {
super.generate();
}
} // generate
1.12 +1 -1 xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaWriter.java
Index: JavaWriter.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaWriter.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- JavaWriter.java 9 May 2002 13:14:28 -0000 1.11
+++ JavaWriter.java 10 May 2002 13:30:35 -0000 1.12
@@ -192,7 +192,7 @@
emitter.getGeneratedFileInfo().add(path, fqClass, type);
namespaces.mkdir(packageName);
File file = new File(packageDirName, fileName);
- if (emitter.verbose()) {
+ if (emitter.isVerbose()) {
System.out.println(message + ": " + file.getPath());
}
pw = new PrintWriter(new FileWriter(file));
1.26 +5 -5 xml-axis/java/test/wsdl/Wsdl2javaAntTask.java
Index: Wsdl2javaAntTask.java
===================================================================
RCS file: /home/cvs/xml-axis/java/test/wsdl/Wsdl2javaAntTask.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- Wsdl2javaAntTask.java 9 May 2002 13:14:29 -0000 1.25
+++ Wsdl2javaAntTask.java 10 May 2002 13:30:35 -0000 1.26
@@ -130,16 +130,16 @@
if (!namespaceMap.isEmpty()) {
emitter.setNamespaceMap(namespaceMap);
}
- emitter.setGenerateTestCase(testCase);
- emitter.setGenerateHelper(helperGen);
+ emitter.setTestCaseWanted(testCase);
+ emitter.setHelperWanted(helperGen);
if (factory != null) {
emitter.setFactory(factory);
}
emitter.setImports(!noImports);
- emitter.setGenerateAll(all);
+ emitter.setAllWanted(all);
emitter.setOutputDir(output);
- emitter.setGenerateServerSide(server);
- emitter.setDeploySkeleton(skeletonDeploy);
+ emitter.setServerSide(server);
+ emitter.setSkeletonWanted(skeletonDeploy);
emitter.setVerbose(verbose);
emitter.setTypeMappingVersion(tm);
emitter.setNStoPkg(project.resolveFile("NStoPkg.properties"));
