Author: cbrisson
Date: Fri Dec 9 13:27:05 2016
New Revision: 1773380
URL: http://svn.apache.org/viewvc?rev=1773380&view=rev
Log:
[engine] since we drop support for the old ResourceLoader API, there's no need
of using the suffixed name ResourceLoader2
Added:
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/ResourceLoader.java
- copied, changed from r1773379,
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/ResourceLoader2.java
Removed:
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/ResourceLoader2.java
Modified:
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/Resource.java
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/ResourceManagerImpl.java
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/ClasspathResourceLoader.java
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/DataSourceResourceLoader.java
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/FileResourceLoader.java
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/JarResourceLoader.java
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/ResourceLoaderFactory.java
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/StringResourceLoader.java
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/URLResourceLoader.java
velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/ResourceLoaderInstanceTestCase.java
velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/misc/ExceptionGeneratingResourceLoader.java
velocity/engine/trunk/velocity-engine-scripting/src/main/java/org/apache/velocity/script/VelocityScriptEngine.java
Modified:
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/Resource.java
URL:
http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/Resource.java?rev=1773380&r1=1773379&r2=1773380&view=diff
==============================================================================
---
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/Resource.java
(original)
+++
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/Resource.java
Fri Dec 9 13:27:05 2016
@@ -23,7 +23,7 @@ import org.apache.velocity.exception.Par
import org.apache.velocity.exception.ResourceNotFoundException;
import org.apache.velocity.runtime.RuntimeConstants;
import org.apache.velocity.runtime.RuntimeServices;
-import org.apache.velocity.runtime.resource.loader.ResourceLoader2;
+import org.apache.velocity.runtime.resource.loader.ResourceLoader;
import org.slf4j.Logger;
/**
@@ -45,7 +45,7 @@ public abstract class Resource
* stream for this template, and knows how to check the
* source of the input stream for modification.
*/
- protected ResourceLoader2 resourceLoader;
+ protected ResourceLoader resourceLoader;
/**
* The number of milliseconds in a minute, used to calculate the
@@ -237,7 +237,7 @@ public abstract class Resource
* in the template stream
* @return The resource loader for this resource.
*/
- public ResourceLoader2 getResourceLoader()
+ public ResourceLoader getResourceLoader()
{
return resourceLoader;
}
@@ -248,7 +248,7 @@ public abstract class Resource
* came from the list of possible sources.
* @param resourceLoader
*/
- public void setResourceLoader(ResourceLoader2 resourceLoader)
+ public void setResourceLoader(ResourceLoader resourceLoader)
{
this.resourceLoader = resourceLoader;
}
Modified:
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/ResourceManagerImpl.java
URL:
http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/ResourceManagerImpl.java?rev=1773380&r1=1773379&r2=1773380&view=diff
==============================================================================
---
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/ResourceManagerImpl.java
(original)
+++
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/ResourceManagerImpl.java
Fri Dec 9 13:27:05 2016
@@ -24,13 +24,12 @@ import org.apache.velocity.exception.Res
import org.apache.velocity.exception.VelocityException;
import org.apache.velocity.runtime.RuntimeConstants;
import org.apache.velocity.runtime.RuntimeServices;
-import org.apache.velocity.runtime.resource.loader.ResourceLoader2;
+import org.apache.velocity.runtime.resource.loader.ResourceLoader;
import org.apache.velocity.runtime.resource.loader.ResourceLoaderFactory;
import org.apache.velocity.util.ClassUtils;
import org.apache.velocity.util.ExtProperties;
import org.apache.velocity.util.StringUtils;
import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import java.util.ArrayList;
import java.util.Iterator;
@@ -99,7 +98,7 @@ public class ResourceManagerImpl
return;
}
- ResourceLoader2 resourceLoader = null;
+ ResourceLoader resourceLoader = null;
rsvc = rs;
log = rsvc.getLog("loader");
@@ -117,7 +116,7 @@ public class ResourceManagerImpl
ExtProperties configuration = (ExtProperties) it.next();
String loaderClass =
StringUtils.nullTrim(configuration.getString("class"));
- ResourceLoader2 loaderInstance = (ResourceLoader2)
configuration.get("instance");
+ ResourceLoader loaderInstance = (ResourceLoader)
configuration.get("instance");
if (loaderInstance != null)
{
@@ -421,7 +420,7 @@ public class ResourceManagerImpl
for (Iterator it = resourceLoaders.iterator(); it.hasNext();)
{
- ResourceLoader2 resourceLoader = (ResourceLoader2) it.next();
+ ResourceLoader resourceLoader = (ResourceLoader) it.next();
resource.setResourceLoader(resourceLoader);
/*
@@ -513,7 +512,7 @@ public class ResourceManagerImpl
/* check whether this can now be found in a higher priority
* resource loader. if so, pass the request off to loadResource.
*/
- ResourceLoader2 loader = resource.getResourceLoader();
+ ResourceLoader loader = resource.getResourceLoader();
if (resourceLoaders.size() > 0 && resourceLoaders.indexOf(loader) > 0)
{
String name = resource.getName();
@@ -580,7 +579,7 @@ public class ResourceManagerImpl
*/
public String getLoaderNameForResource(String resourceName)
{
- ResourceLoader2 loader = getLoaderForResource(resourceName);
+ ResourceLoader loader = getLoaderForResource(resourceName);
if (loader == null)
{
return null;
@@ -589,14 +588,14 @@ public class ResourceManagerImpl
}
/**
- * Returns the first {@link ResourceLoader2} in which the specified
+ * Returns the first {@link ResourceLoader} in which the specified
* resource exists.
*/
- private ResourceLoader2 getLoaderForResource(String resourceName)
+ private ResourceLoader getLoaderForResource(String resourceName)
{
for (Iterator i = resourceLoaders.iterator(); i.hasNext(); )
{
- ResourceLoader2 loader = (ResourceLoader2)i.next();
+ ResourceLoader loader = (ResourceLoader)i.next();
if (loader.resourceExists(resourceName))
{
return loader;
Modified:
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/ClasspathResourceLoader.java
URL:
http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/ClasspathResourceLoader.java?rev=1773380&r1=1773379&r2=1773380&view=diff
==============================================================================
---
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/ClasspathResourceLoader.java
(original)
+++
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/ClasspathResourceLoader.java
Fri Dec 9 13:27:05 2016
@@ -76,7 +76,7 @@ import java.io.Reader;
* @author <a href="mailto:[email protected]";>Geir Magnusson Jr.</a>
* @version $Id$
*/
-public class ClasspathResourceLoader extends ResourceLoader2
+public class ClasspathResourceLoader extends ResourceLoader
{
/**
@@ -150,7 +150,7 @@ public class ClasspathResourceLoader ext
}
/**
- * @see
org.apache.velocity.runtime.resource.loader.ResourceLoader2#isSourceModified(org.apache.velocity.runtime.resource.Resource)
+ * @see
ResourceLoader#isSourceModified(org.apache.velocity.runtime.resource.Resource)
*/
public boolean isSourceModified(Resource resource)
{
@@ -158,7 +158,7 @@ public class ClasspathResourceLoader ext
}
/**
- * @see
org.apache.velocity.runtime.resource.loader.ResourceLoader2#getLastModified(org.apache.velocity.runtime.resource.Resource)
+ * @see
ResourceLoader#getLastModified(org.apache.velocity.runtime.resource.Resource)
*/
public long getLastModified(Resource resource)
{
Modified:
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/DataSourceResourceLoader.java
URL:
http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/DataSourceResourceLoader.java?rev=1773380&r1=1773379&r2=1773380&view=diff
==============================================================================
---
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/DataSourceResourceLoader.java
(original)
+++
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/DataSourceResourceLoader.java
Fri Dec 9 13:27:05 2016
@@ -126,7 +126,7 @@ import java.sql.Timestamp;
* @version $Id$
* @since 1.5
*/
-public class DataSourceResourceLoader extends ResourceLoader2
+public class DataSourceResourceLoader extends ResourceLoader
{
private String dataSourceName;
private String tableName;
@@ -137,7 +137,7 @@ public class DataSourceResourceLoader ex
private DataSource dataSource;
/**
- * @see
org.apache.velocity.runtime.resource.loader.ResourceLoader2#init(org.apache.velocity.util.ExtProperties)
+ * @see ResourceLoader#init(org.apache.velocity.util.ExtProperties)
*/
public void init(ExtProperties configuration)
{
@@ -186,7 +186,7 @@ public class DataSourceResourceLoader ex
}
/**
- * @see
org.apache.velocity.runtime.resource.loader.ResourceLoader2#isSourceModified(org.apache.velocity.runtime.resource.Resource)
+ * @see
ResourceLoader#isSourceModified(org.apache.velocity.runtime.resource.Resource)
*/
public boolean isSourceModified(final Resource resource)
{
@@ -195,7 +195,7 @@ public class DataSourceResourceLoader ex
}
/**
- * @see
org.apache.velocity.runtime.resource.loader.ResourceLoader2#getLastModified(org.apache.velocity.runtime.resource.Resource)
+ * @see
ResourceLoader#getLastModified(org.apache.velocity.runtime.resource.Resource)
*/
public long getLastModified(final Resource resource)
{
Modified:
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/FileResourceLoader.java
URL:
http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/FileResourceLoader.java?rev=1773380&r1=1773379&r2=1773380&view=diff
==============================================================================
---
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/FileResourceLoader.java
(original)
+++
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/FileResourceLoader.java
Fri Dec 9 13:27:05 2016
@@ -47,7 +47,7 @@ import java.util.Map;
* @author <a href="mailto:[email protected]";>Jason van Zyl</a>
* @version $Id$
*/
-public class FileResourceLoader extends ResourceLoader2
+public class FileResourceLoader extends ResourceLoader
{
/**
* The paths to search for templates.
@@ -63,7 +63,7 @@ public class FileResourceLoader extends
private Map templatePaths = Collections.synchronizedMap(new HashMap());
/**
- * @see
org.apache.velocity.runtime.resource.loader.ResourceLoader2#init(org.apache.velocity.util.ExtProperties)
+ * @see ResourceLoader#init(org.apache.velocity.util.ExtProperties)
*/
public void init( ExtProperties configuration)
{
@@ -328,7 +328,7 @@ public class FileResourceLoader extends
}
/**
- * @see
org.apache.velocity.runtime.resource.loader.ResourceLoader2#getLastModified(org.apache.velocity.runtime.resource.Resource)
+ * @see
ResourceLoader#getLastModified(org.apache.velocity.runtime.resource.Resource)
*/
public long getLastModified(Resource resource)
{
Modified:
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/JarResourceLoader.java
URL:
http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/JarResourceLoader.java?rev=1773380&r1=1773379&r2=1773380&view=diff
==============================================================================
---
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/JarResourceLoader.java
(original)
+++
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/JarResourceLoader.java
Fri Dec 9 13:27:05 2016
@@ -64,7 +64,7 @@ import java.util.Vector;
* @author <a href="mailto:[email protected]";>Dave Bryson</a>
* @version $Id$
*/
-public class JarResourceLoader extends ResourceLoader2
+public class JarResourceLoader extends ResourceLoader
{
/**
* Maps entries to the parent JAR File
@@ -245,7 +245,7 @@ public class JarResourceLoader extends R
// TODO: SHOULD BE DELEGATED TO THE JARHOLDER
/**
- * @see
org.apache.velocity.runtime.resource.loader.ResourceLoader2#isSourceModified(org.apache.velocity.runtime.resource.Resource)
+ * @see
ResourceLoader#isSourceModified(org.apache.velocity.runtime.resource.Resource)
*/
public boolean isSourceModified(Resource resource)
{
@@ -253,7 +253,7 @@ public class JarResourceLoader extends R
}
/**
- * @see
org.apache.velocity.runtime.resource.loader.ResourceLoader2#getLastModified(org.apache.velocity.runtime.resource.Resource)
+ * @see
ResourceLoader#getLastModified(org.apache.velocity.runtime.resource.Resource)
*/
public long getLastModified(Resource resource)
{
Copied:
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/ResourceLoader.java
(from r1773379,
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/ResourceLoader2.java)
URL:
http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/ResourceLoader.java?p2=velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/ResourceLoader.java&p1=velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/ResourceLoader2.java&r1=1773379&r2=1773380&rev=1773380&view=diff
==============================================================================
---
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/ResourceLoader2.java
(original)
+++
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/ResourceLoader.java
Fri Dec 9 13:27:05 2016
@@ -46,7 +46,7 @@ import java.io.UnsupportedEncodingExcept
* @author <a href="mailto:[email protected]";>Claude Brisson</a>
* @version $Id$
*/
-public abstract class ResourceLoader2
+public abstract class ResourceLoader
{
/**
* Does this loader want templates produced with it
Modified:
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/ResourceLoaderFactory.java
URL:
http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/ResourceLoaderFactory.java?rev=1773380&r1=1773379&r2=1773380&view=diff
==============================================================================
---
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/ResourceLoaderFactory.java
(original)
+++
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/ResourceLoaderFactory.java
Fri Dec 9 13:27:05 2016
@@ -37,13 +37,13 @@ public class ResourceLoaderFactory
* @param loaderClassName
* @return TemplateLoader
*/
- public static ResourceLoader2 getLoader(RuntimeServices rs, String
loaderClassName)
+ public static ResourceLoader getLoader(RuntimeServices rs, String
loaderClassName)
{
- ResourceLoader2 loader = null;
+ ResourceLoader loader = null;
try
{
- loader = (ResourceLoader2) ClassUtils.getNewInstance(
loaderClassName );
+ loader = (ResourceLoader) ClassUtils.getNewInstance(
loaderClassName );
rs.getLog().debug("ResourceLoader instantiated: "
+ loader.getClass().getName());
Modified:
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/StringResourceLoader.java
URL:
http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/StringResourceLoader.java?rev=1773380&r1=1773379&r2=1773380&view=diff
==============================================================================
---
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/StringResourceLoader.java
(original)
+++
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/StringResourceLoader.java
Fri Dec 9 13:27:05 2016
@@ -113,7 +113,7 @@ import java.util.Map;
* @version $Id$
* @since 1.5
*/
-public class StringResourceLoader extends ResourceLoader2
+public class StringResourceLoader extends ResourceLoader
{
/**
* Key to determine whether the repository should be set as the static one
or not.
@@ -210,7 +210,7 @@ public class StringResourceLoader extend
/**
- * @see
org.apache.velocity.runtime.resource.loader.ResourceLoader2#init(org.apache.velocity.util.ExtProperties)
+ * @see ResourceLoader#init(org.apache.velocity.util.ExtProperties)
*/
public void init(final ExtProperties configuration)
{
@@ -390,7 +390,7 @@ public class StringResourceLoader extend
}
/**
- * @see
org.apache.velocity.runtime.resource.loader.ResourceLoader2#isSourceModified(org.apache.velocity.runtime.resource.Resource)
+ * @see
ResourceLoader#isSourceModified(org.apache.velocity.runtime.resource.Resource)
*/
public boolean isSourceModified(final Resource resource)
{
@@ -408,7 +408,7 @@ public class StringResourceLoader extend
}
/**
- * @see
org.apache.velocity.runtime.resource.loader.ResourceLoader2#getLastModified(org.apache.velocity.runtime.resource.Resource)
+ * @see
ResourceLoader#getLastModified(org.apache.velocity.runtime.resource.Resource)
*/
public long getLastModified(final Resource resource)
{
Modified:
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/URLResourceLoader.java
URL:
http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/URLResourceLoader.java?rev=1773380&r1=1773379&r2=1773380&view=diff
==============================================================================
---
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/URLResourceLoader.java
(original)
+++
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/URLResourceLoader.java
Fri Dec 9 13:27:05 2016
@@ -41,7 +41,7 @@ import java.util.HashMap;
* @version $Id: URLResourceLoader.java 191743 2005-06-21 23:22:20Z dlr $
* @since 1.5
*/
-public class URLResourceLoader extends ResourceLoader2
+public class URLResourceLoader extends ResourceLoader
{
private String[] roots = null;
protected HashMap templateRoots = null;
@@ -49,7 +49,7 @@ public class URLResourceLoader extends R
private Method[] timeoutMethods;
/**
- * @see
org.apache.velocity.runtime.resource.loader.ResourceLoader2#init(org.apache.velocity.util.ExtProperties)
+ * @see ResourceLoader#init(org.apache.velocity.util.ExtProperties)
*/
public void init(ExtProperties configuration)
{
Modified:
velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/ResourceLoaderInstanceTestCase.java
URL:
http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/ResourceLoaderInstanceTestCase.java?rev=1773380&r1=1773379&r2=1773380&view=diff
==============================================================================
---
velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/ResourceLoaderInstanceTestCase.java
(original)
+++
velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/ResourceLoaderInstanceTestCase.java
Fri Dec 9 13:27:05 2016
@@ -27,7 +27,7 @@ import org.apache.velocity.app.Velocity;
import org.apache.velocity.runtime.RuntimeConstants;
import org.apache.velocity.runtime.RuntimeSingleton;
import org.apache.velocity.runtime.resource.loader.FileResourceLoader;
-import org.apache.velocity.runtime.resource.loader.ResourceLoader2;
+import org.apache.velocity.runtime.resource.loader.ResourceLoader;
import org.apache.velocity.test.misc.TestLogger;
import java.io.BufferedWriter;
@@ -88,7 +88,7 @@ public class ResourceLoaderInstanceTestC
throws Exception
{
- ResourceLoader2 rl = new FileResourceLoader();
+ ResourceLoader rl = new FileResourceLoader();
// pass in an instance to Velocity
Velocity.reset();
Modified:
velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/misc/ExceptionGeneratingResourceLoader.java
URL:
http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/misc/ExceptionGeneratingResourceLoader.java?rev=1773380&r1=1773379&r2=1773380&view=diff
==============================================================================
---
velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/misc/ExceptionGeneratingResourceLoader.java
(original)
+++
velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/misc/ExceptionGeneratingResourceLoader.java
Fri Dec 9 13:27:05 2016
@@ -21,7 +21,7 @@ package org.apache.velocity.test.misc;
import org.apache.velocity.exception.ResourceNotFoundException;
import org.apache.velocity.runtime.resource.Resource;
-import org.apache.velocity.runtime.resource.loader.ResourceLoader2;
+import org.apache.velocity.runtime.resource.loader.ResourceLoader;
import org.apache.velocity.util.ExtProperties;
import java.io.Reader;
@@ -33,7 +33,7 @@ import java.io.Reader;
* @author <a href="mailto:[email protected]";>Will Glass-Husain</a>
* @version $Id$
*/
-public class ExceptionGeneratingResourceLoader extends ResourceLoader2
+public class ExceptionGeneratingResourceLoader extends ResourceLoader
{
public void init(ExtProperties configuration)
Modified:
velocity/engine/trunk/velocity-engine-scripting/src/main/java/org/apache/velocity/script/VelocityScriptEngine.java
URL:
http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-scripting/src/main/java/org/apache/velocity/script/VelocityScriptEngine.java?rev=1773380&r1=1773379&r2=1773380&view=diff
==============================================================================
---
velocity/engine/trunk/velocity-engine-scripting/src/main/java/org/apache/velocity/script/VelocityScriptEngine.java
(original)
+++
velocity/engine/trunk/velocity-engine-scripting/src/main/java/org/apache/velocity/script/VelocityScriptEngine.java
Fri Dec 9 13:27:05 2016
@@ -61,7 +61,7 @@ import org.apache.velocity.Template;
import org.apache.velocity.VelocityContext;
import org.apache.velocity.runtime.RuntimeInstance;
import org.apache.velocity.exception.ResourceNotFoundException;
-import org.apache.velocity.runtime.resource.loader.ResourceLoader2;
+import org.apache.velocity.runtime.resource.loader.ResourceLoader;
import org.apache.velocity.runtime.resource.loader.StringResourceLoader;
import javax.script.AbstractScriptEngine;
@@ -298,7 +298,7 @@ public class VelocityScriptEngine extend
public CompiledScript compile(Reader script) throws ScriptException
{
initVelocityEngine(null);
- ResourceLoader2 resourceLoader = new SingleResourceReader(script);
+ ResourceLoader resourceLoader = new SingleResourceReader(script);
Template template = new Template();
template.setRuntimeServices(velocityEngine);
template.setResourceLoader(resourceLoader);
