Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 1C4E29520 for ; Mon, 19 Sep 2011 12:09:09 +0000 (UTC) Received: (qmail 35231 invoked by uid 500); 19 Sep 2011 12:09:09 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 35115 invoked by uid 500); 19 Sep 2011 12:09:08 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 35108 invoked by uid 99); 19 Sep 2011 12:09:08 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 19 Sep 2011 12:09:08 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 19 Sep 2011 12:09:07 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id C9C1623888FD for ; Mon, 19 Sep 2011 12:08:46 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1172584 - in /cxf/branches/2.4.x-fixes: ./ tools/corba/src/main/java/org/apache/cxf/tools/corba/common/toolspec/toolspecs/ tools/javato/ws/src/main/java/org/apache/cxf/tools/java2js/ tools/javato/ws/src/main/java/org/apache/cxf/tools/java2... Date: Mon, 19 Sep 2011 12:08:46 -0000 To: commits@cxf.apache.org From: ningjiang@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20110919120846.C9C1623888FD@eris.apache.org> Author: ningjiang Date: Mon Sep 19 12:08:45 2011 New Revision: 1172584 URL: http://svn.apache.org/viewvc?rev=1172584&view=rev Log: Merged revisions 1172522 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1172522 | ningjiang | 2011-09-19 16:51:16 +0800 (Mon, 19 Sep 2011) | 1 line CXF-3055 Adding -version, -Q switches to all command line tools ........ Modified: cxf/branches/2.4.x-fixes/ (props changed) cxf/branches/2.4.x-fixes/tools/corba/src/main/java/org/apache/cxf/tools/corba/common/toolspec/toolspecs/idl2wsdl.xml cxf/branches/2.4.x-fixes/tools/corba/src/main/java/org/apache/cxf/tools/corba/common/toolspec/toolspecs/wsdl2idl.xml cxf/branches/2.4.x-fixes/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2js/java2js.xml cxf/branches/2.4.x-fixes/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2ws/java2ws.xml cxf/branches/2.4.x-fixes/tools/validator/src/main/java/org/apache/cxf/tools/validator/wsdlvalidator.xml cxf/branches/2.4.x-fixes/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/jaxrs-toolspec.xml cxf/branches/2.4.x-fixes/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/wsdlto.xml cxf/branches/2.4.x-fixes/tools/wsdlto/frontend/javascript/src/main/resources/org/apache/cxf/tools/wsdlto/javascript/javascript-toolspec.xml cxf/branches/2.4.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/jaxws-toolspec.xml cxf/branches/2.4.x-fixes/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/wsdl2service.xml cxf/branches/2.4.x-fixes/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/wsdl2soap.xml cxf/branches/2.4.x-fixes/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/wsdl2xml.xml cxf/branches/2.4.x-fixes/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/xsd2wsdl.xml Propchange: cxf/branches/2.4.x-fixes/ ------------------------------------------------------------------------------ svn:mergeinfo = /cxf/trunk:1172522 Propchange: cxf/branches/2.4.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.4.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.4.x-fixes/tools/corba/src/main/java/org/apache/cxf/tools/corba/common/toolspec/toolspecs/idl2wsdl.xml?rev=1172584&r1=1172583&r2=1172584&view=diff ============================================================================== --- cxf/branches/2.4.x-fixes/tools/corba/src/main/java/org/apache/cxf/tools/corba/common/toolspec/toolspecs/idl2wsdl.xml (original) +++ cxf/branches/2.4.x-fixes/tools/corba/src/main/java/org/apache/cxf/tools/corba/common/toolspec/toolspecs/idl2wsdl.xml Mon Sep 19 12:08:45 2011 @@ -201,6 +201,7 @@ @@ -214,6 +215,7 @@ Quiet mode quiet q + Q Modified: cxf/branches/2.4.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.4.x-fixes/tools/corba/src/main/java/org/apache/cxf/tools/corba/common/toolspec/toolspecs/wsdl2idl.xml?rev=1172584&r1=1172583&r2=1172584&view=diff ============================================================================== --- cxf/branches/2.4.x-fixes/tools/corba/src/main/java/org/apache/cxf/tools/corba/common/toolspec/toolspecs/wsdl2idl.xml (original) +++ cxf/branches/2.4.x-fixes/tools/corba/src/main/java/org/apache/cxf/tools/corba/common/toolspec/toolspecs/wsdl2idl.xml Mon Sep 19 12:08:45 2011 @@ -128,6 +128,7 @@ te parameters. @@ -141,6 +142,7 @@ te parameters. Quiet mode quiet q + Q Modified: cxf/branches/2.4.x-fixes/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2js/java2js.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2js/java2js.xml?rev=1172584&r1=1172583&r2=1172584&view=diff ============================================================================== --- cxf/branches/2.4.x-fixes/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2js/java2js.xml (original) +++ cxf/branches/2.4.x-fixes/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2js/java2js.xml Mon Sep 19 12:08:45 2011 @@ -114,6 +114,7 @@ under the License. Display the version of the tool. + version v @@ -131,6 +132,7 @@ under the License. quiet q + Q Modified: cxf/branches/2.4.x-fixes/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2ws/java2ws.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2ws/java2ws.xml?rev=1172584&r1=1172583&r2=1172584&view=diff ============================================================================== --- cxf/branches/2.4.x-fixes/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2ws/java2ws.xml (original) +++ cxf/branches/2.4.x-fixes/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2ws/java2ws.xml Mon Sep 19 12:08:45 2011 @@ -227,6 +227,7 @@ Display the version of the tool. + version v @@ -244,6 +245,7 @@ quiet q + Q Modified: cxf/branches/2.4.x-fixes/tools/validator/src/main/java/org/apache/cxf/tools/validator/wsdlvalidator.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/tools/validator/src/main/java/org/apache/cxf/tools/validator/wsdlvalidator.xml?rev=1172584&r1=1172583&r2=1172584&view=diff ============================================================================== --- cxf/branches/2.4.x-fixes/tools/validator/src/main/java/org/apache/cxf/tools/validator/wsdlvalidator.xml (original) +++ cxf/branches/2.4.x-fixes/tools/validator/src/main/java/org/apache/cxf/tools/validator/wsdlvalidator.xml Mon Sep 19 12:08:45 2011 @@ -82,6 +82,7 @@ wsdlvalidator -s http://cxf.apache.org/s Display the version of the tool. + version v @@ -99,6 +100,7 @@ wsdlvalidator -s http://cxf.apache.org/s quiet q + Q Modified: cxf/branches/2.4.x-fixes/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/jaxrs-toolspec.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/jaxrs-toolspec.xml?rev=1172584&r1=1172583&r2=1172584&view=diff ============================================================================== --- cxf/branches/2.4.x-fixes/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/jaxrs-toolspec.xml (original) +++ cxf/branches/2.4.x-fixes/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/jaxrs-toolspec.xml Mon Sep 19 12:08:45 2011 @@ -266,6 +266,7 @@ TODO: consider implementing most of the @@ -281,6 +282,7 @@ TODO: consider implementing most of the Specifies that the generator runs in quiet mode. quiet q + Q Modified: cxf/branches/2.4.x-fixes/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/wsdlto.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/wsdlto.xml?rev=1172584&r1=1172583&r2=1172584&view=diff ============================================================================== --- cxf/branches/2.4.x-fixes/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/wsdlto.xml (original) +++ cxf/branches/2.4.x-fixes/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/wsdlto.xml Mon Sep 19 12:08:45 2011 @@ -229,6 +229,7 @@ under the License. @@ -242,6 +243,7 @@ under the License. Quiet mode quiet q + Q Modified: cxf/branches/2.4.x-fixes/tools/wsdlto/frontend/javascript/src/main/resources/org/apache/cxf/tools/wsdlto/javascript/javascript-toolspec.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/tools/wsdlto/frontend/javascript/src/main/resources/org/apache/cxf/tools/wsdlto/javascript/javascript-toolspec.xml?rev=1172584&r1=1172583&r2=1172584&view=diff ============================================================================== --- cxf/branches/2.4.x-fixes/tools/wsdlto/frontend/javascript/src/main/resources/org/apache/cxf/tools/wsdlto/javascript/javascript-toolspec.xml (original) +++ cxf/branches/2.4.x-fixes/tools/wsdlto/frontend/javascript/src/main/resources/org/apache/cxf/tools/wsdlto/javascript/javascript-toolspec.xml Mon Sep 19 12:08:45 2011 @@ -93,6 +93,7 @@ Examples: @@ -108,6 +109,7 @@ Examples: Quiet mode quiet q + Q Modified: cxf/branches/2.4.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/jaxws-toolspec.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/jaxws-toolspec.xml?rev=1172584&r1=1172583&r2=1172584&view=diff ============================================================================== --- cxf/branches/2.4.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/jaxws-toolspec.xml (original) +++ cxf/branches/2.4.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/jaxws-toolspec.xml Mon Sep 19 12:08:45 2011 @@ -385,6 +385,7 @@ Examples: @@ -400,6 +401,7 @@ Examples: Specifies that the generator runs in quiet mode. quiet q + Q @@ -232,6 +233,7 @@ wsdl2service -transport http -e servicen quiet q + Q @@ -147,6 +148,7 @@ wsdl2soap -i GreetPortType -n http://apa quiet q + Q Modified: cxf/branches/2.4.x-fixes/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/wsdl2xml.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/wsdl2xml.xml?rev=1172584&r1=1172583&r2=1172584&view=diff ============================================================================== --- cxf/branches/2.4.x-fixes/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/wsdl2xml.xml (original) +++ cxf/branches/2.4.x-fixes/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/wsdl2xml.xml Mon Sep 19 12:08:45 2011 @@ -120,6 +120,7 @@ wsdl2xml -i GreetPortType -a address Tes Display the version of the tool. + version v @@ -137,6 +138,7 @@ wsdl2xml -i GreetPortType -a address Tes quiet q + Q Modified: cxf/branches/2.4.x-fixes/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/xsd2wsdl.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/xsd2wsdl.xml?rev=1172584&r1=1172583&r2=1172584&view=diff ============================================================================== --- cxf/branches/2.4.x-fixes/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/xsd2wsdl.xml (original) +++ cxf/branches/2.4.x-fixes/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/xsd2wsdl.xml Mon Sep 19 12:08:45 2011 @@ -88,6 +88,7 @@ xsd2wsdl -t http://org.apache/invoice -n Display the version of the tool. + version v @@ -105,6 +106,7 @@ xsd2wsdl -t http://org.apache/invoice -n quiet q + Q