Branch: refs/heads/master Home: https://github.com/forge/core Commit: bc41c4d9f113e02fd9b0ed153324882782cc7a13 https://github.com/forge/core/commit/bc41c4d9f113e02fd9b0ed153324882782cc... Author: George Gastaldi <gegastaldi(a)gmail.com&gt; Date: 2014-03-24 (Mon, 24 Mar 2014) Changed paths: M resources/impl/src/main/java/org/jboss/forge/addon/resource/URLResourceGenerator.java M resources/impl/src/main/java/org/jboss/forge/addon/resource/URLResourceImpl.java M resources/tests/src/test/java/org/jboss/forge/addon/resource/URLResourceGeneratorTest.java M templates/freemarker/src/main/java/org/jboss/forge/addon/templates/freemarker/FreemarkerTemplate.java M templates/freemarker/src/main/java/org/jboss/forge/addon/templates/freemarker/FreemarkerTemplateGenerator.java M templates/freemarker/src/main/java/org/jboss/forge/addon/templates/freemarker/ResourceTemplateLoader.java M templates/spi/src/main/java/org/jboss/forge/addon/templates/TemplateGenerator.java M templates/tests/src/test/java/org/jboss/forge/addon/templates/TemplateTestCase.java A templates/tests/src/test/resources/org/jboss/forge/addon/templates/includes.ftl Log Message: ----------- FORGE-1692: Freemarker includes are now supported Commit: 1d7ffe8cd210d98ac896d53c654a051f9b352efe https://github.com/forge/core/commit/1d7ffe8cd210d98ac896d53c654a051f9b35... Author: George Gastaldi <gegastaldi(a)gmail.com&gt; Date: 2014-03-25 (Tue, 25 Mar 2014) Changed paths: M resources/impl/src/main/java/org/jboss/forge/addon/resource/URLResourceGenerator.java M resources/impl/src/main/java/org/jboss/forge/addon/resource/URLResourceImpl.java M resources/tests/src/test/java/org/jboss/forge/addon/resource/URLResourceGeneratorTest.java M templates/freemarker/src/main/java/org/jboss/forge/addon/templates/freemarker/FreemarkerTemplate.java M templates/freemarker/src/main/java/org/jboss/forge/addon/templates/freemarker/FreemarkerTemplateGenerator.java M templates/freemarker/src/main/java/org/jboss/forge/addon/templates/freemarker/ResourceTemplateLoader.java M templates/spi/src/main/java/org/jboss/forge/addon/templates/TemplateGenerator.java M templates/tests/src/test/java/org/jboss/forge/addon/templates/TemplateTestCase.java A templates/tests/src/test/resources/org/jboss/forge/addon/templates/includes.ftl Log Message: ----------- Merge pull request #426 from gastaldi/FORGE-1692 FORGE-1692: Freemarker includes are now supported Compare: https://github.com/forge/core/compare/ad2e495166dd...1d7ffe8cd210