freemarker-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ddek...@apache.org
Subject [2/8] incubator-freemarker git commit: The new (in 2.3.24-pre01) TemplateConfigurer class was renamed to TemplateConfiguration, and the related configuration setting from template_configurers to template_configurations. Also, the TemplateConfigurer.confi
Date Sat, 19 Dec 2015 16:51:15 GMT
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ea5c47d1/src/test/resources/freemarker/manual/TemplateConfigurerExamples1.properties
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/manual/TemplateConfigurerExamples1.properties b/src/test/resources/freemarker/manual/TemplateConfigurerExamples1.properties
deleted file mode 100644
index 30edee6..0000000
--- a/src/test/resources/freemarker/manual/TemplateConfigurerExamples1.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-templateConfigurers = \
-    ConditionalTemplateConfigurerFactory( \
-        FileExtensionMatcher("xml"), \
-        TemplateConfigurer( \
-            encoding = "utf-8", \
-            outputFormat = XMLOutputFormat() \
-        ) \
-    )
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ea5c47d1/src/test/resources/freemarker/manual/TemplateConfigurerExamples2.properties
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/manual/TemplateConfigurerExamples2.properties b/src/test/resources/freemarker/manual/TemplateConfigurerExamples2.properties
deleted file mode 100644
index 07bd91b..0000000
--- a/src/test/resources/freemarker/manual/TemplateConfigurerExamples2.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-templateConfigurers = \
-    ConditionalTemplateConfigurerFactory( \
-        PathGlobMatcher("mail/**"), \
-        FirstMatchTemplateConfigurerFactory( \
-            ConditionalTemplateConfigurerFactory( \
-                FileNameGlobMatcher("*.subject.*"), \
-                TemplateConfigurer(outputFormat = PlainTextOutputFormat()) \
-            ), \
-            ConditionalTemplateConfigurerFactory( \
-                FileNameGlobMatcher("*.body.*"), \
-                TemplateConfigurer(outputFormat = HTMLOutputFormat()) \
-            ), \
-            noMatchErrorDetails = 'Mail template names must contain ".subject." or ".body."!'
\
-        ) \
-    )

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ea5c47d1/src/test/resources/freemarker/manual/TemplateConfigurerExamples3.properties
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/manual/TemplateConfigurerExamples3.properties b/src/test/resources/freemarker/manual/TemplateConfigurerExamples3.properties
deleted file mode 100644
index bbdd5e8..0000000
--- a/src/test/resources/freemarker/manual/TemplateConfigurerExamples3.properties
+++ /dev/null
@@ -1,30 +0,0 @@
-templateConfigurers = \
-    MergingTemplateConfigurerFactory( \
-        ConditionalTemplateConfigurerFactory( \
-            FileNameGlobMatcher("*.stats.*"), \
-            TemplateConfigurer( \
-                dateTimeFormat = "iso", \
-                dateFormat = "iso", \
-                timeFormat = "iso", \
-                timeZone = TimeZone("UTC") \
-            ) \
-        ), \
-        ConditionalTemplateConfigurerFactory( \
-            PathGlobMatcher("mail/**"), \
-            TemplateConfigurer(encoding = "utf-8") \
-        ), \
-        FirstMatchTemplateConfigurerFactory( \
-            ConditionalTemplateConfigurerFactory( \
-                FileExtensionMatcher("xml"), \
-                TemplateConfigurer(outputFormat = XMLOutputFormat()) \
-            ), \
-            ConditionalTemplateConfigurerFactory( \
-                OrMatcher( \
-                    FileExtensionMatcher("html"), \
-                    FileExtensionMatcher("htm") \
-                ), \
-                TemplateConfigurer(outputFormat = HTMLOutputFormat()) \
-            ), \
-            allowNoMatch = true \
-        ) \
-    )


Mime
View raw message