You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by at...@apache.org on 2007/02/26 03:06:39 UTC
svn commit: r511693 -
/portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/jetspeed-spring.xml
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