Repository: freemarker Updated Branches: refs/heads/3 e9ca9d4c8 -> 81b482214
http://git-wip-us.apache.org/repos/asf/freemarker/blob/81b48221/freemarker-servlet/src/test/resources/org/apache/freemarker/servlet/jsp/webapps/multipleLoaders/WEB-INF/web.xml ---------------------------------------------------------------------- diff --git a/freemarker-servlet/src/test/resources/org/apache/freemarker/servlet/jsp/webapps/multipleLoaders/WEB-INF/web.xml b/freemarker-servlet/src/test/resources/org/apache/freemarker/servlet/jsp/webapps/multipleLoaders/WEB-INF/web.xml index 37978c1..59fc8af 100644 --- a/freemarker-servlet/src/test/resources/org/apache/freemarker/servlet/jsp/webapps/multipleLoaders/WEB-INF/web.xml +++ b/freemarker-servlet/src/test/resources/org/apache/freemarker/servlet/jsp/webapps/multipleLoaders/WEB-INF/web.xml @@ -63,7 +63,7 @@ <servlet-mapping> <servlet-name>freemarker</servlet-name> - <url-pattern>*.ftl</url-pattern> + <url-pattern>*.f3ah</url-pattern> </servlet-mapping> <!-- Prevent the visiting of MVC Views from outside the servlet container. @@ -72,7 +72,7 @@ <security-constraint> <web-resource-collection> <web-resource-name>FreeMarker MVC Views</web-resource-name> - <url-pattern>*.ftl</url-pattern> + <url-pattern>*.f3ah</url-pattern> <url-pattern>*.jsp</url-pattern> </web-resource-collection> <auth-constraint> http://git-wip-us.apache.org/repos/asf/freemarker/blob/81b48221/freemarker-servlet/src/test/resources/org/apache/freemarker/servlet/jsp/webapps/tldDiscovery/CONTENTS.txt ---------------------------------------------------------------------- diff --git a/freemarker-servlet/src/test/resources/org/apache/freemarker/servlet/jsp/webapps/tldDiscovery/CONTENTS.txt b/freemarker-servlet/src/test/resources/org/apache/freemarker/servlet/jsp/webapps/tldDiscovery/CONTENTS.txt index 13f1923..3fb84ee 100644 --- a/freemarker-servlet/src/test/resources/org/apache/freemarker/servlet/jsp/webapps/tldDiscovery/CONTENTS.txt +++ b/freemarker-servlet/src/test/resources/org/apache/freemarker/servlet/jsp/webapps/tldDiscovery/CONTENTS.txt @@ -19,8 +19,8 @@ // Only the files listed here will be part of the tested Web application deployment! -test-noClasspath.ftl -test1.ftl +test-noClasspath.f3ah +test1.f3ah WEB-INF/fmtesttag 2.tld WEB-INF/fmtesttag4.tld @@ -34,4 +34,4 @@ WEB-INF/subdir-with-tld/fmtesttag3.tld not-auto-scanned/fmtesttag.tld -subdir/test-rel.ftl +subdir/test-rel.f3ah http://git-wip-us.apache.org/repos/asf/freemarker/blob/81b48221/freemarker-servlet/src/test/resources/org/apache/freemarker/servlet/jsp/webapps/tldDiscovery/WEB-INF/web.xml ---------------------------------------------------------------------- diff --git a/freemarker-servlet/src/test/resources/org/apache/freemarker/servlet/jsp/webapps/tldDiscovery/WEB-INF/web.xml b/freemarker-servlet/src/test/resources/org/apache/freemarker/servlet/jsp/webapps/tldDiscovery/WEB-INF/web.xml index bb64b8c..ab032c4 100644 --- a/freemarker-servlet/src/test/resources/org/apache/freemarker/servlet/jsp/webapps/tldDiscovery/WEB-INF/web.xml +++ b/freemarker-servlet/src/test/resources/org/apache/freemarker/servlet/jsp/webapps/tldDiscovery/WEB-INF/web.xml @@ -147,7 +147,7 @@ <servlet-mapping> <servlet-name>freemarker</servlet-name> - <url-pattern>*.ftl</url-pattern> + <url-pattern>*.f3ah</url-pattern> </servlet-mapping> <taglib> @@ -168,7 +168,7 @@ <security-constraint> <web-resource-collection> <web-resource-name>FreeMarker MVC Views</web-resource-name> - <url-pattern>*.ftl</url-pattern> + <url-pattern>*.f3ah</url-pattern> <url-pattern>*.jsp</url-pattern> </web-resource-collection> <auth-constraint> http://git-wip-us.apache.org/repos/asf/freemarker/blob/81b48221/freemarker-servlet/src/test/resources/org/apache/freemarker/servlet/jsp/webapps/tldDiscovery/subdir/test-rel.f3ah ---------------------------------------------------------------------- diff --git a/freemarker-servlet/src/test/resources/org/apache/freemarker/servlet/jsp/webapps/tldDiscovery/subdir/test-rel.f3ah b/freemarker-servlet/src/test/resources/org/apache/freemarker/servlet/jsp/webapps/tldDiscovery/subdir/test-rel.f3ah new file mode 100644 index 0000000..fdf9c25 --- /dev/null +++ b/freemarker-servlet/src/test/resources/org/apache/freemarker/servlet/jsp/webapps/tldDiscovery/subdir/test-rel.f3ah @@ -0,0 +1,20 @@ +<#-- + 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. +--> +<@JspTaglibs["taglib"].simpletag /> +<@JspTaglibs["taglib"].simpletag /> http://git-wip-us.apache.org/repos/asf/freemarker/blob/81b48221/freemarker-servlet/src/test/resources/org/apache/freemarker/servlet/jsp/webapps/tldDiscovery/subdir/test-rel.ftl ---------------------------------------------------------------------- diff --git a/freemarker-servlet/src/test/resources/org/apache/freemarker/servlet/jsp/webapps/tldDiscovery/subdir/test-rel.ftl b/freemarker-servlet/src/test/resources/org/apache/freemarker/servlet/jsp/webapps/tldDiscovery/subdir/test-rel.ftl deleted file mode 100644 index fdf9c25..0000000 --- a/freemarker-servlet/src/test/resources/org/apache/freemarker/servlet/jsp/webapps/tldDiscovery/subdir/test-rel.ftl +++ /dev/null @@ -1,20 +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. ---> -<@JspTaglibs["taglib"].simpletag /> -<@JspTaglibs["taglib"].simpletag /> http://git-wip-us.apache.org/repos/asf/freemarker/blob/81b48221/freemarker-servlet/src/test/resources/org/apache/freemarker/servlet/jsp/webapps/tldDiscovery/test-noClasspath.f3ah ---------------------------------------------------------------------- diff --git a/freemarker-servlet/src/test/resources/org/apache/freemarker/servlet/jsp/webapps/tldDiscovery/test-noClasspath.f3ah b/freemarker-servlet/src/test/resources/org/apache/freemarker/servlet/jsp/webapps/tldDiscovery/test-noClasspath.f3ah new file mode 100644 index 0000000..e7a65a9 --- /dev/null +++ b/freemarker-servlet/src/test/resources/org/apache/freemarker/servlet/jsp/webapps/tldDiscovery/test-noClasspath.f3ah @@ -0,0 +1,32 @@ +<#-- + 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. +--> +<!-- Test loading from web.xml-mapped JAR --> +<#assign tl2 = JspTaglibs["http://freemarker.sf.net/taglibs/freemarker-junit-test-tag-2.2-2";]> +<@tl2.testtag></@> +<!-- Test loading from autodeployed WEB-INF/lib/*.jar --> +<#assign tl3 = JspTaglibs["http://freemarker.sf.net/taglibs/freemarker-junit-test-tag-2.2-foo";]> +<@tl3.testtag></@> +<!-- Test loading from FreemarkerServlet "ClasspathTlds" --> +<@JspTaglibs["http://freemarker.org/taglibs/test/ClassPathTlds-1"].simpletag/> +<@JspTaglibs["http://freemarker.org/taglibs/test/ClassPathTlds-2"].simpletag/> +<#attempt><#assign _ = JspTaglibs["http://freemarker.org/taglibs/test/MetaInfTldSources-1";]><#recover>missing</#attempt> +<!-- Test loading from "MetaInfTldSources", inherited from Jetty --> +${JspTaglibs["http://java.sun.com/jsp/jstl/functions"].join(['a', 'b'], '+')} +<!-- Test loading from "MetaInfTldSources", set via init-param --> +<#attempt><#assign _ = JspTaglibs["http://displaytag.sf.net";]><#recover>missing</#attempt> http://git-wip-us.apache.org/repos/asf/freemarker/blob/81b48221/freemarker-servlet/src/test/resources/org/apache/freemarker/servlet/jsp/webapps/tldDiscovery/test-noClasspath.ftl ---------------------------------------------------------------------- diff --git a/freemarker-servlet/src/test/resources/org/apache/freemarker/servlet/jsp/webapps/tldDiscovery/test-noClasspath.ftl b/freemarker-servlet/src/test/resources/org/apache/freemarker/servlet/jsp/webapps/tldDiscovery/test-noClasspath.ftl deleted file mode 100644 index e7a65a9..0000000 --- a/freemarker-servlet/src/test/resources/org/apache/freemarker/servlet/jsp/webapps/tldDiscovery/test-noClasspath.ftl +++ /dev/null @@ -1,32 +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. ---> -<!-- Test loading from web.xml-mapped JAR --> -<#assign tl2 = JspTaglibs["http://freemarker.sf.net/taglibs/freemarker-junit-test-tag-2.2-2";]> -<@tl2.testtag></@> -<!-- Test loading from autodeployed WEB-INF/lib/*.jar --> -<#assign tl3 = JspTaglibs["http://freemarker.sf.net/taglibs/freemarker-junit-test-tag-2.2-foo";]> -<@tl3.testtag></@> -<!-- Test loading from FreemarkerServlet "ClasspathTlds" --> -<@JspTaglibs["http://freemarker.org/taglibs/test/ClassPathTlds-1"].simpletag/> -<@JspTaglibs["http://freemarker.org/taglibs/test/ClassPathTlds-2"].simpletag/> -<#attempt><#assign _ = JspTaglibs["http://freemarker.org/taglibs/test/MetaInfTldSources-1";]><#recover>missing</#attempt> -<!-- Test loading from "MetaInfTldSources", inherited from Jetty --> -${JspTaglibs["http://java.sun.com/jsp/jstl/functions"].join(['a', 'b'], '+')} -<!-- Test loading from "MetaInfTldSources", set via init-param --> -<#attempt><#assign _ = JspTaglibs["http://displaytag.sf.net";]><#recover>missing</#attempt> http://git-wip-us.apache.org/repos/asf/freemarker/blob/81b48221/freemarker-servlet/src/test/resources/org/apache/freemarker/servlet/jsp/webapps/tldDiscovery/test1.f3ah ---------------------------------------------------------------------- diff --git a/freemarker-servlet/src/test/resources/org/apache/freemarker/servlet/jsp/webapps/tldDiscovery/test1.f3ah b/freemarker-servlet/src/test/resources/org/apache/freemarker/servlet/jsp/webapps/tldDiscovery/test1.f3ah new file mode 100644 index 0000000..b4f2a7b --- /dev/null +++ b/freemarker-servlet/src/test/resources/org/apache/freemarker/servlet/jsp/webapps/tldDiscovery/test1.f3ah @@ -0,0 +1,55 @@ +<#-- + 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. +--> +<!-- Test loading from web.xml-mapped JAR --> +<@JspTaglibs["http://freemarker.sf.net/taglibs/freemarker-junit-test-tag-2.2"].simpletag bodyLoopCount=1 name="simpletag1"> + foo +</@> +<@JspTaglibs["http://freemarker.sf.net/taglibs/freemarker-junit-test-tag-2.2-2"].testtag></@> + +<!-- Test loading from autodeployed WEB-INF/lib/*.jar --> +<@JspTaglibs["http://freemarker.sf.net/taglibs/freemarker-junit-test-tag-2.2-foo"].testtag></@> + +<!-- Test loading from root-relative URL --> +<@JspTaglibs["/WEB-INF/taglib 2.jar"].testtag></@> + +<!-- Test loading from non-root-relative URL --> +<@JspTaglibs["WEB-INF/taglib 2.jar"].testtag></@> + +<!-- Test loading from autodeployed .tld --> +<@JspTaglibs["http://freemarker.sf.net/taglibs/freemarker-junit-test-tag-autodeploy-tld-2"].simpletag/> +<@JspTaglibs["http://freemarker.sf.net/taglibs/freemarker-junit-test-tag-autodeploy-tld-3"].simpletag/> + +<!-- Test loading from FreemarkerServlet "ClasspathTlds" --> +<@JspTaglibs["http://freemarker.org/taglibs/test/ClassPathTlds-1"].simpletag/> +<@JspTaglibs["http://freemarker.org/taglibs/test/ClassPathTlds-2"].simpletag/> + +<!-- Test loading from "MetaInfTldSources", inherited from Jetty --> +${JspTaglibs["http://java.sun.com/jsp/jstl/functions"].join(['a', 'b'], '+')} + +<!-- Test loading from "MetaInfTldSources", set via init-param --> +<@JspTaglibs["http://freemarker.org/taglibs/test/MetaInfTldSources-1"].simpletag/> +<#assign display = JspTaglibs["http://displaytag.sf.net";]> +<@display.table name="lsob"> + <@display.column property="name" /> + <@display.column property="age" /> + <@display.column property="maried" /> +</@display.table> + +<!-- Test loading from mapped relative URL --> +<@JspTaglibs["/subdir/taglib"].simpletag /> http://git-wip-us.apache.org/repos/asf/freemarker/blob/81b48221/freemarker-servlet/src/test/resources/org/apache/freemarker/servlet/jsp/webapps/tldDiscovery/test1.ftl ---------------------------------------------------------------------- diff --git a/freemarker-servlet/src/test/resources/org/apache/freemarker/servlet/jsp/webapps/tldDiscovery/test1.ftl b/freemarker-servlet/src/test/resources/org/apache/freemarker/servlet/jsp/webapps/tldDiscovery/test1.ftl deleted file mode 100644 index b4f2a7b..0000000 --- a/freemarker-servlet/src/test/resources/org/apache/freemarker/servlet/jsp/webapps/tldDiscovery/test1.ftl +++ /dev/null @@ -1,55 +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. ---> -<!-- Test loading from web.xml-mapped JAR --> -<@JspTaglibs["http://freemarker.sf.net/taglibs/freemarker-junit-test-tag-2.2"].simpletag bodyLoopCount=1 name="simpletag1"> - foo -</@> -<@JspTaglibs["http://freemarker.sf.net/taglibs/freemarker-junit-test-tag-2.2-2"].testtag></@> - -<!-- Test loading from autodeployed WEB-INF/lib/*.jar --> -<@JspTaglibs["http://freemarker.sf.net/taglibs/freemarker-junit-test-tag-2.2-foo"].testtag></@> - -<!-- Test loading from root-relative URL --> -<@JspTaglibs["/WEB-INF/taglib 2.jar"].testtag></@> - -<!-- Test loading from non-root-relative URL --> -<@JspTaglibs["WEB-INF/taglib 2.jar"].testtag></@> - -<!-- Test loading from autodeployed .tld --> -<@JspTaglibs["http://freemarker.sf.net/taglibs/freemarker-junit-test-tag-autodeploy-tld-2"].simpletag/> -<@JspTaglibs["http://freemarker.sf.net/taglibs/freemarker-junit-test-tag-autodeploy-tld-3"].simpletag/> - -<!-- Test loading from FreemarkerServlet "ClasspathTlds" --> -<@JspTaglibs["http://freemarker.org/taglibs/test/ClassPathTlds-1"].simpletag/> -<@JspTaglibs["http://freemarker.org/taglibs/test/ClassPathTlds-2"].simpletag/> - -<!-- Test loading from "MetaInfTldSources", inherited from Jetty --> -${JspTaglibs["http://java.sun.com/jsp/jstl/functions"].join(['a', 'b'], '+')} - -<!-- Test loading from "MetaInfTldSources", set via init-param --> -<@JspTaglibs["http://freemarker.org/taglibs/test/MetaInfTldSources-1"].simpletag/> -<#assign display = JspTaglibs["http://displaytag.sf.net";]> -<@display.table name="lsob"> - <@display.column property="name" /> - <@display.column property="age" /> - <@display.column property="maried" /> -</@display.table> - -<!-- Test loading from mapped relative URL --> -<@JspTaglibs["/subdir/taglib"].simpletag /> http://git-wip-us.apache.org/repos/asf/freemarker/blob/81b48221/freemarker-servlet/src/test/resources/org/apache/freemarker/servlet/webapptemplateloadertest/WEB-INF/templates/test.f3ah ---------------------------------------------------------------------- diff --git a/freemarker-servlet/src/test/resources/org/apache/freemarker/servlet/webapptemplateloadertest/WEB-INF/templates/test.f3ah b/freemarker-servlet/src/test/resources/org/apache/freemarker/servlet/webapptemplateloadertest/WEB-INF/templates/test.f3ah new file mode 100644 index 0000000..06ebbcc --- /dev/null +++ b/freemarker-servlet/src/test/resources/org/apache/freemarker/servlet/webapptemplateloadertest/WEB-INF/templates/test.f3ah @@ -0,0 +1,19 @@ +<#-- + 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. +--> +foo \ No newline at end of file http://git-wip-us.apache.org/repos/asf/freemarker/blob/81b48221/freemarker-servlet/src/test/resources/org/apache/freemarker/servlet/webapptemplateloadertest/WEB-INF/templates/test.ftl ---------------------------------------------------------------------- diff --git a/freemarker-servlet/src/test/resources/org/apache/freemarker/servlet/webapptemplateloadertest/WEB-INF/templates/test.ftl b/freemarker-servlet/src/test/resources/org/apache/freemarker/servlet/webapptemplateloadertest/WEB-INF/templates/test.ftl deleted file mode 100644 index 06ebbcc..0000000 --- a/freemarker-servlet/src/test/resources/org/apache/freemarker/servlet/webapptemplateloadertest/WEB-INF/templates/test.ftl +++ /dev/null @@ -1,19 +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. ---> -foo \ No newline at end of file http://git-wip-us.apache.org/repos/asf/freemarker/blob/81b48221/freemarker-spring/src/test/java/org/apache/freemarker/spring/SpringResourceTemplateLoaderTest.java ---------------------------------------------------------------------- diff --git a/freemarker-spring/src/test/java/org/apache/freemarker/spring/SpringResourceTemplateLoaderTest.java b/freemarker-spring/src/test/java/org/apache/freemarker/spring/SpringResourceTemplateLoaderTest.java index 87f9ded..3a39d66 100644 --- a/freemarker-spring/src/test/java/org/apache/freemarker/spring/SpringResourceTemplateLoaderTest.java +++ b/freemarker-spring/src/test/java/org/apache/freemarker/spring/SpringResourceTemplateLoaderTest.java @@ -60,7 +60,7 @@ public class SpringResourceTemplateLoaderTest { @Test public void testSuccessful() throws Exception { for (int i = 0; i < 2; i++) { - assertThat(cfg.getTemplate("sub1/sub2/t.ftl").toString(), endsWith("foo")); + assertThat(cfg.getTemplate("sub1/sub2/t.f3ah").toString(), endsWith("foo")); } } http://git-wip-us.apache.org/repos/asf/freemarker/blob/81b48221/freemarker-spring/src/test/resources/META-INF/templates/sub1/sub2/t.f3ah ---------------------------------------------------------------------- diff --git a/freemarker-spring/src/test/resources/META-INF/templates/sub1/sub2/t.f3ah b/freemarker-spring/src/test/resources/META-INF/templates/sub1/sub2/t.f3ah new file mode 100644 index 0000000..06ebbcc --- /dev/null +++ b/freemarker-spring/src/test/resources/META-INF/templates/sub1/sub2/t.f3ah @@ -0,0 +1,19 @@ +<#-- + 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. +--> +foo \ No newline at end of file http://git-wip-us.apache.org/repos/asf/freemarker/blob/81b48221/freemarker-spring/src/test/resources/META-INF/templates/sub1/sub2/t.ftl ---------------------------------------------------------------------- diff --git a/freemarker-spring/src/test/resources/META-INF/templates/sub1/sub2/t.ftl b/freemarker-spring/src/test/resources/META-INF/templates/sub1/sub2/t.ftl deleted file mode 100644 index 06ebbcc..0000000 --- a/freemarker-spring/src/test/resources/META-INF/templates/sub1/sub2/t.ftl +++ /dev/null @@ -1,19 +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. ---> -foo \ No newline at end of file http://git-wip-us.apache.org/repos/asf/freemarker/blob/81b48221/freemarker-test-utils/src/main/java/org/apache/freemarker/test/TemplateTestSuite.java ---------------------------------------------------------------------- diff --git a/freemarker-test-utils/src/main/java/org/apache/freemarker/test/TemplateTestSuite.java b/freemarker-test-utils/src/main/java/org/apache/freemarker/test/TemplateTestSuite.java index 93ab0e8..a2ead97 100644 --- a/freemarker-test-utils/src/main/java/org/apache/freemarker/test/TemplateTestSuite.java +++ b/freemarker-test-utils/src/main/java/org/apache/freemarker/test/TemplateTestSuite.java @@ -62,7 +62,7 @@ import junit.framework.TestSuite; * <ol> * <li>Add a new <tt>testcase</tt> element to <tt>testcases.xml</tt></li> * <li>Add a template to <tt>templates/</tt> with fits the <tt>testcase</tt> added to the XML (by default it's the test - * case name + ".ftl")</li> + * case name + ".f3ac")</li> * <li>Add the expected output to <tt>references/</tt> with fits the <tt>testcase</tt> added to the XML (by default * it's the test name + ".txt")</li> * <li>If you want to add items to the data-model or change the {@link Configuration}, modify the @@ -219,7 +219,7 @@ public abstract class TemplateTestSuite extends TestSuite { { String s = _StringUtils.emptyToNull(testCaseElem.getAttribute(ATTR_TEMPLATE)); - templateName = s != null ? s : beforeEndTN + ".ftl"; + templateName = s != null ? s : beforeEndTN + ".f3ac"; } {
