[richfaces-svn-commits] JBoss Rich Faces SVN: r14321 - branches/community/3.3.X/docs/common-resources/en/src/main/xslt.

[richfaces-svn-commits at lists.jboss.org]

Author: ochikvina
Date: 2009-05-26 06:13:47 -0400 (Tue, 26 May 2009)
New Revision: 14321

Modified:
   branches/community/3.3.X/docs/common-resources/en/src/main/xslt/f.xsl
Log:
https://jira.jboss.org/jira/browse/RF-7081 - reverting the last modifications;

Modified: branches/community/3.3.X/docs/common-resources/en/src/main/xslt/f.xsl
===================================================================
--- branches/community/3.3.X/docs/common-resources/en/src/main/xslt/f.xsl	2009-05-26 09:11:58 UTC (rev 14320)
+++ branches/community/3.3.X/docs/common-resources/en/src/main/xslt/f.xsl	2009-05-26 10:13:47 UTC (rev 14321)
@@ -3,21 +3,20 @@
 	xmlns:javaee="http://java.sun.com/xml/ns/javaee"
 	xmlns:u="http:/jsf.exadel.com/template/util"
 	xmlns:f='http:/jsf.exadel.com/template'
-	version="1.0" exclude-result-prefixes="javaee u f">
-	<xsl:output name="xmlOutput" method="xml" version="1.0" encoding="UTF-8" indent="yes"
+	version="1.0" exclude-result-prefixes="javaee">
+	<xsl:output method="xml" version="1.0" encoding="UTF-8" indent="yes"
 		omit-xml-declaration="yes" />
 	<xsl:param name="lang" />
 	<xsl:param name="title" />
 	<xsl:param name="separator" />
 	<xsl:param name="prefix" />
 	<xsl:param name="xcssPath" />
-	<xsl:param name="outputDir" />
 	
 	<xsl:variable name="rowsAmount">
 		<xsl:value-of select="count(.)" />
 	</xsl:variable>
 	
-	<!--xsl:template match="//f:template">
+	<xsl:template match="//f:template">
 		<table>
 			<xsl:for-each select="u:selector">
 				<xsl:sort select="@name" />
@@ -42,7 +41,7 @@
 		</table>
 	</xsl:template>
 	
-	<xsl:template match="/f:template/f:verbatim"/-->
+	<xsl:template match="/f:template/f:verbatim"/>
 	
 
 	<xsl:template match="javaee:taglib | taglib">
@@ -54,46 +53,29 @@
 
 			<!--xsl:value-of select="./name/text()" /-->
 
-			<xsl:if test="not(contains($excluded-tag-names, javaee:name))">
+			<xsl:if
+				test="not(contains($excluded-tag-names, javaee:name))">
 				<xsl:call-template name="tag" />
 			</xsl:if>
-			<xsl:if	test="not(contains($excluded-tag-names, ./name/text()))">
-					<xsl:call-template name="tag" />
+			<xsl:if
+				test="not(contains($excluded-tag-names, ./name/text()))">
+				<xsl:call-template name="tag" />
 			</xsl:if>
 		</xsl:for-each>
 	</xsl:template>
 
 	<xsl:template name="tag">
-	
-	<xsl:variable name="tag_name">
-		<xsl:choose>
-			<xsl:when test="javaee:name">
-				<xsl:value-of select="javaee:name" />
-			</xsl:when>
-			<xsl:otherwise>
-				<xsl:value-of select="./name/text()" />
-			</xsl:otherwise>
-		</xsl:choose>
-	</xsl:variable>
-	
-	<xsl:variable name="descPrefixExistence" select="boolean(document(concat($lang, $separator, 'included', $separator, $prefix, '_', $tag_name, '.desc.xml')))" />
-	<xsl:variable name="prefixExistence" select="boolean(document(concat($lang, $separator, 'included', $separator, $prefix, '_', $tag_name, '.xml')))" />
-
-	<!--xsl:variable name="hrefForResultDoc">
-		<xsl:choose>
-			<xsl:when test="$descPrefixExistence and $prefixExistence">
-				<xsl:value-of select="concat($outputDir, $prefix, '_', $tag_name, '.xml')" />
-			</xsl:when>
-			<xsl:otherwise>
-				<xsl:value-of select="concat($outputDir, $tag_name, '.xml')" />
-			</xsl:otherwise>
-		</xsl:choose>
-	</xsl:variable-->
-
-	
-	<xsl:result-document href="{concat($outputDir, $prefix, '_', $tag_name, '.xml')}" format="xmlOutput">		
 		<section role="NotInToc">
-			
+			<xsl:variable name="tag_name">
+				<xsl:choose>
+					<xsl:when test="javaee:name">
+						<xsl:value-of select="javaee:name" />
+					</xsl:when>
+					<xsl:otherwise>
+						<xsl:value-of select="./name/text()" />
+					</xsl:otherwise>
+				</xsl:choose>
+			</xsl:variable>
 			<!--
 			<xsl:variable name="prefix">
 				<xsl:choose>
@@ -106,8 +88,7 @@
 				</xsl:choose>
 			</xsl:variable>			
 			-->
-			<xsl:attribute name="id">
-				<xsl:value-of select="concat($prefix, '_', $tag_name)" />
+			<xsl:attribute name="id"><xsl:value-of select="concat($prefix, '_', $tag_name)" />
 			</xsl:attribute>
 			<title>
 				&lt;
@@ -116,7 +97,7 @@
 			</title>
 			
 			<xsl:choose>
-				<xsl:when test="$descPrefixExistence">
+				<xsl:when test="document(concat($lang, $separator, 'included', $separator, $prefix, '_', $tag_name, '.desc.xml'))">
 					<xsl:for-each select="document(concat($lang, $separator,'included',$separator, $prefix, '_', $tag_name, '.desc.xml'))/*">
 						<xsl:copy-of select="./*" />
 					</xsl:for-each>
@@ -127,8 +108,7 @@
 					</xsl:for-each>	
 				</xsl:otherwise>
 			</xsl:choose>
-
-	
+			
 			<table>
 				<title>
 					<xsl:value-of select="$prefix" />
@@ -189,9 +169,8 @@
 					</tgroup>
 				</table>
 			</xsl:if-->
-
 			<xsl:choose>
-				<xsl:when test="$prefixExistence">
+				<xsl:when test="document(concat($lang, $separator, 'included', $separator, $prefix, '_', $tag_name, '.xml'))">
 					<xsl:for-each select="document(concat($lang, $separator,'included',$separator, $prefix, '_', $tag_name, '.xml'))/*">
 						<xsl:copy-of select="./*" />
 					</xsl:for-each>
@@ -203,7 +182,7 @@
 				</xsl:otherwise>
 			</xsl:choose>
 			
+
 		</section>
-</xsl:result-document>		
 	</xsl:template>
-</xsl:transform>
+</xsl:transform>
\ No newline at end of file