You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by vg...@apache.org on 2007/12/21 15:55:53 UTC
svn commit: r606211 - in
/cocoon/trunk/blocks/cocoon-samples-style/cocoon-samples-style-default/src/main/resources/COB-INF:
./ blocks/ common/style/xsl/html/
Author: vgritsenko
Date: Fri Dec 21 06:55:53 2007
New Revision: 606211
URL: http://svn.apache.org/viewvc?rev=606211&view=rev
Log:
fix @year@, @version@
Modified:
cocoon/trunk/blocks/cocoon-samples-style/cocoon-samples-style-default/src/main/resources/COB-INF/blocks/dynamic-page2html.xsl
cocoon/trunk/blocks/cocoon-samples-style/cocoon-samples-style-default/src/main/resources/COB-INF/common/style/xsl/html/complex-page2html.xsl
cocoon/trunk/blocks/cocoon-samples-style/cocoon-samples-style-default/src/main/resources/COB-INF/common/style/xsl/html/simple-page2html.xsl
cocoon/trunk/blocks/cocoon-samples-style/cocoon-samples-style-default/src/main/resources/COB-INF/common/style/xsl/html/simple-samples2html.xsl
cocoon/trunk/blocks/cocoon-samples-style/cocoon-samples-style-default/src/main/resources/COB-INF/sitemap.xmap
Modified: cocoon/trunk/blocks/cocoon-samples-style/cocoon-samples-style-default/src/main/resources/COB-INF/blocks/dynamic-page2html.xsl
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-samples-style/cocoon-samples-style-default/src/main/resources/COB-INF/blocks/dynamic-page2html.xsl?rev=606211&r1=606210&r2=606211&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-samples-style/cocoon-samples-style-default/src/main/resources/COB-INF/blocks/dynamic-page2html.xsl (original)
+++ cocoon/trunk/blocks/cocoon-samples-style/cocoon-samples-style-default/src/main/resources/COB-INF/blocks/dynamic-page2html.xsl Fri Dec 21 06:55:53 2007
@@ -16,11 +16,13 @@
limitations under the License.
-->
-<xsl:stylesheet
- version="1.0"
- xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
- xmlns:xsp-request="http://apache.org/xsp/request/2.0"
- xmlns:xsp="http://apache.org/xsp">
+<!--
+ - $Id: simple-samples2html.xsl 597805 2007-11-24 05:14:03Z vgritsenko $
+ -->
+<xsl:stylesheet version="1.0"
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ xmlns:xsp-request="http://apache.org/xsp/request/2.0"
+ xmlns:xsp="http://apache.org/xsp">
<xsl:include href="../common/style/xsl/html/simple-page2html.xsl"/>
@@ -34,24 +36,18 @@
<xsl:template match="xsp-request:parameter-values">
<p>Parameter Values for "<xsl:value-of select="@name"/>":</p>
-
<ul>
<xsl:for-each select="xsp-request:value">
- <li>
- <xsl:value-of select="."/>
- </li>
+ <li><xsl:value-of select="."/></li>
</xsl:for-each>
</ul>
</xsl:template>
<xsl:template match="xsp-request:parameter-names">
<p>All Parameter Names:</p>
-
<ul>
<xsl:for-each select="xsp-request:name">
- <li>
- <xsl:value-of select="."/>
- </li>
+ <li><xsl:value-of select="."/></li>
</xsl:for-each>
</ul>
</xsl:template>
@@ -61,10 +57,10 @@
<ul>
<xsl:for-each select="xsp-request:header">
- <li>
+ <li>
<i><xsl:value-of select="@name"/></i>:
<b><xsl:value-of select="."/></b>
- </li>
+ </li>
</xsl:for-each>
</ul>
<br/>
@@ -76,12 +72,9 @@
<xsl:template match="xsp-request:header-names">
<p>All Header names:</p>
-
<ul>
<xsl:for-each select="xsp-request:name">
- <li>
- <xsl:value-of select="."/>
- </li>
+ <li><xsl:value-of select="."/></li>
</xsl:for-each>
</ul>
</xsl:template>
@@ -117,9 +110,9 @@
</xsl:template>
<xsl:template match="@*|node()" priority="-1" name="copy">
- <xsl:copy>
- <xsl:apply-templates select="@*|node()"/>
- </xsl:copy>
+ <xsl:copy>
+ <xsl:apply-templates select="@*|node()"/>
+ </xsl:copy>
</xsl:template>
</xsl:stylesheet>
Modified: cocoon/trunk/blocks/cocoon-samples-style/cocoon-samples-style-default/src/main/resources/COB-INF/common/style/xsl/html/complex-page2html.xsl
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-samples-style/cocoon-samples-style-default/src/main/resources/COB-INF/common/style/xsl/html/complex-page2html.xsl?rev=606211&r1=606210&r2=606211&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-samples-style/cocoon-samples-style-default/src/main/resources/COB-INF/common/style/xsl/html/complex-page2html.xsl (original)
+++ cocoon/trunk/blocks/cocoon-samples-style/cocoon-samples-style-default/src/main/resources/COB-INF/common/style/xsl/html/complex-page2html.xsl Fri Dec 21 06:55:53 2007
@@ -24,10 +24,13 @@
<xsl:stylesheet version="1.0"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+ <xsl:param name="version">2</xsl:param>
+ <xsl:param name="year">????</xsl:param>
+
<xsl:template match="/">
<html>
<head>
- <title>Apache Cocoon @version@</title>
+ <title>Apache Cocoon <xsl:value-of select="$version"/></title>
<link rel="SHORTCUT ICON" href="servlet:/icons/cocoon.ico"/>
<link href="servlet:/styles/main.css" type="text/css" rel="stylesheet"/>
<xsl:apply-templates select="document/header/style"/>
@@ -38,7 +41,7 @@
<tr>
<td width="*">The Apache Software Foundation is proud to present...</td>
<td width="40%" align="center"><img border="0" src="servlet:/images/cocoon.gif"/></td>
- <td width="30%" align="center">Version: <b>@version@</b></td>
+ <td width="30%" align="center">Version: <b><xsl:value-of select="$version"/></b></td>
</tr>
</table>
@@ -75,8 +78,8 @@
</p>
<p class="copyright">
- Copyright © @year@ <a href="http://www.apache.org/">The Apache Software Foundation</a>.
- All rights reserved.
+ <xsl:text>Copyright © </xsl:text><xsl:value-of select="$year"/><xsl:text> </xsl:text>
+ <a href="http://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.
</p>
</body>
</html>
Modified: cocoon/trunk/blocks/cocoon-samples-style/cocoon-samples-style-default/src/main/resources/COB-INF/common/style/xsl/html/simple-page2html.xsl
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-samples-style/cocoon-samples-style-default/src/main/resources/COB-INF/common/style/xsl/html/simple-page2html.xsl?rev=606211&r1=606210&r2=606211&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-samples-style/cocoon-samples-style-default/src/main/resources/COB-INF/common/style/xsl/html/simple-page2html.xsl (original)
+++ cocoon/trunk/blocks/cocoon-samples-style/cocoon-samples-style-default/src/main/resources/COB-INF/common/style/xsl/html/simple-page2html.xsl Fri Dec 21 06:55:53 2007
@@ -22,8 +22,12 @@
<xsl:stylesheet version="1.0"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+ <xsl:param name="version">2</xsl:param>
+ <xsl:param name="year">????</xsl:param>
+
<xsl:param name="contextPath">servlet:/</xsl:param>
+
<xsl:template match="/">
<html>
<xsl:apply-templates/>
@@ -33,7 +37,7 @@
<xsl:template match="page">
<head>
<title>
- <xsl:text>Apache Cocoon @version@</xsl:text>
+ <xsl:text>Apache Cocoon </xsl:text><xsl:value-of select="$version"/>
<xsl:if test="title">
<xsl:text> | </xsl:text>
<xsl:value-of select="title"/>
@@ -67,8 +71,8 @@
<xsl:apply-templates/>
<p class="copyright">
- Copyright © @year@ <a href="http://www.apache.org/">The Apache Software Foundation</a>.
- All rights reserved.
+ <xsl:text>Copyright © </xsl:text><xsl:value-of select="$year"/><xsl:text> </xsl:text>
+ <a href="http://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.
</p>
</body>
</xsl:template>
Modified: cocoon/trunk/blocks/cocoon-samples-style/cocoon-samples-style-default/src/main/resources/COB-INF/common/style/xsl/html/simple-samples2html.xsl
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-samples-style/cocoon-samples-style-default/src/main/resources/COB-INF/common/style/xsl/html/simple-samples2html.xsl?rev=606211&r1=606210&r2=606211&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-samples-style/cocoon-samples-style-default/src/main/resources/COB-INF/common/style/xsl/html/simple-samples2html.xsl (original)
+++ cocoon/trunk/blocks/cocoon-samples-style/cocoon-samples-style-default/src/main/resources/COB-INF/common/style/xsl/html/simple-samples2html.xsl Fri Dec 21 06:55:53 2007
@@ -24,6 +24,9 @@
<xsl:stylesheet version="1.0"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+ <xsl:param name="version">2</xsl:param>
+ <xsl:param name="year">????</xsl:param>
+
<xsl:param name="contextPath">servlet:</xsl:param>
<xsl:variable name="stdLinks" select="samples/links/link[not(@role)]"/>
@@ -34,7 +37,7 @@
<html>
<head>
<title>
- <xsl:text>Apache Cocoon @version@</xsl:text>
+ <xsl:text>Apache Cocoon </xsl:text><xsl:value-of select="$version"/>
<xsl:if test="samples/@name">
<xsl:text> | </xsl:text>
<xsl:value-of select="samples/@name"/>
@@ -82,8 +85,8 @@
<xsl:apply-templates select="samples/additional-info"/>
<p class="copyright">
- Copyright © @year@ <a href="http://www.apache.org/">The Apache Software Foundation</a>.
- All rights reserved.
+ <xsl:text>Copyright © </xsl:text><xsl:value-of select="$year"/><xsl:text> </xsl:text>
+ <a href="http://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.
</p>
</body>
</html>
Modified: cocoon/trunk/blocks/cocoon-samples-style/cocoon-samples-style-default/src/main/resources/COB-INF/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-samples-style/cocoon-samples-style-default/src/main/resources/COB-INF/sitemap.xmap?rev=606211&r1=606210&r2=606211&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-samples-style/cocoon-samples-style-default/src/main/resources/COB-INF/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-samples-style/cocoon-samples-style-default/src/main/resources/COB-INF/sitemap.xmap Fri Dec 21 06:55:53 2007
@@ -26,21 +26,27 @@
<map:pipelines>
<map:pipeline id="services">
<!--
- These matchers are intended to be called
- when making use of servlet services from other blocks
- -->
+ - These matchers are intended to be called
+ - when making use of servlet services from other blocks
+ -->
+
<map:match pattern="service/blocks/*">
<map:generate src="service-consumer:"/>
<map:transform src="blocks/{1}.xsl"/>
<map:transform type="servletLinkRewriter"/>
<map:serialize type="html"/>
</map:match>
+
<map:match pattern="service/common/*">
<map:generate src="service-consumer:"/>
- <map:transform src="common/style/xsl/html/{1}.xsl"/>
+ <map:transform src="common/style/xsl/html/{1}.xsl">
+ <map:parameter name="version" value="{cocoon-properties:version}"/>
+ <map:parameter name="year" value="{cocoon-properties:year}"/>
+ </map:transform>
<map:transform type="servletLinkRewriter"/>
<map:serialize type="html"/>
</map:match>
+
<map:match pattern="service/system/*">
<map:generate src="service-consumer:"/>
<map:transform src="stylesheets/system/{1}.xslt"/>