Author: thorsten
Date: Wed Oct 15 05:36:49 2008
New Revision: 704891
URL: http://svn.apache.org/viewvc?rev=704891&view=rev
Log:
FOR-1118 removing level of properties matching
Modified:
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/resource/themer/themes/common/html/branding-css-links.contract.xml
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/resource/themer/themes/common/html/branding-logo.contract.xml
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/resource/themer/themes/common/html/master.contract.xml
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/resource/themer/themes/common/html/siteinfo-meta-icon.contract.xml
Modified:
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/resource/themer/themes/common/html/branding-css-links.contract.xml
URL:
http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/resource/themer/themes/common/html/branding-css-links.contract.xml?rev=704891&r1=704890&r2=704891&view=diff
==============================================================================
---
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/resource/themer/themes/common/html/branding-css-links.contract.xml
(original)
+++
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/resource/themer/themes/common/html/branding-css-links.contract.xml
Wed Oct 15 05:36:49 2008
@@ -83,8 +83,8 @@
xmlns:forrest="http://apache.org/forrest/templates/1.0";>
<xsl:param name="defaultVariables" select="'test.html'"/>
<xsl:param name="branding-css-links-input"/>
- <xsl:variable name="root" select="$defaultVariables/*/[EMAIL
PROTECTED]'root']/@value"/>
- <xsl:variable name="theme" select="$defaultVariables/*/[EMAIL
PROTECTED]'theme']/@value"/>
+ <xsl:variable name="root" select="$defaultVariables/[EMAIL
PROTECTED]'root']/@value"/>
+ <xsl:variable name="theme" select="$defaultVariables/[EMAIL
PROTECTED]'theme']/@value"/>
<xsl:template match="/">
<forrest:content>
<forrest:part xpath="/html/head">
Modified:
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/resource/themer/themes/common/html/branding-logo.contract.xml
URL:
http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/resource/themer/themes/common/html/branding-logo.contract.xml?rev=704891&r1=704890&r2=704891&view=diff
==============================================================================
---
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/resource/themer/themes/common/html/branding-logo.contract.xml
(original)
+++
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/resource/themer/themes/common/html/branding-logo.contract.xml
Wed Oct 15 05:36:49 2008
@@ -57,7 +57,7 @@
<xsl:param name="branding-logo-over"/>
<xsl:param name="branding-logo-width"/>
<xsl:param name="branding-logo-height"/>
- <xsl:variable name="root" select="$defaultVariables/*/[EMAIL
PROTECTED]'root']/@value"/>
+ <xsl:variable name="root" select="$defaultVariables/[EMAIL
PROTECTED]'root']/@value"/>
<xsl:template match="/">
<forrest:content>
<forrest:part>
Modified:
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/resource/themer/themes/common/html/master.contract.xml
URL:
http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/resource/themer/themes/common/html/master.contract.xml?rev=704891&r1=704890&r2=704891&view=diff
==============================================================================
---
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/resource/themer/themes/common/html/master.contract.xml
(original)
+++
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/resource/themer/themes/common/html/master.contract.xml
Wed Oct 15 05:36:49 2008
@@ -38,7 +38,7 @@
<!-- If you need default variables: -->
<!--<xsl:param name="defaultVariables" select="'test.html'"/>-->
<!-- then extract the variable like: -->
-<!--<xsl:variable name="skin-img-dir" select="$defaultVariables/*/[EMAIL
PROTECTED]'skin-img-dir']/@value"/>-->
+<!--<xsl:variable name="skin-img-dir" select="$defaultVariables/[EMAIL
PROTECTED]'skin-img-dir']/@value"/>-->
<!-- more information which variables are available can be found at
http://localhost:8888/**.props
which connects to the org.apache.forrest.plugin.output.inputModule plugin.
A custom generator contacts the forrest properties input module to get
all aviable key/values and
@@ -67,7 +67,7 @@
<!-- copy n paste -->
<!--
<xsl:param name="defaultVariables" select="'test.html'"/>
- <xsl:variable name="skin-img-dir" select="$defaultVariables/*/[EMAIL
PROTECTED]'skin-img-dir']/@value"/>
+ <xsl:variable name="skin-img-dir" select="$defaultVariables/[EMAIL
PROTECTED]'skin-img-dir']/@value"/>
<xsl:template match="/">
<forrest:content>
<forrest:part/>
Modified:
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/resource/themer/themes/common/html/siteinfo-meta-icon.contract.xml
URL:
http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/resource/themer/themes/common/html/siteinfo-meta-icon.contract.xml?rev=704891&r1=704890&r2=704891&view=diff
==============================================================================
---
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/resource/themer/themes/common/html/siteinfo-meta-icon.contract.xml
(original)
+++
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/resource/themer/themes/common/html/siteinfo-meta-icon.contract.xml
Wed Oct 15 05:36:49 2008
@@ -42,7 +42,7 @@
<xsl:stylesheet version="1.1"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform";>
<xsl:param name="defaultVariables" select="'test.html'"/>
<xsl:param name="siteinfo-meta-icon"/>
- <xsl:variable name="root" select="$defaultVariables/*/[EMAIL
PROTECTED]'root']/@value"/>
+ <xsl:variable name="root" select="$defaultVariables/[EMAIL
PROTECTED]'root']/@value"/>
<xsl:template match="/">
<forrest:content>
<forrest:part xpath="/html/head">
