You are viewing a plain text version of this content. The canonical link for it is here.

Posted to cvs@cocoon.apache.org by cz...@apache.org on 2006/11/03 13:26:48 UTC

svn commit: r470778 - /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/avalon/ConfigurationReader.java

Author: cziegeler
Date: Fri Nov  3 04:26:47 2006
New Revision: 470778

URL: http://svn.apache.org/viewvc?view=rev&rev=470778
Log:
Allow cocoon as root element for avalon configurations

Modified:
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/avalon/ConfigurationReader.java

Modified: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/avalon/ConfigurationReader.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/avalon/ConfigurationReader.java?view=diff&rev=470778&r1=470777&r2=470778
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/avalon/ConfigurationReader.java (original)
+++ cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/avalon/ConfigurationReader.java Fri Nov  3 04:26:47 2006
@@ -506,7 +506,7 @@
 
             // what is it?
             final String includeKind = includeConfig.getName();
-            if (includeKind.equals("components")) {
+            if (includeKind.equals("components") || includeKind.equals("cocoon")) {
                 // more components
                 this.parseConfiguration(includeConfig, uri, loadedURIs);
             } else if (includeKind.equals("role-list")) {