freemarker-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ddek...@apache.org
Subject [1/6] incubator-freemarker git commit: Continued subpackage content rearrangement...
Date Fri, 17 Feb 2017 01:53:37 GMT
Repository: incubator-freemarker
Updated Branches:
  refs/heads/3 94d39312b -> b0e08ccb8


http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/b0e08ccb/src/test/java/org/apache/freemarker/core/ast/EnvironmentGetTemplateVariantsTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/freemarker/core/ast/EnvironmentGetTemplateVariantsTest.java
b/src/test/java/org/apache/freemarker/core/ast/EnvironmentGetTemplateVariantsTest.java
index 3b41068..7c81954 100644
--- a/src/test/java/org/apache/freemarker/core/ast/EnvironmentGetTemplateVariantsTest.java
+++ b/src/test/java/org/apache/freemarker/core/ast/EnvironmentGetTemplateVariantsTest.java
@@ -35,7 +35,7 @@ import org.apache.freemarker.core.model.TemplateDirectiveBody;
 import org.apache.freemarker.core.model.TemplateDirectiveModel;
 import org.apache.freemarker.core.model.TemplateModel;
 import org.apache.freemarker.core.model.impl.SimpleScalar;
-import org.apache.freemarker.core.templateresolver.StringTemplateLoader;
+import org.apache.freemarker.core.templateresolver.impl.StringTemplateLoader;
 import org.apache.freemarker.test.TemplateTest;
 import org.junit.Test;
 

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/b0e08ccb/src/test/java/org/apache/freemarker/core/ast/InterpretAndEvalTemplateNameTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/freemarker/core/ast/InterpretAndEvalTemplateNameTest.java
b/src/test/java/org/apache/freemarker/core/ast/InterpretAndEvalTemplateNameTest.java
index 20bdb57..2579d60 100644
--- a/src/test/java/org/apache/freemarker/core/ast/InterpretAndEvalTemplateNameTest.java
+++ b/src/test/java/org/apache/freemarker/core/ast/InterpretAndEvalTemplateNameTest.java
@@ -21,7 +21,7 @@ package org.apache.freemarker.core.ast;
 import java.io.IOException;
 
 import org.apache.freemarker.core.TemplateException;
-import org.apache.freemarker.core.templateresolver.StringTemplateLoader;
+import org.apache.freemarker.core.templateresolver.impl.StringTemplateLoader;
 import org.apache.freemarker.test.TemplateTest;
 import org.junit.Test;
 

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/b0e08ccb/src/test/java/org/apache/freemarker/core/ast/MiscErrorMessagesTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/freemarker/core/ast/MiscErrorMessagesTest.java b/src/test/java/org/apache/freemarker/core/ast/MiscErrorMessagesTest.java
index 0b3c166..368c717 100644
--- a/src/test/java/org/apache/freemarker/core/ast/MiscErrorMessagesTest.java
+++ b/src/test/java/org/apache/freemarker/core/ast/MiscErrorMessagesTest.java
@@ -19,7 +19,7 @@
 
 package org.apache.freemarker.core.ast;
 
-import org.apache.freemarker.core.templateresolver.TemplateNameFormat;
+import org.apache.freemarker.core.templateresolver.impl.DefaultTemplateNameFormat;
 import org.apache.freemarker.test.TemplateTest;
 import org.junit.Test;
 
@@ -32,7 +32,7 @@ public class MiscErrorMessagesTest extends TemplateTest {
     
     @Test
     public void wrongTemplateNameFormat() {
-        getConfiguration().setTemplateNameFormat(TemplateNameFormat.DEFAULT_2_4_0);
+        getConfiguration().setTemplateNameFormat(DefaultTemplateNameFormat.INSTANCE);
         
         assertErrorContains("<#include 'foo:/bar:baaz'>", "Malformed template name",
"':'");
         assertErrorContains("<#include '../baaz'>", "Malformed template name", "root");

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/b0e08ccb/src/test/java/org/apache/freemarker/core/ast/ObjectBuilderSettingsTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/freemarker/core/ast/ObjectBuilderSettingsTest.java b/src/test/java/org/apache/freemarker/core/ast/ObjectBuilderSettingsTest.java
index 7343565..f9d1840 100644
--- a/src/test/java/org/apache/freemarker/core/ast/ObjectBuilderSettingsTest.java
+++ b/src/test/java/org/apache/freemarker/core/ast/ObjectBuilderSettingsTest.java
@@ -56,11 +56,11 @@ import org.apache.freemarker.core.model.impl.DefaultObjectWrapper;
 import org.apache.freemarker.core.model.impl.beans.BeansWrapper;
 import org.apache.freemarker.core.subpkg.PublicWithMixedConstructors;
 import org.apache.freemarker.core.templateresolver.CacheStorage;
-import org.apache.freemarker.core.templateresolver.MruCacheStorage;
 import org.apache.freemarker.core.templateresolver.TemplateLoader;
 import org.apache.freemarker.core.templateresolver.TemplateLoaderSession;
 import org.apache.freemarker.core.templateresolver.TemplateLoadingResult;
 import org.apache.freemarker.core.templateresolver.TemplateLoadingSource;
+import org.apache.freemarker.core.templateresolver.impl.MruCacheStorage;
 import org.apache.freemarker.core.util.WriteProtectable;
 import org.junit.Test;
 

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/b0e08ccb/src/test/java/org/apache/freemarker/core/ast/TemplatGetEncodingTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/freemarker/core/ast/TemplatGetEncodingTest.java b/src/test/java/org/apache/freemarker/core/ast/TemplatGetEncodingTest.java
index 4d4a849..af001c9 100644
--- a/src/test/java/org/apache/freemarker/core/ast/TemplatGetEncodingTest.java
+++ b/src/test/java/org/apache/freemarker/core/ast/TemplatGetEncodingTest.java
@@ -30,9 +30,9 @@ import org.apache.freemarker.core.Configuration;
 import org.apache.freemarker.core.Template;
 import org.apache.freemarker.core.TemplateNotFoundException;
 import org.apache.freemarker.core.ast.ParseException;
-import org.apache.freemarker.core.templateresolver.ByteArrayTemplateLoader;
 import org.apache.freemarker.core.templateresolver.MalformedTemplateNameException;
-import org.apache.freemarker.core.templateresolver.StrongCacheStorage;
+import org.apache.freemarker.core.templateresolver.impl.ByteArrayTemplateLoader;
+import org.apache.freemarker.core.templateresolver.impl.StrongCacheStorage;
 import org.junit.Test;
 
 public class TemplatGetEncodingTest {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/b0e08ccb/src/test/java/org/apache/freemarker/core/ast/TemplateConfigurationTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/freemarker/core/ast/TemplateConfigurationTest.java b/src/test/java/org/apache/freemarker/core/ast/TemplateConfigurationTest.java
index b8bff7b..5d8f6fc 100644
--- a/src/test/java/org/apache/freemarker/core/ast/TemplateConfigurationTest.java
+++ b/src/test/java/org/apache/freemarker/core/ast/TemplateConfigurationTest.java
@@ -67,7 +67,7 @@ import org.apache.freemarker.core.ast.TemplateNumberFormatFactory;
 import org.apache.freemarker.core.ast.UndefinedOutputFormat;
 import org.apache.freemarker.core.ast.XMLOutputFormat;
 import org.apache.freemarker.core.model.impl.SimpleObjectWrapper;
-import org.apache.freemarker.core.templateresolver.StringTemplateLoader;
+import org.apache.freemarker.core.templateresolver.impl.StringTemplateLoader;
 import org.apache.freemarker.core.util.NullArgumentException;
 import org.junit.Test;
 

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/b0e08ccb/src/test/java/org/apache/freemarker/core/ast/TemplateConfigurationWithTemplateResolverTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/freemarker/core/ast/TemplateConfigurationWithTemplateResolverTest.java
b/src/test/java/org/apache/freemarker/core/ast/TemplateConfigurationWithTemplateResolverTest.java
index b9cbc61..f6e1df9 100644
--- a/src/test/java/org/apache/freemarker/core/ast/TemplateConfigurationWithTemplateResolverTest.java
+++ b/src/test/java/org/apache/freemarker/core/ast/TemplateConfigurationWithTemplateResolverTest.java
@@ -30,12 +30,12 @@ import org.apache.freemarker.core.Template;
 import org.apache.freemarker.core.TemplateException;
 import org.apache.freemarker.core.ast.CustomAttribute;
 import org.apache.freemarker.core.ast.TemplateConfiguration;
-import org.apache.freemarker.core.templateresolver.ByteArrayTemplateLoader;
 import org.apache.freemarker.core.templateresolver.ConditionalTemplateConfigurationFactory;
 import org.apache.freemarker.core.templateresolver.FileNameGlobMatcher;
 import org.apache.freemarker.core.templateresolver.FirstMatchTemplateConfigurationFactory;
 import org.apache.freemarker.core.templateresolver.MergingTemplateConfigurationFactory;
-import org.apache.freemarker.core.templateresolver.StringTemplateLoader;
+import org.apache.freemarker.core.templateresolver.impl.ByteArrayTemplateLoader;
+import org.apache.freemarker.core.templateresolver.impl.StringTemplateLoader;
 import org.junit.Test;
 
 public class TemplateConfigurationWithTemplateResolverTest {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/b0e08ccb/src/test/java/org/apache/freemarker/core/ast/TemplateLevelSettings.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/freemarker/core/ast/TemplateLevelSettings.java b/src/test/java/org/apache/freemarker/core/ast/TemplateLevelSettings.java
index 5de9e51..7794041 100644
--- a/src/test/java/org/apache/freemarker/core/ast/TemplateLevelSettings.java
+++ b/src/test/java/org/apache/freemarker/core/ast/TemplateLevelSettings.java
@@ -28,8 +28,8 @@ import org.apache.freemarker.core.Configuration;
 import org.apache.freemarker.core.Template;
 import org.apache.freemarker.core.TemplateException;
 import org.apache.freemarker.core.Version;
-import org.apache.freemarker.core.templateresolver.StringTemplateLoader;
-import org.apache.freemarker.core.templateresolver.StrongCacheStorage;
+import org.apache.freemarker.core.templateresolver.impl.StringTemplateLoader;
+import org.apache.freemarker.core.templateresolver.impl.StrongCacheStorage;
 import org.junit.Test;
 
 public class TemplateLevelSettings {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/b0e08ccb/src/test/java/org/apache/freemarker/core/ast/TemplateNameSpecialVariablesTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/freemarker/core/ast/TemplateNameSpecialVariablesTest.java
b/src/test/java/org/apache/freemarker/core/ast/TemplateNameSpecialVariablesTest.java
index 12b11ef..e7ca755 100644
--- a/src/test/java/org/apache/freemarker/core/ast/TemplateNameSpecialVariablesTest.java
+++ b/src/test/java/org/apache/freemarker/core/ast/TemplateNameSpecialVariablesTest.java
@@ -24,8 +24,8 @@ import org.apache.freemarker.core.Configuration;
 import org.apache.freemarker.core.Template;
 import org.apache.freemarker.core.TemplateException;
 import org.apache.freemarker.core.Version;
-import org.apache.freemarker.core.templateresolver.StringTemplateLoader;
 import org.apache.freemarker.core.templateresolver.TemplateLoader;
+import org.apache.freemarker.core.templateresolver.impl.StringTemplateLoader;
 import org.apache.freemarker.core.util.StringUtil;
 import org.apache.freemarker.test.TemplateTest;
 import org.junit.Before;

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/b0e08ccb/src/test/java/org/apache/freemarker/core/templateresolver/DefaultTemplateResolverTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/freemarker/core/templateresolver/DefaultTemplateResolverTest.java
b/src/test/java/org/apache/freemarker/core/templateresolver/DefaultTemplateResolverTest.java
index 42690b6..0660228 100644
--- a/src/test/java/org/apache/freemarker/core/templateresolver/DefaultTemplateResolverTest.java
+++ b/src/test/java/org/apache/freemarker/core/templateresolver/DefaultTemplateResolverTest.java
@@ -35,6 +35,10 @@ import org.apache.freemarker.core.Configuration;
 import org.apache.freemarker.core.Template;
 import org.apache.freemarker.core.TemplateNotFoundException;
 import org.apache.freemarker.core.ast.ParseException;
+import org.apache.freemarker.core.templateresolver.impl.DefaultTemplateNameFormat;
+import org.apache.freemarker.core.templateresolver.impl.DefaultTemplateResolver;
+import org.apache.freemarker.core.templateresolver.impl.StringTemplateLoader;
+import org.apache.freemarker.core.templateresolver.impl.StrongCacheStorage;
 import org.apache.freemarker.test.MonitoredTemplateLoader;
 import org.apache.freemarker.test.MonitoredTemplateLoader.CloseSessionEvent;
 import org.apache.freemarker.test.MonitoredTemplateLoader.CreateSessionEvent;
@@ -461,7 +465,7 @@ public class DefaultTemplateResolverTest {
         
         // [2.4] Test it with IcI 2.4
         
-        cfg.setTemplateNameFormat(TemplateNameFormat.DEFAULT_2_4_0);
+        cfg.setTemplateNameFormat(DefaultTemplateNameFormat.INSTANCE);
         try {
             cfg.getTemplate("../x", null, null, null, true, true);
             fail();

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/b0e08ccb/src/test/java/org/apache/freemarker/core/templateresolver/FileTemplateLoaderTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/freemarker/core/templateresolver/FileTemplateLoaderTest.java
b/src/test/java/org/apache/freemarker/core/templateresolver/FileTemplateLoaderTest.java
index 77b7b81..34a4a99 100644
--- a/src/test/java/org/apache/freemarker/core/templateresolver/FileTemplateLoaderTest.java
+++ b/src/test/java/org/apache/freemarker/core/templateresolver/FileTemplateLoaderTest.java
@@ -28,7 +28,7 @@ import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang.SystemUtils;
 import org.apache.freemarker.core.Configuration;
 import org.apache.freemarker.core.TemplateNotFoundException;
-import org.apache.freemarker.core.templateresolver.FileTemplateLoader;
+import org.apache.freemarker.core.templateresolver.impl.FileTemplateLoader;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/b0e08ccb/src/test/java/org/apache/freemarker/core/templateresolver/MultiTemplateLoaderTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/freemarker/core/templateresolver/MultiTemplateLoaderTest.java
b/src/test/java/org/apache/freemarker/core/templateresolver/MultiTemplateLoaderTest.java
index 1780263..8923417 100644
--- a/src/test/java/org/apache/freemarker/core/templateresolver/MultiTemplateLoaderTest.java
+++ b/src/test/java/org/apache/freemarker/core/templateresolver/MultiTemplateLoaderTest.java
@@ -27,13 +27,13 @@ import java.io.InputStreamReader;
 import java.nio.charset.StandardCharsets;
 
 import org.apache.commons.io.IOUtils;
-import org.apache.freemarker.core.templateresolver.ByteArrayTemplateLoader;
-import org.apache.freemarker.core.templateresolver.MultiTemplateLoader;
-import org.apache.freemarker.core.templateresolver.StringTemplateLoader;
 import org.apache.freemarker.core.templateresolver.TemplateLoader;
 import org.apache.freemarker.core.templateresolver.TemplateLoaderSession;
 import org.apache.freemarker.core.templateresolver.TemplateLoadingResult;
 import org.apache.freemarker.core.templateresolver.TemplateLoadingResultStatus;
+import org.apache.freemarker.core.templateresolver.impl.ByteArrayTemplateLoader;
+import org.apache.freemarker.core.templateresolver.impl.MultiTemplateLoader;
+import org.apache.freemarker.core.templateresolver.impl.StringTemplateLoader;
 import org.junit.Test;
 
 public class MultiTemplateLoaderTest {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/b0e08ccb/src/test/java/org/apache/freemarker/core/templateresolver/TemplateNameFormatTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/freemarker/core/templateresolver/TemplateNameFormatTest.java
b/src/test/java/org/apache/freemarker/core/templateresolver/TemplateNameFormatTest.java
index 0a3a417..9ad98e7 100644
--- a/src/test/java/org/apache/freemarker/core/templateresolver/TemplateNameFormatTest.java
+++ b/src/test/java/org/apache/freemarker/core/templateresolver/TemplateNameFormatTest.java
@@ -32,7 +32,8 @@ import org.apache.freemarker.core.Configuration;
 import org.apache.freemarker.core.Template;
 import org.apache.freemarker.core.TemplateNotFoundException;
 import org.apache.freemarker.core.ast.ParseException;
-import org.apache.freemarker.core.templateresolver.TemplateNameFormat;
+import org.apache.freemarker.core.templateresolver.impl.DefaultTemplateNameFormat;
+import org.apache.freemarker.core.templateresolver.impl.DefaultTemplateNameFormatFM2;
 import org.apache.freemarker.test.MonitoredTemplateLoader;
 import org.junit.Test;
 
@@ -45,7 +46,7 @@ public class TemplateNameFormatTest {
     public void testToRootBasedName() throws MalformedTemplateNameException {
         // Path that are treated the same both in 2.3 and 2.4 format:
         for (TemplateNameFormat tnf : new TemplateNameFormat[] {
-                TemplateNameFormat.DEFAULT_2_3_0, TemplateNameFormat.DEFAULT_2_4_0 }) {
+                DefaultTemplateNameFormatFM2.INSTANCE, DefaultTemplateNameFormat.INSTANCE
}) {
             // Relative paths:
             // - No scheme:
             assertEquals("a/b", tnf.toRootBasedName("a/", "b"));
@@ -76,7 +77,7 @@ public class TemplateNameFormatTest {
         
         // Scheme names in 2.4 format only:
         {
-            final TemplateNameFormat tnf = TemplateNameFormat.DEFAULT_2_4_0;
+            final TemplateNameFormat tnf = DefaultTemplateNameFormat.INSTANCE;
             assertEquals("s:b", tnf.toRootBasedName("s:f", "b"));
             assertEquals("s:/b", tnf.toRootBasedName("s:/f", "b"));
             assertEquals("s:b", tnf.toRootBasedName("s:f", "/b"));
@@ -91,7 +92,7 @@ public class TemplateNameFormatTest {
         
         // Scheme names in 2.3 format only:
         {
-            final TemplateNameFormat tnf = TemplateNameFormat.DEFAULT_2_3_0;
+            final TemplateNameFormat tnf = DefaultTemplateNameFormatFM2.INSTANCE;
             assertEquals("a/s://b", tnf.toRootBasedName("a/s://f/", "/b"));
         }
     }
@@ -100,7 +101,7 @@ public class TemplateNameFormatTest {
     public void testNormalizeRootBasedName() throws MalformedTemplateNameException {
         // Normalizations that are the same in legacy and modern format:
         for (TemplateNameFormat tnf : new TemplateNameFormat[] {
-                TemplateNameFormat.DEFAULT_2_3_0, TemplateNameFormat.DEFAULT_2_4_0 }) {
+                DefaultTemplateNameFormatFM2.INSTANCE, DefaultTemplateNameFormat.INSTANCE
}) {
             assertEquals("", tnf.normalizeRootBasedName(""));
             for (String lead : new String[] { "", "/" }) {
                 assertEquals("foo", tnf.normalizeRootBasedName(lead + "foo"));
@@ -212,11 +213,11 @@ public class TemplateNameFormatTest {
         
         // New kind of scheme handling:
 
-        assertEquals("s:a/b", TemplateNameFormat.DEFAULT_2_4_0.normalizeRootBasedName("s:a/b"));
-        assertEquals("s:a/b", TemplateNameFormat.DEFAULT_2_4_0.normalizeRootBasedName("s:/a/b"));
-        assertEquals("s://a/b", TemplateNameFormat.DEFAULT_2_4_0.normalizeRootBasedName("s://a/b"));
-        assertEquals("s://a/b", TemplateNameFormat.DEFAULT_2_4_0.normalizeRootBasedName("s:///a/b"));
-        assertEquals("s://a/b", TemplateNameFormat.DEFAULT_2_4_0.normalizeRootBasedName("s:////a/b"));
+        assertEquals("s:a/b", DefaultTemplateNameFormat.INSTANCE.normalizeRootBasedName("s:a/b"));
+        assertEquals("s:a/b", DefaultTemplateNameFormat.INSTANCE.normalizeRootBasedName("s:/a/b"));
+        assertEquals("s://a/b", DefaultTemplateNameFormat.INSTANCE.normalizeRootBasedName("s://a/b"));
+        assertEquals("s://a/b", DefaultTemplateNameFormat.INSTANCE.normalizeRootBasedName("s:///a/b"));
+        assertEquals("s://a/b", DefaultTemplateNameFormat.INSTANCE.normalizeRootBasedName("s:////a/b"));
         
         // Illegal use a of ":":
         assertNormRBNameThrowsColonExceptionOn24("a/b:c/d");
@@ -276,7 +277,7 @@ public class TemplateNameFormatTest {
     @Test
     public void assertBackslashNotAllowedWith24() throws MalformedTemplateNameException,
ParseException, IOException {
         Configuration cfg = new Configuration(Configuration.VERSION_2_3_0);
-        cfg.setTemplateNameFormat(TemplateNameFormat.DEFAULT_2_4_0);
+        cfg.setTemplateNameFormat(DefaultTemplateNameFormat.INSTANCE);
         try {
             cfg.getTemplate("././foo\\bar.ftl", Locale.US);
             fail();
@@ -288,14 +289,14 @@ public class TemplateNameFormatTest {
     
     private void assertEqualsOn23AndOn24(String expected23, String expected24, String name)
             throws MalformedTemplateNameException {
-        assertEquals(expected23, TemplateNameFormat.DEFAULT_2_3_0.normalizeRootBasedName(name));
-        assertEquals(expected24, TemplateNameFormat.DEFAULT_2_4_0.normalizeRootBasedName(name));
+        assertEquals(expected23, DefaultTemplateNameFormatFM2.INSTANCE.normalizeRootBasedName(name));
+        assertEquals(expected24, DefaultTemplateNameFormat.INSTANCE.normalizeRootBasedName(name));
     }
 
     private void assertNormRBNameEqualsOn23ButThrowsBackOutExcOn24(final String expected23,
final String name)
             throws MalformedTemplateNameException {
-        assertEquals(expected23, TemplateNameFormat.DEFAULT_2_3_0.normalizeRootBasedName(name));
-        assertThrowsWithBackingOutException(name, TemplateNameFormat.DEFAULT_2_4_0);
+        assertEquals(expected23, DefaultTemplateNameFormatFM2.INSTANCE.normalizeRootBasedName(name));
+        assertThrowsWithBackingOutException(name, DefaultTemplateNameFormat.INSTANCE);
     }
 
     private void assertThrowsWithBackingOutException(final String name, final TemplateNameFormat
tnf) {
@@ -310,7 +311,7 @@ public class TemplateNameFormatTest {
 
     private void assertNormRBNameThrowsColonExceptionOn24(final String name) throws MalformedTemplateNameException
{
         try {
-            TemplateNameFormat.DEFAULT_2_4_0.normalizeRootBasedName(name);
+            DefaultTemplateNameFormat.INSTANCE.normalizeRootBasedName(name);
             fail();
         } catch (MalformedTemplateNameException e) {
             assertEquals(name, e.getTemplateName());

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/b0e08ccb/src/test/java/org/apache/freemarker/manualtest/ExamplesTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/freemarker/manualtest/ExamplesTest.java b/src/test/java/org/apache/freemarker/manualtest/ExamplesTest.java
index 3cb0249..2541478 100644
--- a/src/test/java/org/apache/freemarker/manualtest/ExamplesTest.java
+++ b/src/test/java/org/apache/freemarker/manualtest/ExamplesTest.java
@@ -23,10 +23,10 @@ import java.io.InputStream;
 import java.util.Properties;
 
 import org.apache.freemarker.core.Configuration;
-import org.apache.freemarker.core.templateresolver.ByteArrayTemplateLoader;
-import org.apache.freemarker.core.templateresolver.ClassTemplateLoader;
-import org.apache.freemarker.core.templateresolver.MultiTemplateLoader;
 import org.apache.freemarker.core.templateresolver.TemplateLoader;
+import org.apache.freemarker.core.templateresolver.impl.ByteArrayTemplateLoader;
+import org.apache.freemarker.core.templateresolver.impl.ClassTemplateLoader;
+import org.apache.freemarker.core.templateresolver.impl.MultiTemplateLoader;
 import org.apache.freemarker.test.TemplateTest;
 import org.junit.Ignore;
 

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/b0e08ccb/src/test/java/org/apache/freemarker/servlet/FreemarkerServletTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/freemarker/servlet/FreemarkerServletTest.java b/src/test/java/org/apache/freemarker/servlet/FreemarkerServletTest.java
index aa9eb03..413f05d 100644
--- a/src/test/java/org/apache/freemarker/servlet/FreemarkerServletTest.java
+++ b/src/test/java/org/apache/freemarker/servlet/FreemarkerServletTest.java
@@ -47,11 +47,11 @@ import org.apache.freemarker.core.Template;
 import org.apache.freemarker.core.TemplateException;
 import org.apache.freemarker.core.ast.Environment;
 import org.apache.freemarker.core.ast.TemplateConfiguration;
-import org.apache.freemarker.core.templateresolver.ByteArrayTemplateLoader;
 import org.apache.freemarker.core.templateresolver.ConditionalTemplateConfigurationFactory;
 import org.apache.freemarker.core.templateresolver.FileNameGlobMatcher;
 import org.apache.freemarker.core.templateresolver.FirstMatchTemplateConfigurationFactory;
 import org.apache.freemarker.core.templateresolver.TemplateLoader;
+import org.apache.freemarker.core.templateresolver.impl.ByteArrayTemplateLoader;
 import org.apache.freemarker.servlet.FreemarkerServlet;
 import org.junit.Before;
 import org.junit.Test;

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/b0e08ccb/src/test/java/org/apache/freemarker/servlet/InitParamParserTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/freemarker/servlet/InitParamParserTest.java b/src/test/java/org/apache/freemarker/servlet/InitParamParserTest.java
index 1480475..d4e8499 100644
--- a/src/test/java/org/apache/freemarker/servlet/InitParamParserTest.java
+++ b/src/test/java/org/apache/freemarker/servlet/InitParamParserTest.java
@@ -31,8 +31,8 @@ import java.util.Collections;
 
 import org.apache.freemarker.core.Configuration;
 import org.apache.freemarker.core.MockServletContext;
-import org.apache.freemarker.core.templateresolver.ClassTemplateLoader;
-import org.apache.freemarker.core.templateresolver.MultiTemplateLoader;
+import org.apache.freemarker.core.templateresolver.impl.ClassTemplateLoader;
+import org.apache.freemarker.core.templateresolver.impl.MultiTemplateLoader;
 import org.apache.freemarker.servlet.InitParamParser;
 import org.junit.Test;
 

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/b0e08ccb/src/test/java/org/apache/freemarker/servlet/jsp/RealServletContainertTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/freemarker/servlet/jsp/RealServletContainertTest.java
b/src/test/java/org/apache/freemarker/servlet/jsp/RealServletContainertTest.java
index fd4d787..6232e91 100644
--- a/src/test/java/org/apache/freemarker/servlet/jsp/RealServletContainertTest.java
+++ b/src/test/java/org/apache/freemarker/servlet/jsp/RealServletContainertTest.java
@@ -45,8 +45,8 @@ import org.apache.freemarker.core.model.impl.DefaultObjectWrapper;
 import org.apache.freemarker.core.model.impl.SimpleObjectWrapper;
 import org.apache.freemarker.core.model.impl.beans.BeansWrapper;
 import org.apache.freemarker.core.model.impl.beans.BeansWrapperBuilder;
-import org.apache.freemarker.core.templateresolver.ClassTemplateLoader;
 import org.apache.freemarker.core.templateresolver.TemplateLoader;
+import org.apache.freemarker.core.templateresolver.impl.ClassTemplateLoader;
 import org.apache.freemarker.servlet.FreemarkerServlet;
 import org.apache.freemarker.servlet.WebAppTemplateLoader;
 import org.apache.freemarker.test.servlet.DefaultModel2TesterAction;

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/b0e08ccb/src/test/java/org/apache/freemarker/test/TemplateTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/freemarker/test/TemplateTest.java b/src/test/java/org/apache/freemarker/test/TemplateTest.java
index beac0a5..8017467 100644
--- a/src/test/java/org/apache/freemarker/test/TemplateTest.java
+++ b/src/test/java/org/apache/freemarker/test/TemplateTest.java
@@ -37,9 +37,9 @@ import org.apache.freemarker.core.Configuration;
 import org.apache.freemarker.core.Template;
 import org.apache.freemarker.core.TemplateException;
 import org.apache.freemarker.core.ast.ParseException;
-import org.apache.freemarker.core.templateresolver.ByteArrayTemplateLoader;
-import org.apache.freemarker.core.templateresolver.MultiTemplateLoader;
 import org.apache.freemarker.core.templateresolver.TemplateLoader;
+import org.apache.freemarker.core.templateresolver.impl.ByteArrayTemplateLoader;
+import org.apache.freemarker.core.templateresolver.impl.MultiTemplateLoader;
 import org.apache.freemarker.core.util.StringUtil;
 import org.apache.freemarker.test.templatesuite.TemplateTestSuite;
 import org.apache.freemarker.test.util.TestUtil;

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/b0e08ccb/src/test/java/org/apache/freemarker/test/templatesuite/TemplateTestCase.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/freemarker/test/templatesuite/TemplateTestCase.java
b/src/test/java/org/apache/freemarker/test/templatesuite/TemplateTestCase.java
index 7a472cf..9e7ecab 100644
--- a/src/test/java/org/apache/freemarker/test/templatesuite/TemplateTestCase.java
+++ b/src/test/java/org/apache/freemarker/test/templatesuite/TemplateTestCase.java
@@ -66,7 +66,7 @@ import org.apache.freemarker.core.model.impl.beans.BooleanModel;
 import org.apache.freemarker.core.model.impl.beans.Java7MembersOnlyBeansWrapper;
 import org.apache.freemarker.core.model.impl.beans.ResourceBundleModel;
 import org.apache.freemarker.core.model.impl.dom.NodeModel;
-import org.apache.freemarker.core.templateresolver.FileTemplateLoader;
+import org.apache.freemarker.core.templateresolver.impl.FileTemplateLoader;
 import org.apache.freemarker.core.util.NullArgumentException;
 import org.apache.freemarker.core.util.NullWriter;
 import org.apache.freemarker.core.util.StringUtil;

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/b0e08ccb/src/test/java/org/apache/freemarker/test/templatesuite/models/Listables.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/freemarker/test/templatesuite/models/Listables.java
b/src/test/java/org/apache/freemarker/test/templatesuite/models/Listables.java
index 1cf9bbf..86eb8ab 100644
--- a/src/test/java/org/apache/freemarker/test/templatesuite/models/Listables.java
+++ b/src/test/java/org/apache/freemarker/test/templatesuite/models/Listables.java
@@ -35,7 +35,6 @@ import org.apache.freemarker.core.Configuration;
 import org.apache.freemarker.core.ast._DelayedJQuote;
 import org.apache.freemarker.core.ast._TemplateModelException;
 import org.apache.freemarker.core.model.AdapterTemplateModel;
-import org.apache.freemarker.core.model.MapKeyValuePairIterator;
 import org.apache.freemarker.core.model.ObjectWrapper;
 import org.apache.freemarker.core.model.TemplateCollectionModel;
 import org.apache.freemarker.core.model.TemplateHashModelEx;
@@ -48,6 +47,7 @@ import org.apache.freemarker.core.model.WrappingTemplateModel;
 import org.apache.freemarker.core.model.TemplateHashModelEx2.KeyValuePairIterator;
 import org.apache.freemarker.core.model.impl.DefaultMapAdapter;
 import org.apache.freemarker.core.model.impl.DefaultObjectWrapperBuilder;
+import org.apache.freemarker.core.model.impl.MapKeyValuePairIterator;
 import org.apache.freemarker.core.model.impl.SimpleCollection;
 import org.apache.freemarker.core.model.impl.SimpleHash;
 import org.apache.freemarker.core.model.impl.beans.BeansWrapperBuilder;


Mime
View raw message