manveen 02/04/26 12:15:52
Modified: webapps/admin/connector connectors.jsp
webapps/admin/context context.jsp contexts.jsp
Log:
* disable "delete this context" operation from "/admin"
* mark connector and context that cant be deleted from the admin tool with a red*
Revision Changes Path
1.3 +3 -0 jakarta-tomcat-4.0/webapps/admin/connector/connectors.jsp
Index: connectors.jsp
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/connector/connectors.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- connectors.jsp 26 Apr 2002 03:50:41 -0000 1.2
+++ connectors.jsp 26 Apr 2002 19:15:52 -0000 1.3
@@ -66,6 +66,9 @@
<td><div align="left" class="table-normal-text">
<%-- the connector the admin app is running on cannot be deleted
through the tool --%>
+ <logic:match name="connector" value='<%=
Integer.toString(request.getServerPort()) %>'>
+ <font color='red'>*</font>
+ </logic:match>
<logic:notMatch name="connector" value='<%=
Integer.toString(request.getServerPort()) %>'>
<html:multibox property="connectors"
value="<%= connector.toString() %>"/>
1.5 +4 -0 jakarta-tomcat-4.0/webapps/admin/context/context.jsp
Index: context.jsp
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/context/context.jsp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- context.jsp 16 Apr 2002 17:04:19 -0000 1.4
+++ context.jsp 26 Apr 2002 19:15:52 -0000 1.5
@@ -70,11 +70,15 @@
URLEncoder.encode(thisObjectName) %>'>
<bean:message key="actions.valves.deletes"/>
</controls:action>
+ <%-- cannot delete the context of the admin app from the tool --%>
+ <logic:notEqual name="contextForm" property="path"
+ value='<%= request.getContextPath() %>'>
<controls:action disabled="true">
------------------------------------- </controls:action>
<controls:action url='<%= "/DeleteContext.do?select=" +
URLEncoder.encode(thisObjectName) %>'>
<bean:message key="actions.contexts.delete"/>
</controls:action>
+ </logic:notEqual>
</logic:notEqual>
</controls:actions>
</div>
1.4 +3 -0 jakarta-tomcat-4.0/webapps/admin/context/contexts.jsp
Index: contexts.jsp
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/context/contexts.jsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- contexts.jsp 26 Apr 2002 04:06:44 -0000 1.3
+++ contexts.jsp 26 Apr 2002 19:15:52 -0000 1.4
@@ -65,6 +65,9 @@
<tr class="line-row">
<td><div align="left" class="table-normal-text">
<%-- admin context cannot be deleted from the tool --%>
+ <logic:match name="context" value='<%= request.getContextPath() %>'>
+ <font color='red'>*</font>
+ </logic:match>
<logic:notMatch name="context" value='<%= request.getContextPath()
%>'>
<html:multibox property="contexts"
value="<%= context.toString() %>"/>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
