[prev in list] [next in list] [prev in thread] [next in thread]
List: forrest-svn
Subject: svn commit: r106675 - in forrest/trunk/plugins/org.apache.forrest.plugin.fbits: . fbits resources/st
From: thorsten () apache ! org
Date: 2004-11-27 1:12:54
Message-ID: 20041127011254.37059.qmail () minotaur ! apache ! org
[Download RAW message or body]
Author: thorsten
Date: Fri Nov 26 17:12:53 2004
New Revision: 106675
URL: http://svn.apache.org/viewcvs?view=rev&rev=106675
Log:
added forrest:xmlns; updated xmlns to xsl matches
Modified:
forrest/trunk/plugins/org.apache.forrest.plugin.fbits/fbits/c-fontsize-fct.xml
forrest/trunk/plugins/org.apache.forrest.plugin.fbits/fbits/c-pdf.link-fct.xml
forrest/trunk/plugins/org.apache.forrest.plugin.fbits/fbits/c-pod.link-fct.xml
forrest/trunk/plugins/org.apache.forrest.plugin.fbits/fbits/c-txt.link-fct.xml
forrest/trunk/plugins/org.apache.forrest.plugin.fbits/fbits/c-xml.link-fct.xml
forrest/trunk/plugins/org.apache.forrest.plugin.fbits/output.xmap
forrest/trunk/plugins/org.apache.forrest.plugin.fbits/resources/stylesheets/contract.xsl
forrest/trunk/plugins/org.apache.forrest.plugin.fbits/resources/stylesheets/dir2contracts.xsl
forrest/trunk/plugins/org.apache.forrest.plugin.fbits/resources/stylesheets/filter.xsl
Modified: forrest/trunk/plugins/org.apache.forrest.plugin.fbits/fbits/c-fontsize-fct.xml
Url: http://svn.apache.org/viewcvs/forrest/trunk/plugins/org.apache.forrest.plugin.fbi \
ts/fbits/c-fontsize-fct.xml?view=diff&rev=106675&p1=forrest/trunk/plugins/org.apache.f \
orrest.plugin.fbits/fbits/c-fontsize-fct.xml&r1=106674&p2=forrest/trunk/plugins/org.apache.forrest.plugin.fbits/fbits/c-fontsize-fct.xml&r2=106675
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.fbits/fbits/c-fontsize-fct.xml (original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.fbits/fbits/c-fontsize-fct.xml Fri \
Nov 26 17:12:53 2004 @@ -14,7 +14,8 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<contract name="fontsize-fct" nc="fontsize" tlc="content">
+<forrest:contract name="fontsize-fct" nc="fontsize" tlc="content"
+ xmlns:forrest="http://apache.org/forrest/templates/1.0">
<description>
This functions lets you change the size of the font you are using in the site \
with a jscript. </description>
@@ -33,4 +34,4 @@
</div>
</body>
</xhtml>
-</contract>
+</forrest:contract>
Modified: forrest/trunk/plugins/org.apache.forrest.plugin.fbits/fbits/c-pdf.link-fct.xml
Url: http://svn.apache.org/viewcvs/forrest/trunk/plugins/org.apache.forrest.plugin.fbi \
ts/fbits/c-pdf.link-fct.xml?view=diff&rev=106675&p1=forrest/trunk/plugins/org.apache.f \
orrest.plugin.fbits/fbits/c-pdf.link-fct.xml&r1=106674&p2=forrest/trunk/plugins/org.apache.forrest.plugin.fbits/fbits/c-pdf.link-fct.xml&r2=106675
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.fbits/fbits/c-pdf.link-fct.xml (original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.fbits/fbits/c-pdf.link-fct.xml Fri \
Nov 26 17:12:53 2004 @@ -14,7 +14,8 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<contract name="pdf-fct" nc="pdf" tlc="content">
+<forrest:contract name="pdf-fct" nc="pdf" tlc="content"
+ xmlns:forrest="http://apache.org/forrest/templates/1.0">
<description>
This functions will output the PDF link with image.
</description>
@@ -27,4 +28,4 @@
</div>
</body>
</xhtml>
-</contract>
+</forrest:contract>
Modified: forrest/trunk/plugins/org.apache.forrest.plugin.fbits/fbits/c-pod.link-fct.xml
Url: http://svn.apache.org/viewcvs/forrest/trunk/plugins/org.apache.forrest.plugin.fbi \
ts/fbits/c-pod.link-fct.xml?view=diff&rev=106675&p1=forrest/trunk/plugins/org.apache.f \
orrest.plugin.fbits/fbits/c-pod.link-fct.xml&r1=106674&p2=forrest/trunk/plugins/org.apache.forrest.plugin.fbits/fbits/c-pod.link-fct.xml&r2=106675
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.fbits/fbits/c-pod.link-fct.xml (original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.fbits/fbits/c-pod.link-fct.xml Fri \
Nov 26 17:12:53 2004 @@ -14,7 +14,8 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<contract name="pod-fct" nc="pod" tlc="content">
+<forrest:contract name="pod-fct" nc="pod" tlc="content"
+ xmlns:forrest="http://apache.org/forrest/templates/1.0">
<description>
This functions will output the POD link with image.
</description>
@@ -27,4 +28,4 @@
</div>
</body>
</xhtml>
-</contract>
+</forrest:contract>
Modified: forrest/trunk/plugins/org.apache.forrest.plugin.fbits/fbits/c-txt.link-fct.xml
Url: http://svn.apache.org/viewcvs/forrest/trunk/plugins/org.apache.forrest.plugin.fbi \
ts/fbits/c-txt.link-fct.xml?view=diff&rev=106675&p1=forrest/trunk/plugins/org.apache.f \
orrest.plugin.fbits/fbits/c-txt.link-fct.xml&r1=106674&p2=forrest/trunk/plugins/org.apache.forrest.plugin.fbits/fbits/c-txt.link-fct.xml&r2=106675
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.fbits/fbits/c-txt.link-fct.xml (original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.fbits/fbits/c-txt.link-fct.xml Fri \
Nov 26 17:12:53 2004 @@ -14,7 +14,8 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<contract name="txt-fct" nc="txt" tlc="content">
+<forrest:contract name="txt-fct" nc="txt" tlc="content"
+ xmlns:forrest="http://apache.org/forrest/templates/1.0">
<description>
This functions will output the TXT link with image and print link.
</description>
@@ -44,4 +45,4 @@
</script>
</body>
</xhtml>
-</contract>
+</forrest:contract>
Modified: forrest/trunk/plugins/org.apache.forrest.plugin.fbits/fbits/c-xml.link-fct.xml
Url: http://svn.apache.org/viewcvs/forrest/trunk/plugins/org.apache.forrest.plugin.fbi \
ts/fbits/c-xml.link-fct.xml?view=diff&rev=106675&p1=forrest/trunk/plugins/org.apache.f \
orrest.plugin.fbits/fbits/c-xml.link-fct.xml&r1=106674&p2=forrest/trunk/plugins/org.apache.forrest.plugin.fbits/fbits/c-xml.link-fct.xml&r2=106675
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.fbits/fbits/c-xml.link-fct.xml (original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.fbits/fbits/c-xml.link-fct.xml Fri \
Nov 26 17:12:53 2004 @@ -14,7 +14,8 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<contract name="xml-fct" nc="xml" tlc="content">
+<forrest:contract name="xml-fct" nc="xml" tlc="content"
+ xmlns:forrest="http://apache.org/forrest/templates/1.0">
<description>
This functions will output the XML link with image.
</description>
@@ -27,4 +28,4 @@
</div>
</body>
</xhtml>
-</contract>
+</forrest:contract>
Modified: forrest/trunk/plugins/org.apache.forrest.plugin.fbits/output.xmap
Url: http://svn.apache.org/viewcvs/forrest/trunk/plugins/org.apache.forrest.plugin.fbi \
ts/output.xmap?view=diff&rev=106675&p1=forrest/trunk/plugins/org.apache.forrest.plugin \
.fbits/output.xmap&r1=106674&p2=forrest/trunk/plugins/org.apache.forrest.plugin.fbits/output.xmap&r2=106675
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.fbits/output.xmap (original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.fbits/output.xmap Fri Nov 26 \
17:12:53 2004 @@ -30,6 +30,14 @@
<map:serialize type="xml"/>
</map:match>
</map:pipeline>
+
+ <map:pipeline>
+ <map:match pattern="f.*.get">
+ <map:generate src="fbits/c-{1}-fct.xml"/>
+ <map:transform src="resources/stylesheets/contract.xsl"/>
+ <map:serialize type="xml"/>
+ </map:match>
+ </map:pipeline>
<!--
1. check all aviable fct
Modified: forrest/trunk/plugins/org.apache.forrest.plugin.fbits/resources/stylesheets/contract.xsl
Url: http://svn.apache.org/viewcvs/forrest/trunk/plugins/org.apache.forrest.plugin.fbi \
ts/resources/stylesheets/contract.xsl?view=diff&rev=106675&p1=forrest/trunk/plugins/or \
g.apache.forrest.plugin.fbits/resources/stylesheets/contract.xsl&r1=106674&p2=forrest/ \
trunk/plugins/org.apache.forrest.plugin.fbits/resources/stylesheets/contract.xsl&r2=106675
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.fbits/resources/stylesheets/contract.xsl (original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.fbits/resources/stylesheets/contract.xsl Fri \
Nov 26 17:12:53 2004 @@ -29,7 +29,7 @@
-->
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" \
xmlns:forrest="http://apache.org/forrest/templates/1.0"> <xsl:param \
name="contextPath"/>
<!--+
@@ -42,23 +42,23 @@
|XHTML-head
+-->
<head>
- <xsl:apply-templates select="contract" mode="xhtml-head"/>
+ <xsl:apply-templates select="forrest:contract" mode="xhtml-head"/>
</head>
<!--+
|XHTML-body
+-->
<body>
- <xsl:apply-templates select="contract" mode="xhtml-body"/>
+ <xsl:apply-templates select="forrest:contract" mode="xhtml-body"/>
</body>
</elements>
</xsl:template>
- <xsl:template match="contract" mode="xhtml-head">
+ <xsl:template match="forrest:contract" mode="xhtml-head">
<xsl:comment>function name=<xsl:value-of select="@name"/> HEAD</xsl:comment>
<xsl:copy-of select="xhtml/head/*"/>
</xsl:template>
- <xsl:template match="contract" mode="xhtml-body">
+ <xsl:template match="forrest:contract" mode="xhtml-body">
<xsl:comment>function name=<xsl:value-of select="@name"/> BODY</xsl:comment>
<xsl:copy-of select="xhtml/body/*"/>
</xsl:template>
Modified: forrest/trunk/plugins/org.apache.forrest.plugin.fbits/resources/stylesheets/dir2contracts.xsl
Url: http://svn.apache.org/viewcvs/forrest/trunk/plugins/org.apache.forrest.plugin.fbi \
ts/resources/stylesheets/dir2contracts.xsl?view=diff&rev=106675&p1=forrest/trunk/plugi \
ns/org.apache.forrest.plugin.fbits/resources/stylesheets/dir2contracts.xsl&r1=106674&p \
2=forrest/trunk/plugins/org.apache.forrest.plugin.fbits/resources/stylesheets/dir2contracts.xsl&r2=106675
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.fbits/resources/stylesheets/dir2contracts.xsl (original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.fbits/resources/stylesheets/dir2contracts.xsl Fri \
Nov 26 17:12:53 2004 @@ -20,6 +20,7 @@
xmlns:xhtml="http://www.w3.org/1999/xhtml"
xmlns:dir="http://apache.org/cocoon/directory/2.0"
xmlns:session="http://apache.org/cocoon/session/1.0"
+ xmlns:forrest="http://apache.org/forrest/templates/1.0"
>
<xsl:param name="contentDir" select="'default/path'"/>
@@ -30,9 +31,9 @@
function.
-->
<xsl:template match="/">
- <contracts xmlns:xhtml="http://www.w3.org/1999/xhtml">
+ <forrest:contracts xmlns:forrest="http://apache.org/forrest/templates/1.0">
<xsl:apply-templates select="//dir:file"/>
- </contracts>
+ </forrest:contracts>
</xsl:template>
<xsl:template match="dir:file[starts-with(@name,'c-')]">
@@ -42,26 +43,26 @@
<xsl:value-of select="@name"/>
</xsl:variable>
<xsl:variable name="fct-bit-title">
- <xsl:value-of select="document($fct-bit-file)/contract/@name"/>
+ <xsl:value-of select="document($fct-bit-file)/forrest:contract/@name"/>
</xsl:variable>
<xsl:variable name="fct-bit-nc">
- <xsl:value-of select="document($fct-bit-file)/contract/@nc"/>
+ <xsl:value-of select="document($fct-bit-file)/forrest:contract/@nc"/>
</xsl:variable>
<xsl:variable name="fct-bit-tlc">
- <xsl:value-of select="document($fct-bit-file)/contract/@tlc"/>
+ <xsl:value-of select="document($fct-bit-file)/forrest:contract/@tlc"/>
</xsl:variable>
<xsl:variable name="fct-bit-description">
- <xsl:value-of select="document($fct-bit-file)/contract/description"/>
+ <xsl:value-of select="document($fct-bit-file)/forrest:contract/description"/>
</xsl:variable>
<xsl:if test="$fct-bit-tlc='content'">
- <contract name="{$fct-bit-title}" css="{$fct-bit-nc}" file-name="{@name}">
+ <forrest:contract name="{$fct-bit-title}" css="{$fct-bit-nc}" \
file-name="{@name}"> <description>
<xsl:value-of select="$fct-bit-description"/>
</description>
<realpath>
<xsl:value-of select="$fct-bit-file"/>
</realpath>
- </contract>
+ </forrest:contract>
</xsl:if>
</xsl:template>
Modified: forrest/trunk/plugins/org.apache.forrest.plugin.fbits/resources/stylesheets/filter.xsl
Url: http://svn.apache.org/viewcvs/forrest/trunk/plugins/org.apache.forrest.plugin.fbi \
ts/resources/stylesheets/filter.xsl?view=diff&rev=106675&p1=forrest/trunk/plugins/org. \
apache.forrest.plugin.fbits/resources/stylesheets/filter.xsl&r1=106674&p2=forrest/trun \
k/plugins/org.apache.forrest.plugin.fbits/resources/stylesheets/filter.xsl&r2=106675 \
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.fbits/resources/stylesheets/filter.xsl (original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.fbits/resources/stylesheets/filter.xsl Fri \
Nov 26 17:12:53 2004 @@ -30,28 +30,24 @@
-->
<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" \
xmlns:forrest="http://apache.org/forrest/templates/1.0">
- <xsl:param name="contextPath"/>
-
- <!--+
- |Overall site template
- +-->
+
<xsl:template match="/">
- <filter>
- <xsl:apply-templates />
- </filter>
+ <forrest:filter>
+ <xsl:apply-templates/>
+ </forrest:filter>
</xsl:template>
+
<xsl:template match="forrest:hook">
<forrest:hook id="{@name}">
- <xsl:apply-templates />
+ <xsl:apply-templates select="forrest:contract"/>
</forrest:hook>
</xsl:template>
- <xsl:template match="forrest:contract">
+
+ <xsl:template match="forrest:contract">
<xsl:variable name="css-ft"><xsl:value-of select="@name"/></xsl:variable>
- <div id="{@name}">id=<xsl:value-of select="$css-ft"/>
- <xsl:apply-templates select="contracts" />
- </div>
- </xsl:template>
- <xsl:template name="include" match="contracts">
- <xsl:apply-templates select="content"/>
+ <xsl:copy-of select="//forrest:contracts/forrest:contract[@css=$css-ft]" />
</xsl:template>
+
+ <xsl:template match="forrest:contracts/forrest:contract"/>
+
</xsl:stylesheet>
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic