FREEMARKER-55: Removing mvcUrl function as it's not in earlier version of spring 4.0.x
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/2076c5e8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/2076c5e8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/2076c5e8 Branch: refs/heads/3 Commit: 2076c5e83786b5253ea80651f4a47ea87f263fd0 Parents: 834abd7 Author: Woonsan Ko <woon...@apache.org> Authored: Mon Sep 11 17:14:39 2017 -0400 Committer: Woonsan Ko <woon...@apache.org> Committed: Mon Sep 11 17:14:39 2017 -0400 ---------------------------------------------------------------------- .../freemarker/spring/model/MvcUrlFunction.java | 74 -------------------- .../model/SpringTemplateCallableHashModel.java | 1 - 2 files changed, 75 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/2076c5e8/freemarker-spring/src/main/java/org/apache/freemarker/spring/model/MvcUrlFunction.java ---------------------------------------------------------------------- diff --git a/freemarker-spring/src/main/java/org/apache/freemarker/spring/model/MvcUrlFunction.java b/freemarker-spring/src/main/java/org/apache/freemarker/spring/model/MvcUrlFunction.java deleted file mode 100644 index 047d5c2..0000000 --- a/freemarker-spring/src/main/java/org/apache/freemarker/spring/model/MvcUrlFunction.java +++ /dev/null @@ -1,74 +0,0 @@ -/* - * 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 org.apache.freemarker.spring.model; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.apache.freemarker.core.CallPlace; -import org.apache.freemarker.core.Environment; -import org.apache.freemarker.core.TemplateException; -import org.apache.freemarker.core.model.ArgumentArrayLayout; -import org.apache.freemarker.core.model.ObjectWrapperAndUnwrapper; -import org.apache.freemarker.core.model.TemplateModel; -import org.apache.freemarker.core.util.StringToIndexMap; -import org.springframework.web.servlet.support.RequestContext; - -/** - * A <code>TemplateFunctionModel</code> providing functionality equivalent to the Spring Framework's - * <code>spring:mvcUrl</code> JSP Tag Library Function. - * <P> - * Some valid example(s): - * </P> - * <PRE> - * </PRE> - */ -public class MvcUrlFunction extends AbstractSpringTemplateFunctionModel { - - public static final String NAME = "mvcUrl"; - - private static final int MAPPING_NAME_PARAM_IDX = 0; - - private static final ArgumentArrayLayout ARGS_LAYOUT = - ArgumentArrayLayout.create( - 1, - false, - null, - false - ); - - public MvcUrlFunction(HttpServletRequest request, HttpServletResponse response) { - super(request, response); - } - - @Override - public TemplateModel executeInternal(TemplateModel[] args, CallPlace callPlace, Environment env, - ObjectWrapperAndUnwrapper objectWrapperAndUnwrapper, RequestContext requestContext) - throws TemplateException { - // TODO - return null; - } - - @Override - public ArgumentArrayLayout getFunctionArgumentArrayLayout() { - return ARGS_LAYOUT; - } - -} http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/2076c5e8/freemarker-spring/src/main/java/org/apache/freemarker/spring/model/SpringTemplateCallableHashModel.java ---------------------------------------------------------------------- diff --git a/freemarker-spring/src/main/java/org/apache/freemarker/spring/model/SpringTemplateCallableHashModel.java b/freemarker-spring/src/main/java/org/apache/freemarker/spring/model/SpringTemplateCallableHashModel.java index 7315947..26ae060 100644 --- a/freemarker-spring/src/main/java/org/apache/freemarker/spring/model/SpringTemplateCallableHashModel.java +++ b/freemarker-spring/src/main/java/org/apache/freemarker/spring/model/SpringTemplateCallableHashModel.java @@ -55,7 +55,6 @@ public final class SpringTemplateCallableHashModel implements TemplateHashModel, modelsMap.put(TransformFunction.NAME, new TransformFunction(request, response)); modelsMap.put(UrlFunction.NAME, new UrlFunction(request, response)); modelsMap.put(EvalFunction.NAME, new EvalFunction(request, response)); - modelsMap.put(MvcUrlFunction.NAME, new MvcUrlFunction(request, response)); } public TemplateModel get(String key) throws TemplateException {
