FREEMARKER-55: Updating change logs
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/1c7c9874 Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/1c7c9874 Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/1c7c9874 Branch: refs/heads/3 Commit: 1c7c98745a87d86d3f953ed99a26e239a3bcaaaa Parents: ef9ba12 Author: Woonsan Ko <[email protected]> Authored: Tue Sep 12 22:16:09 2017 -0400 Committer: Woonsan Ko <[email protected]> Committed: Tue Sep 12 22:16:09 2017 -0400 ---------------------------------------------------------------------- FM3-CHANGE-LOG.txt | 14 ++++++++++++ .../spring/model/BindErrorsDirective.java | 8 ++++++- .../freemarker/spring/model/EvalFunction.java | 8 ++++++- .../spring/model/MessageFunction.java | 9 ++++++-- .../spring/model/NestedPathDirective.java | 8 ++++++- .../spring/model/TransformFunction.java | 8 ++++++- .../freemarker/spring/model/UrlFunction.java | 9 ++++++-- .../apache/freemarker/spring/model/package.html | 23 ++++++++++++++++++++ .../org/apache/freemarker/spring/package.html | 23 ++++++++++++++++++++ .../freemarker/spring/web/view/package.html | 23 ++++++++++++++++++++ 10 files changed, 125 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/1c7c9874/FM3-CHANGE-LOG.txt ---------------------------------------------------------------------- diff --git a/FM3-CHANGE-LOG.txt b/FM3-CHANGE-LOG.txt index e1bbb44..0febe03 100644 --- a/FM3-CHANGE-LOG.txt +++ b/FM3-CHANGE-LOG.txt @@ -476,6 +476,20 @@ This is about the Spring Framework Support (freemarker-spring): FREEMARKER-54, F - SpringResourceTemplateLoader, a new TemplateLoader to load templates from Spring Framework's Resources. - New FreeMarkerView and FreeMarkerViewResolver for MVC support. FreeMarkerView supports TaglibFactory and other models by default like FreemarkerServlet does. +- Directives and Functions Support to replace Spring JSP Tag Libraries in spring.tld: + - <spring:htmlEscape ... /> : No need since FreeMarker Built-In's and escaping directives are better. + - <spring:escapeBody ... /> : No need since FreeMarker Built-In's and escaping directives are better. + - <spring:message ... /> : Replaced by spring.message function. e.g, ${spring.message(...)} + - <spring:theme ... /> : Replaced by spring.theme function. e.g, ${spring.theme(...)} + - <spring:argument ... /> : No need since spring.message(...) and spring.theme(...) functions support + positional varargs for variable length arguments. + - <spring:hasBindErrors ... /> : Replaced by <@spring.hasBindErrors ... /> directive. + - <spring:nestedPath ... /> : Replaced by <@spring.nestedPath ... /> directive. + - <spring:bind ... /> : Replaced by <@spring.bind ... /> directive. + - <spring:transform ... /> : Replaced by spring.transform(...) function. + - <spring:url ... /> : Replaced by spring.url(...) function. + - <spring:param ... /> : No need since spring.url(...) function supports named vargs for variable length parameters. + - <spring:eval /> : Replaced by spring.eval(...) function. Core / Miscellaneous .................... http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/1c7c9874/freemarker-spring/src/main/java/org/apache/freemarker/spring/model/BindErrorsDirective.java ---------------------------------------------------------------------- diff --git a/freemarker-spring/src/main/java/org/apache/freemarker/spring/model/BindErrorsDirective.java b/freemarker-spring/src/main/java/org/apache/freemarker/spring/model/BindErrorsDirective.java index d775cd1..2b73780 100644 --- a/freemarker-spring/src/main/java/org/apache/freemarker/spring/model/BindErrorsDirective.java +++ b/freemarker-spring/src/main/java/org/apache/freemarker/spring/model/BindErrorsDirective.java @@ -71,7 +71,13 @@ public class BindErrorsDirective extends AbstractSpringTemplateDirectiveModel { private static final int NAME_PARAM_IDX = 0; - private static final ArgumentArrayLayout ARGS_LAYOUT = ArgumentArrayLayout.create(1, false, null, false); + private static final ArgumentArrayLayout ARGS_LAYOUT = + ArgumentArrayLayout.create( + 1, + false, + null, + false + ); public BindErrorsDirective(HttpServletRequest request, HttpServletResponse response) { super(request, response); http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/1c7c9874/freemarker-spring/src/main/java/org/apache/freemarker/spring/model/EvalFunction.java ---------------------------------------------------------------------- diff --git a/freemarker-spring/src/main/java/org/apache/freemarker/spring/model/EvalFunction.java b/freemarker-spring/src/main/java/org/apache/freemarker/spring/model/EvalFunction.java index 52cd62b..39d210e 100644 --- a/freemarker-spring/src/main/java/org/apache/freemarker/spring/model/EvalFunction.java +++ b/freemarker-spring/src/main/java/org/apache/freemarker/spring/model/EvalFunction.java @@ -81,7 +81,13 @@ public class EvalFunction extends AbstractSpringTemplateFunctionModel { private static final int EXPRESSION_PARAM_IDX = 0; - private static final ArgumentArrayLayout ARGS_LAYOUT = ArgumentArrayLayout.create(1, false, null, false); + private static final ArgumentArrayLayout ARGS_LAYOUT = + ArgumentArrayLayout.create( + 1, + false, + null, + false + ); private static final String EVALUATION_CONTEXT_VAR_NAME = "org.apache.freemarker.spring.model.EVALUATION_CONTEXT"; http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/1c7c9874/freemarker-spring/src/main/java/org/apache/freemarker/spring/model/MessageFunction.java ---------------------------------------------------------------------- diff --git a/freemarker-spring/src/main/java/org/apache/freemarker/spring/model/MessageFunction.java b/freemarker-spring/src/main/java/org/apache/freemarker/spring/model/MessageFunction.java index 8b98652..f30e07b 100644 --- a/freemarker-spring/src/main/java/org/apache/freemarker/spring/model/MessageFunction.java +++ b/freemarker-spring/src/main/java/org/apache/freemarker/spring/model/MessageFunction.java @@ -84,8 +84,13 @@ public class MessageFunction extends AbstractSpringTemplateFunctionModel { private static final String MESSAGE_RESOLVABLE_PARAM_NAME = "message"; - private static final ArgumentArrayLayout ARGS_LAYOUT = ArgumentArrayLayout.create(1, true, - StringToIndexMap.of(MESSAGE_RESOLVABLE_PARAM_NAME, MESSAGE_RESOLVABLE_PARAM_IDX), false); + private static final ArgumentArrayLayout ARGS_LAYOUT = + ArgumentArrayLayout.create( + 1, + true, + StringToIndexMap.of(MESSAGE_RESOLVABLE_PARAM_NAME, MESSAGE_RESOLVABLE_PARAM_IDX), + false + ); public MessageFunction(HttpServletRequest request, HttpServletResponse response) { super(request, response); http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/1c7c9874/freemarker-spring/src/main/java/org/apache/freemarker/spring/model/NestedPathDirective.java ---------------------------------------------------------------------- diff --git a/freemarker-spring/src/main/java/org/apache/freemarker/spring/model/NestedPathDirective.java b/freemarker-spring/src/main/java/org/apache/freemarker/spring/model/NestedPathDirective.java index a743c3f..b24dfaf 100644 --- a/freemarker-spring/src/main/java/org/apache/freemarker/spring/model/NestedPathDirective.java +++ b/freemarker-spring/src/main/java/org/apache/freemarker/spring/model/NestedPathDirective.java @@ -60,7 +60,13 @@ public class NestedPathDirective extends AbstractSpringTemplateDirectiveModel { private static final int PATH_PARAM_IDX = 0; - private static final ArgumentArrayLayout ARGS_LAYOUT = ArgumentArrayLayout.create(1, false, null, false); + private static final ArgumentArrayLayout ARGS_LAYOUT = + ArgumentArrayLayout.create( + 1, + false, + null, + false + ); public NestedPathDirective(HttpServletRequest request, HttpServletResponse response) { super(request, response); http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/1c7c9874/freemarker-spring/src/main/java/org/apache/freemarker/spring/model/TransformFunction.java ---------------------------------------------------------------------- diff --git a/freemarker-spring/src/main/java/org/apache/freemarker/spring/model/TransformFunction.java b/freemarker-spring/src/main/java/org/apache/freemarker/spring/model/TransformFunction.java index 9d40650..6110652 100644 --- a/freemarker-spring/src/main/java/org/apache/freemarker/spring/model/TransformFunction.java +++ b/freemarker-spring/src/main/java/org/apache/freemarker/spring/model/TransformFunction.java @@ -57,7 +57,13 @@ public class TransformFunction extends AbstractSpringTemplateFunctionModel { private static final int PROPERTY_EDITOR_PARAM_IDX = 0; private static final int VALUE_PARAM_IDX = 1; - private static final ArgumentArrayLayout ARGS_LAYOUT = ArgumentArrayLayout.create(2, false, null, false); + private static final ArgumentArrayLayout ARGS_LAYOUT = + ArgumentArrayLayout.create( + 2, + false, + null, + false + ); public TransformFunction(HttpServletRequest request, HttpServletResponse response) { super(request, response); http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/1c7c9874/freemarker-spring/src/main/java/org/apache/freemarker/spring/model/UrlFunction.java ---------------------------------------------------------------------- diff --git a/freemarker-spring/src/main/java/org/apache/freemarker/spring/model/UrlFunction.java b/freemarker-spring/src/main/java/org/apache/freemarker/spring/model/UrlFunction.java index ae70a45..47c83ab 100644 --- a/freemarker-spring/src/main/java/org/apache/freemarker/spring/model/UrlFunction.java +++ b/freemarker-spring/src/main/java/org/apache/freemarker/spring/model/UrlFunction.java @@ -87,8 +87,13 @@ public class UrlFunction extends AbstractSpringTemplateFunctionModel { private static final String URL_TEMPLATE_DELIMITER_SUFFIX = "}"; - private static final ArgumentArrayLayout ARGS_LAYOUT = ArgumentArrayLayout.create(1, false, - StringToIndexMap.of(CONTEXT_PARAM_NAME, CONTEXT_PARAM_IDX), true); + private static final ArgumentArrayLayout ARGS_LAYOUT = + ArgumentArrayLayout.create( + 1, + false, + StringToIndexMap.of(CONTEXT_PARAM_NAME, CONTEXT_PARAM_IDX), + true + ); public UrlFunction(HttpServletRequest request, HttpServletResponse response) { super(request, response); http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/1c7c9874/freemarker-spring/src/main/java/org/apache/freemarker/spring/model/package.html ---------------------------------------------------------------------- diff --git a/freemarker-spring/src/main/java/org/apache/freemarker/spring/model/package.html b/freemarker-spring/src/main/java/org/apache/freemarker/spring/model/package.html new file mode 100644 index 0000000..5a98e44 --- /dev/null +++ b/freemarker-spring/src/main/java/org/apache/freemarker/spring/model/package.html @@ -0,0 +1,23 @@ +<!-- + 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. +--> +<html> +<body> +<p>FreeMarker Directives and Functions Support for Spring Framework MVC</p> +</body> +</html> http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/1c7c9874/freemarker-spring/src/main/java/org/apache/freemarker/spring/package.html ---------------------------------------------------------------------- diff --git a/freemarker-spring/src/main/java/org/apache/freemarker/spring/package.html b/freemarker-spring/src/main/java/org/apache/freemarker/spring/package.html new file mode 100644 index 0000000..05ba1ff --- /dev/null +++ b/freemarker-spring/src/main/java/org/apache/freemarker/spring/package.html @@ -0,0 +1,23 @@ +<!-- + 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. +--> +<html> +<body> +<p>Spring Framework (MVC) Support</p> +</body> +</html> http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/1c7c9874/freemarker-spring/src/main/java/org/apache/freemarker/spring/web/view/package.html ---------------------------------------------------------------------- diff --git a/freemarker-spring/src/main/java/org/apache/freemarker/spring/web/view/package.html b/freemarker-spring/src/main/java/org/apache/freemarker/spring/web/view/package.html new file mode 100644 index 0000000..98b1417 --- /dev/null +++ b/freemarker-spring/src/main/java/org/apache/freemarker/spring/web/view/package.html @@ -0,0 +1,23 @@ +<!-- + 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. +--> +<html> +<body> +<p>Spring Framework MVC View Support</p> +</body> +</html>
