forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From thors...@apache.org
Subject svn commit: r431247 [2/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
Modified: forrest/trunk/site-author/content/xdocs/docs_0_80/faq.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/site-author/content/xdocs/docs_0_80/faq.xml?rev=431247&r1=431246&r2=431247&view=diff
==============================================================================
--- forrest/trunk/site-author/content/xdocs/docs_0_80/faq.xml (original)
+++ forrest/trunk/site-author/content/xdocs/docs_0_80/faq.xml Sun Aug 13 14:41:37 2006
@@ -535,11 +535,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;
@@ -938,7 +938,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"/>
@@ -984,14 +984,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/trunk/site-author/content/xdocs/docs_0_80/howto/howto-buildPlugin.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/site-author/content/xdocs/docs_0_80/howto/howto-buildPlugin.xml?rev=431247&r1=431246&r2=431247&view=diff
==============================================================================
--- forrest/trunk/site-author/content/xdocs/docs_0_80/howto/howto-buildPlugin.xml (original)
+++ forrest/trunk/site-author/content/xdocs/docs_0_80/howto/howto-buildPlugin.xml Sun Aug 13 14:41:37 2006
@@ -237,7 +237,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>
@@ -446,7 +446,7 @@
         <source><![CDATA[
     <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>
         ]]></source>

Modified: forrest/trunk/site-author/content/xdocs/docs_0_80/howto/howto-custom-html-source.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/site-author/content/xdocs/docs_0_80/howto/howto-custom-html-source.xml?rev=431247&r1=431246&r2=431247&view=diff
==============================================================================
--- forrest/trunk/site-author/content/xdocs/docs_0_80/howto/howto-custom-html-source.xml (original)
+++ forrest/trunk/site-author/content/xdocs/docs_0_80/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="#custom">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,11 +694,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><![CDATA[
-      <map:transform src="{project:resources.stylesheets}/fixMyBadHTML.xsl"/>]]>
+      <map:transform src="{properties:resources.stylesheets}/fixMyBadHTML.xsl"/>]]>
   </strong><![CDATA[
-      <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/trunk/site-author/content/xdocs/docs_0_80/locationmap.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/site-author/content/xdocs/docs_0_80/locationmap.xml?rev=431247&r1=431246&r2=431247&view=diff
==============================================================================
--- forrest/trunk/site-author/content/xdocs/docs_0_80/locationmap.xml (original)
+++ forrest/trunk/site-author/content/xdocs/docs_0_80/locationmap.xml Sun Aug 13 14:41:37 2006
@@ -128,8 +128,8 @@
     <source><![CDATA[
 <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>
     ]]></source>
@@ -144,7 +144,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,
         or even remote repositories. For example, the following location match 
@@ -202,7 +202,7 @@
         <source>
 &lt;map:match pattern="lenya/**.xml"&gt;
   &lt;map:generate type="html" src="{lm:{0}}" /&gt;
-  &lt;map:transform src="{forrest:stylesheets}/html2document.xsl" /&gt;
+  &lt;map:transform src="{forrest:forrest.stylesheets}/html2document.xsl" /&gt;
   &lt;map:serialize type="xml"/&gt;
 &lt;/map:match&gt;
         </source>

Modified: forrest/trunk/site-author/content/xdocs/docs_0_80/sitemap-ref.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/site-author/content/xdocs/docs_0_80/sitemap-ref.xml?rev=431247&r1=431246&r2=431247&view=diff
==============================================================================
--- forrest/trunk/site-author/content/xdocs/docs_0_80/sitemap-ref.xml (original)
+++ forrest/trunk/site-author/content/xdocs/docs_0_80/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_80/upgrading_08.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/site-author/content/xdocs/docs_0_80/upgrading_08.xml?rev=431247&r1=431246&r2=431247&view=diff
==============================================================================
--- forrest/trunk/site-author/content/xdocs/docs_0_80/upgrading_08.xml (original)
+++ forrest/trunk/site-author/content/xdocs/docs_0_80/upgrading_08.xml Sun Aug 13 14:41:37 2006
@@ -68,6 +68,31 @@
         forrest.properties and skinconf.xml with that of your project.
       </p>
     </section>
+    
+    <section id="modules">
+      <title>Forrest configuration simplification</title>
+      <p>
+        <strong>FOR-920</strong> Merging the
+        <code>defaults</code> and
+        <code>project</code> modules to the new
+        <code>properties</code> module. You can use it like {properties:forrest.home}
+        </p>
+      <p> In all custom code you have, </p>
+      
+      <ul>
+        <li>find:
+          <code>{defaults:</code> and replace with
+          <code>{properties:forrest.</code></li>
+        <li>find:
+          <code>{forrest:</code> and replace with
+          <code>{forrest:forrest.</code> or
+          <code>{properties:forrest.</code> (if you do not need the
+          ChainMetaModule)</li>
+        <li>find:
+          <code>{project:</code> and replace with
+          <code>{properties:</code></li>
+      </ul>
+    </section>
 
     <section id="clean">
       <title>Run a clean target after upgrade</title>

Modified: forrest/trunk/site-author/content/xdocs/docs_0_80/your-project.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/site-author/content/xdocs/docs_0_80/your-project.xml?rev=431247&r1=431246&r2=431247&view=diff
==============================================================================
--- forrest/trunk/site-author/content/xdocs/docs_0_80/your-project.xml (original)
+++ forrest/trunk/site-author/content/xdocs/docs_0_80/your-project.xml Sun Aug 13 14:41:37 2006
@@ -828,8 +828,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[
@@ -918,17 +918,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>
@@ -966,7 +966,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[
@@ -980,7 +980,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/howto-dev.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/site-author/content/xdocs/howto-dev.xml?rev=431247&r1=431246&r2=431247&view=diff
==============================================================================
--- forrest/trunk/site-author/content/xdocs/howto-dev.xml (original)
+++ forrest/trunk/site-author/content/xdocs/howto-dev.xml Sun Aug 13 14:41:37 2006
@@ -499,7 +499,7 @@
       <source><![CDATA[
 ...
 <map:transform type="validation-report"
-  src="{forrest:context}/resources/schema/relaxng/unstable/any.rng"/>
+  src="{forrest:forrest.context}/resources/schema/relaxng/unstable/any.rng"/>
 ...
 ]]></source>
         <p>See

Modified: forrest/trunk/site-author/content/xdocs/pluginDocs/plugins_0_70/pluginInfrastructure.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/site-author/content/xdocs/pluginDocs/plugins_0_70/pluginInfrastructure.xml?rev=431247&r1=431246&r2=431247&view=diff
==============================================================================
--- forrest/trunk/site-author/content/xdocs/pluginDocs/plugins_0_70/pluginInfrastructure.xml (original)
+++ forrest/trunk/site-author/content/xdocs/pluginDocs/plugins_0_70/pluginInfrastructure.xml Sun Aug 13 14:41:37 2006
@@ -224,18 +224,18 @@
 <source><![CDATA[
 <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>
@@ -276,7 +276,7 @@
   <source><![CDATA[
         <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/trunk/site-author/content/xdocs/pluginDocs/plugins_0_80/pluginInfrastructure.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/site-author/content/xdocs/pluginDocs/plugins_0_80/pluginInfrastructure.xml?rev=431247&r1=431246&r2=431247&view=diff
==============================================================================
--- forrest/trunk/site-author/content/xdocs/pluginDocs/plugins_0_80/pluginInfrastructure.xml (original)
+++ forrest/trunk/site-author/content/xdocs/pluginDocs/plugins_0_80/pluginInfrastructure.xml Sun Aug 13 14:41:37 2006
@@ -221,18 +221,18 @@
 <source><![CDATA[
 <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>
@@ -272,7 +272,7 @@
   <source><![CDATA[
         <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/trunk/site-author/content/xdocs/trash/docs_0_50/upgrading_05.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/site-author/content/xdocs/trash/docs_0_50/upgrading_05.xml?rev=431247&r1=431246&r2=431247&view=diff
==============================================================================
--- forrest/trunk/site-author/content/xdocs/trash/docs_0_50/upgrading_05.xml (original)
+++ forrest/trunk/site-author/content/xdocs/trash/docs_0_50/upgrading_05.xml Sun Aug 13 14:41:37 2006
@@ -160,7 +160,7 @@
       <title>Skin invocation changes</title>
       <p>Users with custom skins <em>may</em> need to update them, depending on what use they make of passed-in XSLT
         parameters.  If your custom skin does not appear to work with 0.5, look in Forrest's <code>sitemap.xmap</code>
-        for occurrences of <code>{forrest:skin}</code>, and check that the callee (your XSLT) is expecting what the
+        for occurrences of <code>{forrest:forrest.skin}</code>, and check that the callee (your XSLT) is expecting what the
         caller (the sitemap) is passing it.  Forrest skins can be used as a reference.</p>
     </section>
 

Modified: forrest/trunk/site-author/sitemap.xmap
URL: http://svn.apache.org/viewvc/forrest/trunk/site-author/sitemap.xmap?rev=431247&r1=431246&r2=431247&view=diff
==============================================================================
--- forrest/trunk/site-author/sitemap.xmap (original)
+++ forrest/trunk/site-author/sitemap.xmap Sun Aug 13 14:41:37 2006
@@ -33,8 +33,8 @@
         
     <map:match pattern="dtdx/*.dtdx.pdf">
      <map:select type="exists">
-      <map:when test="{project:content}{1}.dtdx.pdf">
-        <map:read src="{project:content}{1}.dtdx.pdf" mime-type="application/pdf"/>
+      <map:when test="{properties:content}{1}.dtdx.pdf">
+        <map:read src="{properties:content}{1}.dtdx.pdf" mime-type="application/pdf"/>
       </map:when>
      </map:select>
    </map:match>

Modified: forrest/trunk/site-author/status.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/site-author/status.xml?rev=431247&r1=431246&r2=431247&view=diff
==============================================================================
--- forrest/trunk/site-author/status.xml (original)
+++ forrest/trunk/site-author/status.xml Sun Aug 13 14:41:37 2006
@@ -140,12 +140,22 @@
         <link href="site:v0.80//upgrading_08">upgrading to v0.8</link>
       </action>
 <!-- 2006-08 -->
+      <action type="update" context="docs" dev="TS">
+        <strong>FOR-920</strong> - Addings notes how to
+        <link href="site:v0.80//upgrading_08">update</link> the different module calls in
+        custom code. </action>
+      <action type="update" context="code" dev="TS" importance="high">
+        <strong>FOR-920</strong> Merging the defaults and project modules to the new
+        properties module. You can use it like {properties:forrest.home}, please refer to
+        the
+        <link href="site:v0.80//upgrading_08">update documentation</link> how to
+        change your {defaults:*} {project:*} and {forrest:*}.</action>
       <action context="code" type="update" dev="TS" fixes-bug="FOR-800"> FOR-800 - make
         forrest.properties.xml (as aggregation of all properties) aviable via cocoon://.
         The last remaining issue was implementing the Iterator getAttributeNames in the
         ForrestConfModule. To see all aviable properties add
         org.apache.forrest.plugin.output.inputModule and request
-        cocoon://module.project.properties.</action>
+        cocoon://module.properties.properties.</action>
       <action context="code" type="update" dev="TS" fixes-bug="FOR-916"
         due-to="Mathieu Champlon"> FOR-916 - adding site-wide configuration files
         Applying patches from Mathieu Champlon. Thanks Mathieu for your contribution.
@@ -752,16 +762,6 @@
        normalize-space() the forrest:properties before parsing them to the pipe
       </action>
       
-      <action dev="TS" type="update" context="code"> Added a new 
-        {defaults:view-internal} to better reuse the internal code of views. 
-        has the benefit that I only need to change the forrest-core.conf when 
-        we move views in to the core. The change in 
-        includes-viewLocationmap.xsl allows us to parse the views extension as 
-        paramater. That allows us to easily change '.fv' to '.fv.xml' via the 
-        forrest.properties. <link 
-        href="http://svn.apache.org/viewcvs.cgi?rev=215902&amp;view=rev">Diff</link> 
-        </action>
-
       <action dev="DC" type="add" context="docs" fixes-bug="FOR-603"
         due-to="Addison Berry">
         Added document to explain the process for

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.Database/input.xmap
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.Database/input.xmap?rev=431247&r1=431246&r2=431247&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.Database/input.xmap (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.Database/input.xmap Sun Aug 13 14:41:37 2006
@@ -27,7 +27,7 @@
 	  <map:pipeline>
 	
 	   <map:match pattern="database.xml">
-	    <map:generate src="{project:content.xdocs}/samples/sql-document.xml"/>
+	    <map:generate src="{properties:content.xdocs}/samples/sql-document.xml"/>
 		<map:transform type="sql"> 
 	  	  <map:parameter name="dburl" value="jdbc:hsqldb:hsql://localhost:9002/datalogger"/>
 		  <map:parameter name="username" value="sa"/>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Blog/input.xmap
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Blog/input.xmap?rev=431247&r1=431246&r2=431247&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Blog/input.xmap (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Blog/input.xmap Sun Aug 13 14:41:37 2006
@@ -31,7 +31,7 @@
   
   <!-- for testing to get a "raw" look at the xpathdirectory generators xml -->
     <map:match pattern="blog/raw.xml">
-      <map:generate type="xpathdirectory" src="{project:content.xdocs}/blog">
+      <map:generate type="xpathdirectory" src="{properties:content.xdocs}/blog">
          <map:parameter name="depth" value="99"/>
          <map:parameter name="xpath" value="/document/header[meta='{request-param:category}']/title"/>
          <!--<map:parameter name="dateFormat" value="EEE, MMM d, ''yy"/>-->
@@ -42,7 +42,7 @@
     </map:match>
      
      <map:match pattern="blog/*/index.xml">
-        <map:generate type="xpathdirectory" src="{project:content.xdocs}/blog">
+        <map:generate type="xpathdirectory" src="{properties:content.xdocs}/blog">
            <map:parameter name="depth" value="99"/>
            <map:parameter name="xpath" value="/document/header[meta='{1}']/title"/>
            <!--<map:parameter name="dateFormat" value="EEE, MMM d, ''yy"/>-->
@@ -58,7 +58,7 @@
    </map:match>
    
    <map:match pattern="blog/index.xml">
-      <map:generate type="xpathdirectory" src="{project:content.xdocs}/blog">
+      <map:generate type="xpathdirectory" src="{properties:content.xdocs}/blog">
          <map:parameter name="depth" value="99"/>
          <map:parameter name="xpath" value="/document/header[meta='{request-param:category}']/title"/>
          <!--<map:parameter name="dateFormat" value="EEE, MMM d, ''yy"/>-->

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/input.xmap
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/input.xmap?rev=431247&r1=431246&r2=431247&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/input.xmap (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/input.xmap Sun Aug 13 14:41:37 2006
@@ -34,18 +34,18 @@
   <map:resources>
     <map:resource name="daisy-to-document">
         <map:aggregate element="daisyDocument">
-          <map:part src="cocoon://{project:daisy.pathPrefix}{docID}.daisy.source" />
-          <map:part src="cocoon://daisy.site.{project:daisy.navigation.docID}" />
+          <map:part src="cocoon://{properties:daisy.pathPrefix}{docID}.daisy.source" />
+          <map:part src="cocoon://daisy.site.{properties:daisy.navigation.docID}" />
         </map:aggregate>
         <map:transform src="{lm:daisy.transform.daisy.html}">
           <map:parameter name="documentPath" value="{path}"/>
-          <map:parameter name="pathPrefix" value="{project:daisy.pathPrefix}"/>
-          <map:parameter name="daisyExt" value="{project:daisy.fileExt}"/>
+          <map:parameter name="pathPrefix" value="{properties:daisy.pathPrefix}"/>
+          <map:parameter name="daisyExt" value="{properties:daisy.fileExt}"/>
         </map:transform>
         <map:transform src="{lm:transform.html.document}"/>
         <map:select type="exists">
-          <map:when test="{project:resources.stylesheets}/daisy/postFilter.xsl">
-            <map:transform src="{project:resources.stylesheets}/daisy/postFilter.xsl"/>
+          <map:when test="{properties:resources.stylesheets}/daisy/postFilter.xsl">
+            <map:transform src="{properties:resources.stylesheets}/daisy/postFilter.xsl"/>
           </map:when>
         </map:select>
         <map:serialize/>
@@ -70,21 +70,21 @@
       selects to generate pages are likely to have the same problem is they
       do not use the default ".daisy" extension for daisy hosted pages.
       -->
-      <map:match pattern="{project:daisy.pathPrefix}*.daisy.xml">
+      <map:match pattern="{properties:daisy.pathPrefix}*.daisy.xml">
         <map:call resource="daisy-to-document">
           <map:parameter name="docID" value="{1}"/>
           <map:parameter name="path" value="{0}"/>
         </map:call>
       </map:match>
       
-      <map:match pattern="{project:daisy.pathPrefix}*{project:daisy.fileExt}.xml">
+      <map:match pattern="{properties:daisy.pathPrefix}*{properties:daisy.fileExt}.xml">
         <map:call resource="daisy-to-document">
           <map:parameter name="docID" value="{1}"/>
           <map:parameter name="path" value="{0}"/>
         </map:call>
       </map:match>
       
-      <map:match pattern="{project:daisy.pathPrefix}**{project:daisy.fileExt}.xml">
+      <map:match pattern="{properties:daisy.pathPrefix}**{properties:daisy.fileExt}.xml">
         <map:call resource="daisy-to-document">
           <map:parameter name="docID" value="{1}"/>
           <map:parameter name="path" value="{0}"/>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/locationmap.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/locationmap.xml?rev=431247&r1=431246&r2=431247&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/locationmap.xml (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/locationmap.xml Sun Aug 13 14:41:37 2006
@@ -32,7 +32,7 @@
   <locator>    
     <match pattern="daisy.transform.*.*">
       <select>
-        <location src="{project:resources.stylesheets}/daisy/{1}-to-{2}.xsl"/>
+        <location src="{properties:resources.stylesheets}/daisy/{1}-to-{2}.xsl"/>
         <location src="resources/stylesheets/{1}-to-{2}.xsl"/>
       </select>
     </match>   

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/resources.xmap
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/resources.xmap?rev=431247&r1=431246&r2=431247&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/resources.xmap (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/resources.xmap Sun Aug 13 14:41:37 2006
@@ -33,8 +33,8 @@
        <map:match pattern="**.daisy.source">
         <map:generate src="{lm:{0}}" />
         <map:select type="exists">
-          <map:when test="{project:resources.stylesheets}/daisy/preFilter.xsl">
-				    <map:transform src="{project:resources.stylesheets}/daisy/preFilter.xsl"/>
+          <map:when test="{properties:resources.stylesheets}/daisy/preFilter.xsl">
+				    <map:transform src="{properties:resources.stylesheets}/daisy/preFilter.xsl"/>
           </map:when>
         </map:select>
         <map:serialize type="xml"/>
@@ -57,9 +57,9 @@
   
     <map:pipeline ype="navigation">      
       <map:match pattern="daisy.site.*">
-        <map:generate src="{project:daisy.publisher.URL}blob?documentId={1}&amp;version=live&amp;partType=1" />
-        <map:transform src="{forrest:plugins}/org.apache.forrest.plugin.input.Daisy/resources/stylesheets/navigation-to-siteSnippet.xsl">
-          <map:parameter name="daisyExt" value="{project:daisy.fileExt}"/>
+        <map:generate src="{properties:daisy.publisher.URL}blob?documentId={1}&amp;version=live&amp;partType=1" />
+        <map:transform src="{forrest:forrest.plugins}/org.apache.forrest.plugin.input.Daisy/resources/stylesheets/navigation-to-siteSnippet.xsl">
+          <map:parameter name="daisyExt" value="{properties:daisy.fileExt}"/>
         </map:transform>
         <map:transform type="xinclude"/>
         <map:serialize type="xml" />

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/src/documentation/content/xdocs/index.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/src/documentation/content/xdocs/index.xml?rev=431247&r1=431246&r2=431247&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/src/documentation/content/xdocs/index.xml (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/src/documentation/content/xdocs/index.xml Sun Aug 13 14:41:37 2006
@@ -57,11 +57,11 @@
       <map:parameter name="expires" value="access plus 2 hours"/>
     
       <map:match pattern="locationmap-project.xml">
-        <map:generate src="{project:daisy.publisher.URL}blob?documentId={project:daisy.navigation.docID}&amp;version=live&amp;partType=1"/>
-        <map:transform src="{forrest:plugins}/org.apache.forrest.plugin.input.Daisy/resources/stylesheets/navigation-to-locationmap.xsl">
-          <map:parameter name="publisherURL" value="{project:daisy.publisher.URL}"/>
-          <map:parameter name="pathPrefix" value="{project:daisy.pathPrefix}"/>
-          <map:parameter name="navigationID" value="{project:daisy.navigation.docID}"/>
+        <map:generate src="{properties:daisy.publisher.URL}blob?documentId={properties:daisy.navigation.docID}&amp;version=live&amp;partType=1"/>
+        <map:transform src="{forrest:forrest.plugins}/org.apache.forrest.plugin.input.Daisy/resources/stylesheets/navigation-to-locationmap.xsl">
+          <map:parameter name="publisherURL" value="{properties:daisy.publisher.URL}"/>
+          <map:parameter name="pathPrefix" value="{properties:daisy.pathPrefix}"/>
+          <map:parameter name="navigationID" value="{properties:daisy.navigation.docID}"/>
         </map:transform>
         <map:transform type="xinclude"/>
         <map:serialize type="xml"/>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Lenya/input.xmap
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Lenya/input.xmap?rev=431247&r1=431246&r2=431247&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Lenya/input.xmap (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Lenya/input.xmap Sun Aug 13 14:41:37 2006
@@ -25,11 +25,11 @@
         tree to site,xml? -->
         <map:match pattern="lenya-site.xml">
             <map:generate src="{lm:lenya-site.xml}"/>
-            <map:transform src="{project:resources.stylesheets}/lenyasitetree2linkmap.xsl" />
+            <map:transform src="{properties:resources.stylesheets}/lenyasitetree2linkmap.xsl" />
             <map:serialize type="xml"/>
         </map:match>
         <map:match pattern="doco-site.xml">
-            <map:generate src="{project:content.xdocs}sitetree.xml"/>
+            <map:generate src="{properties:content.xdocs}sitetree.xml"/>
             <map:transform src="resources/stylesheets/sitetree-to-site.xsl" />
             <map:serialize type="xml"/>
         </map:match>
@@ -37,7 +37,7 @@
         <map:match pattern="lenya/**.xml">
             <map:generate src="{lm:{0}}"/>
             <map:transform
-                src="{project:resources.stylesheets}/lenyaxhtml2html.xsl"/>
+                src="{properties:resources.stylesheets}/lenyaxhtml2html.xsl"/>
             <map:transform src="{lm:transform.html.document}"/>
             <map:serialize type="xml"/>
         </map:match>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Resume/input.xmap
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Resume/input.xmap?rev=431247&r1=431246&r2=431247&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Resume/input.xmap (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Resume/input.xmap Sun Aug 13 14:41:37 2006
@@ -39,18 +39,18 @@
     <map:resource name="source-file-resolver">
       <map:select type="exists">
         <!-- FIXME: need to peek inside document to ensure it is the correct type -->
-        <map:when test="{project:content.xdocs}{uri}.sxw">
-          <map:generate type="sxw" src="{project:content.xdocs}{uri}.sxw"/>
+        <map:when test="{properties:content.xdocs}{uri}.sxw">
+          <map:generate type="sxw" src="{properties:content.xdocs}{uri}.sxw"/>
           <map:transform src="resources/stylesheets/ooToResume.xsl"/>
           <map:serialize type="xml"/>
         </map:when>  
         <map:when test="{lm:{uri}.xml}">
-         <map:generate src="{project:content.xdocs}{uri}.xml"/>
+         <map:generate src="{properties:content.xdocs}{uri}.xml"/>
          <map:transform type="xinclude"/>
          <map:serialize type="xml"/>
         </map:when>
-        <map:when test="{project:content.xdocs}{uri}.xml">
-         <map:generate src="{project:content.xdocs}{uri}.xml"/>
+        <map:when test="{properties:content.xdocs}{uri}.xml">
+         <map:generate src="{properties:content.xdocs}{uri}.xml"/>
          <map:transform type="xinclude"/>
          <map:serialize type="xml"/>
         </map:when>
@@ -63,7 +63,7 @@
           <map:parameter name="parameter-selector-test" value="{sourcetype}" />
 
           <map:when test="resume-v1.5.1">
-             <map:generate src="{project:content.xdocs}{../../1}.xml"/>
+             <map:generate src="{properties:content.xdocs}{../../1}.xml"/>
              <map:transform src="resources/stylesheets/resume2xdoc.xsl" />
              <map:serialize type="xml"/>
           </map:when>
@@ -78,7 +78,7 @@
     <map:pipeline>
       <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:match pattern="**.source.xml">
@@ -88,7 +88,7 @@
       </map:match>
    
       <map:match pattern="team/all.source.xml">
-        <map:generate type="directory" src="{project:content.xdocs}/team/resume">
+        <map:generate type="directory" src="{properties:content.xdocs}/team/resume">
           <map:parameter name="include" value=".*.xml$"/>
         </map:generate>
         <map:transform src="resources/stylesheets/directory2resumes.xsl"/>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.XDoc/input.xmap
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.XDoc/input.xmap?rev=431247&r1=431246&r2=431247&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.XDoc/input.xmap (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.XDoc/input.xmap Sun Aug 13 14:41:37 2006
@@ -200,7 +200,7 @@
   <map:pipeline>
       <map:match type="wildcard" pattern="**.xml">
       
-       <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-xhtml2">
             <map:parameter name="src" value="{source}" />

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.citations/locationmap.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.citations/locationmap.xml?rev=431247&r1=431246&r2=431247&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.citations/locationmap.xml (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.citations/locationmap.xml Sun Aug 13 14:41:37 2006
@@ -35,7 +35,7 @@
     </match>   
     <match pattern="resolvePluginContract.*.**">
       <select type="exists">
-        <location src="{forrest:plugins}/org.apache.forrest.plugin.input.citations/resources/themes/{project:theme}/{1}/{2}.fv" />
+        <location src="{forrest:forrest.plugins}/org.apache.forrest.plugin.input.citations/resources/themes/{properties:theme}/{1}/{2}.fv" />
       </select>
     </match>  
 </locator>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.ecs/input.xmap
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.ecs/input.xmap?rev=431247&r1=431246&r2=431247&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.ecs/input.xmap (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.ecs/input.xmap Sun Aug 13 14:41:37 2006
@@ -31,8 +31,8 @@
      
     <map:match pattern="**.ecs.source.xml">
       <map:aggregate element="ecs">
-        <map:part src="{project:content.xdocs}/{1}.ecs.local.xml"/>
-        <map:part src="{project:content.xdocs}/{1}.ecs.amazon.xml"/>
+        <map:part src="{properties:content.xdocs}/{1}.ecs.local.xml"/>
+        <map:part src="{properties:content.xdocs}/{1}.ecs.amazon.xml"/>
       </map:aggregate>
       <map:serialize type="xml"/>
      </map:match>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.logs/input.xmap
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.logs/input.xmap?rev=431247&r1=431246&r2=431247&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.logs/input.xmap (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.logs/input.xmap Sun Aug 13 14:41:37 2006
@@ -45,7 +45,7 @@
           <map:parameter name="parameter-selector-test" value="{sourcetype}" />
 
           <map:when test="J2SE">
-            <map:generate src="{project:content.xdocs}{../../1}.xml" />
+            <map:generate src="{properties:content.xdocs}{../../1}.xml" />
             <map:transform src="resources/stylesheets/j2se2document.xsl" />
             <map:serialize type="xml-document"/>
           </map:when>
@@ -65,7 +65,7 @@
       </map:match>
       <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/whiteboard/plugins/org.apache.forrest.plugin.input.odt/locationmap.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.odt/locationmap.xml?rev=431247&r1=431246&r2=431247&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.odt/locationmap.xml (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.odt/locationmap.xml Sun Aug 13 14:41:37 2006
@@ -33,14 +33,14 @@
     <match pattern="transform.odt.xhtml">
       <select>
         <location 
-          src="{forrest:plugins}/org.apache.forrest.plugin.input.odt/resources/stylesheets/common/odt_to_xhtml.xsl" 
+          src="{forrest:forrest.plugins}/org.apache.forrest.plugin.input.odt/resources/stylesheets/common/odt_to_xhtml.xsl" 
           />
       </select>
     </match>
     <match pattern="transform.odt-forrest.xhtml">
       <select>
         <location 
-          src="{forrest:plugins}/org.apache.forrest.plugin.input.odt/resources/stylesheets/odt-to-forrest-xhtml.xsl" 
+          src="{forrest:forrest.plugins}/org.apache.forrest.plugin.input.odt/resources/stylesheets/odt-to-forrest-xhtml.xsl" 
           />
       </select>
     </match>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.DevTools/internal.xmap
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.DevTools/internal.xmap?rev=431247&r1=431246&r2=431247&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.DevTools/internal.xmap (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.DevTools/internal.xmap Sun Aug 13 14:41:37 2006
@@ -33,11 +33,11 @@
   <map:pipeline type="noncaching">    
     <map:match pattern="devTools/do/savePage.xml">
       <map:act type="write">
-        <map:parameter name="staging-dir" value="{project:staging-dir}"/>
+        <map:parameter name="staging-dir" value="{properties:staging-dir}"/>
         <map:generate type="request"/>
         <map:transform src="{lm:devTools.transform.saveRequest.success}">
           <map:paramaeter name="response" value="{message}"/>
-          <map:paramaeter name="staging-dir" value="{project:staging-dir}"/>
+          <map:paramaeter name="staging-dir" value="{properties:staging-dir}"/>
         </map:transform>
         <map:serialize type="xml-document"/>
       </map:act>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.GoogleSitemap/internal.xmap
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.GoogleSitemap/internal.xmap?rev=431247&r1=431246&r2=431247&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.GoogleSitemap/internal.xmap (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.GoogleSitemap/internal.xmap Sun Aug 13 14:41:37 2006
@@ -240,10 +240,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:transform type="i18n">
               <map:parameter name="locale" value="{request:locale}"/>
@@ -253,7 +253,7 @@
       <!--
         FIXME: strip_namespace is because this bug: http://issues.apache.org/bugzilla/show_bug.cgi?id=35348
       -->
-        <map:transform src="{forrest:context}/skins/common/xslt/html/strip_namespaces.xsl"/>
+        <map:transform src="{forrest:forrest.context}/skins/common/xslt/html/strip_namespaces.xsl"/>
 
       <map:serialize/>
     </map:resource>
@@ -276,13 +276,13 @@
             <map:read src="resources/chaperon/grammars/{1}.xlex"/>
           </map:when>
           <map:otherwise>
-            <map:generate  type="text2xml"   src="{forrest:context}/resources/chaperon/grammars/{1}.grm"/>
-            <map:transform type="lexer"  src="{forrest:context}/resources/chaperon/grammars/grm.xlex"/>
-            <map:transform type="parser" src="{forrest:context}/resources/chaperon/grammars/grm.xgrm"/>
-            <map:transform               src="{forrest:context}/resources/chaperon/stylesheets/text4regex.xsl"/>
-            <map:transform type="lexer"  src="{forrest:context}/resources/chaperon/grammars/regex.xlex"/>
-            <map:transform type="parser" src="{forrest:context}/resources/chaperon/grammars/regex.xgrm"/>
-            <map:transform               src="{forrest:context}/resources/chaperon/stylesheets/grm2xlex.xsl"/>
+            <map:generate  type="text2xml"   src="{forrest:forrest.context}/resources/chaperon/grammars/{1}.grm"/>
+            <map:transform type="lexer"  src="{forrest:forrest.context}/resources/chaperon/grammars/grm.xlex"/>
+            <map:transform type="parser" src="{forrest:forrest.context}/resources/chaperon/grammars/grm.xgrm"/>
+            <map:transform               src="{forrest:forrest.context}/resources/chaperon/stylesheets/text4regex.xsl"/>
+            <map:transform type="lexer"  src="{forrest:forrest.context}/resources/chaperon/grammars/regex.xlex"/>
+            <map:transform type="parser" src="{forrest:forrest.context}/resources/chaperon/grammars/regex.xgrm"/>
+            <map:transform               src="{forrest:forrest.context}/resources/chaperon/stylesheets/grm2xlex.xsl"/>
             <map:serialize type="xml"/>
           </map:otherwise>
         </map:select>
@@ -357,9 +357,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>  
@@ -370,27 +370,27 @@
       
       <map:pipeline internal-only="false">
          <map:match pattern="skinconf.xml">
-           <map:generate src="{project:skinconf}" />
-           <map:transform src="{forrest:stylesheets}/strip-doctype.xsl"/>
-           <map:transform src="{forrest:stylesheets}/upgrade-skinconf.xsl"/>
+           <map:generate src="{properties:skinconf}" />
+           <map:transform src="{forrest:forrest.stylesheets}/strip-doctype.xsl"/>
+           <map:transform src="{forrest:forrest.stylesheets}/upgrade-skinconf.xsl"/>
            <map:select type="exists">
-             <map:when test="{project:skins-dir}{forrest:skin}/skinconf.xsl">
-               <map:transform src="{project:skins-dir}{forrest:skin}/skinconf.xsl"/>
+             <map:when test="{properties:skins-dir}{forrest:forrest.skin}/skinconf.xsl">
+               <map:transform src="{properties:skins-dir}{forrest:forrest.skin}/skinconf.xsl"/>
              </map:when>
            </map:select>
            <map:select type="exists">
-             <map:when test="{forrest:context}/skins/{forrest:skin}/skinconf.xsl">
-               <map:transform src="{forrest:context}/skins/{forrest:skin}/skinconf.xsl"/>
+             <map:when test="{forrest:forrest.context}/skins/{forrest:forrest.skin}/skinconf.xsl">
+               <map:transform src="{forrest:forrest.context}/skins/{forrest:forrest.skin}/skinconf.xsl"/>
              </map:when>
            </map:select>
-           <map:transform src="{forrest:context}/skins/common/skinconf.xsl"/>
+           <map:transform src="{forrest:forrest.context}/skins/common/skinconf.xsl"/>
            <map:transform type="skinconf"/>
            <map:serialize type="xml" />
          </map:match>
 
          <!-- Add some build information, which is added to the html head -->
          <map:match pattern="build-info">
-           <map:generate src="{project:temp-dir}/build-info.xml"/>
+           <map:generate src="{properties:temp-dir}/build-info.xml"/>
            <map:serialize type="xml"/>
          </map:match>
        </map:pipeline>
@@ -407,74 +407,74 @@
 
         <map:match pattern="pluginDocs/plugins_*/index.xml">
           <map:aggregate element="pluginList">
-            <map:part src="{forrest:plugins-src}/plugins.xml"/>
-            <map:part src="{forrest:whiteboard-plugins-src}/whiteboard-plugins.xml"/>
+            <map:part src="{forrest:forrest.plugins-src}/plugins.xml"/>
+            <map:part src="{forrest:forrest.whiteboard-plugins-src}/whiteboard-plugins.xml"/>
           </map:aggregate>
-          <map:transform src="{forrest:stylesheets}/plugins2xdoc.xsl"/>
+          <map:transform src="{forrest:forrest.stylesheets}/plugins2xdoc.xsl"/>
           <map:serialize type="xml"/>
         </map:match>
 
         <map:match pattern="linkmap.xml">
-          <map:mount uri-prefix="" src="{forrest:context}/linkmap.xmap" check-reload="yes" />
+          <map:mount uri-prefix="" src="{forrest:forrest.context}/linkmap.xmap" check-reload="yes" />
         </map:match>
 
         <map:match pattern="forrest-issues.xml">
-          <map:mount uri-prefix="" src="{forrest:context}/issues.xmap" check-reload="yes" />
+          <map:mount uri-prefix="" src="{forrest:forrest.context}/issues.xmap" check-reload="yes" />
         </map:match>
 
         <map:match pattern="**faq.xml">
-          <map:mount uri-prefix="" src="{forrest:context}/faq.xmap" check-reload="yes" />
+          <map:mount uri-prefix="" src="{forrest:forrest.context}/faq.xmap" check-reload="yes" />
         </map:match>
 
         <map:match pattern="community/**index.xml">
-          <map:mount uri-prefix="" src="{forrest:context}/forrest.xmap" check-reload="yes" />
+          <map:mount uri-prefix="" src="{forrest:forrest.context}/forrest.xmap" check-reload="yes" />
         </map:match>
 
         <map:match pattern="community/*/**.xml">
-          <map:mount uri-prefix="" src="{forrest:context}/revisions.xmap" check-reload="yes" />
+          <map:mount uri-prefix="" src="{forrest:forrest.context}/revisions.xmap" check-reload="yes" />
         </map:match>
 
         <!-- wholesite is preferred; site is here for compatibility -->
         <map:match pattern="wholesite.xml">
-          <map:mount uri-prefix="" src="{forrest:context}/aggregate.xmap" check-reload="yes" />
+          <map:mount uri-prefix="" src="{forrest:forrest.context}/aggregate.xmap" check-reload="yes" />
         </map:match>
         <map:match pattern="site.xml">
-          <map:mount uri-prefix="" src="{forrest:context}/aggregate.xmap" check-reload="yes" />
+          <map:mount uri-prefix="" src="{forrest:forrest.context}/aggregate.xmap" check-reload="yes" />
         </map:match>
 
         <!-- Lucene index update and search -->
         <map:match pattern="lucene-*.xml">
-          <map:mount uri-prefix="" src="{forrest:context}/search.xmap" check-reload="yes"/>
+          <map:mount uri-prefix="" src="{forrest:forrest.context}/search.xmap" check-reload="yes"/>
         </map:match>
 
         <!-- Default source types -->
-        <map:mount uri-prefix="" src="{forrest:context}/forrest.xmap" check-reload="yes" />
+        <map:mount uri-prefix="" src="{forrest:forrest.context}/forrest.xmap" check-reload="yes" />
 
       </map:match>
 
       <!-- Menu content -->
       <map:match pattern="abs-menulinks">
-        <map:mount uri-prefix="" src="{forrest:context}/menu.xmap" check-reload="yes" />
+        <map:mount uri-prefix="" src="{forrest:forrest.context}/menu.xmap" check-reload="yes" />
       </map:match>
 
       <map:match pattern="**menulinks-*">
-        <map:mount uri-prefix="" src="{forrest:context}/menu.xmap" check-reload="yes" />
+        <map:mount uri-prefix="" src="{forrest:forrest.context}/menu.xmap" check-reload="yes" />
       </map:match>
 
       <!-- Link maps -->
       <map:match pattern="abs-linkmap">
-        <map:mount uri-prefix="" src="{forrest:context}/linkmap.xmap"/>
+        <map:mount uri-prefix="" src="{forrest:forrest.context}/linkmap.xmap"/>
       </map:match>
 
       <map:match pattern="**linkmap-*">
         <map:match pattern="linkmap-wholesite.*">
-          <map:mount uri-prefix="" src="{forrest:context}/aggregate.xmap" check-reload="yes" />
+          <map:mount uri-prefix="" src="{forrest:forrest.context}/aggregate.xmap" check-reload="yes" />
         </map:match>
         <map:match pattern="linkmap-site.*">
-          <map:mount uri-prefix="" src="{forrest:context}/aggregate.xmap" check-reload="yes" />
+          <map:mount uri-prefix="" src="{forrest:forrest.context}/aggregate.xmap" check-reload="yes" />
         </map:match>
 
-        <map:mount uri-prefix="" src="{forrest:context}/linkmap.xmap" check-reload="yes" />
+        <map:mount uri-prefix="" src="{forrest:forrest.context}/linkmap.xmap" check-reload="yes" />
       </map:match>
 
     </map:pipeline>
@@ -492,14 +492,14 @@
       <!-- External matches -->
       <!-- (HTML rendered directly from special formats) -->
       <map:match pattern="**body-faq.html">
-        <map:mount uri-prefix="" src="{forrest:context}/faq.xmap" check-reload="yes" />
+        <map:mount uri-prefix="" src="{forrest:forrest.context}/faq.xmap" check-reload="yes" />
       </map:match>
 
       <map:match pattern="**body-*.html">
         <map:select type="exists">
-          <map:when test="{project:content.xdocs}{1}{2}.ehtml">
-            <map:generate src="{project:content.xdocs}{1}{2}.ehtml" />
-            <map:transform src="{forrest:stylesheets}/html2htmlbody.xsl" />
+          <map:when test="{properties:content.xdocs}{1}{2}.ehtml">
+            <map:generate src="{properties:content.xdocs}{1}{2}.ehtml" />
+            <map:transform src="{forrest:forrest.stylesheets}/html2htmlbody.xsl" />
             <map:transform type="linkrewriter" src="cocoon:/{1}linkmap-{2}.html"/>
             <map:transform src="{lm:transform.html.broken-links}"/>
             <map:serialize type="xml" />
@@ -533,15 +533,15 @@
       </map:match>
 
       <map:match pattern="**tab-*.html">
-        <map:mount uri-prefix="" src="{forrest:context}/tabs.xmap" check-reload="yes" />
+        <map:mount uri-prefix="" src="{forrest:forrest.context}/tabs.xmap" check-reload="yes" />
       </map:match>
       
       <map:match pattern="**i18n-*.html">
-        <map:mount uri-prefix="" src="{forrest:context}/i18n.xmap" check-reload="yes" />
+        <map:mount uri-prefix="" src="{forrest:forrest.context}/i18n.xmap" check-reload="yes" />
       </map:match>
 
       <map:match pattern="**book-*.html">
-        <map:mount uri-prefix="" src="{forrest:context}/menu.xmap" check-reload="yes" />
+        <map:mount uri-prefix="" src="{forrest:forrest.context}/menu.xmap" check-reload="yes" />
       </map:match>
 
     </map:pipeline>
@@ -587,22 +587,22 @@
 
       <map:match type="regexp" pattern="^.+$">
         <map:select type="exists">
-          <map:when test="{project:content.xdocs}/{0}">
-            <map:mount uri-prefix="" src="{forrest:context}/raw.xmap" check-reload="yes" />
+          <map:when test="{properties:content.xdocs}/{0}">
+            <map:mount uri-prefix="" src="{forrest:forrest.context}/raw.xmap" check-reload="yes" />
           </map:when>
         </map:select>
       </map:match>      
 
       <!-- generate faq.fo specially  -->
       <map:match pattern="**faq.fo">
-        <map:mount uri-prefix="" src="{forrest:context}/faq.xmap" check-reload="yes" />
+        <map:mount uri-prefix="" src="{forrest:forrest.context}/faq.xmap" check-reload="yes" />
       </map:match>
 
       <!-- generate .fo from .xml  -->
       <map:match type="regexp" pattern="^(.*?)([^/]*).fo$">
         <map:select type="exists">
-          <map:when test="{project:content.xdocs}{1}{2}.fo">
-            <map:generate src="{project:content.xdocs}{1}{2}.fo"/>
+          <map:when test="{properties:content.xdocs}{1}{2}.fo">
+            <map:generate src="{properties:content.xdocs}{1}{2}.fo"/>
           </map:when>
           <map:otherwise>
             <map:aggregate element="site">
@@ -613,22 +613,22 @@
             <map:transform type="xinclude"/>
             <map:transform type="linkrewriter" src="cocoon://{1}linkmap-{2}.fo"/>
             <map:select type="exists">
-              <map:when test="{project:skins-dir}{forrest:skin}/xslt/fo/document2fo.xsl">
-                <map:transform src="{project:skins-dir}{forrest:skin}/xslt/fo/document2fo.xsl">
-                  <map:parameter name="imagesdir" value="{project:resources.images}/"/>
-                  <map:parameter name="xmlbasedir" value="{project:content.xdocs}{1}"/>
+              <map:when test="{properties:skins-dir}{forrest:forrest.skin}/xslt/fo/document2fo.xsl">
+                <map:transform src="{properties:skins-dir}{forrest:forrest.skin}/xslt/fo/document2fo.xsl">
+                  <map:parameter name="imagesdir" value="{properties:resources.images}/"/>
+                  <map:parameter name="xmlbasedir" value="{properties:content.xdocs}{1}"/>
                 </map:transform>
               </map:when>
-              <map:when test="{forrest:context}/skins/{forrest:skin}/xslt/fo/document2fo.xsl">
-                <map:transform src="{forrest:context}/skins/{forrest:skin}/xslt/fo/document2fo.xsl">
-                  <map:parameter name="imagesdir" value="{project:resources.images}/"/>
-                  <map:parameter name="xmlbasedir" value="{project:content.xdocs}{1}"/>
+              <map:when test="{forrest:forrest.context}/skins/{forrest:forrest.skin}/xslt/fo/document2fo.xsl">
+                <map:transform src="{forrest:forrest.context}/skins/{forrest:forrest.skin}/xslt/fo/document2fo.xsl">
+                  <map:parameter name="imagesdir" value="{properties:resources.images}/"/>
+                  <map:parameter name="xmlbasedir" value="{properties:content.xdocs}{1}"/>
                 </map:transform>
               </map:when>
               <map:otherwise>
-                <map:transform src="{forrest:context}/skins/common/xslt/fo/document2fo.xsl">
-                  <map:parameter name="imagesdir" value="{project:resources.images}/"/>
-                  <map:parameter name="xmlbasedir" value="{project:content.xdocs}{1}"/>
+                <map:transform src="{forrest:forrest.context}/skins/common/xslt/fo/document2fo.xsl">
+                  <map:parameter name="imagesdir" value="{properties:resources.images}/"/>
+                  <map:parameter name="xmlbasedir" value="{properties:content.xdocs}{1}"/>
                 </map:transform>
               </map:otherwise>
             </map:select>
@@ -638,29 +638,29 @@
       </map:match>
 
       <map:match pattern="profiler">
-        <map:mount uri-prefix="" src="{forrest:context}/profiler.xmap" check-reload="yes" />
+        <map:mount uri-prefix="" src="{forrest:forrest.context}/profiler.xmap" check-reload="yes" />
       </map:match>
 
       <map:match pattern="**.lucene">
-        <map:mount uri-prefix="" src="{forrest:context}/search.xmap" check-reload="yes" />
+        <map:mount uri-prefix="" src="{forrest:forrest.context}/search.xmap" check-reload="yes" />
       </map:match> 
 
      
       
       <map:match pattern="**.js">
-        <map:mount uri-prefix="" src="{forrest:context}/resources.xmap" check-reload="yes" />
+        <map:mount uri-prefix="" src="{forrest:forrest.context}/resources.xmap" check-reload="yes" />
       </map:match>
       <map:match pattern="**.css">
-        <map:mount uri-prefix="" src="{forrest:context}/resources.xmap" check-reload="yes" />
+        <map:mount uri-prefix="" src="{forrest:forrest.context}/resources.xmap" check-reload="yes" />
       </map:match>
       <map:match pattern="**images**">
-        <map:mount uri-prefix="" src="{forrest:context}/resources.xmap" check-reload="yes" />
+        <map:mount uri-prefix="" src="{forrest:forrest.context}/resources.xmap" check-reload="yes" />
       </map:match>
       <map:match pattern="**.png">
-        <map:mount uri-prefix="" src="{forrest:context}/resources.xmap" check-reload="yes" />
+        <map:mount uri-prefix="" src="{forrest:forrest.context}/resources.xmap" check-reload="yes" />
       </map:match>
      <map:match pattern="**.ico">
-        <map:mount uri-prefix="" src="{forrest:context}/resources.xmap" check-reload="yes" />
+        <map:mount uri-prefix="" src="{forrest:forrest.context}/resources.xmap" check-reload="yes" />
       </map:match> 
     </map:pipeline>
 

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.IMSManifest/internal.xmap
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.IMSManifest/internal.xmap?rev=431247&r1=431246&r2=431247&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.IMSManifest/internal.xmap (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.IMSManifest/internal.xmap Sun Aug 13 14:41:37 2006
@@ -35,7 +35,7 @@
     <map:transformers default="xslt">
       <map:transformer name="i18n" src="org.apache.cocoon.transformation.I18nTransformer">
         <catalogues default="menu">
-          <catalogue id="menu" name="menu" location="{project:translations}"/>
+          <catalogue id="menu" name="menu" location="{properties:translations}"/>
         </catalogues>
         <!-- Commented out to verify your translations
         <untranslated-text>untranslated</untranslated-text> -->
@@ -56,7 +56,7 @@
           <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:serialize/>
     </map:resource>
@@ -73,12 +73,12 @@
     <map:pipeline>
       <map:match pattern="abs-linkmap">
         <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:when>
-          <map:when test="{project:content.xdocs}site.xml">
-            <map:generate src="{project:content.xdocs}site.xml" />
+          <map:when test="{properties:content.xdocs}site.xml">
+            <map:generate src="{properties:content.xdocs}site.xml" />
           </map:when>
         </map:select>
         <map:transform src="{transform.linkmap.linkmap-absolutized}" />
@@ -94,12 +94,12 @@
     <map:pipeline >
       <map:match pattern="**tab-*.html">
         <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/imsmanifest2tabs.xsl"/>
           </map:when>
-          <map:when test="{project:content.xdocs}tabs.xml">
-            <map:generate src="{project:content.xdocs}tabs.xml" />
+          <map:when test="{properties:content.xdocs}tabs.xml">
+            <map:generate src="{properties:content.xdocs}tabs.xml" />
           </map:when>
         </map:select>
         <map:transform type="linkrewriter" src="cocoon:/{1}linkmap-{2}.html"/>
@@ -119,15 +119,15 @@
 
       <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="{transform.linkmap.linkmap-absolutized}" />
             <map:transform src="{transform.linkmap.linkmap-normalizedtabs}" />
             <map:serialize type="xml"/>
           </map:when>
-          <map:when test="{project:content.xdocs}site.xml">
-            <map:generate src="{project:content.xdocs}site.xml" />
+          <map:when test="{properties:content.xdocs}site.xml">
+            <map:generate src="{properties:content.xdocs}site.xml" />
             <map:transform src="{transform.linkmap.linkmap-absolutized}" />
             <map:transform src="{transform.linkmap.linkmap-normalizedtabs}" />
             <map:transform src="{transform.xml.xml-normalizedhrefs}"/>
@@ -138,19 +138,19 @@
 
       <map:match pattern="**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="{transform.linkmap.linkmap-absolutized}" />
           </map:when>
-          <map:when test="{project:content.xdocs}site.xml">
-            <map:generate src="{project:content.xdocs}site.xml" />
+          <map:when test="{properties:content.xdocs}site.xml">
+            <map:generate src="{properties:content.xdocs}site.xml" />
             <map:transform src="{transform.linkmap.linkmap-absolutized}" />
           </map:when>
         </map:select>
 
         <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="{transform.linkmap.linkmap-normalizedtabs}" />
@@ -172,10 +172,10 @@
 
         <map:select type="exists">
 
-          <map:when test="{project:content.xdocs}{1}book.xml">
+          <map:when test="{properties:content.xdocs}{1}book.xml">
             <!-- If a hand-created book.xml exists, use it -->
-            <map:parameter name="url" value="{project:content.xdocs}{1}book.xml" />
-            <map:generate src="{project:content.xdocs}{1}book.xml" />
+            <map:parameter name="url" value="{properties:content.xdocs}{1}book.xml" />
+            <map:generate src="{properties:content.xdocs}{1}book.xml" />
           </map:when>
 
           <map:otherwise>
@@ -188,14 +188,14 @@
         </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">
               <map:transform src="{lm:transform.book.book-i18n}"/>
               <map:transform type="i18n">
                 <!-- We can use a default locale attribute or Request Parameter
-                <map:parameter name="locale" value="{defaults:locale}"/>
+                <map:parameter name="locale" value="{properties:forrest.locale}"/>
                 <map:parameter name="locale" value="{request-param:locale}"/>
                 -->
                 <map:parameter name="locale" value="{lang}{country}{variant}"/>
@@ -223,7 +223,7 @@
               <map:generate type="text2xml" src="http://{2}/{1}/src/documentation/content/xdocs/{3}.cwiki" />
               <map:transform type="lexer"   src="cocoon:/wiki.xlex"/>
               <map:transform type="parser"  src="cocoon:/wiki.xgrm"/>
-              <map:transform type="xsltc" src="{forrest:home}/context/resources/chaperon/stylesheets/wiki2xdoc.xsl">
+              <map:transform type="xsltc" src="{forrest:forrest.home}/context/resources/chaperon/stylesheets/wiki2xdoc.xsl">
                 <map:parameter name="name" value="{2}" />
               </map:transform>
               <map:serialize/>
@@ -248,14 +248,14 @@
               <map:part src="jar:http://{2}/{1}/src/documentation/content/xdocs/{3}.sxw!/content.xml"/>
             </map:aggregate>
             <map:select type="exists">
-              <map:when test="{project:resources.stylesheets}/openoffice-writer2forrest.xsl">
-                <map:transform src="{project:resources.stylesheets}/openoffice-writer2forrest.xsl">
+              <map:when test="{properties:resources.stylesheets}/openoffice-writer2forrest.xsl">
+                <map:transform src="{properties:resources.stylesheets}/openoffice-writer2forrest.xsl">
                   <map:parameter name="filename" value="{2}" />
                   <map:parameter name="extension" value="sxw" />
                 </map:transform>
               </map:when>
               <map:otherwise>
-                <map:transform src="{forrest:stylesheets}/openoffice-writer2forrest.xsl">
+                <map:transform src="{forrest:forrest.stylesheets}/openoffice-writer2forrest.xsl">
                   <map:parameter name="filename" value="{2}" />
                   <map:parameter name="extension" value="sxw" />
                 </map:transform>
@@ -272,14 +272,14 @@
               <map:part src="jar:http://{2}/{1}/src/documentation/content/xdocs/{3}.sxi!/content.xml"/>
             </map:aggregate>
             <map:select type="exists">
-              <map:when test="{project:resources.stylesheets}/openoffice-impress2forrest.xsl">
-                <map:transform src="{project:resources.stylesheets}/openoffice-impress2forrest.xsl">
+              <map:when test="{properties:resources.stylesheets}/openoffice-impress2forrest.xsl">
+                <map:transform src="{properties:resources.stylesheets}/openoffice-impress2forrest.xsl">
                   <map:parameter name="filename" value="{2}" />
                   <map:parameter name="extension" value="sxi" />
                 </map:transform>
               </map:when>
               <map:otherwise>
-                <map:transform src="{forrest:stylesheets}/openoffice-impress2forrest.xsl">
+                <map:transform src="{forrest:forrest.stylesheets}/openoffice-impress2forrest.xsl">
                   <map:parameter name="filename" value="{2}" />
                   <map:parameter name="extension" value="sxi" />
                 </map:transform>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.NoteTaking/internal.xmap
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.NoteTaking/internal.xmap?rev=431247&r1=431246&r2=431247&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.NoteTaking/internal.xmap (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.NoteTaking/internal.xmap Sun Aug 13 14:41:37 2006
@@ -42,7 +42,7 @@
       <map:match pattern="noteTaking/do/addNote.xml">
         <map:generate type="request"/>
         <map:transform src="{lm:noteTaking.transform.postedNotes.sourceWriterNotes}">
-          <map:parameter name="notesFile" value="{project:noteTaking.repository.URL}{project:noteTaking.filename}"/>
+          <map:parameter name="notesFile" value="{properties:noteTaking.repository.URL}{properties:noteTaking.filename}"/>
         </map:transform>
         <map:transform type="write-source"/>
         <map:transform src="{lm:noteTaking.transform.writeResult.acknowledgement}">
@@ -52,14 +52,14 @@
       </map:match>
 
       <map:match pattern="noteTaking/do/getNotes">
-        <map:generate src="{project:noteTaking.repository.URL}{project:noteTaking.filename}"/>
+        <map:generate src="{properties:noteTaking.repository.URL}{properties:noteTaking.filename}"/>
         <map:serialize type="xml"/>
       </map:match>
 
       <map:match pattern="noteTaking/do/getNotes/**">
         <map:select type="exists">
-          <map:when test="{project:noteTaking.repository.URL}{project:noteTaking.filename}">
-            <map:generate src="{project:noteTaking.repository.URL}{project:noteTaking.filename}"/>
+          <map:when test="{properties:noteTaking.repository.URL}{properties:noteTaking.filename}">
+            <map:generate src="{properties:noteTaking.repository.URL}{properties:noteTaking.filename}"/>
           </map:when>
           <map:otherwise>
             <map:generate src="resources/xml/notes-bootstrap.xml"/>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.NoteTaking/locationmap.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.NoteTaking/locationmap.xml?rev=431247&r1=431246&r2=431247&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.NoteTaking/locationmap.xml (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.NoteTaking/locationmap.xml Sun Aug 13 14:41:37 2006
@@ -39,7 +39,7 @@
     
     <match pattern="resolvePluginContract.*.**">
       <select type="exists">
-        <location src="{forrest:plugins}/org.apache.forrest.plugin.internal.NoteTaking/resources/themes/{project:theme}/{1}/{2}.ft" />
+        <location src="{forrest:forrest.plugins}/org.apache.forrest.plugin.internal.NoteTaking/resources/themes/{properties:theme}/{1}/{2}.ft" />
       </select>
     </match>
   </locator>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/dataModel.xmap
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/dataModel.xmap?rev=431247&r1=431246&r2=431247&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/dataModel.xmap (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/dataModel.xmap Sun Aug 13 14:41:37 2006
@@ -113,19 +113,19 @@
       <!-- navigation for the current request PART tab-->
       <map:match pattern="**.tab.xml">
         <map:select type="exists">
-          <map:when test="{project:content.xdocs}tabs.xml">
-            <map:generate src="{project:content.xdocs}tabs.xml" />
+          <map:when test="{properties:content.xdocs}tabs.xml">
+            <map:generate src="{properties:content.xdocs}tabs.xml" />
           </map:when>
           <map:when test="{lm:tabs.xml}">
             <map:generate src="{lm:tabs.xml}" />
           </map:when>
           <map:otherwise>
-            <map:generate src="{project:content.xdocs}tabs.xml" />
+            <map:generate src="{properties:content.xdocs}tabs.xml" />
           </map:otherwise>
         </map:select>
         <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}" />
@@ -152,46 +152,46 @@
       <map:match pattern="**.book.xml">
         <map:match pattern="**/*.book.xml">
           <map:select type="exists">
-            <map:when test="{project:content.xdocs}{1}/book.xml">
+            <map:when test="{properties:content.xdocs}{1}/book.xml">
               <!-- If a hand-created book.xml exists, use it -->
               <map:parameter name="url"
-                value="{project:content.xdocs}{1}/book.xml" />
-              <map:generate src="{project:content.xdocs}{1}/book.xml" />
+                value="{properties:content.xdocs}{1}/book.xml" />
+              <map:generate src="{properties:content.xdocs}{1}/book.xml" />
             </map:when>
             <map:otherwise>
               <!-- If no book.xml, generate it from the linkmap. -->
               <map:generate src="cocoon:/{1}/menulinks-{2}" />
               <!-- The above generates the subset of the linkmap relevant to our directory. -->
               <map:transform
-                src="{forrest:stylesheets}/site-to-book.xsl" />
+                src="{forrest:forrest.stylesheets}/site-to-book.xsl" />
             </map:otherwise>
           </map:select>
         </map:match>
         <map:match pattern="*.book.xml">
           <map:select type="exists">
-            <map:when test="{project:content.xdocs}/book.xml">
+            <map:when test="{properties:content.xdocs}/book.xml">
               <!-- If a hand-created book.xml exists, use it -->
               <map:parameter name="url"
-                value="{project:content.xdocs}/book.xml" />
-              <map:generate src="{project:content.xdocs}/book.xml" />
+                value="{properties:content.xdocs}/book.xml" />
+              <map:generate src="{properties:content.xdocs}/book.xml" />
             </map:when>
             <map:otherwise>
               <!-- If no book.xml, generate it from the linkmap. -->
               <map:generate src="cocoon:/menulinks-{1}" />
               <!-- The above generates the subset of the linkmap relevant to our directory. -->
               <map:transform
-                src="{forrest:stylesheets}/site-to-book.xsl" />
+                src="{forrest:forrest.stylesheets}/site-to-book.xsl" />
             </map:otherwise>
           </map:select>
         </map:match>
         <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}" />
               <map:transform type="i18n">
                 <!-- We can use a default locale attribute or Request Parameter
-                  <map:parameter name="locale" value="{defaults:locale}"/>
+                  <map:parameter name="locale" value="{properties:forrest.locale}"/>
                   <map:parameter name="locale" value="{lang}{country}{variant}"-->
                 <map:parameter name="locale" value="{locale}" />
               </map:transform>
@@ -204,16 +204,16 @@
         <map:generate src="cocoon://site.navigation.links.xml" />
         <map:transform type="xinclude" />
         <map:transform
-          src="{forrest:stylesheets}/absolutize-linkmap.xsl" />
+          src="{forrest:forrest.stylesheets}/absolutize-linkmap.xsl" />
         <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="{forrest:stylesheets}/site-to-site-normalizetabs.xsl" />
+              src="{forrest:forrest.stylesheets}/site-to-site-normalizetabs.xsl" />
             <map:transform
-              src="{forrest:stylesheets}/normalizehrefs.xsl" />
+              src="{forrest:forrest.stylesheets}/normalizehrefs.xsl" />
             <map:transform
-              src="{forrest:stylesheets}/site-to-site-selectnode.xsl">
+              src="{forrest:forrest.stylesheets}/site-to-site-selectnode.xsl">
               <map:parameter name="path" value="{1}{2}.html" />
             </map:transform>
           </map:when>
@@ -224,7 +224,7 @@
           </map:when>
         </map:select>
         <map:transform
-          src="{forrest:stylesheets}/relativize-linkmap.xsl">
+          src="{forrest:forrest.stylesheets}/relativize-linkmap.xsl">
           <map:parameter name="path" value="{1}{2}.html" />
         </map:transform>
         <map:serialize type="xml" />

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/internal.xmap
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/internal.xmap?rev=431247&r1=431246&r2=431247&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/internal.xmap (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/internal.xmap Sun Aug 13 14:41:37 2006
@@ -184,9 +184,9 @@
       <map:match pattern="**.dispatcher.css">
         <map:generate type="text" src="cocoon:/{1}.prepare.dispatcher.css" />
         <map:transform type="pattern" 
-          src="{forrest:context}/resources/chaperon/grammars/link.xlex" />
+          src="{forrest:forrest.context}/resources/chaperon/grammars/link.xlex" />
         <map:transform 
-          src="{forrest:context}/resources/chaperon/stylesheets/pattern2link.xsl" 
+          src="{forrest:forrest.context}/resources/chaperon/stylesheets/pattern2link.xsl" 
           />
         <map:serialize type="text" mime-type="text/css" />
       </map:match>



Mime
View raw message