freemarker-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ddek...@apache.org
Subject [1/7] incubator-freemarker git commit: <#ftl outputFormat="HTML"> headers aren't needed with the latest Eclipse plugin anymore, though "latest" means the one with my pull request to JBoss merged in.
Date Thu, 31 Dec 2015 00:16:24 GMT
Repository: incubator-freemarker
Updated Branches:
  refs/heads/master d23927394 -> a99acd5b0


<#ftl outputFormat="HTML"> headers aren't needed with the latest Eclipse plugin anymore,
though "latest" means the one with my pull request to JBoss merged in.


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

Branch: refs/heads/master
Commit: 9d255d897a15a5bfb6045f23b5e16edee7ba3cb6
Parents: be2d799
Author: ddekany <ddekany@apache.org>
Authored: Wed Dec 30 20:46:22 2015 +0100
Committer: ddekany <ddekany@apache.org>
Committed: Wed Dec 30 20:47:54 2015 +0100

----------------------------------------------------------------------
 .../resources/freemarker/manual/AutoEscapingExample-capture.ftlh   | 1 -
 .../resources/freemarker/manual/AutoEscapingExample-convert.ftlh   | 2 --
 .../resources/freemarker/manual/AutoEscapingExample-infoBox.ftlh   | 2 --
 .../freemarker/manual/AutoEscapingExample-infoBox.ftlh.out         | 1 -
 .../resources/freemarker/manual/AutoEscapingExample-markup.ftlh    | 1 -
 .../freemarker/manual/AutoEscapingExample-stringConcat.ftlh        | 1 -
 .../freemarker/manual/AutoEscapingExample-stringLiteral.ftlh       | 1 -
 .../freemarker/manual/AutoEscapingExample-stringLiteral2.ftlh      | 2 --
 8 files changed, 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/9d255d89/src/test/resources/freemarker/manual/AutoEscapingExample-capture.ftlh
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/manual/AutoEscapingExample-capture.ftlh b/src/test/resources/freemarker/manual/AutoEscapingExample-capture.ftlh
index 565bf6a..d371b44 100644
--- a/src/test/resources/freemarker/manual/AutoEscapingExample-capture.ftlh
+++ b/src/test/resources/freemarker/manual/AutoEscapingExample-capture.ftlh
@@ -1,4 +1,3 @@
-<#ftl output_format="HTML"><#-- Needed for the Eclipse plugin -->
 <#assign captured><b>Test</b></#assign>
 Just a string: ${"<b>Test</b>"}
 Captured output: ${captured}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/9d255d89/src/test/resources/freemarker/manual/AutoEscapingExample-convert.ftlh
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/manual/AutoEscapingExample-convert.ftlh b/src/test/resources/freemarker/manual/AutoEscapingExample-convert.ftlh
index 165e1cf..e7eadaf 100644
--- a/src/test/resources/freemarker/manual/AutoEscapingExample-convert.ftlh
+++ b/src/test/resources/freemarker/manual/AutoEscapingExample-convert.ftlh
@@ -1,5 +1,3 @@
-<#ftl output_format="HTML"><#-- Needed for the Eclipse plugin -->
-
 <#assign mo1 = "Foo's bar {}"?esc>
 HTLM: ${mo1}
 XML:  <#outputformat 'XML'>${mo1}</#outputformat>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/9d255d89/src/test/resources/freemarker/manual/AutoEscapingExample-infoBox.ftlh
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/manual/AutoEscapingExample-infoBox.ftlh b/src/test/resources/freemarker/manual/AutoEscapingExample-infoBox.ftlh
index 23c1186..932e541 100644
--- a/src/test/resources/freemarker/manual/AutoEscapingExample-infoBox.ftlh
+++ b/src/test/resources/freemarker/manual/AutoEscapingExample-infoBox.ftlh
@@ -1,5 +1,3 @@
-<#ftl output_format="HTML"><#-- Needed for the Eclipse plugin -->
-
 <@infoBox "Foo & bar" />
 <@infoBox "Foo <b>bar</b>"?no_esc />
 

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/9d255d89/src/test/resources/freemarker/manual/AutoEscapingExample-infoBox.ftlh.out
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/manual/AutoEscapingExample-infoBox.ftlh.out b/src/test/resources/freemarker/manual/AutoEscapingExample-infoBox.ftlh.out
index 04d5d20..640f8a9 100644
--- a/src/test/resources/freemarker/manual/AutoEscapingExample-infoBox.ftlh.out
+++ b/src/test/resources/freemarker/manual/AutoEscapingExample-infoBox.ftlh.out
@@ -1,4 +1,3 @@
-
   <div class="infoBox">
     Foo &amp; bar
   </div>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/9d255d89/src/test/resources/freemarker/manual/AutoEscapingExample-markup.ftlh
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/manual/AutoEscapingExample-markup.ftlh b/src/test/resources/freemarker/manual/AutoEscapingExample-markup.ftlh
index 9f7af37..2f18398 100644
--- a/src/test/resources/freemarker/manual/AutoEscapingExample-markup.ftlh
+++ b/src/test/resources/freemarker/manual/AutoEscapingExample-markup.ftlh
@@ -1,4 +1,3 @@
-<#ftl output_format="HTML"><#-- Needed for the Eclipse plugin -->
 <#assign markupOutput1="<b>Test</b>"?no_esc>
 <#assign markupOutput2="Foo & bar"?esc>
 

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/9d255d89/src/test/resources/freemarker/manual/AutoEscapingExample-stringConcat.ftlh
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/manual/AutoEscapingExample-stringConcat.ftlh b/src/test/resources/freemarker/manual/AutoEscapingExample-stringConcat.ftlh
index 905f10e..f9e2806 100644
--- a/src/test/resources/freemarker/manual/AutoEscapingExample-stringConcat.ftlh
+++ b/src/test/resources/freemarker/manual/AutoEscapingExample-stringConcat.ftlh
@@ -1,2 +1 @@
-<#ftl output_format="HTML"><#-- Needed for the Eclipse plugin -->
 ${"<h1>"?no_esc + "Foo & bar" + "</h1>"?no_esc}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/9d255d89/src/test/resources/freemarker/manual/AutoEscapingExample-stringLiteral.ftlh
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/manual/AutoEscapingExample-stringLiteral.ftlh b/src/test/resources/freemarker/manual/AutoEscapingExample-stringLiteral.ftlh
index 2d3b930..4bec8e4 100644
--- a/src/test/resources/freemarker/manual/AutoEscapingExample-stringLiteral.ftlh
+++ b/src/test/resources/freemarker/manual/AutoEscapingExample-stringLiteral.ftlh
@@ -1,4 +1,3 @@
-<#ftl output_format="HTML"><#-- Needed for the Eclipse plugin -->
 <#assign s = "Foo & bar">
 ${s}
 ${"${s} & baz"}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/9d255d89/src/test/resources/freemarker/manual/AutoEscapingExample-stringLiteral2.ftlh
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/manual/AutoEscapingExample-stringLiteral2.ftlh
b/src/test/resources/freemarker/manual/AutoEscapingExample-stringLiteral2.ftlh
index 060b000..a939431 100644
--- a/src/test/resources/freemarker/manual/AutoEscapingExample-stringLiteral2.ftlh
+++ b/src/test/resources/freemarker/manual/AutoEscapingExample-stringLiteral2.ftlh
@@ -1,5 +1,3 @@
-<#ftl output_format="HTML"><#-- Needed for the Eclipse plugin -->
-
 <#-- Markup output value created by escaping plain text: -->
 <#assign mo1 = "Foo & bar"?esc>
 <#-- Markup output value created outherwise: -->


Mime
View raw message