Author: wsmoak Date: Sun Sep 17 15:42:39 2006 New Revision: 447164 URL: http://svn.apache.org/viewvc?view=rev&rev=447164 Log: Initial update of the 2.0 DTD which was copied from the 1.1 version. Register the new version with Digester, fix the comments in the DTD, and update the test app. SB-30
Modified: struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/digester/DigesterDefinitionsReader.java struts/sandbox/trunk/tiles/tiles-core/src/main/resources/org/apache/tiles/resources/tiles-config_2_0.dtd struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/WEB-INF/tiles-defs.xml Modified: struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/digester/DigesterDefinitionsReader.java URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/digester/DigesterDefinitionsReader.java?view=diff&rev=447164&r1=447163&r2=447164 ============================================================================== --- struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/digester/DigesterDefinitionsReader.java (original) +++ struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/digester/DigesterDefinitionsReader.java Sun Sep 17 15:42:39 2006 @@ -83,6 +83,8 @@ "/org/apache/tiles/resources/tiles-config_1_1.dtd", "-//Apache Software Foundation//DTD Tiles Configuration 1.2//EN", "/org/apache/tiles/resources/tiles-config_1_2.dtd", + "-//Apache Software Foundation//DTD Tiles Configuration 2.0//EN", + "/org/apache/tiles/resources/tiles-config_2_0.dtd" }; /** Modified: struts/sandbox/trunk/tiles/tiles-core/src/main/resources/org/apache/tiles/resources/tiles-config_2_0.dtd URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-core/src/main/resources/org/apache/tiles/resources/tiles-config_2_0.dtd?view=diff&rev=447164&r1=447163&r2=447164 ============================================================================== --- struts/sandbox/trunk/tiles/tiles-core/src/main/resources/org/apache/tiles/resources/tiles-config_2_0.dtd (original) +++ struts/sandbox/trunk/tiles/tiles-core/src/main/resources/org/apache/tiles/resources/tiles-config_2_0.dtd Sun Sep 17 15:42:39 2006 @@ -1,12 +1,12 @@ <!-- - DTD for the Tile Definition File, Version 1.1 + DTD for the Tile Definition File, Version 2.0 To support validation of your configuration file, include the following DOCTYPE element at the beginning (after the "xml" declaration): <!DOCTYPE tiles-definitions PUBLIC - "-//Apache Software Foundation//DTD Tiles Configuration 1.1//EN" - "http://struts.apache.org/dtds/tiles-config_1_1.dtd"> + "-//Apache Software Foundation//DTD Tiles Configuration 2.0//EN" + "http://struts.apache.org/dtds/tiles-config_2_0.dtd"> $Id: tiles-config_1_1.dtd 51703 2004-09-01 10:41:11Z niallp $ --> Modified: struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/WEB-INF/tiles-defs.xml URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/WEB-INF/tiles-defs.xml?view=diff&rev=447164&r1=447163&r2=447164 ============================================================================== --- struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/WEB-INF/tiles-defs.xml (original) +++ struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/WEB-INF/tiles-defs.xml Sun Sep 17 15:42:39 2006 @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="ISO-8859-1" ?> <!DOCTYPE tiles-definitions PUBLIC - "-//Apache Software Foundation//DTD Tiles Configuration 1.1//EN" - "http://struts.apache.org/dtds/tiles-config_1_1.dtd"> + "-//Apache Software Foundation//DTD Tiles Configuration 2.0//EN" + "http://struts.apache.org/dtds/tiles-config_2_0.dtd"> <!-- Definitions for Tiles documentation -->