GitHub user J-C-I-T opened a pull request:
https://github.com/apache/incubator-freemarker/pull/11
Freemarker
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/apache/incubator-freemarker master
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/incubator-freemarker/pull/11.patch
To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:
This closes #11
----
commit 32ce1354896357d1d5e28c72f699624022030c0c
Author: ddekany <[email protected]>
Date: 2015-01-30T23:52:15Z
Raised required Java version to 1.5. Increased FM version number to
2.4.0-nightly.
commit 2a260a10b740ec2d5276aef475412818119635f9
Author: ddekany <[email protected]>
Date: 2015-01-31T13:20:38Z
(Minor source format and javadoc fixes)
commit 960ddafb0242835b69e6e2c98b0e4771b048ae20
Author: ddekany <[email protected]>
Date: 2015-01-31T19:51:16Z
Experiencing with the idea of UnboundTemplate...
commit 09350f30a96aa107bd0e08d45885a9f01254d62f
Author: ddekany <[email protected]>
Date: 2015-02-03T20:49:55Z
Merge branch '2.3-gae'
commit ad8c386e5bf77b5393b9a8f495306297a32a53de
Author: ddekany <[email protected]>
Date: 2015-02-03T20:54:02Z
Merge branch 'master' into unboundTemplate
Conflicts:
src/main/java/freemarker/template/Template.java
commit 36dbace5b6ec28951af1624e58010e7c7de12dbe
Author: ddekany <[email protected]>
Date: 2015-02-03T22:37:29Z
Continued experience with UnboundTemplate-s
commit b9b9cbdf60d244b5a8353a66979aed4244d9c2f4
Author: ddekany <[email protected]>
Date: 2015-02-05T00:30:44Z
Continued experience with UnboundTemplate-s: Implemented
env.getCurrentTemplate() (untested). Added BoundCallable, which replaces Macro
in most places (untested, also backward compatibility tricks are still missing).
commit 329a35898cd71aab2496115d940c9efcea653dcd
Author: ddekany <[email protected]>
Date: 2015-02-05T07:44:13Z
(Fixed test case damaged during refactoring.)
commit 0b3bbe2c3230f079cc5bacd0fd781539521b410f
Author: ddekany <[email protected]>
Date: 2015-02-05T07:49:01Z
Further UnboundTemplate-related fixes
commit a658c3df9341fa32a3dd9c79e4a8007bfdf47762
Author: ddekany <[email protected]>
Date: 2015-02-05T20:15:30Z
2.4.0-aware IcI checks, 2.4.0 version constants
commit 2cb604a504d0d80d163bc61fa482effc026d0c9a
Author: ddekany <[email protected]>
Date: 2015-02-05T20:22:43Z
Merge branch 'master' into unboundTemplate
commit fdef020e04afa6eb7fe58d9583e7efae79e7ec9a
Author: ddekany <[email protected]>
Date: 2015-02-05T20:40:40Z
(JavaDoc updates, also removed some oboslete source code comments)
commit 843773b8ae357677df077b879e9fd54d86ff8301
Author: ddekany <[email protected]>
Date: 2015-02-05T22:21:06Z
Renamed some locals and members from `template` to `unboundTemplate`
commit e272ac216cb1516881fffa1b1f4e08383063fc75
Author: ddekany <[email protected]>
Date: 2015-02-05T23:43:57Z
(Uncommented ParseException deprecated method for B.C.)
commit da402f00abca4d4b348d26e312979620b12c4515
Author: ddekany <[email protected]>
Date: 2015-02-05T23:44:36Z
(Added currentNamespace tests)
commit 3ef25a1ce5366d554e7cd84ae200d64adbbdf0e8
Author: ddekany <[email protected]>
Date: 2015-02-06T23:36:57Z
Merge branch '2.3-gae'
commit f2c43b7f39dca65eaf5b9bbffac62e2de9535f68
Author: ddekany <[email protected]>
Date: 2015-02-06T23:38:54Z
Merge branch 'master' into unboundTemplate
commit 99cb610ec7e87012772d5b236e6914420ca0fdeb
Author: ddekany <[email protected]>
Date: 2015-02-07T12:52:21Z
Merge branch '2.3-gae'
commit d193427370163d2950ecd3915c9c562b8d2d7d59
Author: ddekany <[email protected]>
Date: 2015-02-07T12:53:30Z
Merge branch 'master' into unboundTemplate
commit 9e7f56360c1ad1a227f048d6cf2ba213c961a1a7
Author: ddekany <[email protected]>
Date: 2015-02-07T16:39:17Z
Configurable.customAttributes Map is only made on demand, and is using
*Linked*HashMap now.
commit 6b8ed10cd4094fc3e7fff379fd6b6b0cf7bcdf84
Author: ddekany <[email protected]>
Date: 2015-02-07T20:38:00Z
Custom attributes coming from the #ftl header work again (UnboundTemplate
has broke that)
commit 5beafd2d31d06b8ecbbd487b907fe69f63b8fbe0
Author: ddekany <[email protected]>
Date: 2015-02-07T20:58:56Z
Special variable .pass works again (UnboundTemplate has broke that)
commit b73c6da47a30cce8c5e957d19320113f57237efe
Author: ddekany <[email protected]>
Date: 2015-02-07T21:43:14Z
(Minor code adjustments)
commit 1891514bccd57f6c2c2d1b8b6d7629f65e87740f
Author: ddekany <[email protected]>
Date: 2015-02-08T12:33:44Z
Merge branch '2.3-gae'
commit c26a5d883c54f0799175d6a77bd8bed127499dda
Author: ddekany <[email protected]>
Date: 2015-02-08T12:36:33Z
Merge branch 'master' into unboundTemplate
Conflicts:
src/main/java/freemarker/template/Template.java
commit cda765c678f9903548662831c3a51688a45106d9
Author: ddekany <[email protected]>
Date: 2015-02-08T17:41:46Z
Merge branch '2.3-gae'
commit 9a8a473ceec5d3bd4677eb3f8458132f795f7294
Author: ddekany <[email protected]>
Date: 2015-02-08T17:42:40Z
Merge branch 'master' into unboundTemplate
commit c58f07e519f32eece864b05967088bf53cf1169e
Author: ddekany <[email protected]>
Date: 2015-02-08T18:12:36Z
Fixing backward compatibility with deprecated 2.3 API-s
commit efd3565eb2010b0274aac3bbe01726654584436b
Author: ddekany <[email protected]>
Date: 2015-02-08T18:45:13Z
Moved f.c.Macro.Context to f.c.CallableInvocationContext.
commit 648c656b85ec2a4143fb846d0e6654eb99647388
Author: ddekany <[email protected]>
Date: 2015-02-08T20:37:02Z
Now we have BoundTemplate and UnboundTemplate, and both extends Macro for
backward compatibility, which is now abstract. (So now all JUnit tests are
green.)
----
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at [email protected] or file a JIRA ticket
with INFRA.
---
