Return-Path: Delivered-To: apmail-cocoon-cvs-archive@www.apache.org Received: (qmail 56642 invoked from network); 24 Aug 2006 20:41:20 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 24 Aug 2006 20:41:20 -0000 Received: (qmail 67935 invoked by uid 500); 24 Aug 2006 20:41:20 -0000 Delivered-To: apmail-cocoon-cvs-archive@cocoon.apache.org Received: (qmail 67886 invoked by uid 500); 24 Aug 2006 20:41:20 -0000 Mailing-List: contact cvs-help@cocoon.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@cocoon.apache.org list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list cvs@cocoon.apache.org Received: (qmail 67875 invoked by uid 99); 24 Aug 2006 20:41:20 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 24 Aug 2006 13:41:20 -0700 X-ASF-Spam-Status: No, hits=-8.6 required=10.0 tests=ALL_TRUSTED,INFO_TLD,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 24 Aug 2006 13:41:19 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 0CBED1A981A; Thu, 24 Aug 2006 13:40:59 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit 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 -0000 To: cvs@cocoon.apache.org From: cziegeler@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20060824204059.0CBED1A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N 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 @@ - +