From cxf-commits-return-3615-apmail-incubator-cxf-commits-archive=incubator.apache.org@incubator.apache.org Tue Nov 06 19:08:06 2007 Return-Path: Delivered-To: apmail-incubator-cxf-commits-archive@locus.apache.org Received: (qmail 52444 invoked from network); 6 Nov 2007 19:08:06 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 6 Nov 2007 19:08:06 -0000 Received: (qmail 42798 invoked by uid 500); 6 Nov 2007 19:07:54 -0000 Delivered-To: apmail-incubator-cxf-commits-archive@incubator.apache.org Received: (qmail 42755 invoked by uid 500); 6 Nov 2007 19:07:54 -0000 Mailing-List: contact cxf-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: cxf-dev@incubator.apache.org Delivered-To: mailing list cxf-commits@incubator.apache.org Received: (qmail 42745 invoked by uid 99); 6 Nov 2007 19:07:54 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 06 Nov 2007 11:07:54 -0800 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 06 Nov 2007 19:08:05 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 9A3D71A9832; Tue, 6 Nov 2007 11:07:44 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r592526 - in /incubator/cxf/tags/cxf-2.0.3-incubator: ./ tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/parser/ tools/common/src/test/java/org/apache/cxf/tools/common/toolspec/parser/ tools/common/src/test/java/org/apache/c... Date: Tue, 06 Nov 2007 19:07:43 -0000 To: cxf-commits@incubator.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20071106190744.9A3D71A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dkulp Date: Tue Nov 6 11:07:42 2007 New Revision: 592526 URL: http://svn.apache.org/viewvc?rev=592526&view=rev Log: Merged revisions 592524 via svnmerge from https://svn.apache.org/repos/asf/incubator/cxf/trunk ........ r592524 | dkulp | 2007-11-06 14:00:13 -0500 (Tue, 06 Nov 2007) | 2 lines Last minute fix to fix the output of the -? on the command line tools ........ Modified: incubator/cxf/tags/cxf-2.0.3-incubator/ (props changed) incubator/cxf/tags/cxf-2.0.3-incubator/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/parser/CommandLineParser.java incubator/cxf/tags/cxf-2.0.3-incubator/tools/common/src/test/java/org/apache/cxf/tools/common/toolspec/parser/CommandLineParserTest.java incubator/cxf/tags/cxf-2.0.3-incubator/tools/common/src/test/java/org/apache/cxf/tools/common/toolspec/parser/resources/testtool.xml Propchange: incubator/cxf/tags/cxf-2.0.3-incubator/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: incubator/cxf/tags/cxf-2.0.3-incubator/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/parser/CommandLineParser.java URL: http://svn.apache.org/viewvc/incubator/cxf/tags/cxf-2.0.3-incubator/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/parser/CommandLineParser.java?rev=592526&r1=592525&r2=592526&view=diff ============================================================================== --- incubator/cxf/tags/cxf-2.0.3-incubator/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/parser/CommandLineParser.java (original) +++ incubator/cxf/tags/cxf-2.0.3-incubator/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/parser/CommandLineParser.java Tue Nov 6 11:07:42 2007 @@ -230,10 +230,9 @@ addWhiteNamespace(strbuffer, optSpan - originalStrs[j].length()); strbuffer.append(" "); if (originalStrs[j + 1].length() > totalLen - beforeDesSpan) { - String tmp = originalStrs[j + 1].substring(0, totalLen - beforeDesSpan); - strbuffer.append(tmp); - originalStrs[j + 1] = originalStrs[j + 1].substring(totalLen - beforeDesSpan, - originalStrs[j + 1].length()); + int lastIdx = totalLen - beforeDesSpan; + int lastIdx2 = splitAndAppendText(strbuffer, originalStrs[j + 1], 0, lastIdx); + originalStrs[j + 1] = originalStrs[j + 1].substring(lastIdx2); strbuffer.append(lineSeparator); } else { strbuffer.append(originalStrs[j + 1]); Modified: incubator/cxf/tags/cxf-2.0.3-incubator/tools/common/src/test/java/org/apache/cxf/tools/common/toolspec/parser/CommandLineParserTest.java URL: http://svn.apache.org/viewvc/incubator/cxf/tags/cxf-2.0.3-incubator/tools/common/src/test/java/org/apache/cxf/tools/common/toolspec/parser/CommandLineParserTest.java?rev=592526&r1=592525&r2=592526&view=diff ============================================================================== --- incubator/cxf/tags/cxf-2.0.3-incubator/tools/common/src/test/java/org/apache/cxf/tools/common/toolspec/parser/CommandLineParserTest.java (original) +++ incubator/cxf/tags/cxf-2.0.3-incubator/tools/common/src/test/java/org/apache/cxf/tools/common/toolspec/parser/CommandLineParserTest.java Tue Nov 6 11:07:42 2007 @@ -265,7 +265,8 @@ String[] expected = new String[]{"[ -n ]", "Namespace", "[ -impl ]", - "impl", + "impl - the impl that will be used by this tool to do " + + "whatever it is this tool does.", "[ -e ]", "enum", "-r", @@ -310,13 +311,15 @@ String usage = parser.getFormattedDetailedUsage(); assertNotNull(usage); StringTokenizer st1 = new StringTokenizer(usage, System.getProperty("line.separator")); - assertEquals(13, st1.countTokens()); + assertEquals(14, st1.countTokens()); while (st1.hasMoreTokens()) { String s = st1.nextToken(); if (s.indexOf("java package") != -1) { s = s.trim(); assertTrue(s.charAt(s.length() - 1) != 'o'); + } else if (s.indexOf("impl - the") != -1) { + assertTrue(s.charAt(s.length() - 1) == 'o'); } } Modified: incubator/cxf/tags/cxf-2.0.3-incubator/tools/common/src/test/java/org/apache/cxf/tools/common/toolspec/parser/resources/testtool.xml URL: http://svn.apache.org/viewvc/incubator/cxf/tags/cxf-2.0.3-incubator/tools/common/src/test/java/org/apache/cxf/tools/common/toolspec/parser/resources/testtool.xml?rev=592526&r1=592525&r2=592526&view=diff ============================================================================== --- incubator/cxf/tags/cxf-2.0.3-incubator/tools/common/src/test/java/org/apache/cxf/tools/common/toolspec/parser/resources/testtool.xml (original) +++ incubator/cxf/tags/cxf-2.0.3-incubator/tools/common/src/test/java/org/apache/cxf/tools/common/toolspec/parser/resources/testtool.xml Tue Nov 6 11:07:42 2007 @@ -39,6 +39,7 @@