cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: r434516 - in /cocoon/trunk/core: cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/avalon/ cocoon-webapp/src/main/webapp/WEB-INF/
Date Thu, 24 Aug 2006 20:40:57 GMT
Author: cziegeler
Date: Thu Aug 24 13:40:56 2006
New Revision: 434516

URL: http://svn.apache.org/viewvc?rev=434516&view=rev
Log:
Fix config bug and comment out not working tag

Modified:
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/avalon/ConfigReader.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/avalon/ConfigurationInfoFactoryBean.java
    cocoon/trunk/core/cocoon-webapp/src/main/webapp/WEB-INF/applicationContext.xml

Modified: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/avalon/ConfigReader.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/avalon/ConfigReader.java?rev=434516&r1=434515&r2=434516&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/avalon/ConfigReader.java
(original)
+++ cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/avalon/ConfigReader.java
Thu Aug 24 13:40:56 2006
@@ -149,7 +149,7 @@
             this.logger.info("Reading Avalon configuration from " + relativePath);
         }
         Resource root = this.resolver.getResource(this.convertUrl(relativePath));
-        final DefaultConfigurationBuilder b = new DefaultConfigurationBuilder();
+        final DefaultConfigurationBuilder b = new DefaultConfigurationBuilder(true);
         
         final Configuration config = b.build(this.getInputSource(root));
         // validate cocoon.xconf
@@ -195,7 +195,7 @@
                     this.logger.info("Reading additional user roles: " + userRoles);
                 }
                 final Resource userRolesSource = this.resolver.getResource(this.getUrl(userRoles,
rootUri));
-                final DefaultConfigurationBuilder b = new DefaultConfigurationBuilder();
+                final DefaultConfigurationBuilder b = new DefaultConfigurationBuilder(true);
                 final Configuration userRolesConfig = b.build(this.getInputSource(userRolesSource));
                 this.parseConfiguration(userRolesConfig, userRolesSource.getURL().toExternalForm(),
loadedConfigs);
             }
@@ -398,7 +398,7 @@
             // load it and store it in the read set
             Configuration includeConfig = null;
             try {
-                DefaultConfigurationBuilder builder = new DefaultConfigurationBuilder(null);
+                DefaultConfigurationBuilder builder = new DefaultConfigurationBuilder(true);
                 includeConfig = builder.build(src.getInputStream(), uri);
             } catch (Exception e) {
                 throw new ConfigurationException("Cannot load '" + uri + "' at " + includeStatement.getLocation(),
e);

Modified: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/avalon/ConfigurationInfoFactoryBean.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/avalon/ConfigurationInfoFactoryBean.java?rev=434516&r1=434515&r2=434516&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/avalon/ConfigurationInfoFactoryBean.java
(original)
+++ cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/avalon/ConfigurationInfoFactoryBean.java
Thu Aug 24 13:40:56 2006
@@ -50,11 +50,11 @@
         return true;
     }
 
-    public ConfigurationInfo getInfo() {
+    public ConfigurationInfo getConfigurationInfo() {
         return info;
     }
 
-    public void setInfo(ConfigurationInfo info) {
+    public void setConfigurationInfo(ConfigurationInfo info) {
         this.info = info;
     }
 }

Modified: cocoon/trunk/core/cocoon-webapp/src/main/webapp/WEB-INF/applicationContext.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-webapp/src/main/webapp/WEB-INF/applicationContext.xml?rev=434516&r1=434515&r2=434516&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-webapp/src/main/webapp/WEB-INF/applicationContext.xml (original)
+++ cocoon/trunk/core/cocoon-webapp/src/main/webapp/WEB-INF/applicationContext.xml Thu Aug
24 13:40:56 2006
@@ -25,8 +25,9 @@
 
   <!-- Load all the properties for Cocoon -->
   <cocoon:settings/>
-
+<!-- 
   <cocoon:avalon location="/WEB-INF/cocoon/cocoon.xconf"/>
+ -->
   <!-- The following bean definitions will be replaced later on with
        the use of the new namespace handling in spring:
        <cocoon:settings/>



Mime
View raw message