svn commit: rev 37462 - in forrest/trunk: . src/core/context

[ni...@apache.org]

Author: nicolaken
Date: Fri Sep  3 00:03:23 2004
New Revision: 37462

Modified:
   forrest/trunk/src/core/context/forrest.xmap
   forrest/trunk/status.xml
Log:
      <action dev="NKB" type="add" context="core">
        Now the *.ihtml and *.cwiki extensions are deprecated.
        To ge tthe same functionality it's reccomended to switch to 
        *.html and *.jspwiki. With this it's now possible to have a 
        site in simple html, edited with any html editor.
        The *.jspwiki extension was put to make it clear what the format 
        is about.
      </action>

Modified: forrest/trunk/src/core/context/forrest.xmap
==============================================================================
--- forrest/trunk/src/core/context/forrest.xmap	(original)
+++ forrest/trunk/src/core/context/forrest.xmap	Fri Sep  3 00:03:23 2004
@@ -259,6 +259,25 @@
           <map:transform type="idgen" />
           <map:serialize type="xml-document"/>
         </map:when>
+        <map:when test="{project:content.xdocs}{uri}.html">
+          <map:generate src="{project:content.xdocs}{uri}.html" type="html" />
+          <map:transform src="{forrest:stylesheets}/html2document.xsl" />
+          <map:transform type="idgen" />
+          <map:serialize type="xml-document"/>
+        </map:when>        
+        <map:when test="{project:content.xdocs}{uri}.jspwiki">
+          <map:match type="regexp" pattern="^(.*?)([^/]*).xml$">
+            <map:generate type="text2xml" src="{project:content.xdocs}{1}{2}.jspwiki" />
+            <map:transform type="lexer"   src="cocoon:/wiki.xlex"/>
+            <map:transform type="parser"  src="cocoon:/wiki.xgrm"/>
+            <map:transform type="xsltc" 
+              src="{forrest:context}/resources/chaperon/stylesheets/wiki2xdoc.xsl">
+              <map:parameter name="name" value="{2}" />
+              <map:parameter name="spaceless-filenames" value="true"/>
+            </map:transform>
+            <map:serialize type="xml-document"/>
+          </map:match>
+        </map:when>
         <map:when test="{project:content.xdocs}{uri}.cwiki">
           <map:match type="regexp" pattern="^(.*?)([^/]*).xml$">
             <map:generate type="text2xml" src="{project:content.xdocs}{1}{2}.cwiki" />
@@ -271,7 +290,7 @@
             </map:transform>
             <map:serialize type="xml-document"/>
           </map:match>
-        </map:when>
+        </map:when>        
         <map:when test="{project:content.xdocs}{uri}.txt">
           <map:match type="regexp" pattern="^(.*?)([^/]*).xml$">
             <map:generate type="text2xml" src="{project:content.xdocs}{1}{2}.txt" />

Modified: forrest/trunk/status.xml
==============================================================================
--- forrest/trunk/status.xml	(original)
+++ forrest/trunk/status.xml	Fri Sep  3 00:03:23 2004
@@ -50,6 +50,14 @@
         <link href="site:upgrading_06">upgrading to v0.6</link>
       </action>
       <action dev="NKB" type="add" context="core">
+        Now the *.ihtml and *.cwiki extensions are deprecated.
+        To ge tthe same functionality it's reccomended to switch to 
+        *.html and *.jspwiki. With this it's now possible to have a 
+        site in simple html, edited with any html editor.
+        The *.jspwiki extension was put to make it clear what the format 
+        is about.
+      </action>
+      <action dev="NKB" type="add" context="core">
         New project sitemap extension mechanism. Now it's possible to add
         a project sitmap that plugs into the processing at the beginning.
         If the requested url is resolved by it, it will serve the file directly.