Author: ema
Date: Tue Sep 25 19:50:05 2007
New Revision: 579433
URL: http://svn.apache.org/viewvc?rev=579433&view=rev
Log:
Revert commit 578749 : merge -s and -d flag for java2ws
Modified:
incubator/cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2ws/java2ws.xml
incubator/cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/JavaToWSDLProcessor.java
incubator/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToProcessorTest.java
Modified:
incubator/cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2ws/java2ws.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2ws/java2ws.xml?rev=579433&r1=579432&r2=579433&view=diff
==============================================================================
---
incubator/cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2ws/java2ws.xml
(original)
+++
incubator/cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2ws/java2ws.xml
Tue Sep 25 19:50:05 2007
@@ -26,31 +26,29 @@
xmlns:ts="http://cxf.apache.org/Xutil/ToolSpecification";>
<annotation>
- Examples :
- java2ws -wsdl org.apache.hello_world_soap_http.Greeter
- java2ws -cp ./tmp org.apache.hello_world_soap_http.Greeter
-wsdl
- java2ws -wsdl -o hello.wsdl
org.apache.hello_world_soap_http.Greeter
- java2ws -client -server org.apache.hello_world_soap_http.Greeter
- java2ws -wrapperbean org.apache.hello_world_soap_http.Greeter
+ Examples :
+ java2ws -wsdl org.apache.hello_world_soap_http.Greeter
+ java2ws -cp ./tmp org.apache.hello_world_soap_http.Greeter -wsdl
+ java2ws -o hello.wsdl -wsdl org.apache.hello_world_soap_http.Greeter
+ java2ws -client -server org.apache.hello_world_soap_http.Greeter
+ java2ws -wrapperbean org.apache.hello_world_soap_http.Greeter
</annotation>
<usage>
<optionGroup id="options">
-
+
<option id="databinding" maxOccurs="1">
<annotation>
- Specify the data binding (aegis or
jaxb). Default is
- jaxb for jaxws frontend, and aegis for
simple
- frontend.
+ Specify the data binding (aegis or jaxb).
Default is jaxb for jaxws
+ frontend, and aegis for simple frontend.
</annotation>
<switch>databinding</switch>
<associatedArgument placement="afterSpace">
- <annotation>jaxb or aegis</annotation>
+ <annotation>jaxb or aegis</annotation>
</associatedArgument>
</option>
<option id="frontend" maxOccurs="1">
<annotation>
- Specify the frontend to use. jaxws and
the simple
- frontend are supported.
+ Specify the frontend to use. jaxws and
the simple frontend are supported.
</annotation>
<switch>frontend</switch>
<associatedArgument placement="afterSpace">
@@ -64,28 +62,28 @@
</annotation>
<switch>wsdl</switch>
</option>
-
+
<option id="wrapperbean" maxOccurs="1">
<annotation>
Specify to generate the wrapper and
fault bean
</annotation>
<switch>wrapperbean</switch>
</option>
-
+
<option id="client" maxOccurs="1">
<annotation>
Specify to genearte client side code
</annotation>
<switch>client</switch>
</option>
-
+
<option id="server" maxOccurs="1">
<annotation>
Specify to genearte server side code
</annotation>
<switch>server</switch>
</option>
-
+
<option id="outputfile" maxOccurs="1">
<annotation>
Specify the output wsdl file name
@@ -98,8 +96,7 @@
<option id="outputdir" maxOccurs="1">
<annotation>
- The directory in which the generated
source files
- and wsdl file are placed
+ The directory in which the output files
are placed
</annotation>
<switch>d</switch>
<associatedArgument placement="afterSpace">
@@ -107,6 +104,16 @@
</associatedArgument>
</option>
+ <option id="sourcedir" maxOccurs="1">
+ <annotation>
+ The directory in which the generated
source files
+ are placed
+ </annotation>
+ <switch>s</switch>
+ <associatedArgument placement="afterSpace">
+
<annotation>source-directory</annotation>
+ </associatedArgument>
+ </option>
<option id="classdir" maxOccurs="1">
<annotation>
The directory in which the generated
sources are
@@ -146,17 +153,13 @@
<annotation>target-namespace</annotation>
</associatedArgument>
</option>
-
+
<option id="beans" maxOccurs="unbounded">
- <annotation>
- Specify the pathname of a file defining
additional
- Spring beans to customize databinding
configuration.
- </annotation>
+ <annotation>Specify the pathname of a file
defining additional Spring beans to customize databinding
+ configuration.</annotation>
<switch>beans</switch>
<associatedArgument placement="afterSpace">
- <annotation>
- pathname of the bean definition
file.
- </annotation>
+ <annotation>pathname of the bean
definition file.</annotation>
</associatedArgument>
</option>
@@ -209,20 +212,26 @@
</option>
<option id="verbose">
- <annotation>Verbose mode</annotation>
+ <annotation>
+ Verbose mode
+ </annotation>
<switch>verbose</switch>
<switch>V</switch>
</option>
<option id="quiet">
- <annotation>Quiet mode</annotation>
+ <annotation>
+ Quiet mode
+ </annotation>
<switch>quiet</switch>
<switch>q</switch>
</option>
</optionGroup>
- <argument id="classname" minOccurs="1" maxOccurs="1">
- <annotation>SEI class name</annotation>
- </argument>
+ <argument id="classname" minOccurs="1" maxOccurs="1">
+ <annotation>
+ SEI class name
+ </annotation>
+ </argument>
</usage>
</toolspec>
Modified:
incubator/cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/JavaToWSDLProcessor.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/JavaToWSDLProcessor.java?rev=579433&r1=579432&r2=579433&view=diff
==============================================================================
---
incubator/cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/JavaToWSDLProcessor.java
(original)
+++
incubator/cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/JavaToWSDLProcessor.java
Tue Sep 25 19:50:05 2007
@@ -304,7 +304,7 @@
}
File getSourceDir() {
- String dir = (String) this.context.get(ToolConstants.CFG_OUTPUTDIR);
+ String dir = (String) this.context.get(ToolConstants.CFG_SOURCEDIR);
if (StringUtils.isEmpty(dir)) {
return null;
}
Modified:
incubator/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToProcessorTest.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToProcessorTest.java?rev=579433&r1=579432&r2=579433&view=diff
==============================================================================
---
incubator/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToProcessorTest.java
(original)
+++
incubator/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToProcessorTest.java
Tue Sep 25 19:50:05 2007
@@ -248,7 +248,7 @@
env.put(ToolConstants.CFG_CLASSNAME,
"org.apache.cxf.tools.fortest.classnoanno.docwrapped.Calculator");
env.put(ToolConstants.CFG_OUTPUTFILE, output.getPath() +
"/my_stock.wsdl");
- env.put(ToolConstants.CFG_OUTPUTDIR, output.getPath() + "/beans");
+ env.put(ToolConstants.CFG_SOURCEDIR, output.getPath() + "/beans");
env.put(ToolConstants.CFG_WRAPPERBEAN, ToolConstants.CFG_WRAPPERBEAN);
processor.setEnvironment(env);
