You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tiles.apache.org by ap...@apache.org on 2007/10/16 21:58:12 UTC
svn commit: r585239 - in /tiles/framework/trunk:
tiles-compat/src/main/java/org/apache/tiles/compat/definition/digester/
tiles-compat/src/test/java/org/apache/tiles/compat/definition/digester/
tiles-compat/src/test/java/org/apache/tiles/config/ tiles-c...
Author: apetrelli
Date: Tue Oct 16 12:58:11 2007
New Revision: 585239
URL: http://svn.apache.org/viewvc?rev=585239&view=rev
Log:
TILES-156
Corrected use of the registrations.
Corrected test case that reads an old-format Tiles definition files.
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-compat/src/test/java/org/apache/tiles/config/tiles-defs-1.1.xml
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/digester/DigesterDefinitionsReader.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=585239&r1=585238&r2=585239&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 Tue Oct 16 12:58:11 2007
@@ -36,15 +36,7 @@
* versions of the configuration file DTDs we know about. There <strong>MUST</strong>
* be an even number of Strings in this list!
*/
- protected String[] registrations = {
- "-//Apache Software Foundation//DTD Tiles Configuration 2.0//EN",
- "/org/apache/tiles/resources/tiles-config_2_0.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",
- "/org/apache/tiles/compat/resources/tiles-config_1_3.dtd",
- "-//Apache Software Foundation//DTD Tiles Configuration 1.4//EN",
- "/org/apache/tiles/compat/resources/tiles-config_1_4.dtd" };
+ protected String[] registrations;
/** {@inheritDoc} */
@Override
@@ -196,6 +188,17 @@
/** {@inheritDoc} */
protected String[] getRegistrations() {
+ if (registrations == null) {
+ 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 1.1//EN",
+ "/org/apache/tiles/compat/resources/tiles-config_1_1.dtd",
+ "-//Apache Software Foundation//DTD Tiles Configuration 1.3//EN",
+ "/org/apache/tiles/compat/resources/tiles-config_1_3.dtd",
+ "-//Apache Software Foundation//DTD Tiles Configuration 1.4//EN",
+ "/org/apache/tiles/compat/resources/tiles-config_1_4.dtd"};
+ }
return registrations;
}
}
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=585239&r1=585238&r2=585239&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 Tue Oct 16 12:58:11 2007
@@ -21,6 +21,7 @@
package org.apache.tiles.compat.definition.digester;
+import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
import java.util.HashMap;
@@ -68,59 +69,49 @@
/**
* Tests the read method to read Tiles 1.1 files.
*/
- public void testReadOldFormat() {
- try {
- DefinitionsReader reader = new CompatibilityDigesterDefinitionsReader();
- reader.init(new HashMap<String, String>());
-
- URL configFile = this.getClass().getClassLoader().getResource(
- "org/apache/tiles/config/tiles-defs-1.1.xml");
- assertNotNull("Config file not found", configFile);
-
- InputStream source = configFile.openStream();
- Map<String, Definition> definitions = reader.read(source);
-
- assertNotNull("Definitions not returned.", definitions);
- assertNotNull("Couldn't find doc.mainLayout tile.",
- definitions.get("doc.mainLayout"));
- assertNotNull("Couldn't Find title attribute.", definitions.get(
- "doc.mainLayout").getAttribute("title").getValue());
- assertEquals("Incorrect Find title attribute.",
- "Tiles Library Documentation", definitions.get(
- "doc.mainLayout").getAttribute("title").getValue());
-
- } catch (Exception e) {
- fail("Exception reading configuration." + e);
- }
+ public void testReadOldFormat() throws DefinitionsFactoryException, IOException {
+ DefinitionsReader reader = new CompatibilityDigesterDefinitionsReader();
+ reader.init(new HashMap<String, String>());
+
+ URL configFile = this.getClass().getClassLoader().getResource(
+ "org/apache/tiles/config/tiles-defs-1.1.xml");
+ assertNotNull("Config file not found", configFile);
+
+ InputStream source = configFile.openStream();
+ Map<String, Definition> definitions = reader.read(source);
+
+ assertNotNull("Definitions not returned.", definitions);
+ assertNotNull("Couldn't find doc.mainLayout tile.",
+ definitions.get("doc.mainLayout"));
+ assertNotNull("Couldn't Find title attribute.", definitions.get(
+ "doc.mainLayout").getAttribute("title").getValue());
+ assertEquals("Incorrect Find title attribute.",
+ "Tiles Library Documentation", definitions.get(
+ "doc.mainLayout").getAttribute("title").getValue());
}
/**
* Tests the read method to read Tiles 2.0 files.
*/
- public void testReadNewFormat() {
- try {
- DefinitionsReader reader = new CompatibilityDigesterDefinitionsReader();
- reader.init(new HashMap<String, String>());
-
- URL configFile = this.getClass().getClassLoader().getResource(
- "org/apache/tiles/config/tiles-defs-2.0.xml");
- assertNotNull("Config file not found", configFile);
-
- InputStream source = configFile.openStream();
- Map<String, Definition> definitions = reader.read(source);
-
- assertNotNull("Definitions not returned.", definitions);
- assertNotNull("Couldn't find doc.mainLayout tile.",
- definitions.get("doc.mainLayout"));
- assertNotNull("Couldn't Find title attribute.", definitions.get(
- "doc.mainLayout").getAttribute("title").getValue());
- assertEquals("Incorrect Find title attribute.",
- "Tiles Library Documentation", definitions.get(
- "doc.mainLayout").getAttribute("title").getValue());
-
- } catch (Exception e) {
- fail("Exception reading configuration." + e);
- }
+ public void testReadNewFormat() throws DefinitionsFactoryException, IOException {
+ DefinitionsReader reader = new CompatibilityDigesterDefinitionsReader();
+ reader.init(new HashMap<String, String>());
+
+ URL configFile = this.getClass().getClassLoader().getResource(
+ "org/apache/tiles/config/tiles-defs-2.0.xml");
+ assertNotNull("Config file not found", configFile);
+
+ InputStream source = configFile.openStream();
+ Map<String, Definition> definitions = reader.read(source);
+
+ assertNotNull("Definitions not returned.", definitions);
+ assertNotNull("Couldn't find doc.mainLayout tile.",
+ definitions.get("doc.mainLayout"));
+ assertNotNull("Couldn't Find title attribute.", definitions.get(
+ "doc.mainLayout").getAttribute("title").getValue());
+ assertEquals("Incorrect Find title attribute.",
+ "Tiles Library Documentation", definitions.get(
+ "doc.mainLayout").getAttribute("title").getValue());
}
/**
Modified: tiles/framework/trunk/tiles-compat/src/test/java/org/apache/tiles/config/tiles-defs-1.1.xml
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-compat/src/test/java/org/apache/tiles/config/tiles-defs-1.1.xml?rev=585239&r1=585238&r2=585239&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-compat/src/test/java/org/apache/tiles/config/tiles-defs-1.1.xml (original)
+++ tiles/framework/trunk/tiles-compat/src/test/java/org/apache/tiles/config/tiles-defs-1.1.xml Tue Oct 16 12:58:11 2007
@@ -23,7 +23,7 @@
-->
<!DOCTYPE tiles-definitions PUBLIC
- "-//Apache Software Foundation//DTD Tiles Configuration 2.0//EN"
+ "-//Apache Software Foundation//DTD Tiles Configuration 1.1//EN"
"http://struts.apache.org/dtds/tiles-config_1_1.dtd">
<!-- Definitions for Tiles documentation -->
Modified: tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/digester/DigesterDefinitionsReader.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/digester/DigesterDefinitionsReader.java?rev=585239&r1=585238&r2=585239&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/digester/DigesterDefinitionsReader.java (original)
+++ tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/digester/DigesterDefinitionsReader.java Tue Oct 16 12:58:11 2007
@@ -179,10 +179,7 @@
* the versions of the configuration file DTDs we know about. There
* <strong>MUST</strong> be an even number of Strings in this list!
*/
- protected String[] registrations = {
- "-//Apache Software Foundation//DTD Tiles Configuration 2.0//EN",
- "/org/apache/tiles/resources/tiles-config_2_0.dtd"
- };
+ protected String[] registrations;
/**
* Indicates whether init method has been called.
@@ -399,6 +396,11 @@
* DTDs.
*/
protected String[] getRegistrations() {
+ if (registrations == null) {
+ registrations = new String[] {
+ "-//Apache Software Foundation//DTD Tiles Configuration 2.0//EN",
+ "/org/apache/tiles/resources/tiles-config_2_0.dtd"};
+ }
return registrations;
}
}