patrickl 02/01/10 12:34:04
Modified: webapps/admin/WEB-INF/classes/org/apache/webapp/admin
TomcatTreeBuilder.java
Log:
Encoded the node label names as they contain spaces and other reserved characters.
Submitted by: Manveen Kaur
Revision Changes Path
1.6 +17 -11
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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- TomcatTreeBuilder.java 10 Jan 2002 03:41:13 -0000 1.5
+++ TomcatTreeBuilder.java 10 Jan 2002 20:34:04 -0000 1.6
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/TomcatTreeBuilder.java,v
1.5 2002/01/10 03:41:13 patrickl Exp $
- * $Revision: 1.5 $
- * $Date: 2002/01/10 03:41:13 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/TomcatTreeBuilder.java,v
1.6 2002/01/10 20:34:04 patrickl Exp $
+ * $Revision: 1.6 $
+ * $Date: 2002/01/10 20:34:04 $
*
* ====================================================================
*
@@ -91,7 +91,7 @@
*
* @author Jazmin Jonson
* @author Manveen Kaur
- * @version $Revision: 1.5 $ $Date: 2002/01/10 03:41:13 $
+ * @version $Revision: 1.6 $ $Date: 2002/01/10 20:34:04 $
*/
@@ -140,11 +140,13 @@
// because Tomcat does this automatically
String encodedServerName = URLEncoder.encode(serverObjName);
+ String encodedNodeLabel = URLEncoder.encode(SERVER_LABEL);
+
TreeControlNode serverNode =
new TreeControlNode(serverObjName,
"folder_16_pad.gif", SERVER_LABEL,
"setUpServer.do?select=" + encodedServerName
- +"&nodeLabel=" + SERVER_LABEL,
+ +"&nodeLabel=" + encodedNodeLabel,
"content", true);
return serverNode;
@@ -175,13 +177,14 @@
encodedServiceName =
URLEncoder.encode(service.getObjectName().toString());
String nodeLabel = "Service (" + serviceName + ")";
-
+ String encodedNodeLabel = URLEncoder.encode(nodeLabel);
+
TreeControlNode serviceNode =
new TreeControlNode(service.getObjectName().toString(),
"folder_16_pad.gif",
nodeLabel,
"setUpService.do?select=" + encodedServiceName
- +"&nodeLabel=" + nodeLabel,
+ +"&nodeLabel=" + encodedNodeLabel,
"content", true);
serverNode.addChild(serviceNode);
@@ -213,17 +216,19 @@
encodedConnectorName =
URLEncoder.encode(connectorObj.getObjectName().toString());
+ 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)) {
- String nodeLabel = "Connector (" + connectorName + ")";
connectorNode =
new TreeControlNode(connectorObj.getObjectName().toString(),
"folder_16_pad.gif",
nodeLabel,
"setUpConnector.do?select=" + encodedConnectorName
- + "&nodeLabel="+nodeLabel,
+ + "&nodeLabel="+ encodedNodeLabel,
"content", true);
serviceNode.addChild(connectorNode);
@@ -264,13 +269,14 @@
encodedHostName =
URLEncoder.encode(hostObj.getObjectName().toString());
String nodeLabel="Host (" + hostName + ")";
-
+ String encodedNodeLabel = URLEncoder.encode(nodeLabel);
+
hostNode =
new TreeControlNode(hostObj.getObjectName().toString(),
"folder_16_pad.gif",
nodeLabel,
"setUpHost.do?select=" + encodedHostName
- +"&nodeLabel="+nodeLabel,
+ +"&nodeLabel="+ encodedNodeLabel,
"content", true);
serviceNode.addChild(hostNode);
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
