cedric 01/12/27 09:44:12
Modified: contrib/tiles build.properties.sample
contrib/tiles/conf/share tiles-config.dtd
contrib/tiles/doc tiles.xml
Log:
Add controller tag entry in dtd and tld
Revision Changes Path
1.3 +2 -1 jakarta-struts/contrib/tiles/build.properties.sample
Index: build.properties.sample
===================================================================
RCS file: /home/cvs/jakarta-struts/contrib/tiles/build.properties.sample,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- build.properties.sample 2001/09/10 13:16:55 1.2
+++ build.properties.sample 2001/12/27 17:44:12 1.3
@@ -6,7 +6,7 @@
# to "build.properties" in the same directory that contains the Struts
# "build.xml" file.
#
-# $Id: build.properties.sample,v 1.2 2001/09/10 13:16:55 cedric Exp $
+# $Id: build.properties.sample,v 1.3 2001/12/27 17:44:12 cedric Exp $
# -----------------------------------------------------------------------------
# WARNING: The relative paths below assume that the build.xml file is in the
@@ -27,6 +27,7 @@
# The directory containing your binary distribution of Struts
# (CVS module "jakarta-servletapi" at jakarta.apache.org).
struts.home=../struts
+#struts1.0.home=../struts1.0
# The directory containing your binary distribution of Tomcat 3.2, from CVS
# module "jakarta-tomcat" (and branch "TOMCAT_32") at jakarta.apache.org.
1.4 +22 -3 jakarta-struts/contrib/tiles/conf/share/tiles-config.dtd
Index: tiles-config.dtd
===================================================================
RCS file: /home/cvs/jakarta-struts/contrib/tiles/conf/share/tiles-config.dtd,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- tiles-config.dtd 2001/10/29 17:32:24 1.3
+++ tiles-config.dtd 2001/12/27 17:44:12 1.4
@@ -9,17 +9,20 @@
"-//Apache Software Foundation//DTD Tiles Configuration//EN"
"http://jakarta.apache.org/struts/dtds/tiles-config.dtd">
- $Id: tiles-config.dtd,v 1.3 2001/10/29 17:32:24 cedric Exp $
+ $Id: tiles-config.dtd,v 1.4 2001/12/27 17:44:12 cedric Exp $
-->
<!ELEMENT component-definitions (definition+)>
<!ELEMENT tiles-definitions (definition+)>
<!ELEMENT definition (put*, putList*)>
<!ATTLIST definition
name CDATA #REQUIRED
+ page CDATA #IMPLIED
path CDATA #IMPLIED
extends CDATA #IMPLIED
role CDATA #IMPLIED
template CDATA #IMPLIED
+ controllerClass CDATA #IMPLIED
+ controllerUrl CDATA #IMPLIED
>
<!ELEMENT put (#PCDATA)>
<!ATTLIST put
@@ -29,14 +32,30 @@
content CDATA #IMPLIED
direct (true | false) #IMPLIED
>
-<!ELEMENT putList (add+)>
+<!ELEMENT putList ( (add* | item* | bean*)+) >
<!ATTLIST putList
name CDATA #REQUIRED
>
-<!ELEMENT add EMPTY>
+<!ELEMENT putListElements (add | item | bean)>
+
+<!ELEMENT add (#PCDATA)>
<!ATTLIST add
- value CDATA #REQUIRED
+ value CDATA #IMPLIED
type (string | page | template | definition) #IMPLIED
content CDATA #IMPLIED
direct (true | false) #IMPLIED
+>
+
+<!ELEMENT bean (#PCDATA)>
+<!ATTLIST bean
+ classtype CDATA #REQUIRED
+>
+
+<!ELEMENT item (#PCDATA)>
+<!ATTLIST item
+ value CDATA #REQUIRED
+ link CDATA #REQUIRED
+ classtype CDATA #IMPLIED
+ icon CDATA #IMPLIED
+ tooltip CDATA #IMPLIED
>
1.3 +32 -0 jakarta-struts/contrib/tiles/doc/tiles.xml
Index: tiles.xml
===================================================================
RCS file: /home/cvs/jakarta-struts/contrib/tiles/doc/tiles.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tiles.xml 2001/09/10 13:07:40 1.2
+++ tiles.xml 2001/12/27 17:44:12 1.3
@@ -201,6 +201,38 @@
</info>
</attribute>
+ <attribute>
+ <name>controllerUrl</name>
+ <required>false</required>
+ <rtexprvalue>false</rtexprvalue>
+ <info>
+ Url of a controller called immediately before page is inserted.<br></br>
+ Url usually denote a Struts action. Controller (action) is used to prepare
data
+ to be render by inserted Tile.
+ <br></br>
+ See also controlerClass
+ </info>
+ </attribute>
+
+ <attribute>
+ <name>controllerClass</name>
+ <required>false</required>
+ <rtexprvalue>false</rtexprvalue>
+ <info>
+ Class type of a controller called immediately before page is
inserted.<br></br>
+ Controller is used to prepare data to be render by inserted Tile.
+ <br></br>
+ See also controlerUrl
+ <br></br>
+ Class must implements or extends one of the following :
+ <ul>
+ <li>org.apache.struts.tiles.Controller</li>
+ <li>org.apache.struts.tiles.ControllerSupport</li>
+ <li>org.apache.struts.action.Action (wrapper
org.apache.struts.action.ActionController is used)</li>
+ </ul>
+ </info>
+ </attribute>
+
</tag>
<tag>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>