Return-Path: Delivered-To: apmail-cocoon-cvs-archive@www.apache.org Received: (qmail 8518 invoked from network); 3 Nov 2006 13:59:50 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 3 Nov 2006 13:59:50 -0000 Received: (qmail 23166 invoked by uid 500); 3 Nov 2006 14:00:00 -0000 Delivered-To: apmail-cocoon-cvs-archive@cocoon.apache.org Received: (qmail 23106 invoked by uid 500); 3 Nov 2006 14:00:00 -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 23086 invoked by uid 99); 3 Nov 2006 14:00:00 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 03 Nov 2006 06:00:00 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 03 Nov 2006 05:59:47 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id F15E91A9846; Fri, 3 Nov 2006 05:59:22 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r470823 - /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/SettingsBeanFactoryPostProcessor.java Date: Fri, 03 Nov 2006 13:59:22 -0000 To: cvs@cocoon.apache.org From: lgawron@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20061103135922.F15E91A9846@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: lgawron Date: Fri Nov 3 05:59:22 2006 New Revision: 470823 URL: http://svn.apache.org/viewvc?view=rev&rev=470823 Log: path tweaks Modified: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/SettingsBeanFactoryPostProcessor.java Modified: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/SettingsBeanFactoryPostProcessor.java URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/SettingsBeanFactoryPostProcessor.java?view=diff&rev=470823&r1=470822&r2=470823 ============================================================================== --- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/SettingsBeanFactoryPostProcessor.java (original) +++ cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/SettingsBeanFactoryPostProcessor.java Fri Nov 3 05:59:22 2006 @@ -186,9 +186,9 @@ final Properties properties = new Properties(); // now read all properties from the properties directory - ResourceUtils.readProperties("classpath*:/META-INF/cocoon/properties", properties, this.getResourceLoader(), this.logger); + ResourceUtils.readProperties("classpath*:META-INF/cocoon/properties", properties, this.getResourceLoader(), this.logger); // read all properties from the mode dependent directory - ResourceUtils.readProperties("classpath*:/META-INF/cocoon/properties/" + mode, properties, this.getResourceLoader(), this.logger); + ResourceUtils.readProperties("classpath*:META-INF/cocoon/properties/" + mode, properties, this.getResourceLoader(), this.logger); // now read all properties from the properties directory ResourceUtils.readProperties("/WEB-INF/cocoon/properties", properties, this.getResourceLoader(), this.logger);