Modified: forrest/site/docs_0_80/faq.html URL: http://svn.apache.org/viewvc/forrest/site/docs_0_80/faq.html?rev=431463&r1=431462&r2=431463&view=diff ============================================================================== --- forrest/site/docs_0_80/faq.html (original) +++ forrest/site/docs_0_80/faq.html Mon Aug 14 16:14:23 2006 @@ -1125,11 +1125,11 @@ <pre class="code"> <map:match pattern="old_site/**.html"> <map:select type="exists"> - <map:when test="{project:content}{0}"> - <map:read src="{project:content}/{0}" mime-type="text/html"/> + <map:when test="{properties:content}{0}"> + <map:read src="{properties:content}/{0}" mime-type="text/html"/> <!-- Use this instead if you want JTidy to clean up your HTML - <map:generate type="html" src="{project:content}/{0}" /> + <map:generate type="html" src="{properties:content}/{0}" /> <map:serialize type="html"/> --> </map:when> @@ -1597,7 +1597,7 @@ <map:pipelines> <map:pipeline> <map:match pattern="resolver-*.html"> - <map:generate src="{project:content.xdocs}resolver-{1}.xml"/> + <map:generate src="{properties:content.xdocs}resolver-{1}.xml"/> <map:transform src="file:///usr/share/sgml/docbook/xsl-stylesheets/xhtml/docbook.xsl"/> <map:serialize type="xhtml"/> @@ -1643,14 +1643,14 @@ <map:pipelines> <map:pipeline> <map:match pattern="**.xml"> - <map:act type="sourcetype" src="{project:content.xdocs}{1}.xml"> + <map:act type="sourcetype" src="{properties:content.xdocs}{1}.xml"> <map:select type="parameter"> <map:parameter name="parameter-selector-test" value="{sourcetype}"/> <map:when test="docbook-v4.2"> - <map:generate src="{project:content.xdocs}{../1}.xml"/> + <map:generate src="{properties:content.xdocs}{../1}.xml"/> <map:transform src="file:///usr/share/sgml/docbook/xsl-stylesheets/html/docbook.xsl"/> - <map:transform src="{forrest:stylesheets}/html-to-document.xsl"/> + <map:transform src="{forrest:forrest.stylesheets}/html-to-document.xsl"/> <map:transform type="idgen"/> <map:serialize type="xml-document"/> </map:when>
Modified: forrest/site/docs_0_80/howto/howto-buildPlugin.html URL: http://svn.apache.org/viewvc/forrest/site/docs_0_80/howto/howto-buildPlugin.html?rev=431463&r1=431462&r2=431463&view=diff ============================================================================== --- forrest/site/docs_0_80/howto/howto-buildPlugin.html (original) +++ forrest/site/docs_0_80/howto/howto-buildPlugin.html Mon Aug 14 16:14:23 2006 @@ -623,7 +623,7 @@ </p> <p>If you want to use the realpath where the sitemap.xmap of your plugin resides then you need to use - <span class="codefrag">{forrest:plugins}/PLUGIN_NAME</span> instead of <span class="codefrag">{realpath:/}</span>. + <span class="codefrag">{forrest:forrest.plugins}/PLUGIN_NAME</span> instead of <span class="codefrag">{realpath:/}</span>. </p> <p>See the examples below for more details.</p> <a name="N10144"></a><a name="resources"></a> @@ -826,7 +826,7 @@ <pre class="code"> <match pattern="resolvePluginContract.*.**"> <select type="exists"> - <location src="{forrest:plugins}/PLUGIN_NAME/resources/themes/{project:theme}/{1}/{2}.ft" /> + <location src="{forrest:forrest.plugins}/PLUGIN_NAME/resources/themes/{properties:theme}/{1}/{2}.ft" /> </select> </match> </pre> Modified: forrest/site/docs_0_80/howto/howto-custom-html-source.html URL: http://svn.apache.org/viewvc/forrest/site/docs_0_80/howto/howto-custom-html-source.html?rev=431463&r1=431462&r2=431463&view=diff ============================================================================== --- forrest/site/docs_0_80/howto/howto-custom-html-source.html (original) +++ forrest/site/docs_0_80/howto/howto-custom-html-source.html Mon Aug 14 16:14:23 2006 @@ -705,12 +705,12 @@ </p> <pre class="code"> <map:select type="exists"> - <map:when test="{project:content.xdocs}mytests/mybad.ehtml"></pre> + <map:when test="{properties:content.xdocs}mytests/mybad.ehtml"></pre> <p> we quickly discover that there can't be a file of that name in the project-directory. <br> - (The variable '{project:content.xdocs}' is always replaced with + (The variable '{properties:content.xdocs}' is always replaced with the name of your project directory that you can change in the 'forrest.properties'-file.) </p> @@ -843,7 +843,7 @@ <li> -<span class="codefrag"><map:generate src="{project:content.xdocs}{uri}.html" type="html"/></span> +<span class="codefrag"><map:generate src="{properties:content.xdocs}{uri}.html" type="html"/></span> <br> Using the html-generator, Forrest reads the html-document from file and uses JTidy to clean up and convert it to xml @@ -856,7 +856,7 @@ <li> -<span class="codefrag"><map:transform src="{forrest:stylesheets}/html2document.xsl"/></span> +<span class="codefrag"><map:transform src="{forrest:forrest.stylesheets}/html2document.xsl"/></span> <br> Using the standard stylesheet 'html2document.xsl', this XHTML is transformed into Forrest standard document format. @@ -1057,8 +1057,8 @@ <!--Custom Pipeline for my bad html-pages--> <map:pipeline> <map:match pattern="mytest/*.xml"> - <map:generate src="{project:content.xdocs}{uri}.html" type="html"/> - <map:transform src="{forrest:stylesheets}/html2document.xsl"/> + <map:generate src="{properties:content.xdocs}{uri}.html" type="html"/> + <map:transform src="{forrest:forrest.stylesheets}/html2document.xsl"/> <map:transform type="idgen"/> <map:serialize type="xml-document"/> </map:match> @@ -1083,11 +1083,11 @@ <!--Custom Pipeline for my bad html-pages--> <map:pipeline> <map:match pattern="mytest/*.xml"> - <map:generate src="{project:content.xdocs}{uri}.html" type="html" /> + <map:generate src="{properties:content.xdocs}{uri}.html" type="html" /> <strong> - <map:transform src="{project:resources.stylesheets}/fixMyBadHTML.xsl"/> + <map:transform src="{properties:resources.stylesheets}/fixMyBadHTML.xsl"/> </strong> - <map:transform src="{forrest:stylesheets}/html2document.xsl" /> + <map:transform src="{forrest:forrest.stylesheets}/html2document.xsl" /> <map:transform type="idgen" /> <map:serialize type="xml-document"/> </map:match> Modified: forrest/site/docs_0_80/locationmap.html URL: http://svn.apache.org/viewvc/forrest/site/docs_0_80/locationmap.html?rev=431463&r1=431462&r2=431463&view=diff ============================================================================== --- forrest/site/docs_0_80/locationmap.html (original) +++ forrest/site/docs_0_80/locationmap.html Mon Aug 14 16:14:23 2006 @@ -445,8 +445,8 @@ <pre class="code"> <match pattern="tabs.xml"> <select type="exists"> - <location src="{project:content.xdocs}tabs1.xml"/> - <location src="{project:content.xdocs}tabs2.xml"/> + <location src="{properties:content.xdocs}tabs1.xml"/> + <location src="{properties:content.xdocs}tabs2.xml"/> </select> </match> </pre> @@ -460,7 +460,7 @@ <div class="section"> <a name="N1008A"></a><a name="source-via-http"></a> <h3 class="underlined_5">Retrieving an XDoc via HTTP</h3> -<p>Normally files are generated from <span class="codefrag">{project:content.xdocs}</span>. +<p>Normally files are generated from <span class="codefrag">{properties:content.xdocs}</span>. Using the Locationmap it is possible to make these files come from elsewhere. This is useful if you want to pull files from different directory structures, or even remote repositories. For example, the following location match @@ -509,7 +509,7 @@ <pre class="code"> <map:match pattern="lenya/**.xml"> <map:generate type="html" src="{lm:{0}}" /> - <map:transform src="{forrest:stylesheets}/html2document.xsl" /> + <map:transform src="{forrest:forrest.stylesheets}/html2document.xsl" /> <map:serialize type="xml"/> </map:match> </pre> Modified: forrest/site/docs_0_80/sitemap-ref.html URL: http://svn.apache.org/viewvc/forrest/site/docs_0_80/sitemap-ref.html?rev=431463&r1=431462&r2=431463&view=diff ============================================================================== --- forrest/site/docs_0_80/sitemap-ref.html (original) +++ forrest/site/docs_0_80/sitemap-ref.html Mon Aug 14 16:14:23 2006 @@ -650,7 +650,7 @@ to document-v13:</p> <pre class="code"> <map:when test="howto-v13"> - <map:transform src="{forrest:stylesheets}/howto2document.xsl" /> + <map:transform src="{forrest:forrest.stylesheets}/howto2document.xsl" /> </map:when> </pre> <a name="N10175"></a><a name="other_source"></a> @@ -735,7 +735,7 @@ 2 <map:generate src="cocoon:/{1}{2}.xml"/> 3 <map:transform type="xinclude"/> 4 <map:transform type="<a href="#linkrewriting_impl">linkrewriter</a>" src="cocoon://{1}linkmap-{2}.pdf"/> -5 <map:transform src="skins/{forrest:skin}/xslt/fo/document2fo.xsl"> +5 <map:transform src="skins/{forrest:forrest.skin}/xslt/fo/document2fo.xsl"> 6 <map:parameter name="ctxbasedir" value="{realpath:.}/"/> 7 <map:parameter name="xmlbasedir" value="content/xdocs/{1}"/> 8 </map:transform> Modified: forrest/site/docs_0_80/upgrading_08.html URL: http://svn.apache.org/viewvc/forrest/site/docs_0_80/upgrading_08.html?rev=431463&r1=431462&r2=431463&view=diff ============================================================================== --- forrest/site/docs_0_80/upgrading_08.html (original) +++ forrest/site/docs_0_80/upgrading_08.html Mon Aug 14 16:14:23 2006 @@ -329,6 +329,9 @@ <a href="#config">Compare configuration</a> </li> <li> +<a href="#modules">Forrest configuration simplification</a> +</li> +<li> <a href="#clean">Run a clean target after upgrade</a> </li> <li> @@ -401,9 +404,42 @@ forrest.properties and skinconf.xml with that of your project. </p> </div> + + +<a name="N1005C"></a><a name="modules"></a> +<h2 class="underlined_10">Forrest configuration simplification</h2> +<div class="section"> +<p> + +<strong>FOR-920</strong> Merging the + <span class="codefrag">defaults</span> and + <span class="codefrag">project</span> modules to the new + <span class="codefrag">properties</span> module. You can use it like {properties:forrest.home} + </p> +<p> In all custom code you have, </p> +<ul> + +<li>find: + <span class="codefrag">{defaults:</span> and replace with + <span class="codefrag">{properties:forrest.</span> +</li> + +<li>find: + <span class="codefrag">{forrest:</span> and replace with + <span class="codefrag">{forrest:forrest.</span> or + <span class="codefrag">{properties:forrest.</span> (if you do not need the + ChainMetaModule)</li> + +<li>find: + <span class="codefrag">{project:</span> and replace with + <span class="codefrag">{properties:</span> +</li> + +</ul> +</div> -<a name="N1005C"></a><a name="clean"></a> +<a name="N10094"></a><a name="clean"></a> <h2 class="underlined_10">Run a clean target after upgrade</h2> <div class="section"> <p> @@ -413,7 +449,7 @@ </div> -<a name="N10066"></a><a name="to2to"></a> +<a name="N1009E"></a><a name="to2to"></a> <h2 class="underlined_10">New filename convention for stylesheets</h2> <div class="section"> <p> @@ -430,7 +466,7 @@ </div> -<a name="N1007A"></a><a name="tips"></a> +<a name="N100B2"></a><a name="tips"></a> <h2 class="underlined_10">General upgrade tips</h2> <div class="section"> <p> @@ -449,7 +485,7 @@ </div> -<a name="N1008A"></a><a name="To+be+continued..."></a> +<a name="N100C2"></a><a name="To+be+continued..."></a> <h2 class="underlined_10">To be continued...</h2> <div class="section"> <p>...as more issues are discovered/remembered :) Please send feedback Modified: forrest/site/docs_0_80/your-project.html URL: http://svn.apache.org/viewvc/forrest/site/docs_0_80/your-project.html?rev=431463&r1=431462&r2=431463&view=diff ============================================================================== --- forrest/site/docs_0_80/your-project.html (original) +++ forrest/site/docs_0_80/your-project.html Mon Aug 14 16:14:23 2006 @@ -1256,8 +1256,8 @@ ... <strong> <map:match pattern="**download.xml"> - <map:generate src="{project:content.xdocs}{1}download.xml" /> - <map:transform src="{project:resources.stylesheets}/download2document.xsl" /> + <map:generate src="{properties:content.xdocs}{1}download.xml" /> + <map:transform src="{properties:resources.stylesheets}/download2document.xsl" /> <map:serialize type="xml"/> </map:match> </strong> @@ -1350,17 +1350,17 @@ <map:pipelines> <map:pipeline> <map:match pattern="**download.xml"> - <map:generate src="{project:content.xdocs}{1}download.xml" /> - <map:act type="sourcetype" src="{project:content.xdocs}{1}download.xml"> + <map:generate src="{properties:content.xdocs}{1}download.xml" /> + <map:act type="sourcetype" src="{properties:content.xdocs}{1}download.xml"> <map:select type="parameter"> <map:parameter name="parameter-selector-test" value="{sourcetype}" /> <map:when test="download-v1.0"> <map:transform - src="{project:resources.stylesheets}/download2document.xsl" /> + src="{properties:resources.stylesheets}/download2document.xsl" /> </map:when> <map:when test="download-v1.1"> <map:transform - src="{project:resources.stylesheets}/download-v11-2document.xsl" /> + src="{properties:resources.stylesheets}/download-v11-2document.xsl" /> </map:when> </map:select> </map:act> @@ -1396,7 +1396,7 @@ <strong> <map:match pattern="**weblog.xml"> <map:generate src="http://blogs.cocoondev.org/stevenn/index.rss"/> - <map:transform src="{forrest:stylesheets}/rss2document.xsl"/> + <map:transform src="{forrest:forrest.stylesheets}/rss2document.xsl"/> <map:serialize type="xml"/> </map:match> </strong> @@ -1410,7 +1410,7 @@ <p>You will probably want to copy the core Forrest <span class="codefrag">rss2document.xsl</span> to your project, customise it to your needs, and refer to it with - <span class="codefrag">src="{project:resources.stylesheets}/rss2document.xsl"</span>. + <span class="codefrag">src="{properties:resources.stylesheets}/rss2document.xsl"</span>. Then of course you would add an entry to site.xml to link to weblog.html </p> Modified: forrest/site/howto-dev.html URL: http://svn.apache.org/viewvc/forrest/site/howto-dev.html?rev=431463&r1=431462&r2=431463&view=diff ============================================================================== --- forrest/site/howto-dev.html (original) +++ forrest/site/howto-dev.html Mon Aug 14 16:14:23 2006 @@ -842,7 +842,7 @@ <pre class="code"> ... <map:transform type="validation-report" - src="{forrest:context}/resources/schema/relaxng/unstable/any.rng"/> + src="{forrest:forrest.context}/resources/schema/relaxng/unstable/any.rng"/> ... </pre> <p>See Modified: forrest/site/pluginDocs/plugins_0_70/pluginInfrastructure.html URL: http://svn.apache.org/viewvc/forrest/site/pluginDocs/plugins_0_70/pluginInfrastructure.html?rev=431463&r1=431462&r2=431463&view=diff ============================================================================== --- forrest/site/pluginDocs/plugins_0_70/pluginInfrastructure.html (original) +++ forrest/site/pluginDocs/plugins_0_70/pluginInfrastructure.html Mon Aug 14 16:14:23 2006 @@ -372,18 +372,18 @@ <pre class="code"> <map:match pattern="abs-menulinks"> <map:select type="exists"> - <map:when test="{project:content.xdocs}imsmanifest.xml"> - <map:generate src="{project:content.xdocs}imsmanifest.xml" /> + <map:when test="{properties:content.xdocs}imsmanifest.xml"> + <map:generate src="{properties:content.xdocs}imsmanifest.xml" /> <map:transform src="resources/stylesheets/imsmanifest2site.xsl"/> - <map:transform src="{forrest:stylesheets}/absolutize-linkmap.xsl" /> - <map:transform src="{forrest:stylesheets}/site2site-normalizetabs.xsl" /> + <map:transform src="{forrest:forrest.stylesheets}/absolutize-linkmap.xsl" /> + <map:transform src="{forrest:forrest.stylesheets}/site2site-normalizetabs.xsl" /> <map:serialize type="xml"/> </map:when> - <map:when test="{project:content.xdocs}site.xml"> - <map:generate src="{project:content.xdocs}site.xml" /> - <map:transform src="{forrest:stylesheets}/absolutize-linkmap.xsl" /> - <map:transform src="{forrest:stylesheets}/site2site-normalizetabs.xsl" /> - <map:transform src="{forrest:stylesheets}/normalizehrefs.xsl"/> + <map:when test="{properties:content.xdocs}site.xml"> + <map:generate src="{properties:content.xdocs}site.xml" /> + <map:transform src="{forrest:forrest.stylesheets}/absolutize-linkmap.xsl" /> + <map:transform src="{forrest:forrest.stylesheets}/site2site-normalizetabs.xsl" /> + <map:transform src="{forrest:forrest.stylesheets}/normalizehrefs.xsl"/> <map:serialize type="xml"/> </map:when> </map:select> @@ -424,7 +424,7 @@ <pre class="code"> <map:pipeline internal-only="false"> <map:mount uri-prefix="" - src="{forrest:plugins}/sitemap.xmap" + src="{forrest:forrest.plugins}/sitemap.xmap" check-reload="yes" pass-through="true"/> </map:pipeline> Modified: forrest/site/pluginDocs/plugins_0_80/pluginInfrastructure.html URL: http://svn.apache.org/viewvc/forrest/site/pluginDocs/plugins_0_80/pluginInfrastructure.html?rev=431463&r1=431462&r2=431463&view=diff ============================================================================== --- forrest/site/pluginDocs/plugins_0_80/pluginInfrastructure.html (original) +++ forrest/site/pluginDocs/plugins_0_80/pluginInfrastructure.html Mon Aug 14 16:14:23 2006 @@ -371,18 +371,18 @@ <pre class="code"> <map:match pattern="abs-menulinks"> <map:select type="exists"> - <map:when test="{project:content.xdocs}imsmanifest.xml"> - <map:generate src="{project:content.xdocs}imsmanifest.xml" /> + <map:when test="{properties:content.xdocs}imsmanifest.xml"> + <map:generate src="{properties:content.xdocs}imsmanifest.xml" /> <map:transform src="resources/stylesheets/imsmanifest2site.xsl"/> - <map:transform src="{forrest:stylesheets}/absolutize-linkmap.xsl" /> - <map:transform src="{forrest:stylesheets}/site2site-normalizetabs.xsl" /> + <map:transform src="{forrest:forrest.stylesheets}/absolutize-linkmap.xsl" /> + <map:transform src="{forrest:forrest.stylesheets}/site2site-normalizetabs.xsl" /> <map:serialize type="xml"/> </map:when> - <map:when test="{project:content.xdocs}site.xml"> - <map:generate src="{project:content.xdocs}site.xml" /> - <map:transform src="{forrest:stylesheets}/absolutize-linkmap.xsl" /> - <map:transform src="{forrest:stylesheets}/site2site-normalizetabs.xsl" /> - <map:transform src="{forrest:stylesheets}/normalizehrefs.xsl"/> + <map:when test="{properties:content.xdocs}site.xml"> + <map:generate src="{properties:content.xdocs}site.xml" /> + <map:transform src="{forrest:forrest.stylesheets}/absolutize-linkmap.xsl" /> + <map:transform src="{forrest:forrest.stylesheets}/site2site-normalizetabs.xsl" /> + <map:transform src="{forrest:forrest.stylesheets}/normalizehrefs.xsl"/> <map:serialize type="xml"/> </map:when> </map:select> @@ -422,7 +422,7 @@ <pre class="code"> <map:pipeline internal-only="false"> <map:mount uri-prefix="" - src="{forrest:plugins}/sitemap.xmap" + src="{forrest:forrest.plugins}/sitemap.xmap" check-reload="yes" pass-through="true"/> </map:pipeline> Modified: forrest/site/skin/images/rc-b-l-15-1body-2menu-3menu.png URL: http://svn.apache.org/viewvc/forrest/site/skin/images/rc-b-l-15-1body-2menu-3menu.png?rev=431463&r1=431462&r2=431463&view=diff ============================================================================== Binary files - no diff available. Modified: forrest/site/skin/images/rc-b-r-15-1body-2menu-3menu.png URL: http://svn.apache.org/viewvc/forrest/site/skin/images/rc-b-r-15-1body-2menu-3menu.png?rev=431463&r1=431462&r2=431463&view=diff ============================================================================== Binary files - no diff available. Modified: forrest/site/skin/images/rc-b-r-5-1header-2tab-selected-3tab-selected.png URL: http://svn.apache.org/viewvc/forrest/site/skin/images/rc-b-r-5-1header-2tab-selected-3tab-selected.png?rev=431463&r1=431462&r2=431463&view=diff ============================================================================== Binary files - no diff available. Modified: forrest/site/skin/images/rc-t-l-5-1header-2searchbox-3searchbox.png URL: http://svn.apache.org/viewvc/forrest/site/skin/images/rc-t-l-5-1header-2searchbox-3searchbox.png?rev=431463&r1=431462&r2=431463&view=diff ============================================================================== Binary files - no diff available. Modified: forrest/site/skin/images/rc-t-l-5-1header-2tab-selected-3tab-selected.png URL: http://svn.apache.org/viewvc/forrest/site/skin/images/rc-t-l-5-1header-2tab-selected-3tab-selected.png?rev=431463&r1=431462&r2=431463&view=diff ============================================================================== Binary files - no diff available. Modified: forrest/site/skin/images/rc-t-l-5-1header-2tab-unselected-3tab-unselected.png URL: http://svn.apache.org/viewvc/forrest/site/skin/images/rc-t-l-5-1header-2tab-unselected-3tab-unselected.png?rev=431463&r1=431462&r2=431463&view=diff ============================================================================== Binary files - no diff available. Modified: forrest/site/skin/images/rc-t-r-15-1body-2menu-3menu.png URL: http://svn.apache.org/viewvc/forrest/site/skin/images/rc-t-r-15-1body-2menu-3menu.png?rev=431463&r1=431462&r2=431463&view=diff ============================================================================== Binary files - no diff available. Modified: forrest/site/skin/images/rc-t-r-5-1header-2searchbox-3searchbox.png URL: http://svn.apache.org/viewvc/forrest/site/skin/images/rc-t-r-5-1header-2searchbox-3searchbox.png?rev=431463&r1=431462&r2=431463&view=diff ============================================================================== Binary files - no diff available. Modified: forrest/site/skin/images/rc-t-r-5-1header-2tab-selected-3tab-selected.png URL: http://svn.apache.org/viewvc/forrest/site/skin/images/rc-t-r-5-1header-2tab-selected-3tab-selected.png?rev=431463&r1=431462&r2=431463&view=diff ============================================================================== Binary files - no diff available. Modified: forrest/site/skin/images/rc-t-r-5-1header-2tab-unselected-3tab-unselected.png URL: http://svn.apache.org/viewvc/forrest/site/skin/images/rc-t-r-5-1header-2tab-unselected-3tab-unselected.png?rev=431463&r1=431462&r2=431463&view=diff ============================================================================== Binary files - no diff available. Modified: forrest/site/skin/images/rc-t-r-50-1body-2menu-3menu.png URL: http://svn.apache.org/viewvc/forrest/site/skin/images/rc-t-r-50-1body-2menu-3menu.png?rev=431463&r1=431462&r2=431463&view=diff ============================================================================== Binary files - no diff available. Modified: forrest/site/skin/images/rc-t-r-50-1body-2menu-3menu.test.png URL: http://svn.apache.org/viewvc/forrest/site/skin/images/rc-t-r-50-1body-2menu-3menu.test.png?rev=431463&r1=431462&r2=431463&view=diff ============================================================================== Binary files - no diff available.
