svn commit: r422438 - in /cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-plugin/src/main/resources/org/apache/cocoon/maven/deployer/monolithic/WEB-INF/cocoon: cocoon.xconf properties/core.properties

[re...@apache.org]

Author: reinhard
Date: Sun Jul 16 06:02:50 2006
New Revision: 422438

URL: http://svn.apache.org/viewvc?rev=422438&view=rev
Log:
use new paths

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

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?rev=422438&r1=422437&r2=422438&view=diff
==============================================================================
--- 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 Sun Jul 16 06:02:50 2006
@@ -26,19 +26,19 @@
       | Include all configuration files ending with ".xconf" 
       | from the xconf directory.
       +-->
-  <include dir="context://WEB-INF/xconf" pattern="*.xconf"/>
+  <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/sitemap-additions" pattern="*.xmap"/>
+  <include dir="context://WEB-INF/cocoon/sitemap-additions" pattern="*.xmap"/>
   
   <!--+
       | Include Spring beans definition files ending with ".xml" from
       | the spring directory.
       +-->
-  <include-beans dir="context://WEB-INF/spring" pattern="*.xml"/>
+  <include-beans dir="context://WEB-INF/cocoon/spring" pattern="*.xml"/>
 
   $devblocks:{ devblock |
     $if(devblock.springConfPath)$

Modified: cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-plugin/src/main/resources/org/apache/cocoon/maven/deployer/monolithic/WEB-INF/cocoon/properties/core.properties
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/properties/core.properties?rev=422438&r1=422437&r2=422438&view=diff
==============================================================================
--- cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-plugin/src/main/resources/org/apache/cocoon/maven/deployer/monolithic/WEB-INF/cocoon/properties/core.properties (original)
+++ cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-plugin/src/main/resources/org/apache/cocoon/maven/deployer/monolithic/WEB-INF/cocoon/properties/core.properties Sun Jul 16 06:02:50 2006
@@ -18,7 +18,7 @@
 # Cocoon in.
 
 # This parameter points to the main configuration file for Cocoon.
-org.apache.cocoon.configuration=/WEB-INF/cocoon.xconf
+org.apache.cocoon.configuration=/WEB-INF/cocoon/cocoon.xconf
 
 # Delay between reload checks for the configuration in ms.
 # The check is only performed if reloading is turned on!
@@ -28,7 +28,7 @@
 # set to "yes" or "true", a new cocoon instance can be created using
 # the request parameter "cocoon-reload". It also enables that Cocoon is
 # reloaded when cocoon.xconf changes. Default is no for security reasons.
-org.apache.cocoon.reloading=no
+org.apache.cocoon.reloading=yes
 
 # Turn on reloading for specific parts:
 #org.apache.cocoon.reloading.sitemap=yes
@@ -37,7 +37,7 @@
 #org.apache.cocoon.reloading.flow=yes
 
 # This parameter indicates the log4j configuration file.
-org.apache.cocoon.logging.configuration=WEB-INF/log4j.xconf
+org.apache.cocoon.logging.configuration=WEB-INF/cocoon/log4j.xconf
 
 # This parameter indicates the category id of the logger
 # configuration used by the environment Cocoon runs in (CLI, Servlet etc.).