Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/MacroAutoReloadTestCase.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/MacroAutoReloadTestCase.java?rev=1855186&r1=1855185&r2=1855186&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/MacroAutoReloadTestCase.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/MacroAutoReloadTestCase.java Mon Mar 11 00:34:05 2019 @@ -55,7 +55,7 @@ public class MacroAutoReloadTestCase ext engine.setProperty(RuntimeConstants.RUNTIME_LOG_INSTANCE, log); // use file resource loader - engine.setProperty(RuntimeConstants.RESOURCE_LOADER, "file,string"); + engine.setProperty(RuntimeConstants.RESOURCE_LOADERS, "file,string"); engine.addProperty("file.resource.loader.path", RELOAD_TEMPLATE_PATH); engine.addProperty("velocimacro.library", "macros2.vtl"); engine.addProperty("velocimacro.library.autoreload", "true");
Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/MacroForwardDefineTestCase.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/MacroForwardDefineTestCase.java?rev=1855186&r1=1855185&r2=1855186&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/MacroForwardDefineTestCase.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/MacroForwardDefineTestCase.java Mon Mar 11 00:34:05 2019 @@ -76,7 +76,7 @@ public class MacroForwardDefineTestCase // use Velocity.setProperty (instead of properties file) so that we can use actual instance of log Velocity.reset(); - Velocity.setProperty(RuntimeConstants.RESOURCE_LOADER,"file"); + Velocity.setProperty(RuntimeConstants.RESOURCE_LOADERS,"file"); Velocity.setProperty(RuntimeConstants.FILE_RESOURCE_LOADER_PATH, FILE_RESOURCE_LOADER_PATH ); Velocity.setProperty(RuntimeConstants.RUNTIME_LOG_REFERENCE_LOG_INVALID,"true"); Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/MultiLoaderTestCase.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/MultiLoaderTestCase.java?rev=1855186&r1=1855185&r2=1855186&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/MultiLoaderTestCase.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/MultiLoaderTestCase.java Mon Mar 11 00:34:05 2019 @@ -90,40 +90,42 @@ public class MultiLoaderTestCase extends Velocity.reset(); - Velocity.setProperty(Velocity.RESOURCE_LOADER, "file"); + Velocity.setProperty(Velocity.RESOURCE_LOADERS, "file"); Velocity.setProperty( Velocity.FILE_RESOURCE_LOADER_PATH, FILE_RESOURCE_LOADER_PATH); - Velocity.addProperty(Velocity.RESOURCE_LOADER, "classpath"); + Velocity.addProperty(Velocity.RESOURCE_LOADERS, "classpath"); - Velocity.addProperty(Velocity.RESOURCE_LOADER, "jar"); + Velocity.addProperty(Velocity.RESOURCE_LOADERS, "jar"); /* * Set up the classpath loader. */ Velocity.setProperty( - "classpath." + Velocity.RESOURCE_LOADER + ".class", - "org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader"); + Velocity.RESOURCE_LOADER + ".classpath.class", + "org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader"); Velocity.setProperty( - "classpath." + Velocity.RESOURCE_LOADER + ".cache", "false"); + Velocity.RESOURCE_LOADER + ".classpath.cache", + "false"); Velocity.setProperty( - "classpath." + Velocity.RESOURCE_LOADER + ".modificationCheckInterval", - "2"); + Velocity.RESOURCE_LOADER + ".classpath.modification_check_interval", + "2"); /* * setup the Jar loader */ Velocity.setProperty( - "jar." + Velocity.RESOURCE_LOADER + ".class", - "org.apache.velocity.runtime.resource.loader.JarResourceLoader"); + Velocity.RESOURCE_LOADER + ".jar.class", + "org.apache.velocity.runtime.resource.loader.JarResourceLoader"); - Velocity.setProperty( "jar." + Velocity.RESOURCE_LOADER + ".path", - "jar:file:" + FILE_RESOURCE_LOADER_PATH + "/test2.jar" ); + Velocity.setProperty( + Velocity.RESOURCE_LOADER + ".jar.path", + "jar:file:" + FILE_RESOURCE_LOADER_PATH + "/test2.jar" ); Velocity.setProperty( Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/ParseWithMacroLibsTestCase.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/ParseWithMacroLibsTestCase.java?rev=1855186&r1=1855185&r2=1855186&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/ParseWithMacroLibsTestCase.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/ParseWithMacroLibsTestCase.java Mon Mar 11 00:34:05 2019 @@ -195,7 +195,7 @@ public class ParseWithMacroLibsTestCase ve.setProperty("file.resource.loader.cache", cache); ve.setProperty( Velocity.RUNTIME_LOG_INSTANCE, new TestLogger()); - ve.setProperty(RuntimeConstants.RESOURCE_LOADER, "file"); + ve.setProperty(RuntimeConstants.RESOURCE_LOADERS, "file"); ve.setProperty(RuntimeConstants.FILE_RESOURCE_LOADER_PATH, TEST_COMPARE_DIR + "/parsemacros"); ve.init(); @@ -224,7 +224,7 @@ public class ParseWithMacroLibsTestCase ve1.setProperty("file.resource.loader.cache", Boolean.TRUE); ve1.setProperty( Velocity.RUNTIME_LOG_INSTANCE, new TestLogger()); - ve1.setProperty(RuntimeConstants.RESOURCE_LOADER, "file"); + ve1.setProperty(RuntimeConstants.RESOURCE_LOADERS, "file"); ve1.setProperty(RuntimeConstants.FILE_RESOURCE_LOADER_PATH, TEST_COMPARE_DIR + "/parsemacros"); ve1.init(); @@ -274,7 +274,7 @@ public class ParseWithMacroLibsTestCase ve1.setProperty("file.resource.loader.cache", Boolean.TRUE); ve1.setProperty( Velocity.RUNTIME_LOG_INSTANCE, new TestLogger()); - ve1.setProperty(RuntimeConstants.RESOURCE_LOADER, "file"); + ve1.setProperty(RuntimeConstants.RESOURCE_LOADERS, "file"); ve1.setProperty(RuntimeConstants.FILE_RESOURCE_LOADER_PATH, TEST_COMPARE_DIR + "/parsemacros"); ve1.init(); Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/PreserveArgumentsLiteralsTestCase.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/PreserveArgumentsLiteralsTestCase.java?rev=1855186&r1=1855185&r2=1855186&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/PreserveArgumentsLiteralsTestCase.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/PreserveArgumentsLiteralsTestCase.java Mon Mar 11 00:34:05 2019 @@ -20,6 +20,7 @@ package org.apache.velocity.test; */ import org.apache.velocity.app.VelocityEngine; +import org.apache.velocity.runtime.RuntimeConstants; /** * This class tests the mode where velocimacros do preserve arguments literals @@ -34,7 +35,7 @@ public class PreserveArgumentsLiteralsTe protected void setUpEngine(VelocityEngine engine) { - engine.setProperty("velocimacro.preserve.arguments.literals", true); + engine.setProperty(RuntimeConstants.VM_PRESERVE_ARGUMENTS_LITERALS, true); } public void testPreserveLiterals() Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/SpaceGobblingTestCase.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/SpaceGobblingTestCase.java?rev=1855186&r1=1855185&r2=1855186&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/SpaceGobblingTestCase.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/SpaceGobblingTestCase.java Mon Mar 11 00:34:05 2019 @@ -70,7 +70,7 @@ public class SpaceGobblingTestCase exten { VelocityEngine ve = new VelocityEngine(); ve.setProperty(Velocity.RUNTIME_LOG_INSTANCE, log); - ve.setProperty(RuntimeConstants.RESOURCE_LOADER, "file"); + ve.setProperty(RuntimeConstants.RESOURCE_LOADERS, "file"); ve.setProperty(RuntimeConstants.FILE_RESOURCE_LOADER_PATH, TEST_COMPARE_DIR + "/gobbling"); ve.setProperty(RuntimeConstants.SPACE_GOBBLING, mode.toString()); ve.init(); Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/StringResourceLoaderRepositoryTestCase.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/StringResourceLoaderRepositoryTestCase.java?rev=1855186&r1=1855185&r2=1855186&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/StringResourceLoaderRepositoryTestCase.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/StringResourceLoaderRepositoryTestCase.java Mon Mar 11 00:34:05 2019 @@ -50,7 +50,7 @@ public class StringResourceLoaderReposit public void setUp() throws Exception { Velocity.reset(); - Velocity.setProperty(Velocity.RESOURCE_LOADER, "string"); + Velocity.setProperty(Velocity.RESOURCE_LOADERS, "string"); Velocity.addProperty("string.resource.loader.class", StringResourceLoader.class.getName()); Velocity.addProperty("string.resource.loader.modificationCheckInterval", "1"); Velocity.setProperty(Velocity.RUNTIME_LOG_INSTANCE, new TestLogger()); @@ -71,7 +71,7 @@ public class StringResourceLoaderReposit { VelocityEngine engine = new VelocityEngine(); TestLogger logger = new TestLogger(); - engine.setProperty(Velocity.RESOURCE_LOADER, "string"); + engine.setProperty(Velocity.RESOURCE_LOADERS, "string"); engine.addProperty("string.resource.loader.class", StringResourceLoader.class.getName()); if (repoName != null) { Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/StringResourceLoaderTestCase.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/StringResourceLoaderTestCase.java?rev=1855186&r1=1855185&r2=1855186&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/StringResourceLoaderTestCase.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/StringResourceLoaderTestCase.java Mon Mar 11 00:34:05 2019 @@ -71,7 +71,7 @@ public class StringResourceLoaderTestCas Velocity.reset(); - Velocity.setProperty(Velocity.RESOURCE_LOADER, "string"); + Velocity.setProperty(Velocity.RESOURCE_LOADERS, "string"); Velocity.addProperty("string.resource.loader.class", StringResourceLoader.class.getName()); Velocity.addProperty("string.resource.loader.modificationCheckInterval", "1"); Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/VMLibraryTestCase.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/VMLibraryTestCase.java?rev=1855186&r1=1855185&r2=1855186&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/VMLibraryTestCase.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/VMLibraryTestCase.java Mon Mar 11 00:34:05 2019 @@ -78,7 +78,7 @@ public class VMLibraryTestCase extends B ve1.setProperty( Velocity.RUNTIME_LOG_INSTANCE, new TestLogger()); - ve1.setProperty(RuntimeConstants.RESOURCE_LOADER, "file"); + ve1.setProperty(RuntimeConstants.RESOURCE_LOADERS, "file"); ve1.setProperty(RuntimeConstants.FILE_RESOURCE_LOADER_PATH, TEST_COMPARE_DIR + "/macrolibs"); ve1.init(); @@ -97,7 +97,7 @@ public class VMLibraryTestCase extends B ve2.setProperty( Velocity.RUNTIME_LOG_INSTANCE, new TestLogger()); - ve2.setProperty(RuntimeConstants.RESOURCE_LOADER, "file"); + ve2.setProperty(RuntimeConstants.RESOURCE_LOADERS, "file"); ve2.setProperty(RuntimeConstants.FILE_RESOURCE_LOADER_PATH, TEST_COMPARE_DIR + "/macrolibs"); ve2.init(); Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity702TestCase.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity702TestCase.java?rev=1855186&r1=1855185&r2=1855186&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity702TestCase.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity702TestCase.java Mon Mar 11 00:34:05 2019 @@ -37,7 +37,7 @@ public class Velocity702TestCase extends public void setUpEngine(VelocityEngine engine) { - engine.setProperty(RuntimeConstants.RESOURCE_LOADER, "high,low"); + engine.setProperty(RuntimeConstants.RESOURCE_LOADERS, "high,low"); engine.addProperty("high.resource.loader.class", StringResourceLoader.class.getName()); engine.addProperty("high.resource.loader.cache", "false"); engine.addProperty("high.resource.loader.repository.name", "high"); Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity747TestCase.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity747TestCase.java?rev=1855186&r1=1855185&r2=1855186&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity747TestCase.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity747TestCase.java Mon Mar 11 00:34:05 2019 @@ -59,12 +59,11 @@ public class Velocity747TestCase extends engine1.setProperty(RuntimeConstants.RUNTIME_LOG_INSTANCE, log); engine2 = new VelocityEngine(); - engine2.setProperty(RuntimeConstants.RESOURCE_LOADER, "file,string"); + engine2.setProperty(RuntimeConstants.RESOURCE_LOADERS, "file,string"); engine2.addProperty("file.resource.loader.path", TEST_COMPARE_DIR + "/issues/velocity-747/"); engine2.addProperty("file.resource.loader.cache", "true"); engine2.addProperty("file.resource.loader.modificationCheckInterval", "-1"); engine2.addProperty("velocimacro.permissions.allow.inline.local.scope", "true"); - engine2.addProperty("directive.set.null.allowed", "true"); engine2.addProperty("velocimacro.max.depth", "-1"); engine2.addProperty("string.resource.loader.class", StringResourceLoader.class.getName()); engine2.addProperty("string.resource.loader.repository.name", "stringRepo"); Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/util/introspection/ConversionHandlerTestCase.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/util/introspection/ConversionHandlerTestCase.java?rev=1855186&r1=1855185&r2=1855186&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/util/introspection/ConversionHandlerTestCase.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/util/introspection/ConversionHandlerTestCase.java Mon Mar 11 00:34:05 2019 @@ -114,7 +114,7 @@ public class ConversionHandlerTestCase e RuntimeInstance ve = new RuntimeInstance(); ve.setProperty( Velocity.VM_PERM_INLINE_LOCAL, Boolean.TRUE); ve.setProperty(Velocity.RUNTIME_LOG_INSTANCE, log); - ve.setProperty(RuntimeConstants.RESOURCE_LOADER, "file"); + ve.setProperty(RuntimeConstants.RESOURCE_LOADERS, "file"); ve.setProperty(RuntimeConstants.FILE_RESOURCE_LOADER_PATH, TEST_COMPARE_DIR + "/conversion"); ve.init(); Uberspect uberspect = ve.getUberspect(); @@ -196,7 +196,7 @@ public class ConversionHandlerTestCase e RuntimeInstance ve = new RuntimeInstance(); ve.setProperty( Velocity.VM_PERM_INLINE_LOCAL, Boolean.TRUE); ve.setProperty(Velocity.RUNTIME_LOG_INSTANCE, log); - ve.setProperty(RuntimeConstants.RESOURCE_LOADER, "file"); + ve.setProperty(RuntimeConstants.RESOURCE_LOADERS, "file"); ve.setProperty(RuntimeConstants.FILE_RESOURCE_LOADER_PATH, TEST_COMPARE_DIR + "/conversion"); ve.setProperty(RuntimeConstants.CONVERSION_HANDLER_INSTANCE, new MyCustomConverter()); ve.init(); @@ -277,7 +277,7 @@ public class ConversionHandlerTestCase e VelocityEngine ve = new VelocityEngine(); ve.setProperty( Velocity.VM_PERM_INLINE_LOCAL, Boolean.TRUE); ve.setProperty(Velocity.RUNTIME_LOG_INSTANCE, log); - ve.setProperty(RuntimeConstants.RESOURCE_LOADER, "file"); + ve.setProperty(RuntimeConstants.RESOURCE_LOADERS, "file"); ve.setProperty(RuntimeConstants.FILE_RESOURCE_LOADER_PATH, TEST_COMPARE_DIR + "/conversion"); if (withConversionsHandler) { Modified: velocity/engine/trunk/velocity-engine-core/src/test/resources/configuration/compare/output.cmp URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/resources/configuration/compare/output.cmp?rev=1855186&r1=1855185&r2=1855186&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/resources/configuration/compare/output.cmp (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/resources/configuration/compare/output.cmp Mon Mar 11 00:34:05 2019 @@ -12,14 +12,14 @@ Testing order of keys ... 08 09 10 -resource.loader -file.resource.loader.class -file.resource.loader.description -file.resource.loader.path -classpath.resource.loader.class -classpath.resource.loader.description -datasource.resource.loader.class -datasource.resource.loader.description +resource.loaders +resource.loader.file.class +resource.loader.file.description +resource.loader.file.path +resource.loader.classpath.class +resource.loader.classpath.description +resource.loader.datasource.class +resource.loader.datasource.description logger.type config.string.value config.boolean.value Modified: velocity/engine/trunk/velocity-engine-core/src/test/resources/issues/velocity-747/vel.props URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/resources/issues/velocity-747/vel.props?rev=1855186&r1=1855185&r2=1855186&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/resources/issues/velocity-747/vel.props (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/resources/issues/velocity-747/vel.props Mon Mar 11 00:34:05 2019 @@ -2,5 +2,4 @@ file.resource.loader.cache = true file.resource.loader.modificationCheckInterval = -1 velocimacro.permissions.allow.inline.local.scope = true -directive.set.null.allowed = true velocimacro.max.depth = -1
