Return-Path: 
 <svn-return-687-apmail-forrest-svn-archive=forrest.apache.org@forrest.apache.org>
Delivered-To: apmail-forrest-svn-archive@www.apache.org
Received: (qmail 77336 invoked from network); 25 Sep 2004 03:03:16 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur-2.apache.org with SMTP; 25 Sep 2004 03:03:16 -0000
Received: (qmail 48764 invoked by uid 500); 25 Sep 2004 03:05:23 -0000
Delivered-To: apmail-forrest-svn-archive@forrest.apache.org
Received: (qmail 48674 invoked by uid 500); 25 Sep 2004 03:05:21 -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 48661 invoked by uid 99); 25 Sep 2004 03:05:21 -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; Fri, 24 Sep 2004 20:05:20 -0700
Received: (qmail 77262 invoked by uid 65534); 25 Sep 2004 03:03:10 -0000
Date: 25 Sep 2004 03:03:10 -0000
Message-ID: <20040925030310.77258.qmail@minotaur.apache.org>
From: crossley@apache.org
To: svn@forrest.apache.org
Subject: svn commit: rev 47180 - in forrest/trunk: lib/core src/core/context
 src/core/context/WEB-INF
X-Virus-Checked: Checked
X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N

Author: crossley
Date: Fri Sep 24 20:03:10 2004
New Revision: 47180

Added:
   forrest/trunk/lib/core/cocoon-20040902.jar   (props changed)
      - copied unchanged from rev 47052, forrest/trunk/lib/core/cocoon-20040902.jar
   forrest/trunk/lib/core/cocoon-deprecated-20040902.jar   (props changed)
      - copied unchanged from rev 47052, forrest/trunk/lib/core/cocoon-deprecated-20040902.jar
Removed:
   forrest/trunk/lib/core/cocoon-BRANCH_2_1_X-rev_47056-20040922.jar
   forrest/trunk/lib/core/cocoon-deprecated-BRANCH_2_1_X-rev_47056-20040922.jar
Modified:
   forrest/trunk/src/core/context/WEB-INF/cocoon.xconf
   forrest/trunk/src/core/context/resources.xmap
   forrest/trunk/src/core/context/sitemap.xmap
Log:
Revert to using Cocoon-2.2 trunk, rather than Cocoon-2.1.X release branch.
Merge changes from prior to r47053.
The project sitemap ability was broken.
Issue: FOR-297


Modified: forrest/trunk/src/core/context/WEB-INF/cocoon.xconf
==============================================================================
--- forrest/trunk/src/core/context/WEB-INF/cocoon.xconf	(original)
+++ forrest/trunk/src/core/context/WEB-INF/cocoon.xconf	Fri Sep 24 20:03:10 2004
@@ -14,7 +14,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<cocoon version="2.1">
+<cocoon version="2.2">
 
 <!--+
     |  This is the Apache Cocoon configuration file. This is the place
@@ -39,8 +39,9 @@
       | For development environment, set the check-reload to yes.
       | For production environment, it is advisable to set check-reload to no.
       +-->
-  <sitemap check-reload="yes" config="resource://org/apache/cocoon/components/treeprocessor/treeprocessor-builtins.xml" file="context://sitemap.xmap" logger="sitemap"/>
-
+  <sitemap check-reload="yes" file="context://sitemap.xmap" logger="sitemap"/>
+  <!-- config="resource://org/apache/cocoon/components/treeprocessor/treeprocessor-builtins.xml" -->
+  
 <!-- =================== Sitemap Input/Output Modules ====================== -->
 
   <!--+

Modified: forrest/trunk/src/core/context/resources.xmap
==============================================================================
--- forrest/trunk/src/core/context/resources.xmap	(original)
+++ forrest/trunk/src/core/context/resources.xmap	Fri Sep 24 20:03:10 2004
@@ -136,7 +136,7 @@
        <map:resource name="read-svg2png-corner-resource">
             <map:select type="exists">
                <map:when test="{project:skins-dir}{forrest:skin}/{path}/{name}.svg.xslt">
-                  <map:call resource="pipe-svg2png-corner-resource">
+                  <map:call resource="pipe-transformed-svg2png-corner-resource">
                     <map:parameter name="path" value="{project:skins-dir}{forrest:skin}/{path}/{name}.svg.xslt" />
                     <map:parameter name="orientation-tb" value="{orientation-tb}"/>
                     <map:parameter name="orientation-lr" value="{orientation-lr}"/>
@@ -147,7 +147,7 @@
                   </map:call>
                </map:when>
                <map:when test="{forrest:context}/skins/{forrest:skin}/{path}/{name}.svg.xslt">
-                  <map:call resource="pipe-svg2png-corner-resource">
+                  <map:call resource="pipe-transformed-svg2png-corner-resource">
                     <map:parameter name="path" value="{forrest:context}/skins/{forrest:skin}/{path}/{name}.svg.xslt" />
                     <map:parameter name="orientation-tb" value="{orientation-tb}"/>
                     <map:parameter name="orientation-lr" value="{orientation-lr}"/>

Modified: forrest/trunk/src/core/context/sitemap.xmap
==============================================================================
--- forrest/trunk/src/core/context/sitemap.xmap	(original)
+++ forrest/trunk/src/core/context/sitemap.xmap	Fri Sep 24 20:03:10 2004
@@ -36,10 +36,54 @@
       <map:generator name="directory" src="org.apache.cocoon.generation.DirectoryGenerator" />
       -->
       <map:generator name="notifier" src="org.apache.cocoon.sitemap.NotifyingGenerator" />
-                  
+      
+      <!--
+        FIXME: there is a bug in the Cocoon 2.2 resolving that can make cocoon:/ 
+               calls call the base sitemap; remove the following when it's fixed.
+        
+      -->
+      <map:generator name="text2xml" logger="sitemap.generator.textgenerator"
+                     src="org.apache.cocoon.generation.TextGenerator">
+       <parameter name="localizable" value="true"/>
+      </map:generator>        
+     <!--
+        FIXME-END 
+      -->
+                
     </map:generators>
 
     <map:transformers default="xslt">
+      <!--
+        FIXME: there is a bug in the Cocoon 2.2 resolving that can make cocoon:/ 
+               calls call the base sitemap; remove the following when it's fixed.
+        
+      -->
+	   <map:transformer name="pattern" 
+	                    src="org.apache.cocoon.transformation.PatternTransformer" 
+	                    logger="sitemap.transformer.pattern">
+	    <parameter name="groups" value="true"/>
+	   </map:transformer>
+	   <map:transformer name="lexer" 
+	                    src="org.apache.cocoon.transformation.LexicalTransformer" 
+	                    logger="sitemap.transformer.lexer">
+	    <parameter name="localizable" value="true"/>
+	   </map:transformer>
+	   <map:transformer name="parser" 
+	                    src="org.apache.cocoon.transformation.ParserTransformer" 
+	                    logger="sitemap.transformer.parser">
+	    <parameter name="flatten" value="true"/>
+	    <parameter name="recovery" value="true"/>
+	    <parameter name="localizable" value="true"/>
+	   </map:transformer>
+	
+	   <map:transformer name="extparser"
+	                    src="org.apache.cocoon.transformation.ExtendedParserTransformer"
+	                    logger="sitemap.transformer.extendedparser">
+	   </map:transformer>
+	 <!--
+        FIXME-END 
+      -->
+	   
       <!-- Add values to skinconf that need extra processing like the color shades -->
       <map:transformer name="skinconf" src="org.apache.forrest.conf.SkinconfTransformer"/>
               
@@ -225,6 +269,64 @@
   <!-- =========================== Pipelines ================================= -->
   <map:pipelines>
 
+  <map:pipeline type="caching" internal-only="true">
+ 
+      <!--
+        FIXME: there is a bug in the Cocoon 2.2 resolving that can make cocoon:/ 
+               calls call the base sitemap; remove the following when it's fixed.
+        
+      -->
+      <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>
+    
       <!-- 
          This is the user pipeline, that can answer requests instead
          of the Forrest one, or let requests pass through.