yoavs 2004/12/03 09:02:25
Modified: webapps/admin Tag: TOMCAT_5_0 tree-control-test.jsp
webapps/admin/WEB-INF/classes/org/apache/webapp/admin Tag:
TOMCAT_5_0 TreeControlTag.java
webapps/docs Tag: TOMCAT_5_0 changelog.xml
Log:
Bugzilla 32381.
Revision Changes Path
No revision
No revision
1.2.2.1 +1 -1
jakarta-tomcat-catalina/webapps/admin/tree-control-test.jsp
Index: tree-control-test.jsp
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/webapps/admin/tree-control-test.jsp,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- tree-control-test.jsp 24 Jul 2002 20:57:25 -0000 1.2
+++ tree-control-test.jsp 3 Dec 2004 17:02:25 -0000 1.2.2.1
@@ -20,7 +20,7 @@
<td width="200">
<controls:tree tree="treeControlTest"
- action="treeControlTest.do?tree=${name}"
+ action="treeControlTest.do?tree={name}"
style="tree-control"
styleSelected="tree-control-selected"
styleUnselected="tree-control-unselected"
No revision
No revision
1.3.2.1 +4 -4
jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/TreeControlTag.java
Index: TreeControlTag.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/TreeControlTag.java,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -r1.3 -r1.3.2.1
--- TreeControlTag.java 27 Feb 2004 14:59:01 -0000 1.3
+++ TreeControlTag.java 3 Dec 2004 17:02:25 -0000 1.3.2.1
@@ -88,7 +88,7 @@
/**
* The hyperlink to be used for submitting requests to expand and
- * contract tree nodes. The placeholder "<code>${name}</code>" will
+ * contract tree nodes. The placeholder "<code>{name}</code>" will
* be replaced by the <code>name</code> property of the current
* tree node.
*/
@@ -350,11 +350,11 @@
// character in parameter values.
String encodedNodeName = URLEncoder.encode(node.getName());
- String action = replace(getAction(), "${name}", encodedNodeName);
+ String action = replace(getAction(), "{name}", encodedNodeName);
String updateTreeAction =
- replace(getAction(), "tree=${name}", "select=" +
encodedNodeName);
+ replace(getAction(), "tree={name}", "select=" + encodedNodeName);
updateTreeAction =
((HttpServletResponse) pageContext.getResponse()).
encodeURL(updateTreeAction);
No revision
No revision
1.70.2.87 +11 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml
Index: changelog.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v
retrieving revision 1.70.2.86
retrieving revision 1.70.2.87
diff -u -r1.70.2.86 -r1.70.2.87
--- changelog.xml 30 Nov 2004 17:26:28 -0000 1.70.2.86
+++ changelog.xml 3 Dec 2004 17:02:25 -0000 1.70.2.87
@@ -36,6 +36,17 @@
<changelog>
</changelog>
</subsection>
+
+ <subsection name="Webapps">
+ <changelog>
+ <fix>
+ Fixed struts-config.xml for Admin webapp after move to Struts v1.2.
(amyroh)
+ </fix>
+ <fix>
+ <bug>32381</bug>: fix name placeholder token after move to Servlet
2.4 DTD for Admin webapp. (yoavs)
+ </fix>
+ </changelog>
+ </subsection>
</section>
<section name="Tomcat 5.0.30 (yoavs)">
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
