Author: thorsten
Date: Thu Oct 2 06:17:25 2008
New Revision: 701117
URL: http://svn.apache.org/viewvc?rev=701117&view=rev
Log:
FOR-1118
Renaming elements from view to structurer
Modified:
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/content/xdocs/index.xml
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/coat.fv
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common.fv
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/html/branding-tagline.contract.xml
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/maven.fv
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/pelt.fv
Modified:
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/content/xdocs/index.xml
URL:
http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/content/xdocs/index.xml?rev=701117&r1=701116&r2=701117&view=diff
==============================================================================
---
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/content/xdocs/index.xml
(original)
+++
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/content/xdocs/index.xml
Thu Oct 2 06:17:25 2008
@@ -18,7 +18,7 @@
<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN"
"http://forrest.apache.org/dtd/document-v20.dtd";>
<document>
<header>
- <title>forrest:viewsHelper - style your site</title>
+ <title>forrest:structurerHelper - style your site</title>
<abstract>
This plugin is a ViewHelper implementation used by the view plugin.
</abstract>
@@ -39,7 +39,7 @@
</note>
<p>
Ok, you may want to try another feature that is coming with
- forrest:views.
+ forrest:structurer.
</p>
<section>
<title>Create your own contract implementation</title>
Modified:
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/coat.fv
URL:
http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/coat.fv?rev=701117&r1=701116&r2=701117&view=diff
==============================================================================
---
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/coat.fv
(original)
+++
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/coat.fv
Thu Oct 2 06:17:25 2008
@@ -15,14 +15,14 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<forrest:views
+<forrest:structurer
xmlns:forrest="http://apache.org/forrest/templates/1.0";
xmlns:jx="http://apache.org/cocoon/templates/jx/1.0";>
<!-- The following variables are used to contact data models and/or contracts.
-->
<jx:set var="getRequest" value="#{$cocoon/parameters/getRequest}"/>
<jx:set var="getRequestExtension"
value="#{$cocoon/parameters/getRequestExtension}" />
<jx:set var="contextPath" value="#{$cocoon/parameters/contextPath}"/>
- <forrest:view type="html" hooksXpath="/html/body">
+ <forrest:structure type="html" hooksXpath="/html/body">
<!--
@type defines this structurer to html.
@hooksXpath defines where all hooks will be injected (as prefix).
@@ -87,5 +87,5 @@
</forrest:contract>
<forrest:contract name="siteinfo-last-published"/>
</forrest:hook>
- </forrest:view>
-</forrest:views>
+ </forrest:structure>
+</forrest:structurer>
Modified:
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common.fv
URL:
http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common.fv?rev=701117&r1=701116&r2=701117&view=diff
==============================================================================
---
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common.fv
(original)
+++
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common.fv
Thu Oct 2 06:17:25 2008
@@ -15,7 +15,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<forrest:views
+<forrest:structurer
xmlns:forrest="http://apache.org/forrest/templates/1.0";
xmlns:jx="http://apache.org/cocoon/templates/jx/1.0";
jx:cache-key="#{$cocoon/parameters/getRequest}"
@@ -35,10 +35,10 @@
and can be overriden by
{properties:resources}/themes/{properties:dispatcher.theme}/html/{1}.vt.xml
-->
- <forrest:view type="fo" hooksXpath="/">
+ <forrest:structure type="fo" hooksXpath="/">
<jx:import uri="cocoon://prepare.panels.common-fo"/>
- </forrest:view>
- <forrest:view type="html" hooksXpath="/html/body">
+ </forrest:structure>
+ <forrest:structure type="html" hooksXpath="/html/body">
<jx:import uri="cocoon://prepare.panels.common-html"/>
- </forrest:view>
-</forrest:views>
+ </forrest:structure>
+</forrest:structurer>
Modified:
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/html/branding-tagline.contract.xml
URL:
http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/html/branding-tagline.contract.xml?rev=701117&r1=701116&r2=701117&view=diff
==============================================================================
---
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/html/branding-tagline.contract.xml
(original)
+++
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/html/branding-tagline.contract.xml
Thu Oct 2 06:17:25 2008
@@ -24,7 +24,7 @@
<![CDATA[<forrest:contract name="branding-tagline">
<forrest:property name="branding-tagline-name">new seed</forrest:property>
<forrest:property name="branding-tagline-tagline">powered by
- forrest:views</forrest:property>
+ forrest:structurer</forrest:property>
</forrest:contract>]]>
</usage>
<forrest:template xmlns:i18n="http://apache.org/cocoon/i18n/2.1";
Modified:
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/maven.fv
URL:
http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/maven.fv?rev=701117&r1=701116&r2=701117&view=diff
==============================================================================
---
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/maven.fv
(original)
+++
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/maven.fv
Thu Oct 2 06:17:25 2008
@@ -15,7 +15,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<forrest:views xmlns:forrest="http://apache.org/forrest/templates/1.0";
+<forrest:structurer xmlns:forrest="http://apache.org/forrest/templates/1.0";
xmlns:jx="http://apache.org/cocoon/templates/jx/1.0";
jx:cache-key="#{$cocoon/parameters/getRequest}"
jx:cache-validity="${Packages.org.apache.excalibur.source.impl.validity.NOPValidity()}">
@@ -24,15 +24,15 @@
<jx:set var="getRequest" value="#{$cocoon/parameters/getRequest}"/>
<jx:set var="getRequestExtension"
value="#{$cocoon/parameters/getRequestExtension}" />
<!-- FO View of the request (e.g. index.fo, usually further processed to
pdf)-->
- <forrest:view type="fo" hooksXpath="/">
+ <forrest:structure type="fo" hooksXpath="/">
<jx:import uri="cocoon://prepare.panels.common-fo"/>
- </forrest:view>
+ </forrest:structure>
<!-- CSS View of the request e.g. index.dispatcher.css -->
- <forrest:view type="css" hooksXpath="/">
+ <forrest:structure type="css" hooksXpath="/">
<jx:import uri="cocoon://prepare.panels.maven-css"/>
- </forrest:view>
+ </forrest:structure>
<!-- HTML View of the request (e.g. index.html)-->
- <forrest:view type="html" hooksXpath="/html/body">
+ <forrest:structure type="html" hooksXpath="/html/body">
<jx:import uri="cocoon://prepare.panels.maven-html.head"/>
<forrest:hook name="container">
<jx:import uri="cocoon://prepare.panels.maven-html.header"/>
@@ -42,5 +42,5 @@
</forrest:hook>
<jx:import uri="cocoon://prepare.panels.maven-html.footer"/>
</forrest:hook>
- </forrest:view>
-</forrest:views>
+ </forrest:structure>
+</forrest:structurer>
Modified:
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/pelt.fv
URL:
http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/pelt.fv?rev=701117&r1=701116&r2=701117&view=diff
==============================================================================
---
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/pelt.fv
(original)
+++
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/pelt.fv
Thu Oct 2 06:17:25 2008
@@ -15,7 +15,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<forrest:views xmlns:forrest="http://apache.org/forrest/templates/1.0";
+<forrest:structurer xmlns:forrest="http://apache.org/forrest/templates/1.0";
xmlns:jx="http://apache.org/cocoon/templates/jx/1.0";
jx:cache-key="#{$cocoon/parameters/getRequest}"
jx:cache-validity="${Packages.org.apache.excalibur.source.impl.validity.NOPValidity()}">
@@ -24,15 +24,15 @@
<jx:set var="getRequest" value="#{$cocoon/parameters/getRequest}"/>
<jx:set var="getRequestExtension"
value="#{$cocoon/parameters/getRequestExtension}" />
<!-- FO View of the request (e.g. index.fo, usually further processed to
pdf)-->
- <forrest:view type="fo" hooksXpath="/">
+ <forrest:structure type="fo" hooksXpath="/">
<jx:import uri="cocoon://prepare.panels.common-fo"/>
- </forrest:view>
+ </forrest:structure>
<!-- CSS View of the request e.g. index.dispatcher.css -->
- <forrest:view type="css" hooksXpath="/">
+ <forrest:structure type="css" hooksXpath="/">
<jx:import uri="cocoon://prepare.panels.pelt-css"/>
- </forrest:view>
+ </forrest:structure>
<!-- HTML View of the request (e.g. index.html)-->
- <forrest:view type="html" hooksXpath="/html/body">
+ <forrest:structure type="html" hooksXpath="/html/body">
<jx:import uri="cocoon://prepare.panels.pelt-html.head"/>
<forrest:hook name="container">
<jx:import uri="cocoon://prepare.panels.pelt-html.header"/>
@@ -42,5 +42,5 @@
</forrest:hook>
<jx:import uri="cocoon://prepare.panels.pelt-html.footer"/>
</forrest:hook>
- </forrest:view>
-</forrest:views>
+ </forrest:structure>
+</forrest:structurer>
