You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by cz...@apache.org on 2006/12/29 16:00:44 UTC
svn commit: r491024 -
/cocoon/trunk/core/cocoon-configuration/cocoon-spring-configurator/src/main/java/org/apache/cocoon/spring/impl/CocoonPropertyOverrideConfigurer.java
Author: cziegeler
Date: Fri Dec 29 07:00:44 2006
New Revision: 491024
URL: http://svn.apache.org/viewvc?view=rev&rev=491024
Log:
Set defaults for override
Modified:
cocoon/trunk/core/cocoon-configuration/cocoon-spring-configurator/src/main/java/org/apache/cocoon/spring/impl/CocoonPropertyOverrideConfigurer.java
Modified: cocoon/trunk/core/cocoon-configuration/cocoon-spring-configurator/src/main/java/org/apache/cocoon/spring/impl/CocoonPropertyOverrideConfigurer.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-configuration/cocoon-spring-configurator/src/main/java/org/apache/cocoon/spring/impl/CocoonPropertyOverrideConfigurer.java?view=diff&rev=491024&r1=491023&r2=491024
==============================================================================
--- cocoon/trunk/core/cocoon-configuration/cocoon-spring-configurator/src/main/java/org/apache/cocoon/spring/impl/CocoonPropertyOverrideConfigurer.java (original)
+++ cocoon/trunk/core/cocoon-configuration/cocoon-spring-configurator/src/main/java/org/apache/cocoon/spring/impl/CocoonPropertyOverrideConfigurer.java Fri Dec 29 07:00:44 2006
@@ -18,6 +18,7 @@
*/
package org.apache.cocoon.spring.impl;
+import java.util.ArrayList;
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
@@ -46,7 +47,7 @@
* The locations of the directories where the different property files are
* located.
*/
- protected List locations = Collections.singletonList(Constants.CLASSPATH_SPRING_CONFIGURATION_LOCATION);
+ protected List locations;
/**
* The resource loader used to load the property files. This loader is
@@ -59,6 +60,13 @@
* The settings object.
*/
protected Settings settings;
+
+ public CocoonPropertyOverrideConfigurer() {
+ // add default locations
+ final List list = new ArrayList();
+ list.add(Constants.CLASSPATH_SPRING_CONFIGURATION_LOCATION);
+ list.add(Constants.GLOBAL_SPRING_CONFIGURATION_LOCATION);
+ }
/**
* Set the directories to search in.