Return-Path: 
 <svn-return-1095-apmail-forrest-svn-archive=forrest.apache.org@forrest.apache.org>
Delivered-To: apmail-forrest-svn-archive@www.apache.org
Received: (qmail 95143 invoked from network); 16 Nov 2004 18:06:53 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur-2.apache.org with SMTP; 16 Nov 2004 18:06:53 -0000
Received: (qmail 14719 invoked by uid 500); 16 Nov 2004 18:06:50 -0000
Delivered-To: apmail-forrest-svn-archive@forrest.apache.org
Received: (qmail 14682 invoked by uid 500); 16 Nov 2004 18:06:50 -0000
Mailing-List: contact svn-help@forrest.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:svn-help@forrest.apache.org>
list-unsubscribe: <mailto:svn-unsubscribe@forrest.apache.org>
list-post: <mailto:svn@forrest.apache.org>
Reply-To: "Forrest Developers List" <dev@forrest.apache.org>
Delivered-To: mailing list svn@forrest.apache.org
Received: (qmail 14668 invoked by uid 99); 16 Nov 2004 18:06:50 -0000
X-ASF-Spam-Status: No, hits=-10.0 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194)
  by apache.org (qpsmtpd/0.28) with SMTP; Tue, 16 Nov 2004 10:06:45 -0800
Received: (qmail 95025 invoked by uid 65534); 16 Nov 2004 18:06:44 -0000
Date: 16 Nov 2004 18:06:44 -0000
Message-ID: <20041116180644.95020.qmail@minotaur.apache.org>
From: rgardler@apache.org
To: svn@forrest.apache.org
Subject: svn commit: rev 75999 - in forrest/trunk: main/webapp
 main/webapp/resources/chaperon plugins/wiki/resources/chaperon
 plugins/wiki/resources/chaperon/grammars plugins/wiki/resources/chaperon/misc
 plugins/wiki/resources/chaperon/stylesheets
 plugins/wiki/resources/chaperon/wiki
X-Virus-Checked: Checked
X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N

Author: rgardler
Date: Tue Nov 16 10:06:44 2004
New Revision: 75999

Added:
   forrest/trunk/plugins/wiki/resources/chaperon/
      - copied from rev 71509, forrest/trunk/main/webapp/resources/chaperon/
   forrest/trunk/plugins/wiki/resources/chaperon/grammars/
      - copied from rev 75998, forrest/trunk/main/webapp/resources/chaperon/grammars/
   forrest/trunk/plugins/wiki/resources/chaperon/misc/
      - copied from rev 75998, forrest/trunk/main/webapp/resources/chaperon/misc/
   forrest/trunk/plugins/wiki/resources/chaperon/readme.txt
      - copied unchanged from rev 75998, forrest/trunk/main/webapp/resources/chaperon/readme.txt
   forrest/trunk/plugins/wiki/resources/chaperon/sitemap.xmap
      - copied unchanged from rev 75998, forrest/trunk/main/webapp/resources/chaperon/sitemap.xmap
   forrest/trunk/plugins/wiki/resources/chaperon/stylesheets/
      - copied from rev 75998, forrest/trunk/main/webapp/resources/chaperon/stylesheets/
   forrest/trunk/plugins/wiki/resources/chaperon/wiki/
      - copied from rev 75998, forrest/trunk/main/webapp/resources/chaperon/wiki/
Removed:
   forrest/trunk/main/webapp/resources/chaperon/
Modified:
   forrest/trunk/main/webapp/default-forrest.properties
   forrest/trunk/main/webapp/forrest.xmap
Log:
moving wiki source format to wiki plugin

Modified: forrest/trunk/main/webapp/default-forrest.properties
==============================================================================
--- forrest/trunk/main/webapp/default-forrest.properties	(original)
+++ forrest/trunk/main/webapp/default-forrest.properties	Tue Nov 16 10:06:44 2004
@@ -140,5 +140,5 @@
 # The names of plugins that are required to build the project
 # comma separated list (no spaces)
 # Run "forrest available-plugins" for a list of plug-ins currently available
-project.required.plugins=OpenOffice.org,simplified-docbook
+project.required.plugins=OpenOffice.org,simplified-docbook,wiki
 

Modified: forrest/trunk/main/webapp/forrest.xmap
==============================================================================
--- forrest/trunk/main/webapp/forrest.xmap	(original)
+++ forrest/trunk/main/webapp/forrest.xmap	Tue Nov 16 10:06:44 2004
@@ -245,45 +245,6 @@
           <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" />
-            <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}.moinwiki">
-          <map:match type="regexp" pattern="^(.*?)([^/]*).xml$">
-            <map:generate type="text2xml" src="{project:content.xdocs}{1}{2}.moinwiki" />
-            <map:transform type="lexer"   src="cocoon:/moinwiki.xlex"/>
-            <map:transform type="parser"  src="cocoon:/moinwiki.xgrm"/>
-            <map:transform type="xsltc" 
-              src="{forrest:context}/resources/chaperon/stylesheets/moinwiki2xdoc.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}.txt">
           <map:match type="regexp" pattern="^(.*?)([^/]*).xml$">
             <map:generate type="text2xml" src="{project:content.xdocs}{1}{2}.txt" />
@@ -354,59 +315,6 @@
       </map:match>
       
   </map:pipeline>
-
-  <map:pipeline type="caching" internal-only="true">
-
-      <map:match pattern="*.xlex">
-        <map:select type="exists">
-          <map:when test="resources/chaperon/grammars/{1}.xlex">
-            <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:serialize type="xml"/>
-          </map:otherwise>
-        </map:select>
-      </map:match>
-
-      <map:match pattern="*.xgrm">
-        <map:select type="exists">
-          <map:when test="resources/chaperon/grammars/{1}.xgrm">
-            <map:read src="resources/chaperon/grammars/{1}.xgrm"/>
-          </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/grm2xgrm.xsl"/>
-    <map:serialize type="xml"/>
-          </map:otherwise>
-        </map:select>
-      </map:match>
-
-   <map:match pattern="*.xegrm">
-        <map:select type="exists">
-          <map:when test="{forrest:context}/resources/chaperon/grammars/{1}.xegrm">
-            <map:read src="{forrest:context}/resources/chaperon/grammars/{1}.xegrm"/>
-          </map:when>
-          <map:otherwise>
-    <map:generate  type="text2xml"   src="{forrest:context}/resources/chaperon/grammars/{1}.egrm"/>
-    <map:transform type="extparser" src="{forrest:context}/resources/chaperon/grammars/egrm.xegrm"/>
-    <map:transform               src="{forrest:context}/resources/chaperon/stylesheets/egrm2xegrm.xsl"/>
-    <map:serialize type="xml"/>
-          </map:otherwise>
-        </map:select>
-      </map:match>
-    </map:pipeline>
 
   </map:pipelines>
 </map:sitemap>