cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lgaw...@apache.org
Subject svn commit: r470852 - in /cocoon/trunk: core/cocoon-core/src/main/resources/org/apache/cocoon/cocoon.xconf tools/cocoon-block-deployer/cocoon-deployer-plugin/src/main/resources/org/apache/cocoon/maven/deployer/monolithic/WEB-INF/cocoon/cocoon.xconf
Date Fri, 03 Nov 2006 15:19:01 GMT
Author: lgawron
Date: Fri Nov  3 07:19:00 2006
New Revision: 470852

URL: http://svn.apache.org/viewvc?view=rev&rev=470852
Log:
reflect the latest directory restructurization

Modified:
    cocoon/trunk/core/cocoon-core/src/main/resources/org/apache/cocoon/cocoon.xconf
    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/core/cocoon-core/src/main/resources/org/apache/cocoon/cocoon.xconf
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/resources/org/apache/cocoon/cocoon.xconf?view=diff&rev=470852&r1=470851&r2=470852
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/resources/org/apache/cocoon/cocoon.xconf (original)
+++ cocoon/trunk/core/cocoon-core/src/main/resources/org/apache/cocoon/cocoon.xconf Fri Nov
 3 07:19:00 2006
@@ -15,8 +15,8 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<!--+ 
-    | This is the default cocoon.xconf which is used if no one configuration file is used.

+<!--+
+    | This is the default cocoon.xconf which is used if no one configuration file is used.
     | $Id$
     +-->
 <cocoon version="2.2">
@@ -25,19 +25,19 @@
       | 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. 
+      | mechanism.
       +-->
   <include src="resource://org/apache/cocoon/cocoon.roles"/>
 
   <!--+
       | Include all configuration files (for core and blocks) from within the jars.
-  <include dir="resource://META-INF/cocoon/xconf" pattern="*.xconf"/>
+  <include dir="resource://META-INF/cocoon/avalon" pattern="*.xconf"/>
       +-->
 
   <!--+
-      | Include all configuration files ending with ".xconf" 
+      | Include all configuration files ending with ".xconf"
       | from the xconf directory.
       +-->
-  <include dir="context://WEB-INF/cocoon/xconf" pattern="*.xconf"/>
+  <include dir="context://WEB-INF/cocoon/avalon" pattern="*.xconf"/>
 
 </cocoon>

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=470852&r1=470851&r2=470852
==============================================================================
--- 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
Fri Nov  3 07:19:00 2006
@@ -21,8 +21,8 @@
       | Include the default cocoon.xconf. The default configuration
       | includes:
       | - resource://org/apache/cocoon/cocoon.roles
-      | - classpath*:/META-INF/cocoon/xconf/*.xconf
-      | - context://WEB-INF/cocoon/xconf/*.xconf
+      | - classpath*:/META-INF/cocoon/avalon/*.xconf
+      | - context://WEB-INF/cocoon/avalon/*.xconf
       +-->
   <include src="resource://org/apache/cocoon/cocoon.xconf"/>
 
@@ -30,11 +30,11 @@
     $if(devblock.springConfPath)$
     <include-beans dir="$devblock.springConfPath$" pattern="*.xml"/>
     $endif$
-    
+
     $if(devblock.xconfConfPath)$
     <include dir="$devblock.xconfConfPath$" pattern="*.xconf"/>
     $endif$
-    
+
     $if(devblock.sitemapAdditionsConfPath)$
     <include dir="$devblock.sitemapAdditionsConfPath$" pattern="*.xmap"/>
     $endif$



Mime
View raw message