freemarker-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ddek...@apache.org
Subject [31/32] incubator-freemarker git commit: Merge branch '2.3.24-gae-stabilization' into 2.3-gae
Date Sat, 26 Mar 2016 15:41:45 GMT
Merge branch '2.3.24-gae-stabilization' into 2.3-gae


Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/92990367
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/92990367
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/92990367

Branch: refs/heads/2.3
Commit: 92990367797e06dda1bddbdaef608f64a06108a1
Parents: 5f9292f 4b8df1f
Author: ddekany <ddekany@apache.org>
Authored: Sat Mar 26 15:45:59 2016 +0100
Committer: ddekany <ddekany@apache.org>
Committed: Sat Mar 26 15:45:59 2016 +0100

----------------------------------------------------------------------
 .classpath                                      |   60 -
 .gitignore                                      |    4 +
 .project                                        |   41 -
 .settings/edu.umd.cs.findbugs.core.prefs        |  143 --
 .../edu.umd.cs.findbugs.plugin.eclipse.prefs    |    4 -
 .settings/org.eclipse.core.resources.prefs      |    2 -
 .settings/org.eclipse.core.runtime.prefs        |    2 -
 .settings/org.eclipse.jdt.core.prefs            |  409 ------
 .settings/org.eclipse.jdt.ui.prefs              |   71 -
 .../org.eclipse.ltk.core.refactoring.prefs      |    2 -
 NOTICE                                          |   12 +-
 README                                          |   96 +-
 RELEASE-NOTES                                   |    4 +-
 build.xml                                       |   44 +-
 codestyle.xml                                   |  313 ----
 src/dist/bin/NOTICE                             |   68 +-
 src/dist/jar/META-INF/NOTICE                    |   22 +
 src/dist/javadoc/META-INF/NOTICE                |    5 +
 .../Formatter-profile-FreeMarker.xml            |  313 ++++
 .../freemarker/cache/MultiTemplateLoader.java   |   61 +-
 .../cache/StatefulTemplateLoader.java           |    2 +-
 .../freemarker/cache/StringTemplateLoader.java  |   13 +
 .../freemarker/cache/WebappTemplateLoader.java  |    2 +-
 .../core/CommonTemplateMarkupOutputModel.java   |    9 +-
 .../freemarker/core/MarkupOutputFormat.java     |   26 +-
 src/main/java/freemarker/core/OutputFormat.java |    2 +-
 .../freemarker/core/TemplateConfiguration.java  |    4 +-
 .../core/TemplateMarkupOutputModel.java         |   21 +-
 src/main/java/freemarker/core/TextBlock.java    |    4 +
 .../ext/servlet/FreemarkerServlet.java          |    3 -
 .../java/freemarker/template/Configuration.java |   24 +-
 .../template/DefaultObjectWrapper.java          |    2 +-
 .../template/TemplateExceptionHandler.java      |    9 +-
 .../freemarker/template/utility/StringUtil.java |    8 +-
 .../resources/freemarker/version.properties     |    8 +-
 src/manual/en_US/book.xml                       | 1356 ++++++++----------
 .../cache/MultiTemplateLoaderTest.java          |   85 ++
 .../core/AppMetaTemplateDateFormatFactory.java  |    2 -
 .../java/freemarker/core/OutputFormatTest.java  |    2 +-
 .../config/WebappLocalFreemarkerServlet.java    |   25 +
 .../freemarker/manual/CustomFormatsExample.java |    3 +-
 .../manual/UnitAwareTemplateNumberModel.java    |    1 -
 .../CopyrightCommentRemoverTemplateLoader.java  |    4 -
 .../freemarker/test/ResourcesExtractor.java     |  296 ++++
 .../freemarker/test/servlet/WebAppTestCase.java |  175 ++-
 .../ext/jsp/webapps/basic/CONTENTS.txt          |   33 +
 .../ext/jsp/webapps/config/CONTENTS.txt         |   33 +
 .../lib/WebappLocalFreemarkerServlet.jar        |  Bin 936 -> 0 bytes
 .../webapps/config/WEB-INF/lib/templates.jar    |  Bin 1018 -> 0 bytes
 .../WEB-INF/lib/templates.jar/sub/test2.ftl     |   19 +
 .../ext/jsp/webapps/config/WEB-INF/web.xml      |    4 +-
 .../ext/jsp/webapps/errors/CONTENTS.txt         |   28 +
 .../jsp/webapps/multipleLoaders/CONTENTS.txt    |   24 +
 .../ext/jsp/webapps/tldDiscovery/CONTENTS.txt   |   37 +
 .../tldDiscovery/WEB-INF/lib/taglib-foo.jar     |  Bin 1221 -> 0 bytes
 .../lib/taglib-foo.jar/META-INF/foo bar.tld     |   32 +
 .../webapps/tldDiscovery/WEB-INF/taglib 2.jar   |  Bin 1179 -> 0 bytes
 .../WEB-INF/taglib 2.jar/META-INF/taglib.tld    |   31 +
 58 files changed, 1962 insertions(+), 2041 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/92990367/src/main/java/freemarker/template/Configuration.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/92990367/src/manual/en_US/book.xml
----------------------------------------------------------------------
diff --cc src/manual/en_US/book.xml
index 35ca1a5,e3d86c5..471b82d
--- a/src/manual/en_US/book.xml
+++ b/src/manual/en_US/book.xml
@@@ -26409,53 -26489,10 +26489,48 @@@ TemplateModel x = env.getVariable("x")
      <appendix xml:id="app_versions">
        <title>Version history</title>
  
 +      <section xml:id="versions_2_3_25">
 +        <title>2.3.25</title>
 +
 +        <section>
 +          <title>Changes on the FTL side</title>
 +
 +          <itemizedlist>
 +            <listitem>
 +              <para>[TODO]</para>
 +            </listitem>
 +          </itemizedlist>
 +        </section>
 +
 +        <section>
 +          <title>Changes on the Java side</title>
 +
 +          <itemizedlist>
 +            <listitem>
 +              <para>Lazy imports: With the new boolean
 +              <literal>Configuration</literal>-level settings,
 +              <literal>lazy_imports</literal> and
 +              <literal>lazy_auto_imports</literal>, you can request imports
 +              (as in <literal>&lt;#import "lib/utils.ftl" as u&gt;</literal>)
 +              and/or auto-imports to be lazy. When the import is lazy, the
 +              namespace variable (<literal>u</literal> in this example) will
 +              be created immediately, just like before, but the template will
 +              be imported and processed only when (and if ever) the content of
 +              the imported namespace is accessed. The main application of this
 +              is with auto-imports, where you don't want the overhead of
 +              importing templates that aren't actually used in a template.
 +              (Also, a new <literal>Environment.importLib</literal> method
 +              overload was added, where you can specify if you want a lazy or
 +              an eager import.)</para>
 +            </listitem>
 +          </itemizedlist>
 +        </section>
 +      </section>
 +
        <section xml:id="versions_2_3_24">
-         <title>2.3.24 Release Candidate 1</title>
- 
-         <para>Date of release for Release Candidate 1: 2015-01-12</para>
- 
-         <para>Planned final release date: around 2016-02-20</para>
+         <title>2.3.24</title>
  
-         <para>Please test for backward compatibility, and help polishing the
-         new features!</para>
+         <para>Release date: 2016-03-20 + release process delay</para>
  
          <section>
            <title>Legal changes</title>


Mime
View raw message