butek 02/03/05 06:52:06
Modified: java/src/org/apache/axis/utils resources.properties
java/src/org/apache/axis/wsdl WSDL2Java.java
java/src/org/apache/axis/wsdl/toJava Emitter.java
JavaBindingWriter.java JavaDefinitionWriter.java
Log:
Cleaned up WSDL2Java behavior of --skeleton/--skeletonDeploy
- --skeleton is now --server-side
- --skeletonDeploy is invalid without --server-side
- a skeleton is NOT generated if --skeletonDeploy false
- fixed the tests to follow these changes.
(The user's guide will be updated shortly.)
Revision Changes Path
1.65 +7 -2 xml-axis/java/src/org/apache/axis/utils/resources.properties
Index: resources.properties
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/utils/resources.properties,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- resources.properties 5 Mar 2002 14:02:13 -0000 1.64
+++ resources.properties 5 Mar 2002 14:52:05 -0000 1.65
@@ -440,7 +440,7 @@
# NOTE: in optionScope00, do not translate "Application", "Request", "Session"
optionScope00=add scope to deploy.xml: "Application", "Request", "Session"
-optionSkel00=emit skeleton class for web service
+optionSkel00=emit server-side bindings for web service
# NOTE: in optionTest00, do not translate "junit"
optionTest00=emit junit testcase class for web service
@@ -629,7 +629,9 @@
j2woptexclude00=space or comma separated list of methods not to export
j2woptstopClass00=space or comma separated list of class names which will stop
inheritance search if --all switch is given
-optionSkeletonDeploy00=(true or false) Indicate whether to deploy skeleton or
implementation class.
+# NOTE: in optionSkeletonDeploy00, do not translate "--server-side".
+optionSkeletonDeploy00=deploy skeleton (true) or implementation (false) in
deploy.wsdd. Default is true. Only valid with --server-side.
+
j2wMissingLocation00=The -l <location> option must be specified if the full wsdl or
the implementation wsdl is requested.
invalidSolResp00={0} is a solicit-response style operation and is unsupported.
invalidNotif00={0} is a notification style operation and is unsupported.
@@ -684,5 +686,8 @@
malformedURLException00=MalformedURLException:
axisFault00=AxisFault:
axisFault01=AxisFault: {0}
+
+# NOTE: in badSkeleton00, do not translate "--skeletonDeploy" and "--server-side".
+badSkeleton00=Error: --skeletonDeploy cannot be specified without --server-side.
badStyle=Bad string for style value - was ''{0}'', should be ''rpc'', ''document'',
or ''wrapped''.
onlyOneMapping=Only a single <elementMapping> is allowed per-operation at present.
1.10 +18 -13 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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- WSDL2Java.java 4 Mar 2002 14:22:48 -0000 1.9
+++ WSDL2Java.java 5 Mar 2002 14:52:05 -0000 1.10
@@ -91,7 +91,7 @@
// Define our short one-letter option identifiers.
protected static final int HELP_OPT = 'h';
protected static final int VERBOSE_OPT = 'v';
- protected static final int SKELETON_OPT = 's';
+ protected static final int SERVER_OPT = 's';
protected static final int SKELETON_DEPLOY_OPT = 'S';
protected static final int NAMESPACE_OPT = 'N';
protected static final int NAMESPACE_FILE_OPT = 'f';
@@ -133,9 +133,9 @@
CLOptionDescriptor.ARGUMENT_DISALLOWED,
VERBOSE_OPT,
JavaUtils.getMessage("optionVerbose00")),
- new CLOptionDescriptor("skeleton",
+ new CLOptionDescriptor("server-side",
CLOptionDescriptor.ARGUMENT_DISALLOWED,
- SKELETON_OPT,
+ SERVER_OPT,
JavaUtils.getMessage("optionSkel00")),
new CLOptionDescriptor("skeletonDeploy",
CLOptionDescriptor.ARGUMENT_REQUIRED,
@@ -202,15 +202,15 @@
* Turn on/off server skeleton creation
* @param boolean value
*/
- public void generateSkeleton(boolean value) {
- emitter.generateSkeleton(value);
+ public void generateServerSide(boolean value) {
+ emitter.generateServerSide(value);
}
/**
* Indicate if we should be emitting server side code and deploy/undeploy
*/
- public boolean getGenerateSkeleton() {
- return emitter.getGenerateSkeleton();
+ public boolean getGenerateServerSide() {
+ return emitter.getGenerateServerSide();
}
/**
@@ -417,7 +417,8 @@
*/
public static void main(String args[]) {
WSDL2Java wsdl2java = new WSDL2Java();
- boolean bSkeleton = false;
+ boolean bServer = false;
+ String skeletonDeploy = null;
boolean bTestClass = false;
String wsdlURI = null;
HashMap namespaceMap = new HashMap();
@@ -459,14 +460,14 @@
wsdl2java.verbose(true);
break;
- case SKELETON_OPT:
- bSkeleton = true;
- wsdl2java.generateSkeleton(true);
+ case SERVER_OPT:
+ bServer = true;
+ wsdl2java.generateServerSide(true);
break;
case SKELETON_DEPLOY_OPT:
- String value = option.getArgument(0);
- if (value.equalsIgnoreCase("true"))
+ skeletonDeploy = option.getArgument(0);
+ if (skeletonDeploy.equalsIgnoreCase("true"))
wsdl2java.deploySkeleton(true);
else
wsdl2java.deploySkeleton(false);
@@ -540,6 +541,10 @@
// validate argument combinations
//
if (wsdlURI == null) {
+ printUsage();
+ }
+ if (skeletonDeploy != null && !bServer) {
+ System.out.println(JavaUtils.getMessage("badSkeleton00"));
printUsage();
}
if (!namespaceMap.isEmpty() && bPackageOpt) {
1.24 +5 -5 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.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- Emitter.java 4 Mar 2002 14:27:38 -0000 1.23
+++ Emitter.java 5 Mar 2002 14:52:06 -0000 1.24
@@ -109,7 +109,7 @@
protected Document doc = null;
protected Definition def = null;
protected boolean bDebug = false;
- protected boolean bEmitSkeleton = false;
+ protected boolean bEmitServer = false;
protected boolean bDeploySkeleton = true;
protected boolean bEmitTestCase = false;
protected boolean bVerbose = false;
@@ -275,15 +275,15 @@
* Turn on/off server skeleton creation
* @param boolean value
*/
- public void generateSkeleton(boolean value) {
- this.bEmitSkeleton = value;
+ public void generateServerSide(boolean value) {
+ this.bEmitServer = value;
}
/**
* Indicate if we should be emitting server side code and deploy/undeploy
*/
- public boolean getGenerateSkeleton() {
- return bEmitSkeleton;
+ public boolean getGenerateServerSide() {
+ return bEmitServer;
}
/**
1.4 +4 -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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- JavaBindingWriter.java 7 Feb 2002 14:15:06 -0000 1.3
+++ JavaBindingWriter.java 5 Mar 2002 14:52:06 -0000 1.4
@@ -96,8 +96,10 @@
stubWriter = new JavaStubWriter(emitter, bEntry, symbolTable);
// Skeleton and Impl writers
- if (emitter.bEmitSkeleton) {
- skelWriter = new JavaSkelWriter(emitter, bEntry, symbolTable);
+ if (emitter.bEmitServer) {
+ if (emitter.bDeploySkeleton) {
+ skelWriter = new JavaSkelWriter(emitter, bEntry, symbolTable);
+ }
String fileName = Utils.getJavaLocalName(bEntry.getName())
+ "Impl.java";
try {
1.3 +1 -1
xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaDefinitionWriter.java
Index: JavaDefinitionWriter.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaDefinitionWriter.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JavaDefinitionWriter.java 19 Dec 2001 14:57:41 -0000 1.2
+++ JavaDefinitionWriter.java 5 Mar 2002 14:52:06 -0000 1.3
@@ -98,7 +98,7 @@
* Write other items from the definition as needed.
*/
public void write() throws IOException {
- if (emitter.getGenerateSkeleton()) {
+ if (emitter.getGenerateServerSide()) {
deployWriter.write();
undeployWriter.write();
}
