[prev in list] [next in list] [prev in thread] [next in thread]
List: struts-dev
Subject: cvs commit: jakarta-struts/contrib/tiles/src/share/org/apache/struts/taglib/tiles InsertTag.java
From: cedric () apache ! org
Date: 2001-10-29 17:32:24
[Download RAW message or body]
cedric 01/10/29 09:32:24
Modified: contrib/tiles/src/share/org/apache/struts/tiles/xmlDefinition
XmlParser.java XmlAttribute.java
contrib/tiles/conf/share tiles-config.dtd
contrib/tiles/src/share/org/apache/struts/tiles/resources
tiles-config.dtd
contrib/tiles/web/doc/doc/portal revisions.jsp download.jsp
contrib/tiles/src/share/org/apache/struts/taglib/tiles
InsertTag.java
Log:
Allow body in <put> tag in definition.xml files
Correct bug "<insert> attribute values not changed when ignore=true" on Orion \
server.
Revision Changes Path
1.3 +13 -5 \
jakarta-struts/contrib/tiles/src/share/org/apache/struts/tiles/xmlDefinition/XmlParser.java
Index: XmlParser.java
===================================================================
RCS file: /home/cvs/jakarta-struts/contrib/tiles/src/share/org/apache/struts/tiles/xmlDefinition/XmlParser.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XmlParser.java 2001/09/28 17:05:22 1.2
+++ XmlParser.java 2001/10/29 17:32:24 1.3
@@ -118,8 +118,9 @@
digester.addSetNext( DEFINITION_TAG, "putDefinition", \
definitionHandlerClass); // put / putAttribute rules
digester.addObjectCreate( PUT_TAG, putAttributeHandlerClass);
- digester.addSetProperties( PUT_TAG);
digester.addSetNext( PUT_TAG, "addAttribute", putAttributeHandlerClass);
+ digester.addSetProperties( PUT_TAG);
+ digester.addCallMethod( PUT_TAG, "setBody", 0);
// list rules
digester.addObjectCreate( LIST_TAG, listHandlerClass);
digester.addSetProperties( LIST_TAG);
@@ -128,8 +129,9 @@
// We use Attribute class to avoid rewriting a new class.
// Name part can't be used in listElement attribute.
digester.addObjectCreate( ADD_LIST_ELE_TAG, putAttributeHandlerClass);
- digester.addSetProperties( ADD_LIST_ELE_TAG);
digester.addSetNext( ADD_LIST_ELE_TAG, "add", putAttributeHandlerClass);
+ digester.addSetProperties( ADD_LIST_ELE_TAG);
+ digester.addCallMethod( ADD_LIST_ELE_TAG, "setBody", 0);
}
/**
@@ -157,9 +159,14 @@
digester.addSetProperties( DEFINITION_TAG);
digester.addSetNext( DEFINITION_TAG, "putDefinition", \
definitionHandlerClass); // put / putAttribute rules
+ // Rules for a same pattern are called in order, but rule.end() are called
+ // in reverse order.
+ // SetNext and CallMethod use rule.end() method. So, placing SetNext in
+ // first position ensure it will be called last (sic).
digester.addObjectCreate( PUT_TAG, putAttributeHandlerClass);
- digester.addSetProperties( PUT_TAG);
digester.addSetNext( PUT_TAG, "addAttribute", putAttributeHandlerClass);
+ digester.addSetProperties( PUT_TAG);
+ digester.addCallMethod( PUT_TAG, "setBody", 0);
// list rules
digester.addObjectCreate( LIST_TAG, listHandlerClass);
digester.addSetProperties( LIST_TAG);
@@ -168,8 +175,9 @@
// We use Attribute class to avoid rewriting a new class.
// Name part can't be used in listElement attribute.
digester.addObjectCreate( ADD_LIST_ELE_TAG, putAttributeHandlerClass);
- digester.addSetProperties( ADD_LIST_ELE_TAG);
digester.addSetNext( ADD_LIST_ELE_TAG, "add", putAttributeHandlerClass);
+ digester.addSetProperties( ADD_LIST_ELE_TAG);
+ digester.addCallMethod( ADD_LIST_ELE_TAG, "setBody", 0);
}
/**
@@ -291,7 +299,7 @@
{
XmlParser parser = new XmlParser();
parser.setValidating(true);
- parser.setDetailLevel(1);
+ parser.setDetailLevel(2);
XmlDefinitionsSet definitions = new XmlDefinitionsSet();
System.out.println( " Parse file" );
parser.parse( input, definitions);
1.3 +14 -1 \
jakarta-struts/contrib/tiles/src/share/org/apache/struts/tiles/xmlDefinition/XmlAttribute.java
Index: XmlAttribute.java
===================================================================
RCS file: /home/cvs/jakarta-struts/contrib/tiles/src/share/org/apache/struts/tiles/xmlDefinition/XmlAttribute.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XmlAttribute.java 2001/09/10 12:57:26 1.2
+++ XmlAttribute.java 2001/10/29 17:32:24 1.3
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-struts/contrib/tiles/src/share/org/apache/struts/tiles/xmlDefinition/XmlAttribute.java,v \
1.2 2001/09/10 12:57:26 cedric Exp $
- * $Revision: 1.2 $
- * $Date: 2001/09/10 12:57:26 $
+ * $Header: /home/cvs/jakarta-struts/contrib/tiles/src/share/org/apache/struts/tiles/xmlDefinition/XmlAttribute.java,v \
1.3 2001/10/29 17:32:24 cedric Exp $ + * $Revision: 1.3 $
+ * $Date: 2001/10/29 17:32:24 $
* $Author: cedric $
*
*/
@@ -154,6 +154,7 @@
*/
public void setValue(Object aValue)
{
+ realValue=null;
value = aValue;
}
@@ -164,7 +165,19 @@
*/
public void setContent(Object aValue)
{
- value = aValue;
+ setValue(aValue);
+ }
+ /**
+ * Sets the value of the value property.
+ *
+ * @param aValue the new value of the value property
+ */
+ public void setBody(String body)
+ {
+ if( body.length() == 0 )
+ return;
+ //System.out.println("body set to'" + body + "'");
+ setValue(body);
}
/**
* Sets the value of the value property.
1.3 +2 -2 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tiles-config.dtd 2001/09/28 16:51:56 1.2
+++ tiles-config.dtd 2001/10/29 17:32:24 1.3
@@ -9,7 +9,7 @@
"-//Apache Software Foundation//DTD Tiles Configuration//EN"
"http://jakarta.apache.org/struts/dtds/tiles-config.dtd">
- $Id: tiles-config.dtd,v 1.2 2001/09/28 16:51:56 cedric Exp $
+ $Id: tiles-config.dtd,v 1.3 2001/10/29 17:32:24 cedric Exp $
-->
<!ELEMENT component-definitions (definition+)>
<!ELEMENT tiles-definitions (definition+)>
@@ -21,10 +21,10 @@
role CDATA #IMPLIED
template CDATA #IMPLIED
>
-<!ELEMENT put EMPTY>
+<!ELEMENT put (#PCDATA)>
<!ATTLIST put
name CDATA #REQUIRED
- value CDATA #REQUIRED
+ value CDATA #IMPLIED
type (string | page | template | definition) #IMPLIED
content CDATA #IMPLIED
direct (true | false) #IMPLIED
1.2 +3 -3 \
jakarta-struts/contrib/tiles/src/share/org/apache/struts/tiles/resources/tiles-config.dtd
Index: tiles-config.dtd
===================================================================
RCS file: /home/cvs/jakarta-struts/contrib/tiles/src/share/org/apache/struts/tiles/resources/tiles-config.dtd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tiles-config.dtd 2001/08/01 14:36:42 1.1
+++ tiles-config.dtd 2001/10/29 17:32:24 1.2
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XML Spy v3.5 NT (http://www.xmlspy.com) by lifl (lifl) -->
+<!-- edited with XML Spy v3.5 NT (http://www.xmlspy.com) by () -->
<!--DTD generated by XML Spy v3.5 NT (http://www.xmlspy.com)-->
<!ELEMENT component-definitions (definition+)>
<!ELEMENT tiles-definitions (definition+)>
@@ -11,10 +11,10 @@
role CDATA #IMPLIED
template CDATA #IMPLIED
>
-<!ELEMENT put EMPTY>
+<!ELEMENT put (#PCDATA)>
<!ATTLIST put
name CDATA #REQUIRED
- value CDATA #REQUIRED
+ value CDATA #IMPLIED
type (string | page | template | definition) #IMPLIED
content CDATA #IMPLIED
direct (true | false) #IMPLIED
1.5 +12 -0 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- revisions.jsp 2001/10/08 13:50:10 1.4
+++ revisions.jsp 2001/10/29 17:32:24 1.5
@@ -2,6 +2,18 @@
<tr>
<th bgcolor="aqua"><FONT size=4>History</FONT></th></tr>
<TR>
+ <TD><FONT size=2><STRONG> 29 oct. 2001</STRONG> </FONT></TD></TR>
+ <TR>
+ <TD>
+ <UL>
+ <LI><FONT size=2>
+ Allow body
+ content in tag
+ <put> and <add> in
+ xml files</FONT>
+ <LI><FONT size=2>Correct bug with Orion : "insert tag attribute not
+ reset when ignore=true".</FONT></LI></UL></TD></TR>
+ <TR>
<TD><FONT size=2><STRONG> 08 oct. 2001</STRONG> </FONT></TD></TR>
<TR>
<TD>
1.5 +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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- download.jsp 2001/10/08 13:50:10 1.4
+++ download.jsp 2001/10/29 17:32:24 1.5
@@ -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 10 08 (with struts 2001
- 09 27 - 1.1dev)</font> </div>
+ <font size="2"> Latest build : 2001 10 29 (with struts \
2001 10 + 15 - 1.1dev)</font> </div>
<div align="center">
<table border="2">
<tr>
1.3 +3 -0 \
jakarta-struts/contrib/tiles/src/share/org/apache/struts/taglib/tiles/InsertTag.java \
Index: InsertTag.java
===================================================================
RCS file: /home/cvs/jakarta-struts/contrib/tiles/src/share/org/apache/struts/taglib/tiles/InsertTag.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- InsertTag.java 2001/09/28 17:00:11 1.2
+++ InsertTag.java 2001/10/29 17:32:24 1.3
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-struts/contrib/tiles/src/share/org/apache/struts/taglib/tiles/InsertTag.java,v \
1.2 2001/09/28 17:00:11 cedric Exp $
- * $Revision: 1.2 $
- * $Date: 2001/09/28 17:00:11 $
+ * $Header: /home/cvs/jakarta-struts/contrib/tiles/src/share/org/apache/struts/taglib/tiles/InsertTag.java,v \
1.3 2001/10/29 17:32:24 cedric Exp $ + * $Revision: 1.3 $
+ * $Date: 2001/10/29 17:32:24 $
* $Author: cedric $
*
*/
@@ -41,7 +41,7 @@
*
* @author David Geary
* @author Cedric Dumoulin
- * @version $Revision: 1.2 $ $Date: 2001/09/28 17:00:11 $
+ * @version $Revision: 1.3 $ $Date: 2001/10/29 17:32:24 $
*/
public class InsertTag extends TagSupport implements PutTagParent, \
ComponentConstants, PutListTagParent {
@@ -360,7 +360,10 @@
public int doEndTag() throws JspException
{
if( !processEndTag )
+ {
+ releaseInternal();
return EVAL_PAGE;
+ }
int res = tagHandler.doEndTag();
// Reset properties used by object, in order to be able to reuse object.
--
To unsubscribe, e-mail: <mailto:struts-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:struts-dev-help@jakarta.apache.org>
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic