Author: apetrelli
Date: Sat Feb 16 08:01:46 2008
New Revision: 628334
URL: http://svn.apache.org/viewvc?rev=628334&view=rev
Log:
TILES-208
Fixed Compatibility Digester definitions reader.
Fixed JUnit tests for digester definitions reader.
Added:
tiles/framework/trunk/tiles-compat/src/test/java/org/apache/tiles/config/tiles-defs-2.1.xml
(with props)
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/config/tiles-defs-2.1.xml
- copied unchanged from r628150,
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/config/tiles-defs-2-1.xml
Removed:
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/config/tiles-defs-2-1.xml
Modified:
tiles/framework/trunk/tiles-compat/src/main/java/org/apache/tiles/compat/definition/digester/CompatibilityDigesterDefinitionsReader.java
tiles/framework/trunk/tiles-compat/src/test/java/org/apache/tiles/compat/definition/digester/TestCompatibilityDigesterDefinitionsReader.java
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/digester/TestDigesterDefinitionsReader.java
Modified:
tiles/framework/trunk/tiles-compat/src/main/java/org/apache/tiles/compat/definition/digester/CompatibilityDigesterDefinitionsReader.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-compat/src/main/java/org/apache/tiles/compat/definition/digester/CompatibilityDigesterDefinitionsReader.java?rev=628334&r1=628333&r2=628334&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-compat/src/main/java/org/apache/tiles/compat/definition/digester/CompatibilityDigesterDefinitionsReader.java
(original)
+++
tiles/framework/trunk/tiles-compat/src/main/java/org/apache/tiles/compat/definition/digester/CompatibilityDigesterDefinitionsReader.java
Sat Feb 16 08:01:46 2008
@@ -190,6 +190,8 @@
registrations = new String[] {
"-//Apache Software Foundation//DTD Tiles Configuration
2.0//EN",
"/org/apache/tiles/resources/tiles-config_2_0.dtd",
+ "-//Apache Software Foundation//DTD Tiles Configuration
2.1//EN",
+ "/org/apache/tiles/resources/tiles-config_2_1.dtd",
"-//Apache Software Foundation//DTD Tiles Configuration
1.1//EN",
"/org/apache/tiles/compat/resources/tiles-config_1_1.dtd",
"-//Apache Software Foundation//DTD Tiles Configuration
1.3//EN",
Modified:
tiles/framework/trunk/tiles-compat/src/test/java/org/apache/tiles/compat/definition/digester/TestCompatibilityDigesterDefinitionsReader.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-compat/src/test/java/org/apache/tiles/compat/definition/digester/TestCompatibilityDigesterDefinitionsReader.java?rev=628334&r1=628333&r2=628334&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-compat/src/test/java/org/apache/tiles/compat/definition/digester/TestCompatibilityDigesterDefinitionsReader.java
(original)
+++
tiles/framework/trunk/tiles-compat/src/test/java/org/apache/tiles/compat/definition/digester/TestCompatibilityDigesterDefinitionsReader.java
Sat Feb 16 08:01:46 2008
@@ -32,9 +32,11 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.tiles.Attribute;
import org.apache.tiles.Definition;
import org.apache.tiles.definition.DefinitionsFactoryException;
import org.apache.tiles.definition.DefinitionsReader;
+import org.apache.tiles.definition.digester.DigesterDefinitionsReader;
/**
* Tests the
<code>org.apache.tiles.definition.digester.DigesterDefinitionsReader</code>
class.
@@ -118,6 +120,39 @@
assertEquals("Incorrect Find title attribute.",
"Tiles Library Documentation", definitions.get(
"doc.mainLayout").getAttribute("title").getValue());
+ }
+
+ /**
+ * Tests the read method under normal conditions for the new features in
2.1
+ * version of the DTD.
+ */
+ public void testRead21Version() {
+ try {
+ DefinitionsReader reader = new DigesterDefinitionsReader();
+ reader.init(new HashMap<String, String>());
+
+ URL configFile = this.getClass().getClassLoader().getResource(
+ "org/apache/tiles/config/tiles-defs-2.1.xml");
+ assertNotNull("Config file not found", configFile);
+
+ InputStream source = configFile.openStream();
+ Map<String, Definition> definitions = reader.read(source);
+
+ assertNotNull("Definitions not returned.", definitions);
+ Definition def = definitions.get("doc.cascaded.test");
+
+ assertNotNull("Couldn't find doc.role.test tile.", def);
+ Attribute attribute = def.getLocalAttribute("title");
+ assertNotNull("Couldn't Find title local attribute.", attribute);
+ attribute = def.getCascadedAttribute("title2");
+ assertNotNull("Couldn't Find title2 cascaded attribute.",
attribute);
+ attribute = def.getLocalAttribute("items1");
+ assertNotNull("Couldn't Find items1 local attribute.", attribute);
+ attribute = def.getCascadedAttribute("items2");
+ assertNotNull("Couldn't Find items2 cascaded attribute.",
attribute);
+ } catch (Exception e) {
+ fail("Exception reading configuration." + e);
+ }
}
/**
Added:
tiles/framework/trunk/tiles-compat/src/test/java/org/apache/tiles/config/tiles-defs-2.1.xml
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-compat/src/test/java/org/apache/tiles/config/tiles-defs-2.1.xml?rev=628334&view=auto
==============================================================================
---
tiles/framework/trunk/tiles-compat/src/test/java/org/apache/tiles/config/tiles-defs-2.1.xml
(added)
+++
tiles/framework/trunk/tiles-compat/src/test/java/org/apache/tiles/config/tiles-defs-2.1.xml
Sat Feb 16 08:01:46 2008
@@ -0,0 +1,43 @@
+<?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.1//EN"
+ "http://tiles.apache.org/dtds/tiles-config_2_1.dtd";>
+
+<!-- Definitions for Tiles documentation -->
+
+<tiles-definitions>
+ <definition name="doc.cascaded.test" template="/layout/classicLayout.jsp">
+ <put-attribute name="title" value="Test title" cascade="false" />
+ <put-attribute name="title2" value="Test title two" cascade="true" />
+ <put-list-attribute name="items1" cascade="false">
+ <add-attribute value="value1" type="string" />
+ </put-list-attribute>
+ <put-list-attribute name="items2" cascade="true">
+ <add-attribute value="value2" type="string" />
+ </put-list-attribute>
+ </definition>
+
+</tiles-definitions>
Propchange:
tiles/framework/trunk/tiles-compat/src/test/java/org/apache/tiles/config/tiles-defs-2.1.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
tiles/framework/trunk/tiles-compat/src/test/java/org/apache/tiles/config/tiles-defs-2.1.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified:
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/digester/TestDigesterDefinitionsReader.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/digester/TestDigesterDefinitionsReader.java?rev=628334&r1=628333&r2=628334&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/digester/TestDigesterDefinitionsReader.java
(original)
+++
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/digester/TestDigesterDefinitionsReader.java
Sat Feb 16 08:01:46 2008
@@ -124,7 +124,7 @@
reader.init(new HashMap<String, String>());
URL configFile = this.getClass().getClassLoader().getResource(
- "org/apache/tiles/config/tiles-defs-2-1.xml");
+ "org/apache/tiles/config/tiles-defs-2.1.xml");
assertNotNull("Config file not found", configFile);
InputStream source = configFile.openStream();
