cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: r469155 - /cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-plugin/src/main/resources/org/apache/cocoon/maven/deployer/monolithic/WEB-INF/cocoon/cocoon.xconf
Date Mon, 30 Oct 2006 14:52:37 GMT
Author: cziegeler
Date: Mon Oct 30 06:52:36 2006
New Revision: 469155

URL: http://svn.apache.org/viewvc?view=rev&rev=469155
Log:
Include default cocoon.xconf

Modified:
    cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-plugin/src/main/resources/org/apache/cocoon/maven/deployer/monolithic/WEB-INF/cocoon/cocoon.xconf

Modified: cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-plugin/src/main/resources/org/apache/cocoon/maven/deployer/monolithic/WEB-INF/cocoon/cocoon.xconf
URL: http://svn.apache.org/viewvc/cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-plugin/src/main/resources/org/apache/cocoon/maven/deployer/monolithic/WEB-INF/cocoon/cocoon.xconf?view=diff&rev=469155&r1=469154&r2=469155
==============================================================================
--- cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-plugin/src/main/resources/org/apache/cocoon/maven/deployer/monolithic/WEB-INF/cocoon/cocoon.xconf
(original)
+++ cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-plugin/src/main/resources/org/apache/cocoon/maven/deployer/monolithic/WEB-INF/cocoon/cocoon.xconf
Mon Oct 30 06:52:36 2006
@@ -18,25 +18,14 @@
 <cocoon version="2.2">
 
   <!--+
-      | Include the core roles definitions. This is for the sake of clarity,
-      | as they are implicitely loaded at startup, but we may want to remove
-      | this implicit behaviour in the future now that we have the include
-      | mechanism. 
+      | Include the default cocoon.xconf. The default configuration
+      | includes:
+      | - resource://org/apache/cocoon/cocoon.roles
+      | - context://WEB-INF/cocoon/xconf/*.xconf
+      | - context://WEB-INF/cocoon/sitemap-additions/*.xmap
       +-->
-  <include src="resource://org/apache/cocoon/cocoon.roles"/>
+  <include src="resource://org/apache/cocoon/cocoon.xconf"/>
 
-  <!--+
-      | Include all configuration files ending with ".xconf" 
-      | from the xconf directory.
-      +-->
-  <include dir="context://WEB-INF/cocoon/xconf" pattern="*.xconf"/>
-
-  <!--+
-      | Include all configuration files ending with ".xmap" 
-      | from the sitemap-additions directory.
-      +-->
-  <include dir="context://WEB-INF/cocoon/sitemap-additions" pattern="*.xmap"/>
-  
   $devblocks:{ devblock |
     $if(devblock.springConfPath)$
     <include-beans dir="$devblock.springConfPath$" pattern="*.xml"/>



Mime
View raw message