forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nicola...@apache.org
Subject svn commit: rev 37393 - in forrest/trunk: lib/core src/core/context src/core/context/WEB-INF
Date Thu, 02 Sep 2004 16:13:47 GMT
Author: nicolaken
Date: Thu Sep  2 09:13:45 2004
New Revision: 37393

Removed:
   forrest/trunk/lib/core/cocoon-2.1.5.jar
   forrest/trunk/lib/core/cocoon-deprecated-2.1.5.jar
Modified:
   forrest/trunk/src/core/context/WEB-INF/cocoon.xconf
   forrest/trunk/src/core/context/sitemap.xmap
Log:
Update Cocoon from trunk, built with Java Jdk 1.3.1_13.
Added the new user pipeline feature, which uses the new Cocoon passthrough attribute on mounts.

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	Thu Sep  2 09:13:45 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/sitemap.xmap
==============================================================================
--- forrest/trunk/src/core/context/sitemap.xmap	(original)
+++ forrest/trunk/src/core/context/sitemap.xmap	Thu Sep  2 09:13:45 2004
@@ -225,12 +225,23 @@
   <!-- =========================== Pipelines ================================= -->
   <map:pipelines>
 
+      <!-- 
+         This is the user pipeline, that can answer requests instead
+         of the Forrest one, or let requests pass through.
+         To take over the rendering of a file it must match the file name and path.
+         To take over the generation of the intermediate format, it must give
+         Forrest the same filename but ending with xml, and a DTD that Forrest
+         recognizes.
+      -->
       <map:pipeline internal-only="false">
-      <map:select type="exists">
-        <map:when test="{project:sitemap}">
-          <map:mount uri-prefix="" src="{project:sitemap}" check-reload="yes" />
-        </map:when>  
-      </map:select>
+           <map:select type="exists">
+             <map:when test="{project:sitemap}">
+               <map:mount uri-prefix="" 
+                          src="{project:sitemap}" 
+                          check-reload="yes" 
+                          pass-through="true"/>
+             </map:when>  
+           </map:select>
       </map:pipeline>
         
       <map:pipeline internal-only="false">

Mime
View raw message