forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nicola...@apache.org
Subject svn commit: rev 47053 - in forrest/trunk: lib/core src/core/context src/core/context/WEB-INF
Date Wed, 22 Sep 2004 15:45:52 GMT
Author: nicolaken
Date: Wed Sep 22 08:45:47 2004
New Revision: 47053

Added:
   forrest/trunk/lib/core/cocoon-BRANCH_2_1_X-rev_47048-20040922.jar   (contents, props changed)
   forrest/trunk/lib/core/cocoon-deprecated-BRANCH_2_1_X-rev_47048-20040922.jar   (contents,
props changed)
Removed:
   forrest/trunk/lib/core/cocoon-20040902.jar
   forrest/trunk/lib/core/cocoon-deprecated-20040902.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:
Fixes FOR-297: "Use Cocoon from branch 2.1 in Forrest"

Added: forrest/trunk/lib/core/cocoon-BRANCH_2_1_X-rev_47048-20040922.jar
==============================================================================
Binary file. No diff available.

Added: forrest/trunk/lib/core/cocoon-deprecated-BRANCH_2_1_X-rev_47048-20040922.jar
==============================================================================
Binary file. No diff available.

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	Wed Sep 22 08:45:47 2004
@@ -14,7 +14,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<cocoon version="2.2">
+<cocoon version="2.1">
 
 <!--+
     |  This is the Apache Cocoon configuration file. This is the place
@@ -39,9 +39,8 @@
       | 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" file="context://sitemap.xmap" logger="sitemap"/>
-  <!-- config="resource://org/apache/cocoon/components/treeprocessor/treeprocessor-builtins.xml"
-->
-  
+  <sitemap check-reload="yes" config="resource://org/apache/cocoon/components/treeprocessor/treeprocessor-builtins.xml"
file="context://sitemap.xmap" logger="sitemap"/>
+
 <!-- =================== 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	Wed Sep 22 08:45:47 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-transformed-svg2png-corner-resource">
+                  <map:call resource="pipe-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-transformed-svg2png-corner-resource">
+                  <map:call resource="pipe-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	Wed Sep 22 08:45:47 2004
@@ -36,54 +36,10 @@
       <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"/>
               
@@ -269,64 +225,6 @@
   <!-- =========================== 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.

Mime
View raw message