Return-Path: 
 <jetspeed-dev-return-28483-apmail-portals-jetspeed-dev-archive=portals.apache.org@portals.apache.org>
Delivered-To: apmail-portals-jetspeed-dev-archive@www.apache.org
Received: (qmail 79866 invoked from network); 26 Feb 2007 02:07:01 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 26 Feb 2007 02:07:01 -0000
Received: (qmail 95420 invoked by uid 500); 26 Feb 2007 02:07:08 -0000
Delivered-To: apmail-portals-jetspeed-dev-archive@portals.apache.org
Received: (qmail 95389 invoked by uid 500); 26 Feb 2007 02:07:08 -0000
Mailing-List: contact jetspeed-dev-help@portals.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:jetspeed-dev-help@portals.apache.org>
List-Unsubscribe: <mailto:jetspeed-dev-unsubscribe@portals.apache.org>
List-Post: <mailto:jetspeed-dev@portals.apache.org>
List-Id: <jetspeed-dev.portals.apache.org>
Reply-To: "Jetspeed Developers List" <jetspeed-dev@portals.apache.org>
Delivered-To: mailing list jetspeed-dev@portals.apache.org
Received: (qmail 95378 invoked by uid 99); 26 Feb 2007 02:07:08 -0000
Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 25 Feb 2007 18:07:08 -0800
X-ASF-Spam-Status: No, hits=-99.5 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; Sun, 25 Feb 2007 18:06:59 -0800
Received: by eris.apache.org (Postfix, from userid 65534)
	id 309331A981A; Sun, 25 Feb 2007 18:06:39 -0800 (PST)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r511693 -
 /portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/jetspeed-spring.xml
Date: Mon, 26 Feb 2007 02:06:39 -0000
To: jetspeed-dev@portals.apache.org
From: ate@apache.org
X-Mailer: svnmailer-1.1.0
Message-Id: <20070226020639.309331A981A@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: ate
Date: Sun Feb 25 18:06:38 2007
New Revision: 511693

URL: http://svn.apache.org/viewvc?view=rev&rev=511693
Log:
Fix for JS2-641: Allow override.properties to actually do what it is intended to do

Modified:
    portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/jetspeed-spring.xml

Modified: portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/jetspeed-spring.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/jetspeed-spring.xml?view=diff&rev=511693&r1=511692&r2=511693
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/jetspeed-spring.xml (original)
+++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/jetspeed-spring.xml Sun Feb 25 18:06:38 2007
@@ -177,8 +177,11 @@
     <!-- ${applicationRoot} is acutally set as a system property via the SpringEngine -->
 
     <bean id="placeholderConfig" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
-        <property name="location">
-            <value>file:///${applicationRoot}/WEB-INF/conf/jetspeed.properties</value>
+        <property name="locations">
+            <list>
+                <value>file:///${applicationRoot}/WEB-INF/conf/jetspeed.properties</value>
+                <value>file:///${applicationRoot}/WEB-INF/conf/override.properties</value>
+            </list>
         </property>
     </bean>
 



---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org