geirm 01/05/10 21:00:30
Modified: src/java/org/apache/velocity/runtime/resource
ResourceManager.java
Log:
Converted from Configuration to ExtendedProperties. Should be no functional
change.
Revision Changes Path
1.27 +4 -4
jakarta-velocity/src/java/org/apache/velocity/runtime/resource/ResourceManager.java
Index: ResourceManager.java
===================================================================
RCS file:
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/resource/ResourceManager.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- ResourceManager.java 2001/04/30 11:02:19 1.26
+++ ResourceManager.java 2001/05/11 04:00:29 1.27
@@ -65,7 +65,6 @@
import org.apache.velocity.Template;
import org.apache.velocity.runtime.Runtime;
-import org.apache.velocity.runtime.configuration.Configuration;
import org.apache.velocity.runtime.resource.ResourceFactory;
import org.apache.velocity.runtime.resource.loader.ResourceLoader;
import org.apache.velocity.runtime.resource.loader.ResourceLoaderFactory;
@@ -73,6 +72,7 @@
import org.apache.velocity.exception.ResourceNotFoundException;
import org.apache.velocity.exception.ParseErrorException;
+import org.apache.commons.collections.ExtendedProperties;
/**
* Class to manage the text resource for the Velocity
@@ -81,7 +81,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Paulo Gaspar</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Geir Magnusson Jr.</a>
- * @version $Id: ResourceManager.java,v 1.26 2001/04/30 11:02:19 geirm Exp $
+ * @version $Id: ResourceManager.java,v 1.27 2001/05/11 04:00:29 geirm Exp $
*/
public class ResourceManager
{
@@ -150,7 +150,7 @@
for (int i = 0; i < sourceInitializerList.size(); i++)
{
- Configuration configuration = (Configuration)
sourceInitializerList.get(i);
+ ExtendedProperties configuration = (ExtendedProperties)
sourceInitializerList.get(i);
String loaderClass = configuration.getString("class");
resourceLoader = ResourceLoaderFactory.getLoader(loaderClass);
@@ -191,7 +191,7 @@
String loaderID =
resourceLoaderNames.get(i) + "." + Runtime.RESOURCE_LOADER;
- Configuration loaderConfiguration =
+ ExtendedProperties loaderConfiguration =
Runtime.getConfiguration().subset(loaderID);
/*
