Author: thorsten
Date: Thu Oct 9 05:19:42 2008
New Revision: 703149
URL: http://svn.apache.org/viewvc?rev=703149&view=rev
Log:
FOR-1118
The path of the defaultVariables has changed a bit. Removing one level
Modified:
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/css/branding-theme-profiler.contract.xml
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/html/blank.contract.xml
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/html/content-odt-link.contract.xml
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/html/content-pdf-link.contract.xml
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/html/content-pod-link.contract.xml
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/html/content-source-xml-link.contract.xml
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/html/content-txt-link.contract.xml
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/html/content-xml-link.contract.xml
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/html/master.contract.xml
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/html/nav-main-testing-foo.contract.xml
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/xhtml2/abstract.contract.xml
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/maven/html/nav-section-round-bottom.contract.xml
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/pelt/html/nav-section-round-bottom.contract.xml
Modified:
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/css/branding-theme-profiler.contract.xml
URL:
http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/css/branding-theme-profiler.contract.xml?rev=703149&r1=703148&r2=703149&view=diff
==============================================================================
---
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/css/branding-theme-profiler.contract.xml
(original)
+++
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/css/branding-theme-profiler.contract.xml
Thu Oct 9 05:19:42 2008
@@ -131,7 +131,7 @@
<xsl:param name="defaultVariables" select="'test.html'"/>
<xsl:param name="branding-theme-profiler"/>
<xsl:param name="branding-theme-profiler-theme"/>
- <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:variable name="header-input"
select="substring-after($branding-theme-profiler/[EMAIL
PROTECTED]'header']/@value, '#')"/>
<xsl:variable name="header">
Modified:
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/html/blank.contract.xml
URL:
http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/html/blank.contract.xml?rev=703149&r1=703148&r2=703149&view=diff
==============================================================================
---
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/html/blank.contract.xml
(original)
+++
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/html/blank.contract.xml
Thu Oct 9 05:19:42 2008
@@ -33,7 +33,7 @@
<xsl:stylesheet version="1.1"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform";>
<!--<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.themes.core/themes/common/html/content-odt-link.contract.xml
URL:
http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/html/content-odt-link.contract.xml?rev=703149&r1=703148&r2=703149&view=diff
==============================================================================
---
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/html/content-odt-link.contract.xml
(original)
+++
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/html/content-odt-link.contract.xml
Thu Oct 9 05:19:42 2008
@@ -28,7 +28,7 @@
name="content-odt-link" inputFormat="xsl" >
<xsl:stylesheet version="1.1"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform";>
<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:variable name="filename-noext" select="$defaultVariables/*/[EMAIL
PROTECTED]'filename-noext']/@value"/>
<xsl:template match="/">
<forrest:content>
Modified:
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/html/content-pdf-link.contract.xml
URL:
http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/html/content-pdf-link.contract.xml?rev=703149&r1=703148&r2=703149&view=diff
==============================================================================
---
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/html/content-pdf-link.contract.xml
(original)
+++
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/html/content-pdf-link.contract.xml
Thu Oct 9 05:19:42 2008
@@ -28,7 +28,7 @@
name="content-pdf-link" inputFormat="xsl" >
<xsl:stylesheet version="1.1"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform";>
<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:variable name="filename-noext" select="$defaultVariables/*/[EMAIL
PROTECTED]'filename-noext']/@value"/>
<xsl:template match="/">
<forrest:content>
Modified:
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/html/content-pod-link.contract.xml
URL:
http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/html/content-pod-link.contract.xml?rev=703149&r1=703148&r2=703149&view=diff
==============================================================================
---
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/html/content-pod-link.contract.xml
(original)
+++
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/html/content-pod-link.contract.xml
Thu Oct 9 05:19:42 2008
@@ -28,7 +28,7 @@
name="content-pod-link" inputFormat="xsl">
<xsl:stylesheet version="1.1"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform";>
<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:variable name="filename-noext" select="$defaultVariables/*/[EMAIL
PROTECTED]'filename-noext']/@value"/>
<xsl:template match="/">
<forrest:content>
Modified:
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/html/content-source-xml-link.contract.xml
URL:
http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/html/content-source-xml-link.contract.xml?rev=703149&r1=703148&r2=703149&view=diff
==============================================================================
---
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/html/content-source-xml-link.contract.xml
(original)
+++
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/html/content-source-xml-link.contract.xml
Thu Oct 9 05:19:42 2008
@@ -33,7 +33,7 @@
<xsl:stylesheet version="1.1"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform";>
<xsl:param name="defaultVariables" select="'test.html'"/>
<xsl:variable name="skin-img-dir"
- select="$defaultVariables/*/[EMAIL
PROTECTED]'skin-img-dir']/@value"/>
+ select="$defaultVariables/[EMAIL PROTECTED]'skin-img-dir']/@value"/>
<xsl:variable name="filename-noext"
select="$defaultVariables/*/[EMAIL
PROTECTED]'filename-noext']/@value"/>
<xsl:template match="/">
Modified:
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/html/content-txt-link.contract.xml
URL:
http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/html/content-txt-link.contract.xml?rev=703149&r1=703148&r2=703149&view=diff
==============================================================================
---
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/html/content-txt-link.contract.xml
(original)
+++
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/html/content-txt-link.contract.xml
Thu Oct 9 05:19:42 2008
@@ -28,7 +28,7 @@
<xsl:stylesheet version="1.1"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform";>
<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:variable name="filename-noext" select="$defaultVariables/*/[EMAIL
PROTECTED]'filename-noext']/@value"/>
<xsl:template match="/">
<forrest:content>
Modified:
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/html/content-xml-link.contract.xml
URL:
http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/html/content-xml-link.contract.xml?rev=703149&r1=703148&r2=703149&view=diff
==============================================================================
---
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/html/content-xml-link.contract.xml
(original)
+++
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/html/content-xml-link.contract.xml
Thu Oct 9 05:19:42 2008
@@ -32,7 +32,7 @@
xmlns:xsl="http://www.w3.org/1999/XSL/Transform";>
<xsl:param name="defaultVariables" select="'test.html'"/>
<xsl:variable name="skin-img-dir"
- select="$defaultVariables/*/[EMAIL
PROTECTED]'skin-img-dir']/@value"/>
+ select="$defaultVariables/[EMAIL PROTECTED]'skin-img-dir']/@value"/>
<xsl:variable name="filename-noext"
select="$defaultVariables/*/[EMAIL
PROTECTED]'filename-noext']/@value"/>
<xsl:template match="/">
Modified:
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/html/master.contract.xml
URL:
http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/html/master.contract.xml?rev=703149&r1=703148&r2=703149&view=diff
==============================================================================
---
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/html/master.contract.xml
(original)
+++
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/html/master.contract.xml
Thu Oct 9 05:19:42 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.themes.core/themes/common/html/nav-main-testing-foo.contract.xml
URL:
http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/html/nav-main-testing-foo.contract.xml?rev=703149&r1=703148&r2=703149&view=diff
==============================================================================
---
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/html/nav-main-testing-foo.contract.xml
(original)
+++
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/html/nav-main-testing-foo.contract.xml
Thu Oct 9 05:19:42 2008
@@ -36,7 +36,7 @@
Path: <xsl:value-of select="$path"/>
<br/>
skin-img-dir: <xsl:copy-of select="$defaultVariables/*/*"/> value:
- <xsl:value-of select="$defaultVariables/*/[EMAIL
PROTECTED]'skin-img-dir']/@value"/>
+ <xsl:value-of select="$defaultVariables/[EMAIL
PROTECTED]'skin-img-dir']/@value"/>
<!--copy-of -->
</forrest:part>
</forrest:content>
Modified:
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/xhtml2/abstract.contract.xml
URL:
http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/xhtml2/abstract.contract.xml?rev=703149&r1=703148&r2=703149&view=diff
==============================================================================
---
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/xhtml2/abstract.contract.xml
(original)
+++
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/xhtml2/abstract.contract.xml
Thu Oct 9 05:19:42 2008
@@ -32,7 +32,7 @@
xmlns:html="http://www.w3.org/2002/06/xhtml2";
xmlns:xsl="http://www.w3.org/1999/XSL/Transform";>
<!--<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.themes.core/themes/maven/html/nav-section-round-bottom.contract.xml
URL:
http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/maven/html/nav-section-round-bottom.contract.xml?rev=703149&r1=703148&r2=703149&view=diff
==============================================================================
---
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/maven/html/nav-section-round-bottom.contract.xml
(original)
+++
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/maven/html/nav-section-round-bottom.contract.xml
Thu Oct 9 05:19:42 2008
@@ -29,7 +29,7 @@
name="nav-section-round-bottom" inputFormat="xsl">
<xsl:stylesheet version="1.1"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform";>
<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.themes.core/themes/pelt/html/nav-section-round-bottom.contract.xml
URL:
http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/pelt/html/nav-section-round-bottom.contract.xml?rev=703149&r1=703148&r2=703149&view=diff
==============================================================================
---
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/pelt/html/nav-section-round-bottom.contract.xml
(original)
+++
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/pelt/html/nav-section-round-bottom.contract.xml
Thu Oct 9 05:19:42 2008
@@ -29,7 +29,7 @@
name="nav-section-round-bottom" inputFormat="xsl">
<xsl:stylesheet version="1.1"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform";>
<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>
