cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From m...@apache.org
Subject svn commit: r569965 - in /incubator/cxf/trunk: api/src/main/java/org/apache/cxf/tools/common/ tools/validator/src/main/java/org/apache/cxf/tools/validator/ tools/wsdlto/ tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/ tools/wsdlto/core/src...
Date Mon, 27 Aug 2007 02:42:47 GMT
Author: mmao
Date: Sun Aug 26 19:42:46 2007
New Revision: 569965

URL: http://svn.apache.org/viewvc?rev=569965&view=rev
Log:
CXF-871 Improve message strings in CLI tools
* Also change the argument -keep to -newonly
Thanks Glen for this patch


Modified:
    incubator/cxf/trunk/api/src/main/java/org/apache/cxf/tools/common/ToolConstants.java
    incubator/cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/wsdlvalidator.xml
    incubator/cxf/trunk/tools/wsdlto/   (props changed)
    incubator/cxf/trunk/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/core/AbstractGenerator.java
    incubator/cxf/trunk/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/wsdlto.xml
    incubator/cxf/trunk/tools/wsdlto/core/src/test/java/org/apache/cxf/tools/wsdlto/core/AbstractGeneratorTest.java
    incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/jaxws-toolspec.xml
    incubator/cxf/trunk/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/wsdl2service.xml
    incubator/cxf/trunk/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/wsdl2soap.xml
    incubator/cxf/trunk/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/wsdl2xml.xml
    incubator/cxf/trunk/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/xsd2wsdl.xml

Modified: incubator/cxf/trunk/api/src/main/java/org/apache/cxf/tools/common/ToolConstants.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/api/src/main/java/org/apache/cxf/tools/common/ToolConstants.java?rev=569965&r1=569964&r2=569965&view=diff
==============================================================================
--- incubator/cxf/trunk/api/src/main/java/org/apache/cxf/tools/common/ToolConstants.java (original)
+++ incubator/cxf/trunk/api/src/main/java/org/apache/cxf/tools/common/ToolConstants.java Sun
Aug 26 19:42:46 2007
@@ -90,7 +90,7 @@
     public static final String CFG_GEN_OVERWRITE = "overwrite";
     public static final String CFG_GEN_FAULT = "genFault";
 
-    public static final String CFG_GEN_KEEP = "keep";
+    public static final String CFG_GEN_NEW_ONLY = "newonly";
 
     // Java2WSDL Constants
 

Modified: incubator/cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/wsdlvalidator.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/wsdlvalidator.xml?rev=569965&r1=569964&r2=569965&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/wsdlvalidator.xml
(original)
+++ incubator/cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/wsdlvalidator.xml
Sun Aug 26 19:42:46 2007
@@ -45,7 +45,7 @@
 			
 			<option id="schemaURL" maxOccurs="unbounded">
 			<annotation>
-			    Specify the user specify schema url.(can be specified multiple times)
+			    Specify the schema URL to validate against.  (This option can be specified multiple
times.)
 			</annotation>
 				<switch>s</switch>
 				<associatedArgument placement="afterSpace">

Propchange: incubator/cxf/trunk/tools/wsdlto/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sun Aug 26 19:42:46 2007
@@ -0,0 +1 @@
+target

Modified: incubator/cxf/trunk/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/core/AbstractGenerator.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/core/AbstractGenerator.java?rev=569965&r1=569964&r2=569965&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/core/AbstractGenerator.java
(original)
+++ incubator/cxf/trunk/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/core/AbstractGenerator.java
Sun Aug 26 19:42:46 2007
@@ -65,7 +65,7 @@
     }
 
     protected boolean wantToKeep() {
-        return env.optionSet(ToolConstants.CFG_GEN_KEEP);
+        return env.optionSet(ToolConstants.CFG_GEN_NEW_ONLY);
     }
 
     protected Writer parseOutputName(String packageName, String filename, String ext) throws
ToolException {

Modified: incubator/cxf/trunk/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/wsdlto.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/wsdlto.xml?rev=569965&r1=569964&r2=569965&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/wsdlto.xml
(original)
+++ incubator/cxf/trunk/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/wsdlto.xml
Sun Aug 26 19:42:46 2007
@@ -135,8 +135,8 @@
 
             <option id="nexclude" maxOccurs="unbounded">
                 <annotation>
-                    The wsdl namespace to exclude for generating code. This
-                    option can be specified multiple times. Also, Optionally
+                    The wsdl namespace to exclude when generating code. This
+                    option can be specified multiple times. Also, optionally
                     specify the java package name to use for this wsdl namespace.
                 </annotation>
                 <switch>nexclude</switch>

Modified: incubator/cxf/trunk/tools/wsdlto/core/src/test/java/org/apache/cxf/tools/wsdlto/core/AbstractGeneratorTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/core/src/test/java/org/apache/cxf/tools/wsdlto/core/AbstractGeneratorTest.java?rev=569965&r1=569964&r2=569965&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/wsdlto/core/src/test/java/org/apache/cxf/tools/wsdlto/core/AbstractGeneratorTest.java
(original)
+++ incubator/cxf/trunk/tools/wsdlto/core/src/test/java/org/apache/cxf/tools/wsdlto/core/AbstractGeneratorTest.java
Sun Aug 26 19:42:46 2007
@@ -56,7 +56,7 @@
 
     @Test
     public void testKeep() throws Exception {
-        context.put(ToolConstants.CFG_GEN_KEEP, "keep");
+        context.put(ToolConstants.CFG_GEN_NEW_ONLY, "keep");
         assertNull(gen.parseOutputName(packageName, className));
     }
 

Modified: incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/jaxws-toolspec.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/jaxws-toolspec.xml?rev=569965&r1=569964&r2=569965&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/jaxws-toolspec.xml
(original)
+++ incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/jaxws-toolspec.xml
Sun Aug 26 19:42:46 2007
@@ -35,7 +35,7 @@
         <optionGroup id="options">
             <option id="frontend" maxOccurs="unbounded">
                 <annotation>
-                    Specify the frontend (default to JAXWS)
+                    Specify the frontend (defaults to JAXWS)
                 </annotation>
                 <switch>fe</switch>
                 <switch>frontend</switch>
@@ -46,7 +46,7 @@
 
             <option id="databinding" maxOccurs="unbounded">
                 <annotation>
-                    Specify the data binding (default to JAXB)
+                    Specify the data binding (defaults to JAXB)
                 </annotation>
                 <switch>db</switch>
                 <switch>databinding</switch>
@@ -184,8 +184,8 @@
 
             <option id="nexclude" maxOccurs="unbounded">
                 <annotation>
-                    The wsdl namespace to exclude for generating code. This
-                    option can be specified multiple times. Also, Optionally
+                    The wsdl namespace to exclude when generating code. This
+                    option can be specified multiple times. Also, optionally
                     specify the java package name to use for this wsdl namespace.
                 </annotation>
                 <switch>nexclude</switch>
@@ -228,16 +228,15 @@
 
             <option id="validate" maxOccurs="1">
                 <annotation>
-                    To valiate the wsdl before generate the code. We highly sugguest
-                    you to run the tool called schema validator before generating
-                    the code.
+                    To validate the wsdl before generating the code.  Usage of 
+                    this option is highly recommended.
                 </annotation>
                 <switch>validate</switch>
             </option>
 
-            <option id="keep" maxOccurs="1">
+            <option id="newonly" maxOccurs="1">
                 <annotation>
-                    To keep the existing files, NOTE: You have to solve the compilation problems
by yourself
+                    Don't overwrite any preexisting files, NOTE: You will have to solve any
resulting compilation problems by yourself
                 </annotation>
                 <switch>keep</switch>
             </option>

Modified: incubator/cxf/trunk/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/wsdl2service.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/wsdl2service.xml?rev=569965&r1=569964&r2=569965&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/wsdl2service.xml
(original)
+++ incubator/cxf/trunk/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/wsdl2service.xml
Sun Aug 26 19:42:46 2007
@@ -58,7 +58,7 @@
 	   	    <option id="port" minOccurs="1" maxOccurs="1">
 			 <annotation>
 			    Specifies the value of the name attribute of the generated 
-			    port element, sperate by space
+			    port element
 			  </annotation>
 				<switch>p</switch>
 				<associatedArgument placement="afterSpace">
@@ -69,7 +69,7 @@
 	   	    <option id="attrbinding" minOccurs="1" maxOccurs="1">
 			  <annotation>
 			    Specifies the name of the binding for which the service 
-			    is generated, sperate by space
+			    is generated
 			   </annotation>
 				<switch>n</switch>
 				<associatedArgument placement="afterSpace">
@@ -79,7 +79,7 @@
 	
 	   	<option id="address" maxOccurs="1">
 			<annotation>
-			    Specifies the value used in the address element of the port, sperate by space
+			    Specifies the value used in the address element of the port
 			</annotation>
 				<switch>a</switch>
 				<associatedArgument placement="afterSpace">
@@ -181,7 +181,7 @@
 
 	      	<option id="outputfile" maxOccurs="1">
 		    <annotation>
-		            Sepcify output wsdl  file name.
+		            Specify output wsdl file name
 		    </annotation>
 				<switch>o</switch>
 		        <associatedArgument placement="afterSpace">

Modified: incubator/cxf/trunk/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/wsdl2soap.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/wsdl2soap.xml?rev=569965&r1=569964&r2=569965&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/wsdl2soap.xml
(original)
+++ incubator/cxf/trunk/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/wsdl2soap.xml
Sun Aug 26 19:42:46 2007
@@ -34,7 +34,7 @@
 		<optionGroup id="options">				
 			<option id="porttype" minOccurs="1" maxOccurs="1">
                         <annotation>
-		            Secify the name of the port type being mapped to a SOAP binding
+		            Specifies the name of the port type being mapped to a SOAP binding
 		        </annotation>
 				<switch>i</switch>
 				<associatedArgument placement="afterSpace">
@@ -44,7 +44,7 @@
 			
 			<option id="binding" maxOccurs="1">
 			<annotation>
-		            Specify the name for the generated SOAP binding,Defaul to 
+		            Specifies the name for the generated SOAP binding.  Defaults to 
 		            portType_SOAPBinding
 		        </annotation>
 				<switch>b</switch>
@@ -55,7 +55,7 @@
 
 			<option id="soap12" maxOccurs="1">
 			    <annotation>
-				Specifies to generate SOAP 1.2 binding
+				Generate SOAP 1.2 binding
 			    </annotation>
 			    <switch>soap12</switch>
 			</option>
@@ -82,7 +82,7 @@
 			
 			<option id="namespace" maxOccurs="1">
 			<annotation>
-			    Specify the soap body namespace when style is RPC
+			    For RPC style, specifies the soap body namespace
 			</annotation>
 				<switch>n</switch>
 				<associatedArgument placement="afterSpace">
@@ -92,8 +92,8 @@
 			
 			<option id="style" maxOccurs="1">
 		        <annotation>
-		            Specify the binding style(Document/RPC) to use in the 
-		            SOAP binding(default : Document)
+                            Specifies the binding style (document or RPC) to use 
+		            in the SOAP binding (default is document)
 		        </annotation>
 				<switch>style</switch>
 				<associatedArgument placement="afterSpace">
@@ -104,7 +104,7 @@
 			
 			<option id="use" maxOccurs="1">
 			<annotation>
-			    Specify the binding use (encoded/literal) to use in 
+			    Specifies the binding use (encoded/literal) to use in 
 			    the soap binding.(default : Literal)
 			</annotation>
 				<switch>use</switch>

Modified: incubator/cxf/trunk/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/wsdl2xml.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/wsdl2xml.xml?rev=569965&r1=569964&r2=569965&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/wsdl2xml.xml
(original)
+++ incubator/cxf/trunk/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/wsdl2xml.xml
Sun Aug 26 19:42:46 2007
@@ -34,7 +34,7 @@
 		<optionGroup id="options">				
 			<option id="porttype" minOccurs="1" maxOccurs="1">
 		          <annotation>
-		            Specify the portType to use.
+		            Specifies the portType to use.
 		          </annotation>
 				<switch>i</switch>
 				<associatedArgument placement="afterSpace">
@@ -44,7 +44,7 @@
 			
 			<option id="binding" maxOccurs="1">
 			<annotation>
-		            Specify the binding name to use.
+		            Specifies the binding name to use.
 		        </annotation>
 				<switch>b</switch>
 				<associatedArgument placement="afterSpace">
@@ -65,7 +65,7 @@
 	   	    <option id="port" maxOccurs="1">
 		        <annotation>
 		            Specifies the value of the name attribute of the generated 
-		            port element, sperate by space
+		            port element
 		        </annotation>
 				<switch>p</switch>
 				<associatedArgument placement="afterSpace">
@@ -75,8 +75,7 @@
 	
 	   	    <option id="address" maxOccurs="1">
 		        <annotation>
-		            Specifies the value used in the address element of the port, 
-		            sperate by space
+		            Specifies the value used in the address element of the port
 		        </annotation>
 				<switch>a</switch>
 				<associatedArgument placement="afterSpace">

Modified: incubator/cxf/trunk/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/xsd2wsdl.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/xsd2wsdl.xml?rev=569965&r1=569964&r2=569965&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/xsd2wsdl.xml
(original)
+++ incubator/cxf/trunk/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/xsd2wsdl.xml
Sun Aug 26 19:42:46 2007
@@ -35,7 +35,7 @@
 				
 			<option id="namespace" minOccurs="1" maxOccurs="1">
 			 <annotation>
-			    Specify the target name space.
+			    Specify the target namespace.
 			  </annotation>
 				<switch>t</switch>
 				<associatedArgument placement="afterSpace">



Mime
View raw message