You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@freemarker.apache.org by dd...@apache.org on 2017/03/12 16:55:39 UTC
[1/2] incubator-freemarker git commit: Bug fixed: If the
incompatible_improvements setting is set to 2.3.26 (or higher),
exp?interpret always gets the parser-related settings from the template that
it's called from. Earlier, sometimes it got those from t
Repository: incubator-freemarker
Updated Branches:
refs/heads/2.3-gae 696ca6b91 -> 0c518cd15
Bug fixed: If the incompatible_improvements setting is set to 2.3.26 (or higher), exp?interpret always gets the parser-related settings from the template that it's called from. Earlier, sometimes it got those from the topmost (main) template instead. Similarly, the generated name of the template that ?interpret creates will always refer to the template where's it's called from.
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/a8633739
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/a8633739
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/a8633739
Branch: refs/heads/2.3-gae
Commit: a863373968a348d2f83872e1637b8c6499bfba50
Parents: 696ca6b
Author: ddekany <dd...@apache.org>
Authored: Sun Mar 12 17:53:48 2017 +0100
Committer: ddekany <dd...@apache.org>
Committed: Sun Mar 12 17:53:48 2017 +0100
----------------------------------------------------------------------
src/main/java/freemarker/core/Interpret.java | 4 +++-
src/manual/en_US/book.xml | 13 +++++++++++++
.../core/InterpretAndEvalTemplateNameTest.java | 17 +++++++++++++++--
3 files changed, 31 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/a8633739/src/main/java/freemarker/core/Interpret.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/Interpret.java b/src/main/java/freemarker/core/Interpret.java
index 818e7a9..a2cff1c 100644
--- a/src/main/java/freemarker/core/Interpret.java
+++ b/src/main/java/freemarker/core/Interpret.java
@@ -31,6 +31,7 @@ import freemarker.template.TemplateModelException;
import freemarker.template.TemplateScalarModel;
import freemarker.template.TemplateSequenceModel;
import freemarker.template.TemplateTransformModel;
+import freemarker.template._TemplateAPI;
/**
@@ -79,7 +80,8 @@ class Interpret extends OutputFormatBoundBuiltIn {
env);
}
String templateSource = sourceExpr.evalAndCoerceToPlainText(env);
- Template parentTemplate = env.getTemplate();
+ Template parentTemplate = env.getConfiguration().getIncompatibleImprovements().intValue()
+ >= _TemplateAPI.VERSION_INT_2_3_26 ? env.getCurrentTemplate() : env.getTemplate();
final Template interpretedTemplate;
try {
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/a8633739/src/manual/en_US/book.xml
----------------------------------------------------------------------
diff --git a/src/manual/en_US/book.xml b/src/manual/en_US/book.xml
index c9248de..741c1a0 100644
--- a/src/manual/en_US/book.xml
+++ b/src/manual/en_US/book.xml
@@ -26895,6 +26895,19 @@ TemplateModel x = env.getVariable("x"); // get variable x</programlisting>
</listitem>
<listitem>
+ <para>Bug fixed: If <link
+ linkend="pgui_config_incompatible_improvements_how_to_set">the
+ <literal>incompatible_improvements</literal> setting</link> is
+ set to 2.3.26 (or higher),
+ <literal><replaceable>exp</replaceable>?interpret</literal>
+ always gets the parser-related settings from the template that
+ it's called from. Earlier, sometimes it got those from the
+ topmost (main) template instead. Similarly, the generated name
+ of the template that <literal>?interpret</literal> creates will
+ always refer to the template where's it's called from.</para>
+ </listitem>
+
+ <listitem>
<para>Bug fixed: <literal>MultiTemplateLoader</literal>, when
it's in sticky mode (the default), and the
<literal>TemplateLoader</literal> that was successfully used for
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/a8633739/src/test/java/freemarker/core/InterpretAndEvalTemplateNameTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/core/InterpretAndEvalTemplateNameTest.java b/src/test/java/freemarker/core/InterpretAndEvalTemplateNameTest.java
index 6f18c37..7652871 100644
--- a/src/test/java/freemarker/core/InterpretAndEvalTemplateNameTest.java
+++ b/src/test/java/freemarker/core/InterpretAndEvalTemplateNameTest.java
@@ -23,7 +23,9 @@ import java.io.IOException;
import org.junit.Test;
import freemarker.cache.StringTemplateLoader;
+import freemarker.template.Configuration;
import freemarker.template.TemplateException;
+import freemarker.template.Version;
import freemarker.test.TemplateTest;
/**
@@ -31,9 +33,20 @@ import freemarker.test.TemplateTest;
* {@code ?eval}-ed parts.
*/
public class InterpretAndEvalTemplateNameTest extends TemplateTest {
-
+
@Test
- public void testInterpret() throws IOException, TemplateException {
+ public void testInterpret230() throws IOException, TemplateException {
+ testInterpret(Configuration.VERSION_2_3_0);
+ }
+
+ @Test
+ public void testInterpret2326() throws IOException, TemplateException {
+ testInterpret(Configuration.VERSION_2_3_26);
+ }
+
+ private void testInterpret(Version version) throws IOException, TemplateException {
+ getConfiguration().setIncompatibleImprovements(version);
+
for (String getTemplateNames : new String[] {
"c=${.current_template_name}, m=${.main_template_name}",
"c=${\".current_template_name\"?eval}, m=${\".main_template_name\"?eval}"
[2/2] incubator-freemarker git commit: (Copyright headers)
Posted by dd...@apache.org.
(Copyright headers)
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/0c518cd1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/0c518cd1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/0c518cd1
Branch: refs/heads/2.3-gae
Commit: 0c518cd151149efb63e92a061a0faf61d1186ce1
Parents: a863373
Author: ddekany <dd...@apache.org>
Authored: Sun Mar 12 17:55:33 2017 +0100
Committer: ddekany <dd...@apache.org>
Committed: Sun Mar 12 17:55:33 2017 +0100
----------------------------------------------------------------------
.../template/DefaultEnumerationAdapter.java | 18 ++++++++++++++++++
src/main/misc/overloadedNumberRules/config.fmpp | 9 +++++++++
.../freemarker/ext/beans/unsafeMethods.properties | 9 +++++++++
src/main/resources/freemarker/version.properties | 9 +++++++++
src/manual/en_US/book.xml | 4 ++--
.../ext/beans/BeansWrapperBridgeMethodsTest.java | 18 ++++++++++++++++++
.../freemarker/ext/beans/BridgeMethodsBean.java | 18 ++++++++++++++++++
.../ext/beans/BridgeMethodsBeanBase.java | 18 ++++++++++++++++++
.../beans/BridgeMethodsWithDefaultMethodBean.java | 18 ++++++++++++++++++
.../BridgeMethodsWithDefaultMethodBean2.java | 18 ++++++++++++++++++
.../BridgeMethodsWithDefaultMethodBeanBase.java | 18 ++++++++++++++++++
.../BridgeMethodsWithDefaultMethodBeanBase2.java | 18 ++++++++++++++++++
.../ConfigureOutputFormatExamples1.properties | 9 +++++++++
.../ConfigureOutputFormatExamples2.properties | 9 +++++++++
.../TemplateConfigurationExamples1.properties | 9 +++++++++
.../TemplateConfigurationExamples2.properties | 9 +++++++++
.../TemplateConfigurationExamples3.properties | 9 +++++++++
.../models/BeansTestResources.properties | 9 +++++++++
18 files changed, 227 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/0c518cd1/src/main/java/freemarker/template/DefaultEnumerationAdapter.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/template/DefaultEnumerationAdapter.java b/src/main/java/freemarker/template/DefaultEnumerationAdapter.java
index 74a58d4..59549b4 100644
--- a/src/main/java/freemarker/template/DefaultEnumerationAdapter.java
+++ b/src/main/java/freemarker/template/DefaultEnumerationAdapter.java
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
package freemarker.template;
import java.io.Serializable;
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/0c518cd1/src/main/misc/overloadedNumberRules/config.fmpp
----------------------------------------------------------------------
diff --git a/src/main/misc/overloadedNumberRules/config.fmpp b/src/main/misc/overloadedNumberRules/config.fmpp
index 50aacbb..f1a34ce 100644
--- a/src/main/misc/overloadedNumberRules/config.fmpp
+++ b/src/main/misc/overloadedNumberRules/config.fmpp
@@ -23,6 +23,15 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
sources: generator.ftl
outputFile: ../../../../build/overloadedNumberRules.java
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/0c518cd1/src/main/resources/freemarker/ext/beans/unsafeMethods.properties
----------------------------------------------------------------------
diff --git a/src/main/resources/freemarker/ext/beans/unsafeMethods.properties b/src/main/resources/freemarker/ext/beans/unsafeMethods.properties
index 916d2f4..ff167fd 100644
--- a/src/main/resources/freemarker/ext/beans/unsafeMethods.properties
+++ b/src/main/resources/freemarker/ext/beans/unsafeMethods.properties
@@ -23,6 +23,15 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
java.lang.Object.wait()
java.lang.Object.wait(long)
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/0c518cd1/src/main/resources/freemarker/version.properties
----------------------------------------------------------------------
diff --git a/src/main/resources/freemarker/version.properties b/src/main/resources/freemarker/version.properties
index 05a3ac1..adec5f4 100644
--- a/src/main/resources/freemarker/version.properties
+++ b/src/main/resources/freemarker/version.properties
@@ -23,6 +23,15 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
# Version info for the builds.
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/0c518cd1/src/manual/en_US/book.xml
----------------------------------------------------------------------
diff --git a/src/manual/en_US/book.xml b/src/manual/en_US/book.xml
index 741c1a0..7ba4089 100644
--- a/src/manual/en_US/book.xml
+++ b/src/manual/en_US/book.xml
@@ -7,9 +7,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/0c518cd1/src/test/java/freemarker/ext/beans/BeansWrapperBridgeMethodsTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/ext/beans/BeansWrapperBridgeMethodsTest.java b/src/test/java/freemarker/ext/beans/BeansWrapperBridgeMethodsTest.java
index 5f73d0e..634fae4 100644
--- a/src/test/java/freemarker/ext/beans/BeansWrapperBridgeMethodsTest.java
+++ b/src/test/java/freemarker/ext/beans/BeansWrapperBridgeMethodsTest.java
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
package freemarker.ext.beans;
import static org.junit.Assert.*;
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/0c518cd1/src/test/java/freemarker/ext/beans/BridgeMethodsBean.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/ext/beans/BridgeMethodsBean.java b/src/test/java/freemarker/ext/beans/BridgeMethodsBean.java
index a32853c..f0cc4ee 100644
--- a/src/test/java/freemarker/ext/beans/BridgeMethodsBean.java
+++ b/src/test/java/freemarker/ext/beans/BridgeMethodsBean.java
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
package freemarker.ext.beans;
public class BridgeMethodsBean extends BridgeMethodsBeanBase<String> {
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/0c518cd1/src/test/java/freemarker/ext/beans/BridgeMethodsBeanBase.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/ext/beans/BridgeMethodsBeanBase.java b/src/test/java/freemarker/ext/beans/BridgeMethodsBeanBase.java
index 4823400..0dc6d5a 100644
--- a/src/test/java/freemarker/ext/beans/BridgeMethodsBeanBase.java
+++ b/src/test/java/freemarker/ext/beans/BridgeMethodsBeanBase.java
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
package freemarker.ext.beans;
public abstract class BridgeMethodsBeanBase<T> {
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/0c518cd1/src/test/java/freemarker/ext/beans/BridgeMethodsWithDefaultMethodBean.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/ext/beans/BridgeMethodsWithDefaultMethodBean.java b/src/test/java/freemarker/ext/beans/BridgeMethodsWithDefaultMethodBean.java
index 0c18991..25b67fe 100644
--- a/src/test/java/freemarker/ext/beans/BridgeMethodsWithDefaultMethodBean.java
+++ b/src/test/java/freemarker/ext/beans/BridgeMethodsWithDefaultMethodBean.java
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
package freemarker.ext.beans;
public class BridgeMethodsWithDefaultMethodBean implements BridgeMethodsWithDefaultMethodBeanBase<String> {
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/0c518cd1/src/test/java/freemarker/ext/beans/BridgeMethodsWithDefaultMethodBean2.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/ext/beans/BridgeMethodsWithDefaultMethodBean2.java b/src/test/java/freemarker/ext/beans/BridgeMethodsWithDefaultMethodBean2.java
index 85bc232..a2261c9 100644
--- a/src/test/java/freemarker/ext/beans/BridgeMethodsWithDefaultMethodBean2.java
+++ b/src/test/java/freemarker/ext/beans/BridgeMethodsWithDefaultMethodBean2.java
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
package freemarker.ext.beans;
public class BridgeMethodsWithDefaultMethodBean2 implements BridgeMethodsWithDefaultMethodBeanBase2 {
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/0c518cd1/src/test/java/freemarker/ext/beans/BridgeMethodsWithDefaultMethodBeanBase.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/ext/beans/BridgeMethodsWithDefaultMethodBeanBase.java b/src/test/java/freemarker/ext/beans/BridgeMethodsWithDefaultMethodBeanBase.java
index 68960de..2dbd459 100644
--- a/src/test/java/freemarker/ext/beans/BridgeMethodsWithDefaultMethodBeanBase.java
+++ b/src/test/java/freemarker/ext/beans/BridgeMethodsWithDefaultMethodBeanBase.java
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
package freemarker.ext.beans;
public interface BridgeMethodsWithDefaultMethodBeanBase<T> {
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/0c518cd1/src/test/java/freemarker/ext/beans/BridgeMethodsWithDefaultMethodBeanBase2.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/ext/beans/BridgeMethodsWithDefaultMethodBeanBase2.java b/src/test/java/freemarker/ext/beans/BridgeMethodsWithDefaultMethodBeanBase2.java
index be46d4f..2886d8f 100644
--- a/src/test/java/freemarker/ext/beans/BridgeMethodsWithDefaultMethodBeanBase2.java
+++ b/src/test/java/freemarker/ext/beans/BridgeMethodsWithDefaultMethodBeanBase2.java
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
package freemarker.ext.beans;
public interface BridgeMethodsWithDefaultMethodBeanBase2 extends BridgeMethodsWithDefaultMethodBeanBase<String> {
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/0c518cd1/src/test/resources/freemarker/manual/ConfigureOutputFormatExamples1.properties
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/manual/ConfigureOutputFormatExamples1.properties b/src/test/resources/freemarker/manual/ConfigureOutputFormatExamples1.properties
index 601ce15..5ba46d4 100644
--- a/src/test/resources/freemarker/manual/ConfigureOutputFormatExamples1.properties
+++ b/src/test/resources/freemarker/manual/ConfigureOutputFormatExamples1.properties
@@ -23,6 +23,15 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
templateConfigurations = \
ConditionalTemplateConfigurationFactory( \
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/0c518cd1/src/test/resources/freemarker/manual/ConfigureOutputFormatExamples2.properties
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/manual/ConfigureOutputFormatExamples2.properties b/src/test/resources/freemarker/manual/ConfigureOutputFormatExamples2.properties
index 0179466..4415630 100644
--- a/src/test/resources/freemarker/manual/ConfigureOutputFormatExamples2.properties
+++ b/src/test/resources/freemarker/manual/ConfigureOutputFormatExamples2.properties
@@ -23,6 +23,15 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
templateConfigurations = \
FirstMatchTemplateConfigurationFactory( \
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/0c518cd1/src/test/resources/freemarker/manual/TemplateConfigurationExamples1.properties
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/manual/TemplateConfigurationExamples1.properties b/src/test/resources/freemarker/manual/TemplateConfigurationExamples1.properties
index 24e9747..36e1da6 100644
--- a/src/test/resources/freemarker/manual/TemplateConfigurationExamples1.properties
+++ b/src/test/resources/freemarker/manual/TemplateConfigurationExamples1.properties
@@ -23,6 +23,15 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
templateConfigurations = \
ConditionalTemplateConfigurationFactory( \
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/0c518cd1/src/test/resources/freemarker/manual/TemplateConfigurationExamples2.properties
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/manual/TemplateConfigurationExamples2.properties b/src/test/resources/freemarker/manual/TemplateConfigurationExamples2.properties
index b5619f0..d54d473 100644
--- a/src/test/resources/freemarker/manual/TemplateConfigurationExamples2.properties
+++ b/src/test/resources/freemarker/manual/TemplateConfigurationExamples2.properties
@@ -23,6 +23,15 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
templateConfigurations = \
ConditionalTemplateConfigurationFactory( \
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/0c518cd1/src/test/resources/freemarker/manual/TemplateConfigurationExamples3.properties
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/manual/TemplateConfigurationExamples3.properties b/src/test/resources/freemarker/manual/TemplateConfigurationExamples3.properties
index 1cd1b26..32aff8c 100644
--- a/src/test/resources/freemarker/manual/TemplateConfigurationExamples3.properties
+++ b/src/test/resources/freemarker/manual/TemplateConfigurationExamples3.properties
@@ -23,6 +23,15 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
templateConfigurations = \
MergingTemplateConfigurationFactory( \
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/0c518cd1/src/test/resources/freemarker/test/templatesuite/models/BeansTestResources.properties
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/models/BeansTestResources.properties b/src/test/resources/freemarker/test/templatesuite/models/BeansTestResources.properties
index 32190a8..3850ec0 100644
--- a/src/test/resources/freemarker/test/templatesuite/models/BeansTestResources.properties
+++ b/src/test/resources/freemarker/test/templatesuite/models/BeansTestResources.properties
@@ -23,6 +23,15 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
message=Message
format={0,date,yyyy-MM-dd}
\ No newline at end of file