bump to tiles-request-1.0.4 and add integration test for TILES-571
git-svn-id: https://svn.apache.org/repos/asf/tiles/framework/trunk@1590859 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/assembly/pom.xml b/assembly/pom.xml
index c8b8f89..a9209ac 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -203,7 +203,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jdk14</artifactId>
- <version>1.5.8</version>
+ <version>1.7.6</version>
<scope>runtime</scope>
</dependency>
diff --git a/pom.xml b/pom.xml
index ad12ff0..e48c4db 100644
--- a/pom.xml
+++ b/pom.xml
@@ -217,15 +217,20 @@
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>1.7.6</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
<artifactId>slf4j-jdk14</artifactId>
- <version>1.5.8</version>
- <optional>true</optional>
+ <version>1.7.6</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
- <version>1.5.8</version>
- <optional>true</optional>
+ <version>1.7.6</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.tiles</groupId>
@@ -313,7 +318,7 @@
<tiles.osgi.private />
<tiles.manifestfile>target/osgi/MANIFEST.MF</tiles.manifestfile>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <tiles.request.version>1.0.1</tiles.request.version>
+ <tiles.request.version>1.0.4</tiles.request.version>
<tiles.autotag.version>1.1.0</tiles.autotag.version>
</properties>
diff --git a/tiles-api/pom.xml b/tiles-api/pom.xml
index 22d101b..59e3b52 100644
--- a/tiles-api/pom.xml
+++ b/tiles-api/pom.xml
@@ -81,9 +81,13 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-jdk14</artifactId>
- <optional>true</optional>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-jdk14</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.tiles</groupId>
diff --git a/tiles-compat/pom.xml b/tiles-compat/pom.xml
index 9ac88a5..fae0f27 100644
--- a/tiles-compat/pom.xml
+++ b/tiles-compat/pom.xml
@@ -89,8 +89,19 @@
<dependency>
<groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
<artifactId>slf4j-jdk14</artifactId>
- <optional>true</optional>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
diff --git a/tiles-core/pom.xml b/tiles-core/pom.xml
index b263a84..eed5636 100644
--- a/tiles-core/pom.xml
+++ b/tiles-core/pom.xml
@@ -88,13 +88,19 @@
<dependency>
<groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jdk14</artifactId>
- <optional>true</optional>
+ <scope>test</scope>
</dependency>
<dependency>
diff --git a/tiles-el/pom.xml b/tiles-el/pom.xml
index f5b927f..ed99907 100644
--- a/tiles-el/pom.xml
+++ b/tiles-el/pom.xml
@@ -85,8 +85,19 @@
<dependency>
<groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
<artifactId>slf4j-jdk14</artifactId>
- <optional>true</optional>
+ <scope>test</scope>
</dependency>
<dependency>
diff --git a/tiles-extras/pom.xml b/tiles-extras/pom.xml
index 5aeef7c..1b820c7 100644
--- a/tiles-extras/pom.xml
+++ b/tiles-extras/pom.xml
@@ -131,14 +131,19 @@
<dependency>
<groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
- <optional>true</optional>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jdk14</artifactId>
- <optional>true</optional>
+ <scope>test</scope>
</dependency>
<dependency>
diff --git a/tiles-freemarker/pom.xml b/tiles-freemarker/pom.xml
index cdba8db..5e61465 100644
--- a/tiles-freemarker/pom.xml
+++ b/tiles-freemarker/pom.xml
@@ -64,8 +64,19 @@
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
<artifactId>slf4j-jdk14</artifactId>
- <optional>true</optional>
+ <scope>test</scope>
</dependency>
<dependency>
diff --git a/tiles-jsp/pom.xml b/tiles-jsp/pom.xml
index afddb6e..443b32f 100644
--- a/tiles-jsp/pom.xml
+++ b/tiles-jsp/pom.xml
@@ -127,8 +127,19 @@
<dependency>
<groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
<artifactId>slf4j-jdk14</artifactId>
- <optional>true</optional>
+ <scope>test</scope>
</dependency>
<dependency>
diff --git a/tiles-mvel/pom.xml b/tiles-mvel/pom.xml
index b0f9ff7..edc227d 100644
--- a/tiles-mvel/pom.xml
+++ b/tiles-mvel/pom.xml
@@ -80,8 +80,19 @@
<dependency>
<groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
<artifactId>slf4j-jdk14</artifactId>
- <optional>true</optional>
+ <scope>test</scope>
</dependency>
<dependency>
diff --git a/tiles-ognl/pom.xml b/tiles-ognl/pom.xml
index 3f2d488..3c3387e 100644
--- a/tiles-ognl/pom.xml
+++ b/tiles-ognl/pom.xml
@@ -80,8 +80,19 @@
<dependency>
<groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
<artifactId>slf4j-jdk14</artifactId>
- <optional>true</optional>
+ <scope>test</scope>
</dependency>
<dependency>
diff --git a/tiles-servlet/pom.xml b/tiles-servlet/pom.xml
index 92f31c9..1e2881e 100644
--- a/tiles-servlet/pom.xml
+++ b/tiles-servlet/pom.xml
@@ -95,9 +95,21 @@
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-jdk14</artifactId>
- <optional>true</optional>
+ <artifactId>slf4j-api</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-jdk14</artifactId>
+ <scope>test</scope>
+ </dependency>
+
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
diff --git a/tiles-template/pom.xml b/tiles-template/pom.xml
index 07f459a..964c7de 100644
--- a/tiles-template/pom.xml
+++ b/tiles-template/pom.xml
@@ -59,8 +59,19 @@
<dependency>
<groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
<artifactId>slf4j-jdk14</artifactId>
- <optional>true</optional>
+ <scope>test</scope>
</dependency>
<dependency>
diff --git a/tiles-test-pom/tiles-test-db/pom.xml b/tiles-test-pom/tiles-test-db/pom.xml
index bc7a071..c49ccc0 100644
--- a/tiles-test-pom/tiles-test-db/pom.xml
+++ b/tiles-test-pom/tiles-test-db/pom.xml
@@ -40,7 +40,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jdbc</artifactId>
- <version>2.5.6</version>
+ <version>3.2.0.RELEASE</version>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
diff --git a/tiles-test-pom/tiles-test/pom.xml b/tiles-test-pom/tiles-test/pom.xml
index c9ed561..8ce1ac8 100644
--- a/tiles-test-pom/tiles-test/pom.xml
+++ b/tiles-test-pom/tiles-test/pom.xml
@@ -66,7 +66,13 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jdk14</artifactId>
- <version>1.5.8</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <scope>compile</scope>
</dependency>
<dependency>
@@ -106,7 +112,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jdbc</artifactId>
- <version>2.5.6</version>
+ <version>3.2.0.RELEASE</version>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
@@ -278,7 +284,7 @@
</goals>
<configuration>
<background>true</background>
- <browser>*firefox</browser>
+ <browser>*googlechrome</browser>
<startURL>http://localhost:8080/tiles-test/</startURL>
<suite>src/test/selenium/TestSuite.html</suite>
</configuration>
diff --git a/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/freemarker/tiles-defs_with_undescore.xml b/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/freemarker/tiles-defs_with_undescore.xml
new file mode 100644
index 0000000..5acce5e
--- /dev/null
+++ b/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/freemarker/tiles-defs_with_undescore.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!--
+/*
+ * $Id$
+ *
+ * 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.
+ */
+-->
+
+ <!DOCTYPE tiles-definitions PUBLIC
+ "-//Apache Software Foundation//DTD Tiles Configuration 2.0//EN"
+ "http://tiles.apache.org/dtds/tiles-config_2_0.dtd">
+
+<!-- Definitions for Tiles documentation -->
+
+<tiles-definitions>
+ <definition name="freemarker.test.non.localized.definition" template="/freemarker/layout.ftl">
+ <put-attribute name="title" value="Non localized definition" />
+ <put-attribute name="header" value="/freemarker/header.ftl" />
+ <put-attribute name="body" value="/freemarker/body.ftl" />
+ </definition>
+
+</tiles-definitions>
diff --git a/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/tiles-defs_with_undescore.xml b/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/tiles-defs_with_undescore.xml
new file mode 100644
index 0000000..9833af6
--- /dev/null
+++ b/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/tiles-defs_with_undescore.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!--
+/*
+ * $Id$
+ *
+ * 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.
+ */
+-->
+
+ <!DOCTYPE tiles-definitions PUBLIC
+ "-//Apache Software Foundation//DTD Tiles Configuration 2.0//EN"
+ "http://tiles.apache.org/dtds/tiles-config_2_0.dtd">
+
+<!-- Definitions for Tiles documentation -->
+
+<tiles-definitions>
+ <definition name="test.non.localized.definition" template="/layout.jsp">
+ <put-attribute name="title" value="Non localized definition" />
+ <put-attribute name="header" value="/header.jsp" />
+ <put-attribute name="body" value="/body.jsp" />
+ </definition>
+
+</tiles-definitions>
diff --git a/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/velocity/tiles-defs_with_undescore.xml b/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/velocity/tiles-defs_with_undescore.xml
new file mode 100644
index 0000000..7717cb2
--- /dev/null
+++ b/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/velocity/tiles-defs_with_undescore.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!--
+/*
+ * $Id$
+ *
+ * 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.
+ */
+-->
+
+ <!DOCTYPE tiles-definitions PUBLIC
+ "-//Apache Software Foundation//DTD Tiles Configuration 2.0//EN"
+ "http://tiles.apache.org/dtds/tiles-config_2_0.dtd">
+
+<!-- Definitions for Tiles documentation -->
+
+<tiles-definitions>
+ <definition name="velocity.test.non.localized.definition" template="/velocity/layout.vm">
+ <put-attribute name="title" value="Non localized definition" />
+ <put-attribute name="header" value="/velocity/header.vm" />
+ <put-attribute name="body" value="/velocity/body.vm" />
+ </definition>
+
+</tiles-definitions>
diff --git a/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testunderscores_nolocale.ftl b/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testunderscores_nolocale.ftl
new file mode 100644
index 0000000..b5f55d1
--- /dev/null
+++ b/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testunderscores_nolocale.ftl
@@ -0,0 +1,24 @@
+<#--
+/*
+ * $Id$
+ *
+ * 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.
+ *
+ */
+-->
+<@tiles.insertDefinition name="freemarker.test.non.localized.definition" />
diff --git a/tiles-test-pom/tiles-test/src/main/webapp/index.jsp b/tiles-test-pom/tiles-test/src/main/webapp/index.jsp
index 7621660..73c886d 100644
--- a/tiles-test-pom/tiles-test/src/main/webapp/index.jsp
+++ b/tiles-test-pom/tiles-test/src/main/webapp/index.jsp
@@ -118,6 +118,11 @@
<a href="testinsertdefinition_ognl.jsp">Test Insert Configured Definition with OGNL</a><br/>
<a href="testinsertdefinition_regexp.jsp">Test Insert Configured Definition with Regular Expression</a><br/>
+ <h2>Features in Tiles 3.0.x</h2>
+
+ <h3>TILES-571</h3>
+ <a href="testunderscores_nolocale.jsp">Test underscores without localization</a>
+
<h1>FreeMarker-based tests</h1>
<h2>Features in Tiles 2.0.x</h2>
@@ -205,6 +210,11 @@
<a href="freemarker/testinsertdefinition_regexp.ftl">FreeMarker: Test Insert Configured Definition with Regular Expression</a><br/>
<a href="org/apache/tiles/test/alt/freemarker/testinsertdefinition_alt.ftl">FreeMarker: Test Insert Configured Definition in Module</a><br/>
+ <h2>Features in Tiles 3.0.x</h2>
+
+ <h3>TILES-571</h3>
+ <a href="freemarker/testunderscores_nolocale.ftl">FreeMarker: Test underscores without localization</a>
+
<h1>Velocity-based tests</h1>
<h2>Features in Tiles 2.0.x</h2>
@@ -292,4 +302,9 @@
<a href="velocity/testinsertdefinition_regexp.vm">Velocity: Test Insert Configured Definition with Regular Expression</a><br/>
<a href="org/apache/tiles/test/alt/velocity/testinsertdefinition_alt.vm">Velocity: Test Insert Configured Definition in Module</a><br/>
+ <h2>Features in Tiles 3.0.x</h2>
+
+ <h3>TILES-571</h3>
+ <a href="velocity/testunderscores_nolocale.vm">Velocity: Test underscores without localization</a>
+
</html>
\ No newline at end of file
diff --git a/tiles-test-pom/tiles-test/src/main/webapp/testunderscores_nolocale.jsp b/tiles-test-pom/tiles-test/src/main/webapp/testunderscores_nolocale.jsp
new file mode 100644
index 0000000..037beeb
--- /dev/null
+++ b/tiles-test-pom/tiles-test/src/main/webapp/testunderscores_nolocale.jsp
@@ -0,0 +1,27 @@
+<%@ page session="false" %>
+<%--
+/*
+ * $Id$
+ *
+ * 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.
+ *
+ */
+--%>
+<%@ taglib uri="http://tiles.apache.org/tags-tiles" prefix="tiles" %>
+
+<tiles:insertDefinition name="test.non.localized.definition" />
diff --git a/tiles-test-pom/tiles-test/src/main/webapp/velocity/testunderscores_nolocale.vm b/tiles-test-pom/tiles-test/src/main/webapp/velocity/testunderscores_nolocale.vm
new file mode 100644
index 0000000..1a80d0e
--- /dev/null
+++ b/tiles-test-pom/tiles-test/src/main/webapp/velocity/testunderscores_nolocale.vm
@@ -0,0 +1,22 @@
+#*
+ * $Id$
+ *
+ * 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.
+ *
+ *#
+#tiles_insertDefinition({"name" : "velocity.test.non.localized.definition"})#end
diff --git a/tiles-test-pom/tiles-test/src/test/selenium/ConfiguredDefinitionWithUnderscoresTest.html b/tiles-test-pom/tiles-test/src/test/selenium/ConfiguredDefinitionWithUnderscoresTest.html
new file mode 100644
index 0000000..8742680
--- /dev/null
+++ b/tiles-test-pom/tiles-test/src/test/selenium/ConfiguredDefinitionWithUnderscoresTest.html
@@ -0,0 +1,52 @@
+<!--
+/*
+ * $Id$
+ *
+ * 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>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Configured Definition Test</title>
+</head>
+<body>
+<table cellpadding="1" cellspacing="1" border="1">
+<thead>
+<tr><td rowspan="1" colspan="3">Configured Definition Test</td></tr>
+</thead><tbody>
+<tr>
+ <td>open</td>
+ <td>/tiles-test/index.jsp</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAndWait</td>
+ <td>link=Test underscores without localization</td>
+ <td></td>
+</tr>
+<tr>
+ <td>assertTextPresent</td>
+ <td>Non localized definition</td>
+ <td></td>
+</tr>
+
+
+</tbody></table>
+</body>
+</html>
diff --git a/tiles-test-pom/tiles-test/src/test/selenium/TestSuite.html b/tiles-test-pom/tiles-test/src/test/selenium/TestSuite.html
index 1e2acb8..2b669eb 100644
--- a/tiles-test-pom/tiles-test/src/test/selenium/TestSuite.html
+++ b/tiles-test-pom/tiles-test/src/test/selenium/TestSuite.html
@@ -121,6 +121,9 @@
<td><a href="ConfiguredDefinitionRegexpTest.html">Configured Definition Regular Expression Test</a></td>
</tr>
<tr>
+ <td><a href="ConfiguredDefinitionWithUnderscoresTest.html">Configured Definition With Underscores Test</a></td>
+ </tr>
+ <tr>
<td><a href="PutTagTest.html">Put Tag Test</a></td>
</tr>
<tr>
@@ -319,6 +322,9 @@
<td><a href="freemarker/ConfiguredDefinitionRegexpTest.html">FreeMarker: Configured Definition Regular Expression Test</a></td>
</tr>
<tr>
+ <td><a href="freemarker/ConfiguredDefinitionWithUnderscoresTest.html">FreeMarker: Configured Definition With Underscores Test</a></td>
+ </tr>
+ <tr>
<td><a href="freemarker/PutTagTest.html">FreeMarker: Put Tag Test</a></td>
</tr>
<tr>
@@ -517,6 +523,9 @@
<td><a href="velocity/ConfiguredDefinitionRegexpTest.html">Velocity: Configured Definition Regular Expression Test</a></td>
</tr>
<tr>
+ <td><a href="velocity/ConfiguredDefinitionWithUnderscoresTest.html">Velocity: Configured Definition With Underscores Test</a></td>
+ </tr>
+ <tr>
<td><a href="velocity/PutTagTest.html">Velocity: Put Tag Test</a></td>
</tr>
<tr>
diff --git a/tiles-test-pom/tiles-test/src/test/selenium/freemarker/ConfiguredDefinitionWithUnderscoresTest.html b/tiles-test-pom/tiles-test/src/test/selenium/freemarker/ConfiguredDefinitionWithUnderscoresTest.html
new file mode 100644
index 0000000..074a4bf
--- /dev/null
+++ b/tiles-test-pom/tiles-test/src/test/selenium/freemarker/ConfiguredDefinitionWithUnderscoresTest.html
@@ -0,0 +1,52 @@
+<!--
+/*
+ * $Id$
+ *
+ * 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>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Configured Definition Test</title>
+</head>
+<body>
+<table cellpadding="1" cellspacing="1" border="1">
+<thead>
+<tr><td rowspan="1" colspan="3">Configured Definition Test</td></tr>
+</thead><tbody>
+<tr>
+ <td>open</td>
+ <td>/tiles-test/index.jsp</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAndWait</td>
+ <td>link=FreeMarker: Test underscores without localization</td>
+ <td></td>
+</tr>
+<tr>
+ <td>assertTextPresent</td>
+ <td>Non localized definition</td>
+ <td></td>
+</tr>
+
+
+</tbody></table>
+</body>
+</html>
diff --git a/tiles-test-pom/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionWithUnderscoresTest.html b/tiles-test-pom/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionWithUnderscoresTest.html
new file mode 100644
index 0000000..16fd184
--- /dev/null
+++ b/tiles-test-pom/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionWithUnderscoresTest.html
@@ -0,0 +1,52 @@
+<!--
+/*
+ * $Id$
+ *
+ * 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>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Configured Definition Test</title>
+</head>
+<body>
+<table cellpadding="1" cellspacing="1" border="1">
+<thead>
+<tr><td rowspan="1" colspan="3">Configured Definition Test</td></tr>
+</thead><tbody>
+<tr>
+ <td>open</td>
+ <td>/tiles-test/index.jsp</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAndWait</td>
+ <td>link=Velocity: Test underscores without localization</td>
+ <td></td>
+</tr>
+<tr>
+ <td>assertTextPresent</td>
+ <td>Non localized definition</td>
+ <td></td>
+</tr>
+
+
+</tbody></table>
+</body>
+</html>
diff --git a/tiles-velocity/pom.xml b/tiles-velocity/pom.xml
index 4105fe6..efc4be7e 100644
--- a/tiles-velocity/pom.xml
+++ b/tiles-velocity/pom.xml
@@ -66,8 +66,19 @@
<dependency>
<groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
<artifactId>slf4j-jdk14</artifactId>
- <optional>true</optional>
+ <scope>test</scope>
</dependency>
<dependency>
