You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by ff...@apache.org on 2011/09/27 12:30:43 UTC
svn commit: r1176314 - in /cxf/branches/2.3.x-fixes: ./
tools/corba/src/main/java/org/apache/cxf/tools/corba/common/toolspec/toolspecs/
tools/corba/src/test/resources/toolspecs/
tools/javato/ws/src/main/java/org/apache/cxf/tools/java2js/ tools/javato/w...
Author: ffang
Date: Tue Sep 27 10:30:42 2011
New Revision: 1176314
URL: http://svn.apache.org/viewvc?rev=1176314&view=rev
Log:
Merged revisions 1176311 via svnmerge from
https://svn.apache.org/repos/asf/cxf/branches/2.4.x-fixes
................
r1176311 | ffang | 2011-09-27 18:19:47 +0800 (二, 27 9 2011) | 9 lines
Merged revisions 1176284 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1176284 | ffang | 2011-09-27 16:52:57 +0800 (二, 27 9 2011) | 1 line
[CXF-3245]Command line options are not uniform across CXF tools
........
................
Modified:
cxf/branches/2.3.x-fixes/ (props changed)
cxf/branches/2.3.x-fixes/tools/corba/src/main/java/org/apache/cxf/tools/corba/common/toolspec/toolspecs/idl2wsdl.xml
cxf/branches/2.3.x-fixes/tools/corba/src/main/java/org/apache/cxf/tools/corba/common/toolspec/toolspecs/wsdl2idl.xml
cxf/branches/2.3.x-fixes/tools/corba/src/test/resources/toolspecs/idl2wsdl.xml
cxf/branches/2.3.x-fixes/tools/corba/src/test/resources/toolspecs/wsdl2idl.xml
cxf/branches/2.3.x-fixes/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2js/java2js.xml
cxf/branches/2.3.x-fixes/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2ws/java2ws.xml
cxf/branches/2.3.x-fixes/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/wsdl2service.xml
cxf/branches/2.3.x-fixes/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/wsdl2soap.xml
cxf/branches/2.3.x-fixes/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/wsdl2xml.xml
cxf/branches/2.3.x-fixes/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/xsd2wsdl.xml
Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.3.x-fixes/tools/corba/src/main/java/org/apache/cxf/tools/corba/common/toolspec/toolspecs/idl2wsdl.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/tools/corba/src/main/java/org/apache/cxf/tools/corba/common/toolspec/toolspecs/idl2wsdl.xml?rev=1176314&r1=1176313&r2=1176314&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/tools/corba/src/main/java/org/apache/cxf/tools/corba/common/toolspec/toolspecs/idl2wsdl.xml (original)
+++ cxf/branches/2.3.x-fixes/tools/corba/src/main/java/org/apache/cxf/tools/corba/common/toolspec/toolspecs/idl2wsdl.xml Tue Sep 27 10:30:42 2011
@@ -48,6 +48,7 @@
<option id="outputdir" maxOccurs="1">
<annotation>The wsdl output directory.</annotation>
<switch>o</switch>
+ <switch>output</switch>
<associatedArgument placement="afterSpace">
<annotation>output-directory</annotation>
</associatedArgument>
@@ -56,6 +57,7 @@
<option id="address" maxOccurs="1">
<annotation>Specify the value to be used for the corba:address location attribute.</annotation>
<switch>a</switch>
+ <switch>address</switch>
<associatedArgument placement="afterSpace">
<annotation>corba-address</annotation>
</associatedArgument>
Modified: cxf/branches/2.3.x-fixes/tools/corba/src/main/java/org/apache/cxf/tools/corba/common/toolspec/toolspecs/wsdl2idl.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/tools/corba/src/main/java/org/apache/cxf/tools/corba/common/toolspec/toolspecs/wsdl2idl.xml?rev=1176314&r1=1176313&r2=1176314&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/tools/corba/src/main/java/org/apache/cxf/tools/corba/common/toolspec/toolspecs/wsdl2idl.xml (original)
+++ cxf/branches/2.3.x-fixes/tools/corba/src/main/java/org/apache/cxf/tools/corba/common/toolspec/toolspecs/wsdl2idl.xml Tue Sep 27 10:30:42 2011
@@ -81,6 +81,7 @@
<option id="idloutputfile" maxOccurs="1">
<annotation>The idl output file name.</annotation>
<switch>o</switch>
+ <switch>output</switch>
<associatedArgument placement="afterSpace">
<annotation>idl-output-file</annotation>
</associatedArgument>
@@ -103,6 +104,7 @@ te parameters.</annotation>
<option id="address" maxOccurs="1">
<annotation>Specify the value to be used for the corba:address location attribute.</annotation>
<switch>a</switch>
+ <switch>address</switch>
<associatedArgument placement="afterSpace">
<annotation>corba-address</annotation>
</associatedArgument>
Modified: cxf/branches/2.3.x-fixes/tools/corba/src/test/resources/toolspecs/idl2wsdl.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/tools/corba/src/test/resources/toolspecs/idl2wsdl.xml?rev=1176314&r1=1176313&r2=1176314&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/tools/corba/src/test/resources/toolspecs/idl2wsdl.xml (original)
+++ cxf/branches/2.3.x-fixes/tools/corba/src/test/resources/toolspecs/idl2wsdl.xml Tue Sep 27 10:30:42 2011
@@ -48,6 +48,7 @@
<option id="outputdir" maxOccurs="1">
<annotation>The wsdl output directory.</annotation>
<switch>o</switch>
+ <switch>output</switch>
<associatedArgument placement="afterSpace">
<annotation>output-directory</annotation>
</associatedArgument>
@@ -56,6 +57,7 @@
<option id="address" maxOccurs="1">
<annotation>Specify the value to be used for the corba:address location attribute.</annotation>
<switch>a</switch>
+ <switch>address</switch>
<associatedArgument placement="afterSpace">
<annotation>corba-address</annotation>
</associatedArgument>
Modified: cxf/branches/2.3.x-fixes/tools/corba/src/test/resources/toolspecs/wsdl2idl.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/tools/corba/src/test/resources/toolspecs/wsdl2idl.xml?rev=1176314&r1=1176313&r2=1176314&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/tools/corba/src/test/resources/toolspecs/wsdl2idl.xml (original)
+++ cxf/branches/2.3.x-fixes/tools/corba/src/test/resources/toolspecs/wsdl2idl.xml Tue Sep 27 10:30:42 2011
@@ -73,6 +73,7 @@
<option id="outputfile" maxOccurs="2">
<annotation>The wsdl/idl output file name.(can be specified twice)</annotation>
<switch>o</switch>
+ <switch>output</switch>
<associatedArgument placement="afterSpace">
<annotation>output-file</annotation>
</associatedArgument>
Modified: cxf/branches/2.3.x-fixes/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2js/java2js.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2js/java2js.xml?rev=1176314&r1=1176313&r2=1176314&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2js/java2js.xml (original)
+++ cxf/branches/2.3.x-fixes/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2js/java2js.xml Tue Sep 27 10:30:42 2011
@@ -37,6 +37,7 @@ under the License.
Specify the data binding (aegis or jaxb). Default is jaxb for jaxws
frontend, and aegis for simple frontend.
</annotation>
+ <switch>db</switch>
<switch>databinding</switch>
<associatedArgument placement="afterSpace">
<annotation>jaxb or aegis</annotation>
@@ -55,6 +56,7 @@ under the License.
Specify the output wsdl file name
</annotation>
<switch>o</switch>
+ <switch>output</switch>
<associatedArgument placement="afterSpace">
<annotation>output-file</annotation>
</associatedArgument>
@@ -86,6 +88,7 @@ under the License.
directories and zip/jar files
</annotation>
<switch>cp</switch>
+ <switch>classpath</switch>
<associatedArgument placement="afterSpace">
<annotation>class-path</annotation>
</associatedArgument>
Modified: cxf/branches/2.3.x-fixes/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2ws/java2ws.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2ws/java2ws.xml?rev=1176314&r1=1176313&r2=1176314&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2ws/java2ws.xml (original)
+++ cxf/branches/2.3.x-fixes/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2ws/java2ws.xml Tue Sep 27 10:30:42 2011
@@ -41,6 +41,7 @@
Specify the data binding (aegis, jaxb, xmlbeans, etc...). Default is jaxb for jaxws
frontend, and aegis for simple frontend.
</annotation>
+ <switch>db</switch>
<switch>databinding</switch>
<associatedArgument placement="afterSpace">
<annotation>databinding name</annotation>
@@ -51,6 +52,7 @@
Specify the frontend to use. jaxws and the simple frontend are supported.
</annotation>
<switch>frontend</switch>
+ <switch>fe</switch>
<associatedArgument placement="afterSpace">
<annotation>jaxws or simple</annotation>
</associatedArgument>
@@ -96,6 +98,7 @@
Specify the output wsdl file name
</annotation>
<switch>o</switch>
+ <switch>output</switch>
<associatedArgument placement="afterSpace">
<annotation>output-file</annotation>
</associatedArgument>
@@ -140,6 +143,7 @@
directories and zip/jar files
</annotation>
<switch>cp</switch>
+ <switch>classpath</switch>
<associatedArgument placement="afterSpace">
<annotation>class-path</annotation>
</associatedArgument>
@@ -196,6 +200,7 @@
<annotation>
Specify the port address
</annotation>
+ <switch>a</switch>
<switch>address</switch>
<associatedArgument placement="afterSpace">
<annotation>address</annotation>
Modified: cxf/branches/2.3.x-fixes/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/wsdl2service.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/wsdl2service.xml?rev=1176314&r1=1176313&r2=1176314&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/wsdl2service.xml (original)
+++ cxf/branches/2.3.x-fixes/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/wsdl2service.xml Tue Sep 27 10:30:42 2011
@@ -83,6 +83,7 @@ wsdl2service -transport http -e servicen
Specifies the value used in the address element of the port
</annotation>
<switch>a</switch>
+ <switch>address</switch>
<associatedArgument placement="afterSpace">
<annotation>address</annotation>
</associatedArgument>
@@ -184,6 +185,7 @@ wsdl2service -transport http -e servicen
Specify output wsdl file name
</annotation>
<switch>o</switch>
+ <switch>output</switch>
<associatedArgument placement="afterSpace">
<annotation>output-file</annotation>
</associatedArgument>
Modified: cxf/branches/2.3.x-fixes/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/wsdl2soap.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/wsdl2soap.xml?rev=1176314&r1=1176313&r2=1176314&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/wsdl2soap.xml (original)
+++ cxf/branches/2.3.x-fixes/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/wsdl2soap.xml Tue Sep 27 10:30:42 2011
@@ -75,6 +75,7 @@ wsdl2soap -i GreetPortType -n http://apa
The output wsdl file name.
</annotation>
<switch>o</switch>
+ <switch>output</switch>
<associatedArgument placement="afterSpace">
<annotation>output-file</annotation>
</associatedArgument>
Modified: cxf/branches/2.3.x-fixes/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/wsdl2xml.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/wsdl2xml.xml?rev=1176314&r1=1176313&r2=1176314&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/wsdl2xml.xml (original)
+++ cxf/branches/2.3.x-fixes/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/wsdl2xml.xml Tue Sep 27 10:30:42 2011
@@ -78,7 +78,8 @@ wsdl2xml -i GreetPortType -a address Tes
Specifies the value used in the address element of the port
</annotation>
<switch>a</switch>
- <associatedArgument placement="afterSpace">
+ <switch>address</switch>
+ <associatedArgument placement="afterSpace">
<annotation>address</annotation>
</associatedArgument>
</option>
@@ -98,6 +99,7 @@ wsdl2xml -i GreetPortType -a address Tes
The wsdl output file name.
</annotation>
<switch>o</switch>
+ <switch>output</switch>
<associatedArgument placement="afterSpace">
<annotation>output-file</annotation>
</associatedArgument>
Modified: cxf/branches/2.3.x-fixes/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/xsd2wsdl.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/xsd2wsdl.xml?rev=1176314&r1=1176313&r2=1176314&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/xsd2wsdl.xml (original)
+++ cxf/branches/2.3.x-fixes/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/xsd2wsdl.xml Tue Sep 27 10:30:42 2011
@@ -68,6 +68,7 @@ xsd2wsdl -t http://org.apache/invoice -n
The wsdl output file name.
</annotation>
<switch>o</switch>
+ <switch>output</switch>
<associatedArgument placement="afterSpace">
<annotation>output-file</annotation>
</associatedArgument>