You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by pa...@apache.org on 2002/01/23 03:18:49 UTC
cvs commit: jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin SetUpTreeAction.java TomcatTreeBuilder.java
patrickl 02/01/22 18:18:49
Modified: webapps/admin/WEB-INF struts-config.xml
webapps/admin/WEB-INF/classes/org/apache/webapp/admin
SetUpTreeAction.java TomcatTreeBuilder.java
Log:
This is a patch to take care of a UI glitch. When Root-node is selected,
the content frame should also get updated to the blank welcome page.
Also, removed check if connector is of type warp (we did not support it
earlier since warp connectors don't conform to the standard
Engine/Host/Context hierarchy). Removed this check since warp connectors
are no longer visible through mBeans.
Submitted by: Manveen Kaur
Revision Changes Path
1.16 +4 -0 jakarta-tomcat-4.0/webapps/admin/WEB-INF/struts-config.xml
Index: struts-config.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/struts-config.xml,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- struts-config.xml 18 Jan 2002 05:53:26 -0000 1.15
+++ struts-config.xml 23 Jan 2002 02:18:49 -0000 1.16
@@ -85,6 +85,10 @@
<forward name="Save Successful"
path="/saved.jsp"
redirect="false"/>
+
+ <forward name="Blank"
+ path="/blank.jsp"
+ redirect="false"/>
</global-forwards>
1.4 +14 -7 jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/SetUpTreeAction.java
Index: SetUpTreeAction.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/SetUpTreeAction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SetUpTreeAction.java 16 Dec 2001 19:38:02 -0000 1.3
+++ SetUpTreeAction.java 23 Jan 2002 02:18:49 -0000 1.4
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/SetUpTreeAction.java,v 1.3 2001/12/16 19:38:02 patrickl Exp $
- * $Revision: 1.3 $
- * $Date: 2001/12/16 19:38:02 $
+ * $Header: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/SetUpTreeAction.java,v 1.4 2002/01/23 02:18:49 patrickl Exp $
+ * $Revision: 1.4 $
+ * $Date: 2002/01/23 02:18:49 $
*
* ====================================================================
*
@@ -86,7 +86,7 @@
*
* @author Jazmin Jonson
* @author Manveen Kaur
- * @version $Revision: 1.3 $ $Date: 2001/12/16 19:38:02 $
+ * @version $Revision: 1.4 $ $Date: 2002/01/23 02:18:49 $
*/
public class SetUpTreeAction extends Action {
@@ -137,8 +137,8 @@
TreeControlNode root =
new TreeControlNode("ROOT-NODE",
null, rootnodeName,
- "treeControlTest.do?select=ROOT-NODE",
- null, true);
+ "setUpTree.do?select=ROOT-NODE",
+ "content", true);
TreeControl control = new TreeControl(root);
@@ -172,7 +172,14 @@
HttpSession session = request.getSession();
session.setAttribute("treeControlTest", control);
- return (mapping.findForward("Tree Control Test"));
+ String name = request.getParameter("select");
+ if (name != null) {
+ control.selectNode(name);
+ // Forward back to the Blank page
+ return (mapping.findForward("Blank"));
+ }
+
+ return (mapping.findForward("Tree Control Test"));
}
}
1.9 +7 -13 jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/TomcatTreeBuilder.java
Index: TomcatTreeBuilder.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/TomcatTreeBuilder.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- TomcatTreeBuilder.java 20 Jan 2002 00:51:53 -0000 1.8
+++ TomcatTreeBuilder.java 23 Jan 2002 02:18:49 -0000 1.9
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/TomcatTreeBuilder.java,v 1.8 2002/01/20 00:51:53 patrickl Exp $
- * $Revision: 1.8 $
- * $Date: 2002/01/20 00:51:53 $
+ * $Header: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/TomcatTreeBuilder.java,v 1.9 2002/01/23 02:18:49 patrickl Exp $
+ * $Revision: 1.9 $
+ * $Date: 2002/01/23 02:18:49 $
*
* ====================================================================
*
@@ -91,7 +91,7 @@
*
* @author Jazmin Jonson
* @author Manveen Kaur
- * @version $Revision: 1.8 $ $Date: 2002/01/20 00:51:53 $
+ * @version $Revision: 1.9 $ $Date: 2002/01/23 02:18:49 $
*/
@@ -223,11 +223,7 @@
String nodeLabel = "Connector (" + connectorName + ")";
String encodedNodeLabel = URLEncoder.encode(nodeLabel);
- // Do not display the connector node if it is a warp connector.
- // This is because warp connector doesn't conform to the
- // standard Engine/Host/Context hierarchy and we don't support it.
- if (!"warp".equalsIgnoreCase(connectorName)) {
- connectorNode =
+ connectorNode =
new TreeControlNode(connectorObj.getObjectName().toString(),
"folder_16_pad.gif",
nodeLabel,
@@ -235,10 +231,8 @@
+ "&nodeLabel="+ encodedNodeLabel,
"content", true);
- serviceNode.addChild(connectorNode);
- }
- }
-
+ serviceNode.addChild(connectorNode);
+ }
}
public void getHosts(TreeControlNode serviceNode, String serviceName)
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>