hawkeye 2005/08/22 09:45:13
Modified: c/src/wsdl/org/apache/axis/wsdl/wsdl2ws WSDL2Ws.java
Log:
removed wrwapped/unwrapped options. It will still work with -wwrapped but we
don't advertise the option.
Revision Changes Path
1.61 +9 -2
ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/WSDL2Ws.java
Index: WSDL2Ws.java
===================================================================
RCS file:
/home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/WSDL2Ws.java,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- WSDL2Ws.java 24 May 2005 10:05:16 -0000 1.60
+++ WSDL2Ws.java 22 Aug 2005 16:45:13 -0000 1.61
@@ -1092,7 +1092,7 @@
+ "-o<folder> target output folder - default is
current folder\n"
+ "-l<c++|c> target language (c++|c) - default
is c++\n"
+ "-s<server|client> target side (server|client) -
default is server\n"
- + "-w<wrapped|nonwrapped> wrapping style of the WSDL
(wrapped|nonwrapped) - default is wrapped\n"
+// + "-w<wrapped|nonwrapped> wrapping style of the WSDL
(wrapped|nonwrapped) - default is wrapped - nonwrapped is currently not
implemented\n"
+ "-verbose, -v be verbose\n"
+ "-m<none|gnu> generate make files (none|gnu) -
default is none\n");
@@ -1109,7 +1109,7 @@
* -help (later ???? not emplemented)
* -h print usage()
* -s (client|server|both)
- * -w wrapping style of the WSDL (wrapped|nonwrapped) - default is
wrapped
+ * -w wrapping style of the WSDL (wrapped|nonwrapped) - default is
wrapped - nonwrapped is currently not implemented so removed option for
-wnonwrapped
* -m create GNU make files
*
* Note: PP - pull parser
@@ -1136,6 +1136,13 @@
usage();
return;
}
+
+ // ensure that only wrapped style is used.
+ if(data.isSet("w") && !
"wrapped".equalsIgnoreCase(data.getOptionBykey("w")))
+ {
+ usage();
+ return;
+ }
WSDL2Ws.makeSystem = data.getOptionBykey("m");
try