forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From thors...@apache.org
Subject svn commit: r431247 [1/3] - in /forrest/trunk: main/fresh-site/src/documentation/ main/fresh-site/src/documentation/content/xdocs/samples/ main/fresh-site/src/documentation/content/xdocs/samples/locationmap/ main/targets/ main/template-sites/basic/src/...
Date Sun, 13 Aug 2006 21:41:41 GMT
Author: thorsten
Date: Sun Aug 13 14:41:37 2006
New Revision: 431247

URL: http://svn.apache.org/viewvc?rev=431247&view=rev
Log:
FOR-920 Merging the defaults and project modules to the new properties module. You can use it like {properties:forrest.home}, please refer to the update documentation how to change your {defaults:*} {project:*} and {forrest:*}.

Modified:
    forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/linking.xml
    forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/locationmap/index.xml
    forrest/trunk/main/fresh-site/src/documentation/sitemap.xmap
    forrest/trunk/main/targets/webapp.xml
    forrest/trunk/main/template-sites/basic/src/documentation/sitemap.xmap
    forrest/trunk/main/template-sites/benchmark/src/documentation/sitemap.xmap
    forrest/trunk/main/var/pluginLmMountSnippet.xsl
    forrest/trunk/main/var/pluginMountSnippet.xsl
    forrest/trunk/main/webapp/WEB-INF/xconf/forrest-core.xconf
    forrest/trunk/main/webapp/faq.xmap
    forrest/trunk/main/webapp/forrest.xmap
    forrest/trunk/main/webapp/i18n.xmap
    forrest/trunk/main/webapp/locationmap-chaperon.xml
    forrest/trunk/main/webapp/locationmap-i18n.xml
    forrest/trunk/main/webapp/locationmap-plugin.xml
    forrest/trunk/main/webapp/locationmap-skinconf.xml
    forrest/trunk/main/webapp/locationmap-skins.xml
    forrest/trunk/main/webapp/locationmap-transforms.xml
    forrest/trunk/main/webapp/locationmap.xml
    forrest/trunk/main/webapp/menu.xmap
    forrest/trunk/main/webapp/raw.xmap
    forrest/trunk/main/webapp/revisions.xmap
    forrest/trunk/main/webapp/search.xmap
    forrest/trunk/main/webapp/sitemap.xmap
    forrest/trunk/main/webapp/tabs.xmap
    forrest/trunk/plugins/org.apache.forrest.plugin.input.PhotoGallery/resources.xmap
    forrest/trunk/plugins/org.apache.forrest.plugin.input.PhotoGallery/src/documentation/content/xdocs/index.xml
    forrest/trunk/plugins/org.apache.forrest.plugin.input.projectInfo/input.xmap
    forrest/trunk/plugins/org.apache.forrest.plugin.input.projectInfo/locationmap.xml
    forrest/trunk/plugins/org.apache.forrest.plugin.input.projectInfo/src/documentation/content/xdocs/index.xml
    forrest/trunk/plugins/org.apache.forrest.plugin.input.projectInfo/svnHelper.xmap
    forrest/trunk/plugins/org.apache.forrest.plugin.output.inputModule/src/documentation/content/xdocs/index.xml
    forrest/trunk/site-author/content/locationmap.xml
    forrest/trunk/site-author/content/xdocs/docs_0_60/faq.xml
    forrest/trunk/site-author/content/xdocs/docs_0_60/howto/howto-pdf-tab.xml
    forrest/trunk/site-author/content/xdocs/docs_0_60/sitemap-ref.xml
    forrest/trunk/site-author/content/xdocs/docs_0_60/your-project.xml
    forrest/trunk/site-author/content/xdocs/docs_0_70/faq.xml
    forrest/trunk/site-author/content/xdocs/docs_0_70/howto/howto-buildPlugin.xml
    forrest/trunk/site-author/content/xdocs/docs_0_70/howto/howto-custom-html-source.xml
    forrest/trunk/site-author/content/xdocs/docs_0_70/howto/howto-view-dsl.xml
    forrest/trunk/site-author/content/xdocs/docs_0_70/sitemap-ref.xml
    forrest/trunk/site-author/content/xdocs/docs_0_70/upgrading_07.xml
    forrest/trunk/site-author/content/xdocs/docs_0_70/your-project.xml
    forrest/trunk/site-author/content/xdocs/docs_0_80/faq.xml
    forrest/trunk/site-author/content/xdocs/docs_0_80/howto/howto-buildPlugin.xml
    forrest/trunk/site-author/content/xdocs/docs_0_80/howto/howto-custom-html-source.xml
    forrest/trunk/site-author/content/xdocs/docs_0_80/locationmap.xml
    forrest/trunk/site-author/content/xdocs/docs_0_80/sitemap-ref.xml
    forrest/trunk/site-author/content/xdocs/docs_0_80/upgrading_08.xml
    forrest/trunk/site-author/content/xdocs/docs_0_80/your-project.xml
    forrest/trunk/site-author/content/xdocs/howto-dev.xml
    forrest/trunk/site-author/content/xdocs/pluginDocs/plugins_0_70/pluginInfrastructure.xml
    forrest/trunk/site-author/content/xdocs/pluginDocs/plugins_0_80/pluginInfrastructure.xml
    forrest/trunk/site-author/content/xdocs/trash/docs_0_50/upgrading_05.xml
    forrest/trunk/site-author/sitemap.xmap
    forrest/trunk/site-author/status.xml
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.Database/input.xmap
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Blog/input.xmap
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/input.xmap
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/locationmap.xml
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/resources.xmap
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/src/documentation/content/xdocs/index.xml
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Lenya/input.xmap
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Resume/input.xmap
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.XDoc/input.xmap
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.citations/locationmap.xml
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.ecs/input.xmap
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.logs/input.xmap
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.odt/locationmap.xml
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.DevTools/internal.xmap
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.GoogleSitemap/internal.xmap
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.IMSManifest/internal.xmap
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.NoteTaking/internal.xmap
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.NoteTaking/locationmap.xml
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/dataModel.xmap
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/internal.xmap
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/locationmap.xml
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources.xmap
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/content/xdocs/how/howto-dispatcher-structurer.xml
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/content/xdocs/int/index.xml
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themes.xmap
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.xhtml2/internal.xmap
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.xhtml2/src/documentation/content/locationmap.xml
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.xhtml2/structurer.xmap
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.htmlArea/output.xmap
    forrest/trunk/whiteboard/tests/xsltunit/sitemap.xmap

Modified: forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/linking.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/linking.xml?rev=431247&r1=431246&r2=431247&view=diff
==============================================================================
--- forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/linking.xml (original)
+++ forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/linking.xml Sun Aug 13 14:41:37 2006
@@ -166,19 +166,19 @@
         <source>
 &lt;map:match pattern="**.html"&gt;
  &lt;map:select type="exists"&gt;
-  &lt;map:when test="{project:content}{0}"&gt;
-    &lt;map:read src="{project:content}/{0}" mime-type="text/html"/&gt;
+  &lt;map:when test="{properties:content}{0}"&gt;
+    &lt;map:read src="{properties:content}/{0}" mime-type="text/html"/&gt;
     &lt;!--
       Use this instead if you want JTidy to clean up your HTML
-      &lt;map:generate type="html" src="{project:content}/{0}" /&gt;
+      &lt;map:generate type="html" src="{properties:content}/{0}" /&gt;
       &lt;map:serialize type="html"/&gt;
     --&gt;
   &lt;/map:when&gt;
-  &lt;map:when test="{project:content.xdocs}{0}"&gt;
-    &lt;map:read src="{project:content.xdocs}/{0}" mime-type="text/html"/&gt;
+  &lt;map:when test="{properties:content.xdocs}{0}"&gt;
+    &lt;map:read src="{properties:content.xdocs}/{0}" mime-type="text/html"/&gt;
     &lt;!--
       Use this instead if you want JTidy to clean up your HTML
-      &lt;map:generate type="html" src="{project:content.xdocs}/{0}" /&gt;
+      &lt;map:generate type="html" src="{properties:content.xdocs}/{0}" /&gt;
       &lt;map:serialize type="html"/&gt;
     --&gt;
   &lt;/map:when&gt;
@@ -187,7 +187,7 @@
         </source>
         
         <p>The above allows us to create links to un-processed skinned files stored
-        in the <code>{project:content}</code> or <code>{project:content.xdocs}</code> 
+        in the <code>{properties:content}</code> or <code>{properties:content.xdocs}</code> 
         directory. For example:  
         &lt;a href="/test1.html"&gt;HTML content&lt;/a&gt;. However, it will
         break the 0.7 behaviour of skinning HTML content. For this reason the old
@@ -204,11 +204,11 @@
         <source>
 &lt;map:match pattern="old_site/**.html"&gt;
  &lt;map:select type="exists"&gt;
-  &lt;map:when test="{project:content}{1}.html"&gt;
-    &lt;map:read src="{project:content}/{1}.html" mime-type="text/html"/&gt;
+  &lt;map:when test="{properties:content}{1}.html"&gt;
+    &lt;map:read src="{properties:content}/{1}.html" mime-type="text/html"/&gt;
     &lt;!--
       Use this instead if you want JTidy to clean up your HTML
-      &lt;map:generate type="html" src="{project:content}/{0}" /&gt;
+      &lt;map:generate type="html" src="{properties:content}/{0}" /&gt;
       &lt;map:serialize type="html"/&gt;
     --&gt;
   &lt;/map:when&gt;
@@ -361,10 +361,10 @@
       <source><![CDATA[
     <match pattern="project.images.**.*">
       <select>
-        <location src="{project:resources.images}{1}.{2}" />
-        <location src="{project:content}../resources/images/{1}.{2}" />
-        <location src="{project:content.xdocs}images/{1}.{2}" />
-        <location src="{project:content.xdocs}{1}.{2}" />
+        <location src="{properties:resources.images}{1}.{2}" />
+        <location src="{properties:content}../resources/images/{1}.{2}" />
+        <location src="{properties:content.xdocs}images/{1}.{2}" />
+        <location src="{properties:content.xdocs}{1}.{2}" />
       </select>
     </match>
 ]]></source>

Modified: forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/locationmap/index.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/locationmap/index.xml?rev=431247&r1=431246&r2=431247&view=diff
==============================================================================
--- forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/locationmap/index.xml (original)
+++ forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/locationmap/index.xml Sun Aug 13 14:41:37 2006
@@ -47,7 +47,7 @@
         <title>Retrieving an XDoc via HTTP</title>
         
         
-        <p>Normally files are generated from <code>{project:content.xdocs}</code>.
+        <p>Normally files are generated from <code>{properties:content.xdocs}</code>.
         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,
         oe even remote repositories.</p>

Modified: forrest/trunk/main/fresh-site/src/documentation/sitemap.xmap
URL: http://svn.apache.org/viewvc/forrest/trunk/main/fresh-site/src/documentation/sitemap.xmap?rev=431247&r1=431246&r2=431247&view=diff
==============================================================================
--- forrest/trunk/main/fresh-site/src/documentation/sitemap.xmap (original)
+++ forrest/trunk/main/fresh-site/src/documentation/sitemap.xmap Sun Aug 13 14:41:37 2006
@@ -38,8 +38,8 @@
           <map:parameter name="parameter-selector-test" value="{sourcetype}" />
 
           <map:when test="hello-v1.0">
-            <map:generate src="{project:content.xdocs}{../../1}.xml" />
-            <map:transform src="{project:resources.stylesheets}/hello2document.xsl" />
+            <map:generate src="{properties:content.xdocs}{../../1}.xml" />
+            <map:transform src="{properties:resources.stylesheets}/hello2document.xsl" />
             <map:serialize type="xml-document"/>
           </map:when>
         </map:select>
@@ -58,11 +58,11 @@
 
     <map:match pattern="old_site/*.html">
      <map:select type="exists">
-      <map:when test="{project:content}{1}.html">
-        <map:read src="{project:content}{1}.html" mime-type="text/html"/>
+      <map:when test="{properties:content}{1}.html">
+        <map:read src="{properties:content}{1}.html" 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>
@@ -71,7 +71,7 @@
   
    <map:match pattern="**.xml">
       <map:call resource="transform-to-document">
-        <map:parameter name="src" value="{project:content.xdocs}{1}.xml" />
+        <map:parameter name="src" value="{properties:content.xdocs}{1}.xml" />
       </map:call>
     </map:match>
   </map:pipeline>

Modified: forrest/trunk/main/targets/webapp.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/main/targets/webapp.xml?rev=431247&r1=431246&r2=431247&view=diff
==============================================================================
--- forrest/trunk/main/targets/webapp.xml (original)
+++ forrest/trunk/main/targets/webapp.xml Sun Aug 13 14:41:37 2006
@@ -155,7 +155,7 @@
          a war file.
 
          The value of "todir" below corresponds to 
-         {project:temp-dir} when running as a web application. -->
+         {properties:temp-dir} when running as a web application. -->
 
     <copy todir="${project.webapp}/project/build/tmp">
      <fileset dir="${project.temp-dir}">

Modified: forrest/trunk/main/template-sites/basic/src/documentation/sitemap.xmap
URL: http://svn.apache.org/viewvc/forrest/trunk/main/template-sites/basic/src/documentation/sitemap.xmap?rev=431247&r1=431246&r2=431247&view=diff
==============================================================================
--- forrest/trunk/main/template-sites/basic/src/documentation/sitemap.xmap (original)
+++ forrest/trunk/main/template-sites/basic/src/documentation/sitemap.xmap Sun Aug 13 14:41:37 2006
@@ -38,8 +38,8 @@
           <map:parameter name="parameter-selector-test" value="{sourcetype}" />
 
           <map:when test="hello-v1.0">
-            <map:generate src="{project:content.xdocs}{../../1}.xml" />
-            <map:transform src="{project:resources.stylesheets}/hello2document.xsl" />
+            <map:generate src="{properties:content.xdocs}{../../1}.xml" />
+            <map:transform src="{properties:resources.stylesheets}/hello2document.xsl" />
             <map:serialize type="xml-document"/>
           </map:when>
         </map:select>
@@ -51,11 +51,11 @@
   <map:pipeline>
     <map:match pattern="old_site/*.html">
      <map:select type="exists">
-      <map:when test="{project:content}{1}.html">
-        <map:read src="{project:content}{1}.html" mime-type="text/html"/>
+      <map:when test="{properties:content}{1}.html">
+        <map:read src="{properties:content}{1}.html" 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>
@@ -64,7 +64,7 @@
   
    <map:match pattern="**.xml">
       <map:call resource="transform-to-document">
-        <map:parameter name="src" value="{project:content.xdocs}{1}.xml" />
+        <map:parameter name="src" value="{properties:content.xdocs}{1}.xml" />
       </map:call>
     </map:match>
   </map:pipeline>

Modified: forrest/trunk/main/template-sites/benchmark/src/documentation/sitemap.xmap
URL: http://svn.apache.org/viewvc/forrest/trunk/main/template-sites/benchmark/src/documentation/sitemap.xmap?rev=431247&r1=431246&r2=431247&view=diff
==============================================================================
--- forrest/trunk/main/template-sites/benchmark/src/documentation/sitemap.xmap (original)
+++ forrest/trunk/main/template-sites/benchmark/src/documentation/sitemap.xmap Sun Aug 13 14:41:37 2006
@@ -38,8 +38,8 @@
           <map:parameter name="parameter-selector-test" value="{sourcetype}" />
 
           <map:when test="hello-v1.0">
-            <map:generate src="{project:content.xdocs}{../../1}.xml" />
-            <map:transform src="{project:resources.stylesheets}/hello2document.xsl" />
+            <map:generate src="{properties:content.xdocs}{../../1}.xml" />
+            <map:transform src="{properties:resources.stylesheets}/hello2document.xsl" />
             <map:serialize type="xml-document"/>
           </map:when>
         </map:select>
@@ -51,11 +51,11 @@
   <map:pipeline>
     <map:match pattern="old_site/*.html">
      <map:select type="exists">
-      <map:when test="{project:content}{1}.html">
-        <map:read src="{project:content}{1}.html" mime-type="text/html"/>
+      <map:when test="{properties:content}{1}.html">
+        <map:read src="{properties:content}{1}.html" 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>
@@ -64,7 +64,7 @@
   
    <map:match pattern="**.xml">
       <map:call resource="transform-to-document">
-        <map:parameter name="src" value="{project:content.xdocs}{1}.xml" />
+        <map:parameter name="src" value="{properties:content.xdocs}{1}.xml" />
       </map:call>
     </map:match>
   </map:pipeline>

Modified: forrest/trunk/main/var/pluginLmMountSnippet.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/main/var/pluginLmMountSnippet.xsl?rev=431247&r1=431246&r2=431247&view=diff
==============================================================================
--- forrest/trunk/main/var/pluginLmMountSnippet.xsl (original)
+++ forrest/trunk/main/var/pluginLmMountSnippet.xsl Sun Aug 13 14:41:37 2006
@@ -39,7 +39,7 @@
        <xsl:apply-templates/>
        <xsl:element name="select">
            <xsl:element name="mount">
-             <xsl:attribute name="src">{forrest:plugins}/<xsl:value-of select="$plugin-name"/>/locationmap.xml</xsl:attribute> 
+             <xsl:attribute name="src">{forrest:forrest.plugins}/<xsl:value-of select="$plugin-name"/>/locationmap.xml</xsl:attribute> 
            </xsl:element>
        </xsl:element>
      </locator>

Modified: forrest/trunk/main/var/pluginMountSnippet.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/main/var/pluginMountSnippet.xsl?rev=431247&r1=431246&r2=431247&view=diff
==============================================================================
--- forrest/trunk/main/var/pluginMountSnippet.xsl (original)
+++ forrest/trunk/main/var/pluginMountSnippet.xsl Sun Aug 13 14:41:37 2006
@@ -40,10 +40,10 @@
        <xsl:element name="map:select">
          <xsl:attribute name="type">exists</xsl:attribute>
          <xsl:element name="map:when">
-           <xsl:attribute name="test">{forrest:plugins}/<xsl:value-of select="$plugin-name"/>/<xsl:value-of select="$plugin-type"/>.xmap</xsl:attribute>
+           <xsl:attribute name="test">{forrest:forrest.plugins}/<xsl:value-of select="$plugin-name"/>/<xsl:value-of select="$plugin-type"/>.xmap</xsl:attribute>
            <xsl:element name="map:mount">
              <xsl:attribute name="uri-prefix"/>
-             <xsl:attribute name="src">{forrest:plugins}/<xsl:value-of select="$plugin-name"/>/<xsl:value-of select="$plugin-type"/>.xmap</xsl:attribute> 
+             <xsl:attribute name="src">{forrest:forrest.plugins}/<xsl:value-of select="$plugin-name"/>/<xsl:value-of select="$plugin-type"/>.xmap</xsl:attribute> 
              <xsl:attribute name="check-reload">yes</xsl:attribute>  
              <xsl:attribute name="pass-through">true</xsl:attribute>
            </xsl:element>

Modified: forrest/trunk/main/webapp/WEB-INF/xconf/forrest-core.xconf
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/WEB-INF/xconf/forrest-core.xconf?rev=431247&r1=431246&r2=431247&view=diff
==============================================================================
--- forrest/trunk/main/webapp/WEB-INF/xconf/forrest-core.xconf (original)
+++ forrest/trunk/main/webapp/WEB-INF/xconf/forrest-core.xconf Sun Aug 13 14:41:37 2006
@@ -219,30 +219,25 @@
       <input-module name="request-param"/>
       <input-module name="request-attr"/>
       <input-module name="session-attr"/>
-      <input-module name="defaults"/>
+      <input-module name="properties"/>
     </component-instance>
 
     
-    <component-instance name="defaults" class="org.apache.forrest.conf.ForrestConfModule">
-      <values>
-        <skin>@project.skin@</skin>
-        <menu-scheme>@project.menu-scheme@</menu-scheme>
-        <bugtracking-url>@project.bugtracking-url@</bugtracking-url>
-        <issues-rss-url>@project.issues-rss-url@</issues-rss-url>
-        <i18n>@project.i18n@</i18n>
-        <home>@forrest.home@/</home>
-        <context>@context.home@</context>        
-        <skins-dir>@context.home@/skins/</skins-dir>
-        <stylesheets>@context.home@/resources/stylesheets</stylesheets>
-        <plugins-src>@forrest.home@/plugins</plugins-src>
-        <whiteboard-plugins-src>@forrest.home@/whiteboard/plugins</whiteboard-plugins-src>
-        <plugins>@forrest.home@/build/plugins</plugins>
-        <locationmap>@context.home@/locationmap.xml</locationmap>
-      </values>
-    </component-instance>
-
-    <component-instance name="project" class="org.apache.forrest.conf.ForrestConfModule">
+    <component-instance name="properties" class="org.apache.forrest.conf.ForrestConfModule">
       <values>
+        <forrest.skin>@project.skin@</forrest.skin>
+        <forrest.menu-scheme>@project.menu-scheme@</forrest.menu-scheme>
+        <forrest.bugtracking-url>@project.bugtracking-url@</forrest.bugtracking-url>
+        <forrest.issues-rss-url>@project.issues-rss-url@</forrest.issues-rss-url>
+        <forrest.i18n>@project.i18n@</forrest.i18n>
+        <forrest.home>@forrest.home@/</forrest.home>
+        <forrest.context>@context.home@</forrest.context>        
+        <forrest.skins-dir>@context.home@/skins/</forrest.skins-dir>
+        <forrest.stylesheets>@context.home@/resources/stylesheets</forrest.stylesheets>
+        <forrest.plugins-src>@forrest.home@/plugins</forrest.plugins-src>
+        <forrest.whiteboard-plugins-src>@forrest.home@/whiteboard/plugins</forrest.whiteboard-plugins-src>
+        <forrest.plugins>@forrest.home@/build/plugins</forrest.plugins>
+        <forrest.locationmap>@context.home@/locationmap.xml</forrest.locationmap>
         <home>@project.home@</home>
         <staging-dir>@project.build-dir@/@project.site@</staging-dir>
         <skin>@project.skin@</skin>

Modified: forrest/trunk/main/webapp/faq.xmap
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/faq.xmap?rev=431247&r1=431246&r2=431247&view=diff
==============================================================================
--- forrest/trunk/main/webapp/faq.xmap (original)
+++ forrest/trunk/main/webapp/faq.xmap Sun Aug 13 14:41:37 2006
@@ -150,8 +150,8 @@
         <map:transform src="{lm:transform.html.broken-links}" />
         <map:transform src="{lm:transform.document.fo}">
            <map:parameter name="numbersections" value="false"/>
-          <map:parameter name="imagesdir" value="{project:resources.images}/"/>
-          <map:parameter name="xmlbasedir" value="{project:content.xdocs}{1}"/>
+          <map:parameter name="imagesdir" value="{properties:resources.images}/"/>
+          <map:parameter name="xmlbasedir" value="{properties:content.xdocs}{1}"/>
         </map:transform>
         <map:serialize type="xml"/>
       </map:match>

Modified: forrest/trunk/main/webapp/forrest.xmap
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/forrest.xmap?rev=431247&r1=431246&r2=431247&view=diff
==============================================================================
--- forrest/trunk/main/webapp/forrest.xmap (original)
+++ forrest/trunk/main/webapp/forrest.xmap Sun Aug 13 14:41:37 2006
@@ -222,32 +222,32 @@
                         pass-through="true"/>
          </map:when> 
        </map:select>
-       <map:match type="i18n" pattern="{project:content.xdocs}{1}.*.xml">
+       <map:match type="i18n" pattern="{properties:content.xdocs}{1}.*.xml">
           <map:generate src="{source}" />
           <map:call resource="transform-to-document">
             <map:parameter name="src" value="{source}" />
           </map:call>
           <map:serialize type="xml-document"/>
        </map:match>
-       <map:match type="i18n" pattern="{project:content.xdocs}{1}.*.ihtml">
+       <map:match type="i18n" pattern="{properties:content.xdocs}{1}.*.ihtml">
          <map:generate src="{source}" type="html" />
          <map:transform src="{lm:transform.html.document}" />
          <map:transform type="idgen" />
          <map:serialize type="xml-document"/>
        </map:match>
-       <map:match type="i18n" pattern="{project:content.xdocs}{1}.*.html">
+       <map:match type="i18n" pattern="{properties:content.xdocs}{1}.*.html">
          <map:generate src="{source}" type="html" />
          <map:transform src="{lm:transform.html.document}" />
          <map:serialize type="xml-document"/>
        </map:match>
-       <map:match type="i18n" pattern="{project:content.xdocs}{1}.*.txt">
+       <map:match type="i18n" pattern="{properties:content.xdocs}{1}.*.txt">
          <map:generate type="text2xml" src="{source}" />
          <map:transform src="{lm:transform.text.document}">
          <map:parameter name="filename" value="{2}" />
          </map:transform>
          <map:serialize type="xml-document"/>
        </map:match>
-       <map:match type="i18n" pattern="{project:content.xdocs}{1}.*.xml">
+       <map:match type="i18n" pattern="{properties:content.xdocs}{1}.*.xml">
           <map:generate src="{source}" />
           <map:call resource="transform-to-document">
             <map:parameter name="src" value="{source}" />

Modified: forrest/trunk/main/webapp/i18n.xmap
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/i18n.xmap?rev=431247&r1=431246&r2=431247&view=diff
==============================================================================
--- forrest/trunk/main/webapp/i18n.xmap (original)
+++ forrest/trunk/main/webapp/i18n.xmap Sun Aug 13 14:41:37 2006
@@ -40,7 +40,7 @@
     <map:pipeline>
       <map:act type="locale" >
       <map:match pattern="**i18n-*.*">
-      <map:generate type="directory" src="{project:content.xdocs}{1}">
+      <map:generate type="directory" src="{properties:content.xdocs}{1}">
         <map:parameter name="dateFormat" value="yyyy-MM-dd hh:mm" />
         <map:parameter name="include" value="^{2}" />
         <map:parameter name="exclude" value="^{2}\.|{2}.{../language}" />

Modified: forrest/trunk/main/webapp/locationmap-chaperon.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/locationmap-chaperon.xml?rev=431247&r1=431246&r2=431247&view=diff
==============================================================================
--- forrest/trunk/main/webapp/locationmap-chaperon.xml (original)
+++ forrest/trunk/main/webapp/locationmap-chaperon.xml Sun Aug 13 14:41:37 2006
@@ -35,24 +35,24 @@
   <locator>
   
     <match pattern="chaperon.grammar.*">
-        <location src="{forrest:context}/resources/chaperon/grammars/{1}.grm" />
+        <location src="{forrest:forrest.context}/resources/chaperon/grammars/{1}.grm" />
     </match>
     
     <match pattern="chaperon.xgrammar.*">
-        <location src="{forrest:context}/resources/chaperon/grammars/{1}.xgrm" />
+        <location src="{forrest:forrest.context}/resources/chaperon/grammars/{1}.xgrm" />
     </match>
     
     <match pattern="chaperon.lexicon.*">
         <location src="resources/chaperon/grammars/{1}.xlex"/>
-        <location src="{forrest:context}/resources/chaperon/grammars/{1}.xlex" />
+        <location src="{forrest:forrest.context}/resources/chaperon/grammars/{1}.xlex" />
     </match>
     
     <match pattern="transform.chaperon.grammar.lexicon">
-        <location src="{forrest:context}/resources/chaperon/stylesheets/grm2xlex.xsl" />
+        <location src="{forrest:forrest.context}/resources/chaperon/stylesheets/grm2xlex.xsl" />
     </match>
     
     <match pattern="transform.chaperon.*">
-        <location src="{forrest:context}/resources/chaperon/stylesheets/{1}.xsl" />
+        <location src="{forrest:forrest.context}/resources/chaperon/stylesheets/{1}.xsl" />
     </match>
     
   </locator>

Modified: forrest/trunk/main/webapp/locationmap-i18n.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/locationmap-i18n.xml?rev=431247&r1=431246&r2=431247&view=diff
==============================================================================
--- forrest/trunk/main/webapp/locationmap-i18n.xml (original)
+++ forrest/trunk/main/webapp/locationmap-i18n.xml Sun Aug 13 14:41:37 2006
@@ -35,7 +35,7 @@
   <locator>
   
     <match pattern="project.translations">
-        <location src="{project:translations}" />
+        <location src="{properties:translations}" />
     </match>
   </locator>
 </locationmap>

Modified: forrest/trunk/main/webapp/locationmap-plugin.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/locationmap-plugin.xml?rev=431247&r1=431246&r2=431247&view=diff
==============================================================================
--- forrest/trunk/main/webapp/locationmap-plugin.xml (original)
+++ forrest/trunk/main/webapp/locationmap-plugin.xml Sun Aug 13 14:41:37 2006
@@ -35,15 +35,15 @@
   <locator>
     
     <match pattern="plugin.descriptor.whiteboard">
-        <location src="{forrest:whiteboard-plugins-src}/whiteboard-plugins.xml" />
+        <location src="{forrest:forrest.whiteboard-plugins-src}/whiteboard-plugins.xml" />
     </match>
     
     <match pattern="plugin.descriptor.forrest">
-        <location src="{forrest:plugins-src}/plugins.xml" />
+        <location src="{forrest:forrest.plugins-src}/plugins.xml" />
     </match>
     
     <match pattern="plugin.xmap.*">
-        <location src="{project:temp-dir}/{1}.xmap" />
+        <location src="{properties:temp-dir}/{1}.xmap" />
     </match>
     
   </locator>

Modified: forrest/trunk/main/webapp/locationmap-skinconf.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/locationmap-skinconf.xml?rev=431247&r1=431246&r2=431247&view=diff
==============================================================================
--- forrest/trunk/main/webapp/locationmap-skinconf.xml (original)
+++ forrest/trunk/main/webapp/locationmap-skinconf.xml Sun Aug 13 14:41:37 2006
@@ -35,19 +35,19 @@
   <locator>
   
     <match pattern="project.skinconf">
-        <location src="{project:skinconf}" />
+        <location src="{properties:skinconf}" />
     </match>
     
     <match pattern="project-skinconf.xsl">
-        <location src="{project:skins-dir}{forrest:skin}/skinconf.xsl" />
+        <location src="{properties:skins-dir}{forrest:forrest.skin}/skinconf.xsl" />
     </match>
     
     <match pattern="forrest-skinconf.xsl">
-        <location src="{forrest:context}/skins/{forrest:skin}/skinconf.xsl" />
+        <location src="{forrest:forrest.context}/skins/{forrest:forrest.skin}/skinconf.xsl" />
     </match>
     
     <match pattern="common-skinconf.xsl">
-        <location src="{forrest:context}/skins/common/skinconf.xsl" />
+        <location src="{forrest:forrest.context}/skins/common/skinconf.xsl" />
     </match>
     
   </locator>

Modified: forrest/trunk/main/webapp/locationmap-skins.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/locationmap-skins.xml?rev=431247&r1=431246&r2=431247&view=diff
==============================================================================
--- forrest/trunk/main/webapp/locationmap-skins.xml (original)
+++ forrest/trunk/main/webapp/locationmap-skins.xml Sun Aug 13 14:41:37 2006
@@ -36,41 +36,41 @@
 
     <match pattern="skin.js.**">
       <select>
-        <location src="{project:skins-dir}{forrest:skin}/scripts/{1}.js" />
-        <location src="{forrest:context}/skins/{forrest:skin}/scripts/{1}.js" />
-        <location src="{forrest:context}/skins/common/scripts/{1}.js" />
+        <location src="{properties:skins-dir}{forrest:forrest.skin}/scripts/{1}.js" />
+        <location src="{forrest:forrest.context}/skins/{forrest:forrest.skin}/scripts/{1}.js" />
+        <location src="{forrest:forrest.context}/skins/common/scripts/{1}.js" />
       </select>
     </match>
 
     <match pattern="skin.css.xslt.**">
       <select>
-        <location src="{project:skins-dir}{forrest:skin}/css/{1}.css.xslt" />
-        <location src="{forrest:context}/skins/{forrest:skin}/css/{1}.css.xslt" />
-        <location src="{forrest:context}/skins/common/css/{1}.css.xslt" />
+        <location src="{properties:skins-dir}{forrest:forrest.skin}/css/{1}.css.xslt" />
+        <location src="{forrest:forrest.context}/skins/{forrest:forrest.skin}/css/{1}.css.xslt" />
+        <location src="{forrest:forrest.context}/skins/common/css/{1}.css.xslt" />
       </select>
     </match>
 
     <match pattern="skin.css.**">
       <select>
-        <location src="{project:skins-dir}{forrest:skin}/css/{1}.css" />
-        <location src="{forrest:context}/skins/{forrest:skin}/css/{1}.css" />
-        <location src="{forrest:context}/skins/common/css/{1}.css" />
+        <location src="{properties:skins-dir}{forrest:forrest.skin}/css/{1}.css" />
+        <location src="{forrest:forrest.context}/skins/{forrest:forrest.skin}/css/{1}.css" />
+        <location src="{forrest:forrest.context}/skins/common/css/{1}.css" />
       </select>
     </match>
 
     <match pattern="skin.images.corner.**.*">
       <select>
-        <location src="{project:skins-dir}{forrest:skin}/{1}/{2}.svg.xslt"/>
-        <location src="{forrest:context}/skins/{forrest:skin}/{1}/{2}.svg.xslt"/>
-        <location src="{forrest:context}/skins/common/{1}/{2}.svg.xslt"/>
+        <location src="{properties:skins-dir}{forrest:forrest.skin}/{1}/{2}.svg.xslt"/>
+        <location src="{forrest:forrest.context}/skins/{forrest:forrest.skin}/{1}/{2}.svg.xslt"/>
+        <location src="{forrest:forrest.context}/skins/common/{1}/{2}.svg.xslt"/>
       </select>
     </match>
 
     <match pattern="skin.images.**.*">
       <select>
-        <location src="{project:skins-dir}{forrest:skin}/images/{1}.{2}" />
-        <location src="{forrest:context}/skins/{forrest:skin}/images/{1}.{2}" />
-        <location src="{forrest:context}/skins/common/images/{1}.{2}" />
+        <location src="{properties:skins-dir}{forrest:forrest.skin}/images/{1}.{2}" />
+        <location src="{forrest:forrest.context}/skins/{forrest:forrest.skin}/images/{1}.{2}" />
+        <location src="{forrest:forrest.context}/skins/common/images/{1}.{2}" />
       </select>
     </match>
   </locator>

Modified: forrest/trunk/main/webapp/locationmap-transforms.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/locationmap-transforms.xml?rev=431247&r1=431246&r2=431247&view=diff
==============================================================================
--- forrest/trunk/main/webapp/locationmap-transforms.xml (original)
+++ forrest/trunk/main/webapp/locationmap-transforms.xml Sun Aug 13 14:41:37 2006
@@ -40,17 +40,17 @@
     
     <match pattern="transform.*.fo">
       <select>
-        <location src="{project:skins-dir}{forrest:skin}/xslt/fo/{1}-to-fo.xsl" />
-        <location src="{forrest:context}/skins/{forrest:skin}/xslt/fo/{1}-to-fo.xsl"/>
-        <location src="{forrest:context}/skins/common/xslt/fo/{1}-to-fo.xsl"/>
+        <location src="{properties:skins-dir}{forrest:forrest.skin}/xslt/fo/{1}-to-fo.xsl" />
+        <location src="{forrest:forrest.context}/skins/{forrest:forrest.skin}/xslt/fo/{1}-to-fo.xsl"/>
+        <location src="{forrest:forrest.context}/skins/common/xslt/fo/{1}-to-fo.xsl"/>
       </select>
     </match>
     
     <match pattern="transform.xdoc.html">
       <select>
-        <location src="{project:skins-dir}{forrest:skin}/xslt/html/document-to-html.xsl" />
-        <location src="{forrest:context}/skins/{forrest:skin}/xslt/html/document-to-html.xsl"/>
-        <location src="{forrest:context}/skins/common/xslt/html/document-to-html.xsl"/>
+        <location src="{properties:skins-dir}{forrest:forrest.skin}/xslt/html/document-to-html.xsl" />
+        <location src="{forrest:forrest.context}/skins/{forrest:forrest.skin}/xslt/html/document-to-html.xsl"/>
+        <location src="{forrest:forrest.context}/skins/common/xslt/html/document-to-html.xsl"/>
       </select>
     </match>
     
@@ -58,51 +58,51 @@
     <!-- utility transforms                 -->
     <!-- ================================== -->
     <match pattern="transform.xml.xml-doctype-stripped">
-      <location src="{forrest:stylesheets}/strip-doctype.xsl" />
+      <location src="{forrest:forrest.stylesheets}/strip-doctype.xsl" />
     </match>
     
     <match pattern="transform.linkmap.linkmap-absolutized">
-      <location src="{forrest:stylesheets}/absolutize-linkmap.xsl" />
+      <location src="{forrest:forrest.stylesheets}/absolutize-linkmap.xsl" />
     </match>
     
     <match pattern="transform.linkmap.linkmap-normalizedtabs">
-      <location src="{forrest:stylesheets}/site-to-site-normalizetabs.xsl" />
+      <location src="{forrest:forrest.stylesheets}/site-to-site-normalizetabs.xsl" />
     </match>
     
     <match pattern="transform.xml.xml-normalizedhrefs">
-      <location src="{forrest:stylesheets}/normalizehrefs.xsl" />
+      <location src="{forrest:forrest.stylesheets}/normalizehrefs.xsl" />
     </match>
     
     <match pattern="transform.xml.dotdots">
-      <location src="{forrest:stylesheets}/dotdots.xsl" />
+      <location src="{forrest:forrest.stylesheets}/dotdots.xsl" />
     </match>
     
     <match pattern="transform.xml.pathutils">
-      <location src="{forrest:stylesheets}/pathutils.xsl" />
+      <location src="{forrest:forrest.stylesheets}/pathutils.xsl" />
     </match>
     
     <match pattern="transform.xml.copyover.helper">
-      <location src="{forrest:stylesheets}/copyover.xsl" />
+      <location src="{forrest:forrest.stylesheets}/copyover.xsl" />
     </match>
     
     <match pattern="transform.xml.generateId">
-      <location src="{forrest:stylesheets}/generateId.xsl" />
+      <location src="{forrest:forrest.stylesheets}/generateId.xsl" />
     </match>
     
     <match pattern="transform.xml.replaceCharsInString">
-      <location src="{forrest:stylesheets}/replaceCharsInString.xsl" />
+      <location src="{forrest:forrest.stylesheets}/replaceCharsInString.xsl" />
     </match>
     
     <match pattern="transform.xml.extracted-svg">
-      <location src="{forrest:stylesheets}/extract-svg.xsl" />
+      <location src="{forrest:forrest.stylesheets}/extract-svg.xsl" />
     </match>
     
     <match pattern="transform.linkmap.linkmap-selectnode">
-      <location src="{forrest:stylesheets}/site-to-site-selectnode.xsl" />
+      <location src="{forrest:forrest.stylesheets}/site-to-site-selectnode.xsl" />
     </match>
     
     <match pattern="transform.linkmap.linkmap-relativized">
-      <location src="{forrest:stylesheets}/relativize-linkmap.xsl" />
+      <location src="{forrest:forrest.stylesheets}/relativize-linkmap.xsl" />
     </match>
     
     <!--
@@ -110,43 +110,43 @@
       workaround for http://issues.apache.org/jira/browse/FOR-592
     -->
     <match pattern="transform.xml.xml-i18n-stripped">
-      <location src="{forrest:stylesheets}/strip-i18n-remains.xsl" />
+      <location src="{forrest:forrest.stylesheets}/strip-i18n-remains.xsl" />
     </match>
     
     <!--
       FIXME: strip_namespace is because this bug: http://issues.apache.org/bugzilla/show_bug.cgi?id=35348
     -->
     <match pattern="transform.xml.xml-namespace-stripped">
-      <location src="{forrest:context}/skins/common/xslt/html/strip_namespaces.xsl" />
+      <location src="{forrest:forrest.context}/skins/common/xslt/html/strip_namespaces.xsl" />
     </match>
 
     <match pattern="transform.html.broken-links">
-      <location src="{forrest:stylesheets}/declare-broken-site-links.xsl" />
+      <location src="{forrest:forrest.stylesheets}/declare-broken-site-links.xsl" />
     </match>
     
     <!-- ================================== -->
     <!-- aggregate transforms                 -->
     <!-- ================================== -->
     <match pattern="transform-aggregate.*.*">
-      <location src="{forrest:stylesheets}/aggregates/{1}-to-{2}.xsl" />
+      <location src="{forrest:forrest.stylesheets}/aggregates/{1}-to-{2}.xsl" />
     </match>
     
     <match pattern="transform-aggregate.linkmap.relativized-linkmap">
-      <location src="{forrest:stylesheets}/aggregates/relativize-split-linkmap.xsl" />
+      <location src="{forrest:forrest.stylesheets}/aggregates/relativize-split-linkmap.xsl" />
     </match>
     
     <match pattern="transform.old-skinconf.new-skinconf">
-      <location src="{forrest:stylesheets}/upgrade-skinconf.xsl" />
+      <location src="{forrest:forrest.stylesheets}/upgrade-skinconf.xsl" />
     </match>
     
     <!-- All core other transforms -->
     <match pattern="transform.*.*">
       <select>
-        <location src="{project:skins-dir}{forrest:skin}/xslt/html/{1}-to-{2}.xsl" />
+        <location src="{properties:skins-dir}{forrest:forrest.skin}/xslt/html/{1}-to-{2}.xsl" />
         <location
-          src="{forrest:context}/skins/{forrest:skin}/xslt/html/{1}-to-{2}.xsl"/>
-        <location src="{forrest:context}/skins/common/xslt/html/{1}-to-{2}.xsl"/>
-        <location src="{forrest:stylesheets}/{1}-to-{2}.xsl"/>
+          src="{forrest:forrest.context}/skins/{forrest:forrest.skin}/xslt/html/{1}-to-{2}.xsl"/>
+        <location src="{forrest:forrest.context}/skins/common/xslt/html/{1}-to-{2}.xsl"/>
+        <location src="{forrest:forrest.stylesheets}/{1}-to-{2}.xsl"/>
       </select>
     </match>
   </locator>

Modified: forrest/trunk/main/webapp/locationmap.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/locationmap.xml?rev=431247&r1=431246&r2=431247&view=diff
==============================================================================
--- forrest/trunk/main/webapp/locationmap.xml (original)
+++ forrest/trunk/main/webapp/locationmap.xml Sun Aug 13 14:41:37 2006
@@ -53,61 +53,61 @@
     <!-- project files                      -->
     <!-- ================================== -->
     <select>
-      <mount src="{project:temp-dir}/locationmap.xml"/>
+      <mount src="{properties:temp-dir}/locationmap.xml"/>
     </select>
     
     <!-- ================================== -->
     <!-- Forrest files                      -->
     <!-- ================================== -->
     <match pattern="forrest.schema.**">
-        <location src="{forrest:context}/resources/schema/dtd/{1}.dtd" />
+        <location src="{forrest:forrest.context}/resources/schema/dtd/{1}.dtd" />
     </match>
     
     <!-- ================================== -->
     <!-- Mount forrest locationmaps         -->
     <!-- ================================== -->
     <select>
-      <mount src="{forrest:context}/locationmap-transforms.xml"/>
+      <mount src="{forrest:forrest.context}/locationmap-transforms.xml"/>
     </select>
     
     <select>
-      <mount src="{forrest:context}/locationmap-skins.xml"/>
+      <mount src="{forrest:forrest.context}/locationmap-skins.xml"/>
     </select>
     
     <select>
-      <mount src="{forrest:context}/locationmap-i18n.xml"/>
+      <mount src="{forrest:forrest.context}/locationmap-i18n.xml"/>
     </select>
 
     <select>
-      <mount src="{forrest:context}/locationmap-skinconf.xml"/>
+      <mount src="{forrest:forrest.context}/locationmap-skinconf.xml"/>
     </select>
     
     <select>
-      <mount src="{forrest:context}/locationmap-plugin.xml"/>
+      <mount src="{forrest:forrest.context}/locationmap-plugin.xml"/>
     </select>
     
     <!--  FIXME: this should be part of a chaperon plugin -->
     <select>
-      <mount src="{forrest:context}/locationmap-chaperon.xml"/>
+      <mount src="{forrest:forrest.context}/locationmap-chaperon.xml"/>
     </select>
 
     <!-- ================================== -->
     <!-- project files                      -->
     <!-- ================================== -->
     <match pattern="project.xmap.sitemap">
-        <location src="{project:sitemap}" />
+        <location src="{properties:sitemap}" />
     </match>
     
     <match pattern="project.build-info">
-      <location src="{project:temp-dir}/build-info.xml" />
+      <location src="{properties:temp-dir}/build-info.xml" />
     </match>
     
     <match pattern="project.images.**.*">
       <select>
-        <location src="{project:resources.images}{1}.{2}" />
-        <location src="{project:content}../resources/images/{1}.{2}" />
-        <location src="{project:content.xdocs}images/{1}.{2}" />
-        <location src="{project:content.xdocs}{1}.{2}" />
+        <location src="{properties:resources.images}{1}.{2}" />
+        <location src="{properties:content}../resources/images/{1}.{2}" />
+        <location src="{properties:content.xdocs}images/{1}.{2}" />
+        <location src="{properties:content.xdocs}{1}.{2}" />
       </select>
     </match>
     
@@ -116,11 +116,11 @@
     </match>
     
     <match pattern="project.xml.site">
-      <location src="{project:content.xdocs}site.xml" />
+      <location src="{properties:content.xdocs}site.xml" />
     </match>
     
     <match pattern="project.**">
-      <location src="{project:content.xdocs}{1}" />
+      <location src="{properties:content.xdocs}{1}" />
     </match>
     
   </locator>

Modified: forrest/trunk/main/webapp/menu.xmap
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/menu.xmap?rev=431247&r1=431246&r2=431247&view=diff
==============================================================================
--- forrest/trunk/main/webapp/menu.xmap (original)
+++ forrest/trunk/main/webapp/menu.xmap Sun Aug 13 14:41:37 2006
@@ -69,7 +69,7 @@
         <map:generate src="cocoon://site.navigation.links.xml"/>
         <map:transform src="{lm:transform.linkmap.linkmap-absolutized}" />
         <map:select type="config">
-          <map:parameter name="value" value="{defaults:menu-scheme}"/>
+          <map:parameter name="value" value="{properties:forrest.menu-scheme}"/>
           <map:when test="tab_attributes">
             <map:transform src="{lm:transform.linkmap.linkmap-normalizedtabs}" />
             <map:transform src="{lm:transform.xml.xml-normalizedhrefs}"/>
@@ -118,7 +118,7 @@
         </map:select>
 
         <map:select type="config">
-          <map:parameter name="value" value="{defaults:i18n}"/>
+          <map:parameter name="value" value="{properties:forrest.i18n}"/>
           <map:when test="true">
 
             <map:act type="locale">

Modified: forrest/trunk/main/webapp/raw.xmap
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/raw.xmap?rev=431247&r1=431246&r2=431247&view=diff
==============================================================================
--- forrest/trunk/main/webapp/raw.xmap (original)
+++ forrest/trunk/main/webapp/raw.xmap Sun Aug 13 14:41:37 2006
@@ -19,13 +19,13 @@
 Serves 'raw' content from files in src/documentation/content/xdocs
 This allows the inclusion of binary content (*.doc, *.pdf etc) in Forrest sites.
 
-This pipeline *relies* on the caller checking if the {project:content.xdocs}/ actually exists!
+This pipeline *relies* on the caller checking if the {properties:content.xdocs}/ actually exists!
 If the caller doesn't do this, this sitemap's '**' pipeline will match everything.
 
-Generates  :  Exact bytes read from {project:content.xdocs}/**
+Generates  :  Exact bytes read from {properties:content.xdocs}/**
 Example URL:  http://localhost:8888/blah.doc
 Used by    :  sitemap.xmap
-Uses       :  {project:content.xdocs}/**
+Uses       :  {properties:content.xdocs}/**
 
 $Revision: 1.2 $
 ==================================================== -->

Modified: forrest/trunk/main/webapp/revisions.xmap
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/revisions.xmap?rev=431247&r1=431246&r2=431247&view=diff
==============================================================================
--- forrest/trunk/main/webapp/revisions.xmap (original)
+++ forrest/trunk/main/webapp/revisions.xmap Sun Aug 13 14:41:37 2006
@@ -51,19 +51,19 @@
     <map:pipeline>
 
       <map:match pattern="**index.xml">
-        <map:generate src="{project:content.xdocs}{0}" />
+        <map:generate src="{properties:content.xdocs}{0}" />
         <map:transform type="idgen" />
         <map:serialize type="xml"/>
       </map:match>
 
       <map:match pattern="**revision-*.xml">
-        <map:generate src="{project:content.xdocs}{1}revision-{2}.xml" />
+        <map:generate src="{properties:content.xdocs}{1}revision-{2}.xml" />
         <map:transform type="idgen" />
         <map:serialize type="xml"/>
       </map:match>
 
       <map:match pattern="**revisions-**">
-	  <map:generate type="directory" src="{project:content.xdocs}{1}">
+	  <map:generate type="directory" src="{properties:content.xdocs}{1}">
           <map:parameter name="dateFormat" value="yyyy-MM-dd hh:mm" />
         </map:generate>
 	<map:transform src="{lm:transform.directory.revisions}">
@@ -75,7 +75,7 @@
 
       <map:match pattern="**/*.xml">
         <map:aggregate element="all">
-          <map:part src="{project:content.xdocs}{0}" />
+          <map:part src="{properties:content.xdocs}{0}" />
           <map:part src="cocoon:/{1}/revisions-{2}" />
         </map:aggregate>
 	<map:transform src="{lm:transform.howto.document}" />

Modified: forrest/trunk/main/webapp/search.xmap
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/search.xmap?rev=431247&r1=431246&r2=431247&view=diff
==============================================================================
--- forrest/trunk/main/webapp/search.xmap (original)
+++ forrest/trunk/main/webapp/search.xmap Sun Aug 13 14:41:37 2006
@@ -120,8 +120,8 @@
       <!-- Creates a lucene:document from a Forrest document body -->
       <map:match pattern="**body-*.lucene">
         <map:select type="exists">
-          <map:when test="{project:content.xdocs}{1}{2}.ehtml">
-            <map:generate src="{project:content.xdocs}{1}{2}.ehtml" />
+          <map:when test="{properties:content.xdocs}{1}{2}.ehtml">
+            <map:generate src="{properties:content.xdocs}{1}{2}.ehtml" />
             <map:transform src="{lm:transform.html.htmlbody}" />
           </map:when>
           <map:when test="cocoon://{1}{2}.xml">

Modified: forrest/trunk/main/webapp/sitemap.xmap
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/sitemap.xmap?rev=431247&r1=431246&r2=431247&view=diff
==============================================================================
--- forrest/trunk/main/webapp/sitemap.xmap (original)
+++ forrest/trunk/main/webapp/sitemap.xmap Sun Aug 13 14:41:37 2006
@@ -138,7 +138,7 @@
 
    <map:transformer name="i18n" src="org.apache.cocoon.transformation.I18nTransformer">
     <catalogues default="common">
-      <catalogue id="common" name="CommonMessages" location="{project:skins-dir}common/translations"/>
+      <catalogue id="common" name="CommonMessages" location="{properties:skins-dir}common/translations"/>
       </catalogues>
     <cache-at-startup>true</cache-at-startup>
    </map:transformer>
@@ -283,7 +283,7 @@
        Instead of filterlinks.xsl, use cli.xconf include/exclude nodes to define which pages to render.
   <map:views>
     <map:view name="links" from-position="last">
-      <map:transform src="{forrest:stylesheets}/filterlinks.xsl">
+      <map:transform src="{forrest:forrest.stylesheets}/filterlinks.xsl">
         <map:parameter name="ctxbasedir" value="{realpath:.}/"/>
       </map:transform>
       <map:serialize type="links"/>
@@ -299,10 +299,10 @@
           <map:parameter name="isfaq" value="{notoc}"/>
           <map:parameter name="nopdf" value="{nopdf}"/>
           <map:parameter name="path" value="{path}"/>
-          <map:parameter name="config-file" value="{project:skinconf}"/>
+          <map:parameter name="config-file" value="{properties:skinconf}"/>
         </map:transform>
         <map:select type="config">
-          <map:parameter name="value" value="{defaults:i18n}"/>
+          <map:parameter name="value" value="{properties:forrest.i18n}"/>
           <map:when test="true">	
             <map:act type="locale">
               <map:transform type="i18n">
@@ -389,9 +389,9 @@
       -->
       <map:pipeline internal-only="false">
            <map:select type="exists">
-             <map:when test="{project:sitemap}">
+             <map:when test="{properties:sitemap}">
                <map:mount uri-prefix=""
-                          src="{project:sitemap}" 
+                          src="{properties:sitemap}" 
                           check-reload="yes" 
                           pass-through="true"/>
              </map:when>  
@@ -404,8 +404,8 @@
       -->  
       <map:pipeline internal-only="false">
         <map:select type="exists">
-          <map:when test="{project:temp-dir}/internal.xmap">
-            <map:mount uri-prefix="" src="{project:temp-dir}/internal.xmap" check-reload="yes" pass-through="true"/>
+          <map:when test="{properties:temp-dir}/internal.xmap">
+            <map:mount uri-prefix="" src="{properties:temp-dir}/internal.xmap" check-reload="yes" pass-through="true"/>
           </map:when>
         </map:select>
       </map:pipeline>
@@ -414,7 +414,7 @@
          matcher if they want to generate the locationmap dynamically -->
 		<map:pipeline internal-only="true">   
        <map:match pattern="locationmap-project.xml">
-         <map:generate src="{project:content}locationmap.xml"/>
+         <map:generate src="{properties:content}locationmap.xml"/>
          <map:serialize type="xml"/>
        </map:match>
 		</map:pipeline>
@@ -468,7 +468,7 @@
         </map:match>
    
         <map:match pattern="locationmap.xml">
-          <map:generate src="{forrest:locationmap}" />
+          <map:generate src="{forrest:forrest.locationmap}" />
           <map:serialize type="xml"/>
         </map:match>
 
@@ -667,8 +667,8 @@
             <map:transform type="xinclude"/>
             <map:transform type="linkrewriter" src="cocoon://{1}linkmap-{2}.fo"/>
             <map:transform src="{lm:transform.document.fo}">
-              <map:parameter name="imagesdir" value="{project:resources.images}/"/>
-              <map:parameter name="xmlbasedir" value="{project:content.xdocs}{1}"/>
+              <map:parameter name="imagesdir" value="{properties:resources.images}/"/>
+              <map:parameter name="xmlbasedir" value="{properties:content.xdocs}{1}"/>
             </map:transform>
         </map:otherwise>
       </map:select>

Modified: forrest/trunk/main/webapp/tabs.xmap
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/tabs.xmap?rev=431247&r1=431246&r2=431247&view=diff
==============================================================================
--- forrest/trunk/main/webapp/tabs.xmap (original)
+++ forrest/trunk/main/webapp/tabs.xmap Sun Aug 13 14:41:37 2006
@@ -55,7 +55,7 @@
         <map:generate src="{lm:project.tabs.xml}"/>
         <map:transform type="xinclude"/>
         <map:select type="config">
-          <map:parameter name="value" value="{defaults:i18n}"/>
+          <map:parameter name="value" value="{properties:forrest.i18n}"/>
           <map:when test="true">
             <map:act type="locale">
               <map:transform src="{lm:transform.book.book-i18n}"/>

Modified: forrest/trunk/plugins/org.apache.forrest.plugin.input.PhotoGallery/resources.xmap
URL: http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.input.PhotoGallery/resources.xmap?rev=431247&r1=431246&r2=431247&view=diff
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.input.PhotoGallery/resources.xmap (original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.input.PhotoGallery/resources.xmap Sun Aug 13 14:41:37 2006
@@ -49,7 +49,7 @@
         <map:read type="image" src="{lm:project.images/gallery/{1}.jpg}">
           <map:parameter name="width" value="150"/>
           <map:parameter name="variant" value="thumb"/>
-          <map:parameter name="persistentStoreLocation" value="{project:content.xdocs}images/"/>
+          <map:parameter name="persistentStoreLocation" value="{properties:content.xdocs}images/"/>
         </map:read>
       </map:match>
 
@@ -57,7 +57,7 @@
         <map:read type="image" src="{lm:project.images/gallery/{1}.jpg}">
           <map:parameter name="width" value="450"/>
           <map:parameter name="variant" value="small"/>
-          <map:parameter name="persistentStoreLocation" value="{project:content.xdocs}images/"/>
+          <map:parameter name="persistentStoreLocation" value="{properties:content.xdocs}images/"/>
         </map:read>
       </map:match>
 

Modified: forrest/trunk/plugins/org.apache.forrest.plugin.input.PhotoGallery/src/documentation/content/xdocs/index.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.input.PhotoGallery/src/documentation/content/xdocs/index.xml?rev=431247&r1=431246&r2=431247&view=diff
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.input.PhotoGallery/src/documentation/content/xdocs/index.xml (original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.input.PhotoGallery/src/documentation/content/xdocs/index.xml Sun Aug 13 14:41:37 2006
@@ -26,7 +26,7 @@
       <p>This plugin creates photo albums from sets of photographs.</p>
       
       <p>The pictures are expected under 
-      <code>{project:content.xdocs}/images/gallery/**</code>.  To create your photo 
+      <code>{properties:content.xdocs}/images/gallery/**</code>.  To create your photo 
       albums simply create a new directory for each photo album under the gallery 
       directory. Place your original sized pictures into each gallery sub-directory. The thumbnail and small sized images will be automatically generated from these.</p>
 

Modified: forrest/trunk/plugins/org.apache.forrest.plugin.input.projectInfo/input.xmap
URL: http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.input.projectInfo/input.xmap?rev=431247&r1=431246&r2=431247&view=diff
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.input.projectInfo/input.xmap (original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.input.projectInfo/input.xmap Sun Aug 13 14:41:37 2006
@@ -63,11 +63,11 @@
       <map:match type="regexp" pattern="^(.*?)([^/]*)changes.xml$">
         <map:generate type="file" src="{lm:project.status}" />
         <map:transform src="{lm:projectInfo.transform.changes.document}" >
-          <map:parameter name="bugtracking-url" value="{defaults:bugtracking-url}"/>
+          <map:parameter name="bugtracking-url" value="{properties:forrest.bugtracking-url}"/>
           <map:parameter name="path" value="{1}{2}"/>
-          <map:parameter name="projectInfo.changes.sort" value="{project:projectInfo.changes.sort}"/>
-          <map:parameter name="projectInfo.changes.includeCommitterList" value="{project:projectInfo.changes.includeCommitterList}"/>
-          <map:parameter name="projectInfo.changes.includeContributorList" value="{project:projectInfo.changes.includeContributorList}"/>
+          <map:parameter name="projectInfo.changes.sort" value="{properties:projectInfo.changes.sort}"/>
+          <map:parameter name="projectInfo.changes.includeCommitterList" value="{properties:projectInfo.changes.includeCommitterList}"/>
+          <map:parameter name="projectInfo.changes.includeContributorList" value="{properties:projectInfo.changes.includeContributorList}"/>
         </map:transform>
         <map:transform type="i18n">
           <map:parameter name="locale" value="{request:locale}" />
@@ -78,11 +78,11 @@
       <map:match type="regexp" pattern="^(.*?)([^/]*)changes_(.*).xml$">
         <map:generate type="file" src="{lm:project.status}" />
         <map:transform src="{lm:projectInfo.transform.changes.document}" >
-          <map:parameter name="bugtracking-url" value="{defaults:bugtracking-url}"/>
+          <map:parameter name="bugtracking-url" value="{properties:forrest.bugtracking-url}"/>
           <map:parameter name="path" value="{1}{2}"/>
           <map:parameter name="versionNumber" value="{3}"/>
-          <map:parameter name="projectInfo.changes.sort" value="{project:projectInfo.changes.sort}"/>
-          <map:parameter name="projectInfo.changes.includeContributorList" value="{project:projectInfo.changes.includeContributorList}"/>
+          <map:parameter name="projectInfo.changes.sort" value="{properties:projectInfo.changes.sort}"/>
+          <map:parameter name="projectInfo.changes.includeContributorList" value="{properties:projectInfo.changes.includeContributorList}"/>
         </map:transform>
         <map:transform type="i18n">
           <map:parameter name="locale" value="{request:locale}" />
@@ -232,7 +232,7 @@
         locationmap.xml file.
       -->
       <map:match pattern="projectDetails/descriptorIndex.xml">
-        <map:generate type="file" src="{project:content}/locationmap.xml" />
+        <map:generate type="file" src="{properties:content}/locationmap.xml" />
         <map:transform src="{lm:projectInfo.transform.locationmap.descriptorIndex}"/>
         <map:transform type="cinclude"/>
         <map:serialize type="xml"/>

Modified: forrest/trunk/plugins/org.apache.forrest.plugin.input.projectInfo/locationmap.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.input.projectInfo/locationmap.xml?rev=431247&r1=431246&r2=431247&view=diff
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.input.projectInfo/locationmap.xml (original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.input.projectInfo/locationmap.xml Sun Aug 13 14:41:37 2006
@@ -34,15 +34,15 @@
   
   <locator>
     <match pattern="project.status">
-      <location src="{project:status}" />
+      <location src="{properties:status}" />
     </match>  
     
     <match pattern="project.useCases.dir">
-      <location src="{project:content}/useCases" />
+      <location src="{properties:content}/useCases" />
     </match>   
     
     <match pattern="project.useCases.**">
-      <location src="{project:content}/useCases/{1}.xml" />
+      <location src="{properties:content}/useCases/{1}.xml" />
     </match>   
     
     <match pattern="projectInfo.transform.*.*">
@@ -54,11 +54,11 @@
     </match>  
     
     <match pattern="projectInfo.svn.log.dir">
-      <location src="{project:content}svn-log/" />
+      <location src="{properties:content}svn-log/" />
     </match> 
     
     <match pattern="projectInfo.svn.mapper">
-      <location src="{project:content}path-to-context.xml" />
+      <location src="{properties:content}path-to-context.xml" />
     </match> 
   </locator>
 </locationmap>

Modified: forrest/trunk/plugins/org.apache.forrest.plugin.input.projectInfo/src/documentation/content/xdocs/index.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.input.projectInfo/src/documentation/content/xdocs/index.xml?rev=431247&r1=431246&r2=431247&view=diff
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.input.projectInfo/src/documentation/content/xdocs/index.xml (original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.input.projectInfo/src/documentation/content/xdocs/index.xml Sun Aug 13 14:41:37 2006
@@ -50,7 +50,7 @@
       <title>SVN Changes</title>
       <p>You can generate as well the changes with svn. For this you need to 
         point forrest to the directory where the svn logs are. The defaut is 
-        set to <code>{project:content}svn-log/</code> and you can change it by 
+        set to <code>{properties:content}svn-log/</code> and you can change it by 
         setting <code>projectInfo.svn.log.dir</code> in your project 
         locationmap.</p>
       <p>We created a log file for demonstration with the following command:</p>
@@ -61,7 +61,7 @@
         can see the result <a href="log.svn.html">log.svn.html</a>.</p>
       <p>You see the only context we have definied is "code". This is 
         controlled by a mapper file. The defaut is set to 
-        <code>{project:content}path-to-context.xml</code> and you can change it 
+        <code>{properties:content}path-to-context.xml</code> and you can change it 
         by setting <code>projectInfo.svn.mapper</code> in your project 
         locationmap.</p>
       <source><![CDATA[<paths>

Modified: forrest/trunk/plugins/org.apache.forrest.plugin.input.projectInfo/svnHelper.xmap
URL: http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.input.projectInfo/svnHelper.xmap?rev=431247&r1=431246&r2=431247&view=diff
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.input.projectInfo/svnHelper.xmap (original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.input.projectInfo/svnHelper.xmap Sun Aug 13 14:41:37 2006
@@ -34,11 +34,11 @@
         </map:aggregate>
         <map:transform src="resources/stylesheets/svn-to-changes.xsl" />
         <map:transform src="{lm:projectInfo.transform.changes.document}" >
-          <map:parameter name="bugtracking-url" value="{defaults:bugtracking-url}"/>
+          <map:parameter name="bugtracking-url" value="{properties:forrest.bugtracking-url}"/>
           <map:parameter name="path" value="{1}"/>
-          <map:parameter name="projectInfo.changes.sort" value="{project:projectInfo.changes.sort}"/>
-          <map:parameter name="projectInfo.changes.includeCommitterList" value="{project:projectInfo.changes.includeCommitterList}"/>
-          <map:parameter name="projectInfo.changes.includeContributorList" value="{project:projectInfo.changes.includeContributorList}"/>
+          <map:parameter name="projectInfo.changes.sort" value="{properties:projectInfo.changes.sort}"/>
+          <map:parameter name="projectInfo.changes.includeCommitterList" value="{properties:projectInfo.changes.includeCommitterList}"/>
+          <map:parameter name="projectInfo.changes.includeContributorList" value="{properties:projectInfo.changes.includeContributorList}"/>
         </map:transform>
         <map:serialize type="xml-document"/>
       </map:match>
@@ -52,8 +52,8 @@
         <map:generate src="cocoon:/{1}.svn-revision.xml"/>
         <map:transform src="resources/stylesheets/svn-log.xsl">
           <map:parameter value="{lm:project.svn.url}" name="url"/>
-          <map:parameter value="{project:projectInfo.svn.ext}" name="ext"/>
-          <map:parameter value="{project:projectInfo.svn.path-prefix}" name="path-prefix"/>
+          <map:parameter value="{properties:projectInfo.svn.ext}" name="ext"/>
+          <map:parameter value="{properties:projectInfo.svn.path-prefix}" name="path-prefix"/>
         </map:transform>
         <map:serialize type="xml"/>
       </map:match>

Modified: forrest/trunk/plugins/org.apache.forrest.plugin.output.inputModule/src/documentation/content/xdocs/index.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.output.inputModule/src/documentation/content/xdocs/index.xml?rev=431247&r1=431246&r2=431247&view=diff
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.output.inputModule/src/documentation/content/xdocs/index.xml (original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.output.inputModule/src/documentation/content/xdocs/index.xml Sun Aug 13 14:41:37 2006
@@ -39,11 +39,9 @@
       require further help please ask on the user mailing list.</p>
       
       <ul>
-        <li><a href="module.project.properties">Properties of the project input 
+        <li><a href="module.properties.properties">Properties of the project input 
           module</a> - used in the sitemap like 
-          {project:content.xdocs}</li>
-        <li><a href="module.defaults.properties">Properties of the defaults input 
-          module</a> - used in the sitemap like {defaults:home}</li>
+          {properties:content.xdocs}</li>
         <li><a href="module.date.properties">Properties of the date input 
           module</a> - we cast an object to a string, but the module returns 
           java.util.Date. This causes a ClassCastException.</li>

Modified: forrest/trunk/site-author/content/locationmap.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/site-author/content/locationmap.xml?rev=431247&r1=431246&r2=431247&view=diff
==============================================================================
--- forrest/trunk/site-author/content/locationmap.xml (original)
+++ forrest/trunk/site-author/content/locationmap.xml Sun Aug 13 14:41:37 2006
@@ -35,7 +35,7 @@
   <locator>
   
     <match pattern="forrest.issues-rss-url">
-        <location src="{forrest:issues-rss-url}" />
+        <location src="{forrest:forrest.issues-rss-url}" />
     </match>
     
   </locator>

Modified: forrest/trunk/site-author/content/xdocs/docs_0_60/faq.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/site-author/content/xdocs/docs_0_60/faq.xml?rev=431247&r1=431246&r2=431247&view=diff
==============================================================================
--- forrest/trunk/site-author/content/xdocs/docs_0_60/faq.xml (original)
+++ forrest/trunk/site-author/content/xdocs/docs_0_60/faq.xml Sun Aug 13 14:41:37 2006
@@ -605,7 +605,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"/>

Modified: forrest/trunk/site-author/content/xdocs/docs_0_60/howto/howto-pdf-tab.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/site-author/content/xdocs/docs_0_60/howto/howto-pdf-tab.xml?rev=431247&r1=431246&r2=431247&view=diff
==============================================================================
--- forrest/trunk/site-author/content/xdocs/docs_0_60/howto/howto-pdf-tab.xml (original)
+++ forrest/trunk/site-author/content/xdocs/docs_0_60/howto/howto-pdf-tab.xml Sun Aug 13 14:41:37 2006
@@ -86,8 +86,8 @@
 <!--
 <map:pipeline internal-only="false">
 <map:select type="exists">
-  <map:when test="{project:sitemap}">
-    <map:mount uri-prefix="" src="{project:sitemap}" check-reload="yes" />
+  <map:when test="{properties:sitemap}">
+    <map:mount uri-prefix="" src="{properties:sitemap}" check-reload="yes" />
   </map:when>  
 </map:select>
 </map:pipeline

Modified: forrest/trunk/site-author/content/xdocs/docs_0_60/sitemap-ref.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/site-author/content/xdocs/docs_0_60/sitemap-ref.xml?rev=431247&r1=431246&r2=431247&view=diff
==============================================================================
--- forrest/trunk/site-author/content/xdocs/docs_0_60/sitemap-ref.xml (original)
+++ forrest/trunk/site-author/content/xdocs/docs_0_60/sitemap-ref.xml Sun Aug 13 14:41:37 2006
@@ -230,7 +230,7 @@
           to document-v13:</p>
         <source><![CDATA[
           <map:when test="howto-v13">
-            <map:transform src="{forrest:stylesheets}/howto2document.xsl" />
+            <map:transform src="{forrest:forrest.stylesheets}/howto2document.xsl" />
           </map:when>
           ]]></source>
           <!--
@@ -326,7 +326,7 @@
 2     <map:generate src="cocoon:/{1}{2}.xml"/>
 3     <map:transform type="xinclude"/>
 4     <map:transform type="]]>&linkrewriter;<![CDATA[" 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/trunk/site-author/content/xdocs/docs_0_60/your-project.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/site-author/content/xdocs/docs_0_60/your-project.xml?rev=431247&r1=431246&r2=431247&view=diff
==============================================================================
--- forrest/trunk/site-author/content/xdocs/docs_0_60/your-project.xml (original)
+++ forrest/trunk/site-author/content/xdocs/docs_0_60/your-project.xml Sun Aug 13 14:41:37 2006
@@ -770,8 +770,8 @@
  <map:pipelines>
   <map:pipeline>
    <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>
   </map:pipeline>
@@ -847,17 +847,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>
@@ -894,7 +894,7 @@
   <strong><![CDATA[
    <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><![CDATA[
@@ -908,7 +908,7 @@
             <p>You will probably want to copy the core Forrest 
               <code>rss2document.xsl</code> to your project,
               customise it to your needs, and refer to it with
-              <code>src="{project:resources.stylesheets}/rss2document.xsl"</code>.
+              <code>src="{properties:resources.stylesheets}/rss2document.xsl"</code>.
               Then of course you would add an entry to site.xml to link
               to weblog.html
             </p>

Modified: forrest/trunk/site-author/content/xdocs/docs_0_70/faq.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/site-author/content/xdocs/docs_0_70/faq.xml?rev=431247&r1=431246&r2=431247&view=diff
==============================================================================
--- forrest/trunk/site-author/content/xdocs/docs_0_70/faq.xml (original)
+++ forrest/trunk/site-author/content/xdocs/docs_0_70/faq.xml Sun Aug 13 14:41:37 2006
@@ -434,11 +434,11 @@
         <source>
 &lt;map:match pattern="old_site/**.html"&gt;
  &lt;map:select type="exists"&gt;
-  &lt;map:when test="{project:content}{0}"&gt;
-    &lt;map:read src="{project:content}/{0}" mime-type="text/html"/&gt;
+  &lt;map:when test="{properties:content}{0}"&gt;
+    &lt;map:read src="{properties:content}/{0}" mime-type="text/html"/&gt;
     &lt;!--
       Use this instead if you want JTidy to clean up your HTML
-      &lt;map:generate type="html" src="{project:content}/{0}" /&gt;
+      &lt;map:generate type="html" src="{properties:content}/{0}" /&gt;
       &lt;map:serialize type="html"/&gt;
     --&gt;
   &lt;/map:when&gt;
@@ -721,7 +721,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"/>

Modified: forrest/trunk/site-author/content/xdocs/docs_0_70/howto/howto-buildPlugin.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/site-author/content/xdocs/docs_0_70/howto/howto-buildPlugin.xml?rev=431247&r1=431246&r2=431247&view=diff
==============================================================================
--- forrest/trunk/site-author/content/xdocs/docs_0_70/howto/howto-buildPlugin.xml (original)
+++ forrest/trunk/site-author/content/xdocs/docs_0_70/howto/howto-buildPlugin.xml Sun Aug 13 14:41:37 2006
@@ -228,7 +228,7 @@
         <code>sitemap.xmap</code></p>
         <p>If you want to use the realpath where the sitemap.xmap of your plugin 
         resides then you need to use 
-        <code>{forrest:plugins}/PLUGIN_NAME</code> instead of <code>{realpath:/}</code>.
+        <code>{forrest:forrest.plugins}/PLUGIN_NAME</code> instead of <code>{realpath:/}</code>.
         </p>
         <p>See the examples below for more details.</p>
       </section>

Modified: forrest/trunk/site-author/content/xdocs/docs_0_70/howto/howto-custom-html-source.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/site-author/content/xdocs/docs_0_70/howto/howto-custom-html-source.xml?rev=431247&r1=431246&r2=431247&view=diff
==============================================================================
--- forrest/trunk/site-author/content/xdocs/docs_0_70/howto/howto-custom-html-source.xml (original)
+++ forrest/trunk/site-author/content/xdocs/docs_0_70/howto/howto-custom-html-source.xml Sun Aug 13 14:41:37 2006
@@ -336,12 +336,12 @@
        </p>
 <source><![CDATA[
 <map:select type="exists">
-   <map:when test="{project:content.xdocs}mytests/mybad.ehtml">]]></source>
+   <map:when test="{properties:content.xdocs}mytests/mybad.ehtml">]]></source>
        <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>
@@ -467,7 +467,7 @@
       </p>
       <ol>
         <li>
-          <code>&lt;map:generate src="{project:content.xdocs}{uri}.html" type="html"/&gt;</code><br/>
+          <code>&lt;map:generate src="{properties:content.xdocs}{uri}.html" type="html"/&gt;</code><br/>
             Using the html-generator, Forrest reads the html-document
             from file and uses JTidy to clean up and convert it to xml
             (which is required for all processing in cocoon pipelines).
@@ -477,7 +477,7 @@
             <a href="site:v0.70//howto/custom-html-source">When to customize</a>).
         </li>
         <li>
-            <code>&lt;map:transform src="{forrest:stylesheets}/html2document.xsl"/&gt;</code><br/>
+            <code>&lt;map:transform src="{forrest:forrest.stylesheets}/html2document.xsl"/&gt;</code><br/>
           Using the standard stylesheet 'html2document.xsl', this XHTML is 
           transformed into Forrest standard document format.
         </li>
@@ -668,8 +668,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>
@@ -694,9 +694,9 @@
 <!--Custom Pipeline for my bad html-pages-->        
 <map:pipeline>
     <map:match pattern="mytest/*.xml">
-      <map:generate src="{project:content.xdocs}{uri}.html" type="html" />
-      <strong><map:transform src="{forrest:stylesheets}/fixMyBadHTML.xsl"/></strong>
-      <map:transform src="{forrest:stylesheets}/html2document.xsl" />
+      <map:generate src="{properties:content.xdocs}{uri}.html" type="html" />
+      <strong><map:transform src="{forrest:forrest.stylesheets}/fixMyBadHTML.xsl"/></strong>
+      <map:transform src="{forrest:forrest.stylesheets}/html2document.xsl" />
       <map:transform type="idgen" />
       <map:serialize type="xml-document"/>
     </map:match>

Modified: forrest/trunk/site-author/content/xdocs/docs_0_70/howto/howto-view-dsl.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/site-author/content/xdocs/docs_0_70/howto/howto-view-dsl.xml?rev=431247&r1=431246&r2=431247&view=diff
==============================================================================
--- forrest/trunk/site-author/content/xdocs/docs_0_70/howto/howto-view-dsl.xml (original)
+++ forrest/trunk/site-author/content/xdocs/docs_0_70/howto/howto-view-dsl.xml Sun Aug 13 14:41:37 2006
@@ -205,7 +205,7 @@
         stylesheet we use another tag within our view <code><![CDATA[<forrest:css url="default.css"/>]]></code>.
       </p>
       <p>
-      	Now we will create a new file as <code><![CDATA[{project:skins-dir}{path}/{name}.css]]></code>. In our case
+      	Now we will create a new file as <code><![CDATA[{properties:skins-dir}{path}/{name}.css]]></code>. In our case
         we will save a file called howTo.css in newSeed/src/documentation/skins/css/howTo.css containing only 
         the following css:
       </p>

Modified: forrest/trunk/site-author/content/xdocs/docs_0_70/sitemap-ref.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/site-author/content/xdocs/docs_0_70/sitemap-ref.xml?rev=431247&r1=431246&r2=431247&view=diff
==============================================================================
--- forrest/trunk/site-author/content/xdocs/docs_0_70/sitemap-ref.xml (original)
+++ forrest/trunk/site-author/content/xdocs/docs_0_70/sitemap-ref.xml Sun Aug 13 14:41:37 2006
@@ -231,7 +231,7 @@
           to document-v13:</p>
         <source><![CDATA[
           <map:when test="howto-v13">
-            <map:transform src="{forrest:stylesheets}/howto2document.xsl" />
+            <map:transform src="{forrest:forrest.stylesheets}/howto2document.xsl" />
           </map:when>
           ]]></source>
           <!--
@@ -327,7 +327,7 @@
 2     <map:generate src="cocoon:/{1}{2}.xml"/>
 3     <map:transform type="xinclude"/>
 4     <map:transform type="]]>&linkrewriter;<![CDATA[" 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/trunk/site-author/content/xdocs/docs_0_70/upgrading_07.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/site-author/content/xdocs/docs_0_70/upgrading_07.xml?rev=431247&r1=431246&r2=431247&view=diff
==============================================================================
--- forrest/trunk/site-author/content/xdocs/docs_0_70/upgrading_07.xml (original)
+++ forrest/trunk/site-author/content/xdocs/docs_0_70/upgrading_07.xml Sun Aug 13 14:41:37 2006
@@ -155,19 +155,19 @@
         <source>
 &lt;map:match pattern="**.html"&gt;
  &lt;map:select type="exists"&gt;
-  &lt;map:when test="{project:content}{0}"&gt;
-    &lt;map:read src="{project:content}/{0}" mime-type="text/html"/&gt;
+  &lt;map:when test="{properties:content}{0}"&gt;
+    &lt;map:read src="{properties:content}/{0}" mime-type="text/html"/&gt;
     &lt;!--
       Use this instead if you want JTidy to clean up your HTML
-      &lt;map:generate type="html" src="{project:content}/{0}" /&gt;
+      &lt;map:generate type="html" src="{properties:content}/{0}" /&gt;
       &lt;map:serialize type="html"/&gt;
     --&gt;
   &lt;/map:when&gt;
-  &lt;map:when test="{project:content.xdocs}{0}"&gt;
-    &lt;map:read src="{project:content.xdocs}/{0}" mime-type="text/html"/&gt;
+  &lt;map:when test="{properties:content.xdocs}{0}"&gt;
+    &lt;map:read src="{properties:content.xdocs}/{0}" mime-type="text/html"/&gt;
     &lt;!--
       Use this instead if you want JTidy to clean up your HTML
-      &lt;map:generate type="html" src="{project:content.xdocs}/{0}" /&gt;
+      &lt;map:generate type="html" src="{properties:content.xdocs}/{0}" /&gt;
       &lt;map:serialize type="html"/&gt;
     --&gt;
   &lt;/map:when&gt;

Modified: forrest/trunk/site-author/content/xdocs/docs_0_70/your-project.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/site-author/content/xdocs/docs_0_70/your-project.xml?rev=431247&r1=431246&r2=431247&view=diff
==============================================================================
--- forrest/trunk/site-author/content/xdocs/docs_0_70/your-project.xml (original)
+++ forrest/trunk/site-author/content/xdocs/docs_0_70/your-project.xml Sun Aug 13 14:41:37 2006
@@ -818,8 +818,8 @@
   ...
   <strong><![CDATA[
    <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><![CDATA[
@@ -908,17 +908,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>
@@ -956,7 +956,7 @@
   <strong><![CDATA[
    <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><![CDATA[
@@ -970,7 +970,7 @@
             <p>You will probably want to copy the core Forrest 
               <code>rss2document.xsl</code> to your project,
               customise it to your needs, and refer to it with
-              <code>src="{project:resources.stylesheets}/rss2document.xsl"</code>.
+              <code>src="{properties:resources.stylesheets}/rss2document.xsl"</code>.
               Then of course you would add an entry to site.xml to link
               to weblog.html
             </p>



Mime
View raw message