You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@forrest.apache.org by je...@apache.org on 2002/12/26 09:33:12 UTC
cvs commit: xml-forrest/src/resources/conf cocoon.xconf sitemap.xmap
jefft 2002/12/26 00:33:12
Modified: src/resources/conf cocoon.xconf sitemap.xmap
Log:
Update config files to work with latest Cocoon
Revision Changes Path
1.8 +1 -2 xml-forrest/src/resources/conf/cocoon.xconf
Index: cocoon.xconf
===================================================================
RCS file: /home/cvs/xml-forrest/src/resources/conf/cocoon.xconf,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- cocoon.xconf 26 Nov 2002 08:28:44 -0000 1.7
+++ cocoon.xconf 26 Dec 2002 08:33:12 -0000 1.8
@@ -184,7 +184,7 @@
<source-factories>
<component-instance class="org.apache.excalibur.source.impl.ResourceSourceFactory" name="resource"/>
<component-instance class="org.apache.cocoon.components.source.impl.ContextSourceFactory" name="context"/>
- <component-instance class="org.apache.cocoon.components.source.impl.CocoonSourceFactory" name="cocoon"/>
+ <component-instance class="org.apache.cocoon.components.source.impl.SitemapSourceFactory" name="cocoon"/>
<!-- file protocol : this is a WriteableSource -->
<component-instance class="org.apache.cocoon.components.source.impl.FileSourceFactory" name="file"/>
@@ -437,7 +437,6 @@
<!-- =============== Sitemap In/Out/Database Modules ==================== -->
<input-modules logger="core.modules.input">
- <component-instance name="context" class="org.apache.cocoon.components.modules.input.RequestContextPathModule" />
<component-instance name="global" class="org.apache.cocoon.components.modules.input.GlobalInputModule"/>
<component-instance name="request" class="org.apache.cocoon.components.modules.input.RequestModule"/>
<component-instance name="session" class="org.apache.cocoon.components.modules.input.SessionModule"/>
1.45 +2 -2 xml-forrest/src/resources/conf/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file: /home/cvs/xml-forrest/src/resources/conf/sitemap.xmap,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- sitemap.xmap 11 Dec 2002 08:28:10 -0000 1.44
+++ sitemap.xmap 26 Dec 2002 08:33:12 -0000 1.45
@@ -367,7 +367,7 @@
<map:match pattern="">
- <map:redirect-to uri="{context:context}/index.html"/>
+ <map:redirect-to uri="{request:contextPath}/index.html"/>
</map:match>
<map:match pattern="**">
@@ -474,7 +474,7 @@
<!-- ================ Directory redirects =========================== -->
<!-- Redirect any request for a directory to the directory's index.html file -->
<map:match pattern="**/">
- <map:redirect-to uri="{context:context}/{1}/index.html"/>
+ <map:redirect-to uri="{request:contextPath}/{1}/index.html"/>
</map:match>
<!-- ================ Libre =========================== -->