freemarker-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ddek...@apache.org
Subject incubator-freemarker git commit: Test: Unused file
Date Tue, 16 May 2017 16:58:35 GMT
Repository: incubator-freemarker
Updated Branches:
  refs/heads/3 3ce155f2d -> 49df6032d


Test: Unused file


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

Branch: refs/heads/3
Commit: 49df6032d95531b8fc893b723530a43c1081927a
Parents: 3ce155f
Author: ddekany <ddekany@apache.org>
Authored: Tue May 16 18:58:24 2017 +0200
Committer: ddekany <ddekany@apache.org>
Committed: Tue May 16 18:58:24 2017 +0200

----------------------------------------------------------------------
 .../org/apache/freemarker/test/servlet/web.xml  | 101 -------------------
 1 file changed, 101 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/49df6032/freemarker-core-test/src/test/resources/org/apache/freemarker/test/servlet/web.xml
----------------------------------------------------------------------
diff --git a/freemarker-core-test/src/test/resources/org/apache/freemarker/test/servlet/web.xml
b/freemarker-core-test/src/test/resources/org/apache/freemarker/test/servlet/web.xml
deleted file mode 100644
index e406b1a..0000000
--- a/freemarker-core-test/src/test/resources/org/apache/freemarker/test/servlet/web.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!--
-  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.
--->
-
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
-	version="2.4">
-
-	<servlet>
-		<servlet-name>controller</servlet-name>
-		<servlet-class>com.example.Model2ControllerServlet</servlet-class>
-	</servlet>
-
-	<servlet-mapping>
-		<servlet-name>controller</servlet-name>
-		<url-pattern>*.c</url-pattern>
-    </servlet-mapping>
-    <servlet-mapping>
-        <servlet-name>controller</servlet-name>
-        <url-pattern>/</url-pattern>
-	</servlet-mapping>
-
-	<servlet>
-		<servlet-name>freemarker</servlet-name>
-		<servlet-class>org.apache.freemarker.servlet.FreemarkerServlet</servlet-class>
-
-		<!-- FreemarkerServlet settings: -->
-		<init-param>
-			<param-name>TemplatePath</param-name>
-			<param-value>/</param-value>
-		</init-param>
-		<init-param>
-			<param-name>NoCache</param-name>
-			<param-value>true</param-value>
-		</init-param>
-		<init-param>
-			<param-name>ContentType</param-name>
-			<param-value>text/html; charset=UTF-8</param-value> <!-- Forces UTF-8 output
encoding! -->
-		</init-param>
-
-		<!-- FreeMarker settings: -->
-		<init-param>
-			<param-name>incompatible_improvements</param-name>
-			<param-value>3.0.0</param-value>
-		</init-param>
-		<init-param>
-			<param-name>template_exception_handler</param-name>
-			<!-- Some may prefer "html_debug" for development. -->
-			<param-value>rethrow</param-value>
-		</init-param>
-		<init-param>
-			<param-name>template_update_delay</param-name>
-			<param-value>0</param-value> <!-- 0 is for development only! Use higher
value otherwise. -->
-		</init-param>
-		<init-param>
-			<param-name>sourceEncoding</param-name>
-			<param-value>UTF-8</param-value> <!-- The encoding of the template files.
-->
-		</init-param>
-		<init-param>
-			<param-name>number_format</param-name>
-			<param-value>0.##########</param-value>
-		</init-param>
-
-		<load-on-startup>1</load-on-startup>
-	</servlet>
-
-	<servlet-mapping>
-		<servlet-name>freemarker</servlet-name>
-		<url-pattern>*.ftl</url-pattern>
-	</servlet-mapping>
-
-	<!-- Prevent the visiting of MVC Views from outside the servlet container. 
-		RequestDispatcher.forward/include should and will still work. Removing this 
-		may open security holes! -->
-	<security-constraint>
-		<web-resource-collection>
-			<web-resource-name>FreeMarker MVC Views</web-resource-name>
-			<url-pattern>*.ftl</url-pattern>
-		</web-resource-collection>
-		<auth-constraint>
-			<!-- Nobody is allowed to visit these -->
-		</auth-constraint>
-	</security-constraint>
-
-</web-app>
\ No newline at end of file


Mime
View raw message