Author: ffang Date: Mon Sep 26 05:41:21 2011 New Revision: 1175678 URL: http://svn.apache.org/viewvc?rev=1175678&view=rev Log: Merged revisions 1175675 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.4.x-fixes
................ r1175675 | ffang | 2011-09-26 13:14:57 +0800 (一, 26 9 2011) | 9 lines Merged revisions 1175672 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1175672 | ffang | 2011-09-26 13:06:45 +0800 (一, 26 9 2011) | 1 line [CXF-3824]CLI tool -help should be able to list all switch in toolspec ........ ................ Modified: cxf/branches/2.3.x-fixes/ (props changed) cxf/branches/2.3.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/parser/detailedUsage.xsl cxf/branches/2.3.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/parser/usage.xsl Propchange: cxf/branches/2.3.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.3.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/parser/detailedUsage.xsl URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/parser/detailedUsage.xsl?rev=1175678&r1=1175677&r2=1175678&view=diff ============================================================================== --- cxf/branches/2.3.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/parser/detailedUsage.xsl (original) +++ cxf/branches/2.3.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/parser/detailedUsage.xsl Mon Sep 26 05:41:21 2011 @@ -53,8 +53,14 @@ <xsl:if test="@minOccurs=0"> <xsl:text>[ </xsl:text> </xsl:if> - <xsl:text>-</xsl:text> - <xsl:value-of select="ts:switch"/> + <xsl:for-each select="ts:switch"> + <xsl:if test="position() > 1"> + <xsl:text>|</xsl:text> + </xsl:if> + <xsl:text>-</xsl:text> + <xsl:value-of select="text()"/> + </xsl:for-each> + <xsl:if test="ts:associatedArgument[@placement='afterSpace']"> <xsl:text> </xsl:text> </xsl:if> Modified: cxf/branches/2.3.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/parser/usage.xsl URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/parser/usage.xsl?rev=1175678&r1=1175677&r2=1175678&view=diff ============================================================================== --- cxf/branches/2.3.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/parser/usage.xsl (original) +++ cxf/branches/2.3.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/parser/usage.xsl Mon Sep 26 05:41:21 2011 @@ -65,8 +65,16 @@ Form </xsl:text> <xsl:text>[ </xsl:text> </xsl:if> - <xsl:text>-</xsl:text> - <xsl:value-of select="ts:switch"/> + + <xsl:for-each select="ts:switch"> + <xsl:if test="position() > 1"> + <xsl:text>|</xsl:text> + </xsl:if> + <xsl:text>-</xsl:text> + <xsl:value-of select="text()"/> + </xsl:for-each> + + <xsl:if test="ts:associatedArgument[@placement='afterSpace']"> <xsl:text> </xsl:text>
