[cvs] expresso commit by rimovm: Fixed Bad DTD Doctype that was preventing

[JCorporate Ltd]

Log Message:
-----------
Fixed Bad DTD Doctype that was preventing proper entity resolving by Digester upon startup for Tiles

Modified Files:
--------------
    expresso/expresso-web/WEB-INF/config:
        tiles-defs.xml
    expresso/expresso-web/WEB-INF/tiles-definitions:
        expresso-page.xml

Revision Data
-------------
Index: tiles-defs.xml
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/config/tiles-defs.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -Lexpresso-web/WEB-INF/config/tiles-defs.xml -Lexpresso-web/WEB-INF/config/tiles-defs.xml -u -r1.3 -r1.4
--- expresso-web/WEB-INF/config/tiles-defs.xml
+++ expresso-web/WEB-INF/config/tiles-defs.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration//EN"
+<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 1.1//EN"
        "http://struts.apache.org/dtds/tiles-config_1_1.dtd">
 <!-- Definitions for Tiles documentation   -->
 <tiles-definitions>
Index: expresso-page.xml
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/tiles-definitions/expresso-page.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -Lexpresso-web/WEB-INF/tiles-definitions/expresso-page.xml -Lexpresso-web/WEB-INF/tiles-definitions/expresso-page.xml -u -r1.6 -r1.7
--- expresso-web/WEB-INF/tiles-definitions/expresso-page.xml
+++ expresso-web/WEB-INF/tiles-definitions/expresso-page.xml
@@ -1,20 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--  the following DOCTYPE URL, if uncommented, will cause Expresso to REQUIRE
-a network connection in order to start up properly (in order to fetch
-the DTD from the URL given).
-Therefore, it is
-best to leave this DOCTYPE definition commmented out, which will allow
-expresso to start up even if network is unavailable at startup time.
-
-An alternative is to provide a local file URL like WEB-INF/config/tiles-config_1_1.dtd
-but this also provides a potential for problems because this path depends on where
-the servlet engine establishes the home directory.
-
-LAH 1/05
- -->
-
-<!--<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration//EN"-->
-<!--       "http://struts.apache.org/dtds/tiles-config_1_1.dtd">-->
+<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 1.1//EN"
+       "http://struts.apache.org/dtds/tiles-config_1_1.dtd">
 <tiles-definitions>
     <!-- html definition Mappings  -->
     <!-- Definition description  -->