You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by da...@apache.org on 2006/04/30 21:12:05 UTC
svn commit: r398406 - in /cocoon/trunk/core/cocoon-webapp/src/main/webapp:
WEB-INF/cocoon.xconf sitemap.xmap
Author: danielf
Date: Sun Apr 30 12:12:02 2006
New Revision: 398406
URL: http://svn.apache.org/viewcvs?rev=398406&view=rev
Log:
Moved the inclusion of additional sitemap components (whatever that is supposed to be), to the parent container.
Modified:
cocoon/trunk/core/cocoon-webapp/src/main/webapp/WEB-INF/cocoon.xconf
cocoon/trunk/core/cocoon-webapp/src/main/webapp/sitemap.xmap
Modified: cocoon/trunk/core/cocoon-webapp/src/main/webapp/WEB-INF/cocoon.xconf
URL: http://svn.apache.org/viewcvs/cocoon/trunk/core/cocoon-webapp/src/main/webapp/WEB-INF/cocoon.xconf?rev=398406&r1=398405&r2=398406&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-webapp/src/main/webapp/WEB-INF/cocoon.xconf (original)
+++ cocoon/trunk/core/cocoon-webapp/src/main/webapp/WEB-INF/cocoon.xconf Sun Apr 30 12:12:02 2006
@@ -35,6 +35,12 @@
<include dir="context://WEB-INF/xconf" pattern="*.xconf"/>
<!--+
+ | Include all configuration files ending with ".xconf"
+ | from the sitemap-additions directory.
+ +-->
+ <include dir="context://WEB-INF/sitemap-additions" pattern="*.xconf"/>
+
+ <!--+
| Include all configuration files ending with ".samplesxconf"
| from the xconf directory.
+-->
Modified: cocoon/trunk/core/cocoon-webapp/src/main/webapp/sitemap.xmap
URL: http://svn.apache.org/viewcvs/cocoon/trunk/core/cocoon-webapp/src/main/webapp/sitemap.xmap?rev=398406&r1=398405&r2=398406&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-webapp/src/main/webapp/sitemap.xmap (original)
+++ cocoon/trunk/core/cocoon-webapp/src/main/webapp/sitemap.xmap Sun Apr 30 12:12:02 2006
@@ -35,8 +35,10 @@
<map:components>
- <!-- include some additional components -->
- <map:include dir="context://WEB-INF/sitemap-additions" pattern="*.xconf"/>
+ <!--+
+ | All needed components are inherited from the parent container
+ | configured in WEB-INF/cocoon.xconf
+ +-->
</map:components>