cedric 01/09/28 09:41:46
Modified: contrib/tiles/web/doc/WEB-INF web.xml
tutorialDefinitions_fr.xml
tutorialDefinitions_de.xml tutorialDefinitions.xml
tilesDefinitions.xml
contrib/tiles/web/doc/doc/portal revisions.jsp download.jsp
contrib/tiles/web/doc/test layoutTestIgnore.jsp
contrib/tiles/web/template introduction.jsp chapter.jsp
contrib/tiles/web/doc/doc installation.html
contrib/tiles/web/channel/WEB-INF
componentDefinitions_silver.xml
componentDefinitions_gold.xml
componentDefinitions.xml
Log:
Turn validation 'on' on xml files : add requested DOCTYPE in header.
Use defintions in template example.
Revision Changes Path
1.2 +9 -0 jakarta-struts/contrib/tiles/web/doc/WEB-INF/web.xml
Index: web.xml
===================================================================
RCS file: /home/cvs/jakarta-struts/contrib/tiles/web/doc/WEB-INF/web.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- web.xml 2001/08/01 14:36:48 1.1
+++ web.xml 2001/09/28 16:41:45 1.2
@@ -19,6 +19,15 @@
<param-value>1</param-value>
</init-param>
<init-param>
+ <param-name>definitions-parser-details</param-name>
+ <param-value>0</param-value>
+ </init-param>
+ <init-param>
+ <param-name>definitions-parser-validate</param-name>
+ <param-value>true</param-value>
+ </init-param>
+
+ <init-param>
<param-name>config</param-name>
<param-value>/WEB-INF/struts-config.xml</param-value>
</init-param>
1.3 +7 -3
jakarta-struts/contrib/tiles/web/doc/WEB-INF/tutorialDefinitions_fr.xml
Index: tutorialDefinitions_fr.xml
===================================================================
RCS file:
/home/cvs/jakarta-struts/contrib/tiles/web/doc/WEB-INF/tutorialDefinitions_fr.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tutorialDefinitions_fr.xml 2001/09/10 13:11:16 1.2
+++ tutorialDefinitions_fr.xml 2001/09/28 16:41:45 1.3
@@ -1,7 +1,11 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
+<?xml version="1.0" encoding="ISO-8859-1"?>
+ <!DOCTYPE tiles-definitions PUBLIC
+ "-//Apache Software Foundation//DTD Tiles Configuration//EN"
+ "http://jakarta.apache.org/struts/dtds/tiles-config.dtd";>
+
<!-- html definition Mappings -->
-<component-definitions>
+<tiles-definitions>
<!-- Main Layout Definition description -->
<definition name="mainLayout" >
@@ -25,4 +29,4 @@
</putList>
</definition>
-</component-definitions>
+</tiles-definitions>
1.2 +7 -2
jakarta-struts/contrib/tiles/web/doc/WEB-INF/tutorialDefinitions_de.xml
Index: tutorialDefinitions_de.xml
===================================================================
RCS file:
/home/cvs/jakarta-struts/contrib/tiles/web/doc/WEB-INF/tutorialDefinitions_de.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tutorialDefinitions_de.xml 2001/08/01 14:36:48 1.1
+++ tutorialDefinitions_de.xml 2001/09/28 16:41:45 1.2
@@ -1,8 +1,13 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+ <!DOCTYPE tiles-definitions PUBLIC
+ "-//Apache Software Foundation//DTD Tiles Configuration//EN"
+ "http://jakarta.apache.org/struts/dtds/tiles-config.dtd";>
+
<!-- html definition Mappings -->
-<component-definitions>
+<tiles-definitions>
<!-- Main Layout Definition description -->
<definition name="mainLayout" path="/layout/classicLayout.jsp">
@@ -27,4 +32,4 @@
</definition>
-</component-definitions>
+</tiles-definitions>
1.3 +7 -2
jakarta-struts/contrib/tiles/web/doc/WEB-INF/tutorialDefinitions.xml
Index: tutorialDefinitions.xml
===================================================================
RCS file:
/home/cvs/jakarta-struts/contrib/tiles/web/doc/WEB-INF/tutorialDefinitions.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tutorialDefinitions.xml 2001/09/10 13:11:16 1.2
+++ tutorialDefinitions.xml 2001/09/28 16:41:45 1.3
@@ -1,4 +1,9 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
+
+ <!DOCTYPE tiles-definitions PUBLIC
+ "-//Apache Software Foundation//DTD Tiles Configuration//EN"
+ "http://jakarta.apache.org/struts/dtds/tiles-config.dtd";>
+
<!--
DTD for the Struts Application Configuration File, Version 1.1
@@ -13,7 +18,7 @@
<!-- html definition Mappings -->
-<component-definitions>
+<tiles-definitions>
<!-- Definition description -->
<definition name="myFirstDefinition" path="/tutorial/layout/classicLayout.jsp">
@@ -191,4 +196,4 @@
-</component-definitions>
+</tiles-definitions>
1.3 +5 -3
jakarta-struts/contrib/tiles/web/doc/WEB-INF/tilesDefinitions.xml
Index: tilesDefinitions.xml
===================================================================
RCS file:
/home/cvs/jakarta-struts/contrib/tiles/web/doc/WEB-INF/tilesDefinitions.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tilesDefinitions.xml 2001/09/10 13:13:04 1.2
+++ tilesDefinitions.xml 2001/09/28 16:41:45 1.3
@@ -1,8 +1,10 @@
+ <!DOCTYPE tiles-definitions PUBLIC
+ "-//Apache Software Foundation//DTD Tiles Configuration//EN"
+ "http://jakarta.apache.org/struts/dtds/tiles-config.dtd";>
-
<!-- Tiles / Components / templates definition -->
-<component-definitions>
+<tiles-definitions>
<!-- Doc index page description -->
<definition name="doc.mainLayout" path="/layout/classicLayout.jsp">
@@ -151,4 +153,4 @@
</definition>
-</component-definitions>
+</tiles-definitions>
1.3 +21 -1 jakarta-struts/contrib/tiles/web/doc/doc/portal/revisions.jsp
Index: revisions.jsp
===================================================================
RCS file: /home/cvs/jakarta-struts/contrib/tiles/web/doc/doc/portal/revisions.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- revisions.jsp 2001/09/10 13:13:04 1.2
+++ revisions.jsp 2001/09/28 16:41:45 1.3
@@ -2,6 +2,26 @@
<tr>
<th bgcolor="aqua"><FONT size=4>History</FONT></th></tr>
<TR>
+ <TD><FONT size=2><STRONG> 27 sept. 2001</STRONG> </FONT></TD></TR>
+ <TR>
+ <TD>
+ <UL>
+ <LI><FONT size=2>
+ Correct bug preventing definitions file tobe loaded when using
+ latest commons-digester.jar.</FONT>
+ <LI><FONT size=2>Remove component-config.tld
+ (replaced by tiles-config.tld).</FONT>
+ <LI><FONT size=2>Add a tilesForStruts1.0.jar file, intended for
+ Struts1.0</FONT></LI></UL></TD></TR>
+ <TR>
+ <TD><FONT size=2><STRONG> 13 sept. 2001</STRONG> </FONT></TD></TR>
+ <TR>
+ <TD>
+ <UL>
+ <LI><FONT size=2>Correct bug in
+ getAsString. Nothing is written when ignore=true and no attribute
+ is found.</FONT></LI></UL></TD></TR>
+ <TR>
<TD><FONT size=2><STRONG> 09 sept. 2001</STRONG> </FONT></TD></TR>
<TR>
<TD>
@@ -17,7 +37,7 @@
<LI><FONT size=2>modify tile attributes inside
action</FONT>
<LI><FONT size=2>associate an action with a tile,
- and this for each tile.</FONT>
+ and this for each tile.</FONT></LI>
</ul>
<LI><FONT size=2>Update and modify the "invoice"
example. </FONT></LI></UL></TD></TR>
1.3 +2 -2 jakarta-struts/contrib/tiles/web/doc/doc/portal/download.jsp
Index: download.jsp
===================================================================
RCS file: /home/cvs/jakarta-struts/contrib/tiles/web/doc/doc/portal/download.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- download.jsp 2001/09/10 13:13:04 1.2
+++ download.jsp 2001/09/28 16:41:45 1.3
@@ -15,8 +15,8 @@
You can also
download it, and additional resources, from</font> <font size="2">following
web sites :</font> </div>
<div align="center">
- <font size="2">Latest build : 2001 09 09 (with struts
2001
- 07 15 - 1.1dev)</font> </div>
+ <font size="2">Latest build : 2001 09 27 (with struts
2001
+ 09 27 - 1.1dev)</font> </div>
<div align="center">
<table border="2">
<tr>
1.2 +2 -1 jakarta-struts/contrib/tiles/web/doc/test/layoutTestIgnore.jsp
Index: layoutTestIgnore.jsp
===================================================================
RCS file: /home/cvs/jakarta-struts/contrib/tiles/web/doc/test/layoutTestIgnore.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- layoutTestIgnore.jsp 2001/08/01 14:36:46 1.1
+++ layoutTestIgnore.jsp 2001/09/28 16:41:45 1.2
@@ -13,6 +13,7 @@
<td><template:insert attribute="header" ignore="true"/></td>
</tr>
<tr>
-<td><template:insert attribute="body" ignore="true"/></td>
+<td><template:insert attribute="body" ignore="true"/>
+</td>
</tr>
</table>
1.3 +2 -7 jakarta-struts/contrib/tiles/web/template/introduction.jsp
Index: introduction.jsp
===================================================================
RCS file: /home/cvs/jakarta-struts/contrib/tiles/web/template/introduction.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- introduction.jsp 2001/09/10 13:10:17 1.2
+++ introduction.jsp 2001/09/28 16:41:45 1.3
@@ -1,12 +1,7 @@
<%@ taglib uri='/WEB-INF/struts-template.tld' prefix='template' %>
-<template:insert template='/chapterTemplate.jsp'>
- <template:put name='title' content='Templates' direct='true'/>
- <template:put name='header' content='/header.html' />
- <template:put name='sidebar' content='/sidebar.jsp' />
- <template:put name='content' content='/introduction.html'/>
- <template:put name='footer' content='/footer.html' />
-</template:insert>
+<template:insert template='introduction.page'/>
+
<%
/*
1.3 +1 -7 jakarta-struts/contrib/tiles/web/template/chapter.jsp
Index: chapter.jsp
===================================================================
RCS file: /home/cvs/jakarta-struts/contrib/tiles/web/template/chapter.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- chapter.jsp 2001/09/10 13:10:17 1.2
+++ chapter.jsp 2001/09/28 16:41:45 1.3
@@ -1,10 +1,4 @@
<%@ taglib uri='/WEB-INF/struts-template.tld'
prefix='template' %>
-<template:insert template='/chapterTemplate.jsp'>
- <template:put name='title' content='Templates' direct='true'/>
- <template:put name='header' content='/header.html' />
- <template:put name='sidebar' content='/sidebar.jsp' />
- <template:put name='content' content='/introduction.html'/>
- <template:put name='footer' content='/footer.html' />
-</template:insert>
+<template:insert template='chapter.page'/>
1.3 +11 -2 jakarta-struts/contrib/tiles/web/doc/doc/installation.html
Index: installation.html
===================================================================
RCS file: /home/cvs/jakarta-struts/contrib/tiles/web/doc/doc/installation.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- installation.html 2001/09/10 13:13:05 1.2
+++ installation.html 2001/09/28 16:41:45 1.3
@@ -26,9 +26,9 @@
<CODE>lib</CODE>directory.
However, if you wish to build Tiles from source, you will
need to download and install the following packages:
<UL>
-
<LI><EM>Beanutils</EM> (Version 1.0 or later)
+
<LI><EM>Beanutils</EM> (Version 1.1 or later)
<LI><EM>Collections</EM> (Version 1.0 or later)
-
<LI><EM>Digester</EM> (Version 1.0 or later)</LI>
+
<LI><EM>Digester</EM> (Version 1.1 or later)</LI>
</UL>
<LI><STRONG>Servlet
Container</STRONG>- You must download and install a servlet container that is
compatible with the Servlet API Specification, version 2.2 or later, and the
JavaServer Pages (JSP) Specification, version 1.1 or later. One popular choice
is to download Apache's<A href="http://jakarta.apache.org/tomcat";> Tomcat
</A> (version 3.1 or later required,
version 3.2 or later recommended).
@@ -157,6 +157,15 @@
<CODE>tiles.jar </CODE>file
(copied earlier)
on the CLASSPATH that is submitted to the compiler.</LI>
</UL></BLOCKQUOTE>
+
+<P>Note to Struts1.0 users :<BR></P>
+ <ul>
+ <li>Use <CODE>tilesForStruts1.0.jar </CODE>instead of tiles.jar
+ </li>
+ <li>Don't use both jar files in the same time</li>
+ <li><CODE>tilesForStruts1.0.jar </CODE> is located in <CODE>lib/struts1.0
</CODE></li>
+ </ul>
+
</TD>
</TR>
</TABLE>
1.2 +7 -2
jakarta-struts/contrib/tiles/web/channel/WEB-INF/componentDefinitions_silver.xml
Index: componentDefinitions_silver.xml
===================================================================
RCS file:
/home/cvs/jakarta-struts/contrib/tiles/web/channel/WEB-INF/componentDefinitions_silver.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- componentDefinitions_silver.xml 2001/08/01 14:36:44 1.1
+++ componentDefinitions_silver.xml 2001/09/28 16:41:45 1.2
@@ -1,7 +1,12 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+ <!DOCTYPE tiles-definitions PUBLIC
+ "-//Apache Software Foundation//DTD Tiles Configuration//EN"
+ "http://jakarta.apache.org/struts/dtds/tiles-config.dtd";>
+
<!-- html definition Mappings -->
-<component-definitions>
+<tiles-definitions>
<!-- Main Layout Definition description -->
<definition name="mainLayout" >
@@ -25,4 +30,4 @@
</putList>
</definition>
-</component-definitions>
+</tiles-definitions>
1.2 +7 -2
jakarta-struts/contrib/tiles/web/channel/WEB-INF/componentDefinitions_gold.xml
Index: componentDefinitions_gold.xml
===================================================================
RCS file:
/home/cvs/jakarta-struts/contrib/tiles/web/channel/WEB-INF/componentDefinitions_gold.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- componentDefinitions_gold.xml 2001/08/01 14:36:44 1.1
+++ componentDefinitions_gold.xml 2001/09/28 16:41:45 1.2
@@ -1,8 +1,13 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+ <!DOCTYPE tiles-definitions PUBLIC
+ "-//Apache Software Foundation//DTD Tiles Configuration//EN"
+ "http://jakarta.apache.org/struts/dtds/tiles-config.dtd";>
+
<!-- html definition Mappings -->
-<component-definitions>
+<tiles-definitions>
<!-- Main Layout Definition description -->
<definition name="mainLayout" path="/layout/classicLayout.jsp">
@@ -27,4 +32,4 @@
</definition>
-</component-definitions>
+</tiles-definitions>
1.2 +7 -2
jakarta-struts/contrib/tiles/web/channel/WEB-INF/componentDefinitions.xml
Index: componentDefinitions.xml
===================================================================
RCS file:
/home/cvs/jakarta-struts/contrib/tiles/web/channel/WEB-INF/componentDefinitions.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- componentDefinitions.xml 2001/08/01 14:36:44 1.1
+++ componentDefinitions.xml 2001/09/28 16:41:45 1.2
@@ -1,8 +1,13 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+ <!DOCTYPE tiles-definitions PUBLIC
+ "-//Apache Software Foundation//DTD Tiles Configuration//EN"
+ "http://jakarta.apache.org/struts/dtds/tiles-config.dtd";>
+
<!-- html definition Mappings -->
-<component-definitions>
+<tiles-definitions>
<!-- Main Layout Definition description -->
<definition name="mainLayout" path="/layout/classicLayout.jsp">
@@ -126,4 +131,4 @@
-</component-definitions>
+</tiles-definitions>
