manveen 02/04/16 10:04:19
Modified: webapps/admin/WEB-INF/classes/org/apache/webapp/admin
ApplicationResources_en.properties
TomcatTreeBuilder.java
webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve
DeleteValveAction.java EditValveAction.java
webapps/admin/context context.jsp
webapps/admin/service service.jsp
webapps/admin/valve accessLogValve.jsp remoteAddrValve.jsp
remoteHostValve.jsp requestDumperValve.jsp
singleSignOnValve.jsp
Log:
"Delete valve" operation enabled/made available from contextand each of the valve
screens.
Revision Changes Path
1.42 +1 -1
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_en.properties
Index: ApplicationResources_en.properties
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_en.properties,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- ApplicationResources_en.properties 10 Apr 2002 00:37:07 -0000 1.41
+++ ApplicationResources_en.properties 16 Apr 2002 17:04:19 -0000 1.42
@@ -101,7 +101,7 @@
actions.valves.create=Create New Valve
actions.valves.edit=Edit Valve
actions.valves.delete=Delete This Valve
-actions.valves.deletes=Delete Valves
+actions.valves.deletes=Delete Existing Valves
actions.alias.create=Create New Aliases
actions.alias.delete=Delete Aliases
connector.type=Type
1.27 +7 -5
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.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- TomcatTreeBuilder.java 11 Apr 2002 07:44:22 -0000 1.26
+++ TomcatTreeBuilder.java 16 Apr 2002 17:04:19 -0000 1.27
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/TomcatTreeBuilder.java,v
1.26 2002/04/11 07:44:22 manveen Exp $
- * $Revision: 1.26 $
- * $Date: 2002/04/11 07:44:22 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/TomcatTreeBuilder.java,v
1.27 2002/04/16 17:04:19 manveen Exp $
+ * $Revision: 1.27 $
+ * $Date: 2002/04/16 17:04:19 $
*
* ====================================================================
*
@@ -93,7 +93,7 @@
*
* @author Jazmin Jonson
* @author Manveen Kaur
- * @version $Revision: 1.26 $ $Date: 2002/04/11 07:44:22 $
+ * @version $Revision: 1.27 $ $Date: 2002/04/16 17:04:19 $
*/
@@ -411,7 +411,9 @@
"EditValve.do?select=" +
URLEncoder.encode(valveName) +
"&nodeLabel=" +
- URLEncoder.encode(nodeLabel),
+ URLEncoder.encode(nodeLabel) +
+ "&parent=" +
+ URLEncoder.encode(containerName),
"content",
false);
containerNode.addChild(valveNode);
1.3 +5 -5
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/DeleteValveAction.java
Index: DeleteValveAction.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/DeleteValveAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DeleteValveAction.java 12 Apr 2002 22:06:30 -0000 1.2
+++ DeleteValveAction.java 16 Apr 2002 17:04:19 -0000 1.3
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/DeleteValveAction.java,v
1.2 2002/04/12 22:06:30 manveen Exp $
- * $Revision: 1.2 $
- * $Date: 2002/04/12 22:06:30 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/DeleteValveAction.java,v
1.3 2002/04/16 17:04:19 manveen Exp $
+ * $Revision: 1.3 $
+ * $Date: 2002/04/16 17:04:19 $
*
* ====================================================================
*
@@ -97,7 +97,7 @@
* The <code>Action</code> that sets up <em>Delete Valves</em> transactions.
*
* @author Manveen Kaur
- * @version $Revision: 1.2 $ $Date: 2002/04/12 22:06:30 $
+ * @version $Revision: 1.3 $ $Date: 2002/04/16 17:04:19 $
*/
public class DeleteValveAction extends Action {
@@ -170,7 +170,7 @@
// Accumulate a list of all available valves
ArrayList list = new ArrayList();
String parent = request.getParameter("parent");
-
+
try {
Iterator items = (Lists.getValves(mBServer, parent)).iterator();
while (items.hasNext()) {
1.2 +11 -9
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/EditValveAction.java
Index: EditValveAction.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/EditValveAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- EditValveAction.java 11 Apr 2002 07:42:04 -0000 1.1
+++ EditValveAction.java 16 Apr 2002 17:04:19 -0000 1.2
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/EditValveAction.java,v
1.1 2002/04/11 07:42:04 manveen Exp $
- * $Revision: 1.1 $
- * $Date: 2002/04/11 07:42:04 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/EditValveAction.java,v
1.2 2002/04/16 17:04:19 manveen Exp $
+ * $Revision: 1.2 $
+ * $Date: 2002/04/16 17:04:19 $
*
* ====================================================================
*
@@ -92,7 +92,7 @@
* Valve </em> transactions, based on the type of Valve.
*
* @author Manveen Kaur
- * @version $Revision: 1.1 $ $Date: 2002/04/11 07:42:04 $
+ * @version $Revision: 1.2 $ $Date: 2002/04/16 17:04:19 $
*/
public class EditValveAction extends Action {
@@ -111,6 +111,7 @@
private HttpSession session = null;
private Locale locale = null;
+ private String parent = null;
// --------------------------------------------------------- Public Methods
@@ -164,6 +165,7 @@
return (null);
}
+ parent = request.getParameter("parent");
String valveType = null;
String attribute = null;
@@ -212,7 +214,7 @@
session.setAttribute("accessLogValveForm", valveFm);
valveFm.setAdminAction("Edit");
valveFm.setObjectName(vname.toString());
- valveFm.setParentObjectName("");
+ valveFm.setParentObjectName(parent);
String valveType = "AccessLogValve";
StringBuffer sb = new StringBuffer("Valve (");
sb.append(valveType);
@@ -263,7 +265,7 @@
session.setAttribute("requestDumperValveForm", valveFm);
valveFm.setAdminAction("Edit");
valveFm.setObjectName(vname.toString());
- valveFm.setParentObjectName("");
+ valveFm.setParentObjectName(parent);
String valveType = "RequestDumperValve";
StringBuffer sb = new StringBuffer("Valve (");
sb.append(valveType);
@@ -280,7 +282,7 @@
session.setAttribute("singleSignOnValveForm", valveFm);
valveFm.setAdminAction("Edit");
valveFm.setObjectName(vname.toString());
- valveFm.setParentObjectName("");
+ valveFm.setParentObjectName(parent);
String valveType = "SingleSignOn";
StringBuffer sb = new StringBuffer("Valve (");
sb.append(valveType);
@@ -315,7 +317,7 @@
session.setAttribute("remoteAddrValveForm", valveFm);
valveFm.setAdminAction("Edit");
valveFm.setObjectName(vname.toString());
- valveFm.setParentObjectName("");
+ valveFm.setParentObjectName(parent);
String valveType = "RemoteAddrValve";
StringBuffer sb = new StringBuffer("Valve (");
sb.append(valveType);
@@ -352,7 +354,7 @@
session.setAttribute("remoteHostValveForm", valveFm);
valveFm.setAdminAction("Edit");
valveFm.setObjectName(vname.toString());
- valveFm.setParentObjectName("");
+ valveFm.setParentObjectName(parent);
String valveType = "RemoteHostValve";
StringBuffer sb = new StringBuffer("Valve (");
sb.append(valveType);
1.4 +16 -11 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- context.jsp 26 Mar 2002 00:04:45 -0000 1.3
+++ context.jsp 16 Apr 2002 17:04:19 -0000 1.4
@@ -51,25 +51,30 @@
URLEncoder.encode(thisObjectName) %>'>
<bean:message key="actions.loggers.deletes"/>
</controls:action>
- <%--
<controls:action disabled="true"> -------------------------------------
</controls:action>
- <controls:action url=""> <bean:message
key="actions.requestfilter.create"/> </controls:action>
- <controls:action url=""> <bean:message
key="actions.requestfilter.delete"/> </controls:action>
- <controls:action> -------------------------------------
</controls:action>
- <controls:action url=""> <bean:message key="actions.realms.create"/>
</controls:action>
+ <controls:action url='<%= "/AddRealm.do?parent=" +
+ URLEncoder.encode(thisObjectName) %>'>
+ <bean:message key="actions.realms.create"/>
+ </controls:action>
<controls:action url='<%= "/DeleteRealm.do?parent=" +
URLEncoder.encode(thisObjectName) %>'>
<bean:message key="actions.realms.deletes"/>
</controls:action>
- <controls:action disabled="true">
------------------------------------- </controls:action>
- <controls:action url=""> <bean:message key="actions.valves.create"/>
</controls:action>
- <controls:action url=""> <bean:message key="actions.valves.deletes"/>
</controls:action>
--%>
- <controls:action disabled="true">
------------------------------------- </controls:action>
- <controls:action url='<%= "/DeleteContext.do?select=" +
+ <controls:action disabled="true">
------------------------------------- </controls:action>
+ <controls:action url='<%= "/AddValve.do?parent=" +
+ URLEncoder.encode(thisObjectName) %>'>
+ <bean:message key="actions.valves.create"/>
+ </controls:action>
+ <controls:action url='<%= "/DeleteValve.do?parent=" +
+ URLEncoder.encode(thisObjectName) %>'>
+ <bean:message key="actions.valves.deletes"/>
+ </controls:action>
+ <controls:action disabled="true">
------------------------------------- </controls:action>
+ <controls:action url='<%= "/DeleteContext.do?select=" +
URLEncoder.encode(thisObjectName) %>'>
<bean:message key="actions.contexts.delete"/>
- </controls:action>
+ </controls:action>
</logic:notEqual>
</controls:actions>
</div>
1.13 +12 -34 jakarta-tomcat-4.0/webapps/admin/service/service.jsp
Index: service.jsp
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/service/service.jsp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- service.jsp 5 Apr 2002 00:02:19 -0000 1.12
+++ service.jsp 16 Apr 2002 17:04:19 -0000 1.13
@@ -48,17 +48,6 @@
-------------------------------------
</controls:action>
<logic:notEqual name="serviceForm" property="adminAction"
value="Create">
- <%--
- <controls:action url="">
- <bean:message key="actions.accesslogger.create"/>
- </controls:action>
- <controls:action url="">
- <bean:message key="actions.accesslogger.delete"/>
- </controls:action>
- <controls:action>
- -------------------------------------
- </controls:action>
- --%>
<controls:action url='<%= "/AddConnector.do?serviceName=" +
serviceName %>'>
<bean:message key="actions.connectors.create"/>
@@ -92,18 +81,7 @@
<controls:action disabled="true">
-------------------------------------
</controls:action>
- <%--
- <controls:action url="">
- <bean:message key="actions.requestfilter.create"/>
- </controls:action>
- <controls:action url="">
- <bean:message key="actions.requestfilter.delete"/>
- </controls:action>
- <controls:action>
- -------------------------------------
- </controls:action>
- --%>
- <controls:action url='<%= "/AddRealm.do?parent=" +
+ <controls:action url='<%= "/AddRealm.do?parent=" +
URLEncoder.encode(thisObjectName) %>'>
<bean:message key="actions.realms.create"/>
</controls:action>
@@ -114,18 +92,18 @@
<controls:action disabled="true">
-------------------------------------
</controls:action>
- <%--
- <controls:action url="">
- <bean:message key="actions.valves.create"/>
- </controls:action>
- <controls:action url="">
- <bean:message key="actions.valves.deletes"/>
- </controls:action>
- <controls:action>
- -------------------------------------
+ <controls:action url='<%= "/AddValve.do?parent=" +
+ URLEncoder.encode(thisObjectName) %>'>
+ <bean:message key="actions.valves.create"/>
</controls:action>
- --%>
- <controls:action url='<%= "/DeleteService.do?select=" +
+ <controls:action url='<%= "/DeleteValve.do?parent=" +
+ URLEncoder.encode(thisObjectName) %>'>
+ <bean:message key="actions.valves.deletes"/>
+ </controls:action>
+ <controls:action disabled="true">
+ -------------------------------------
+ </controls:action>
+ <controls:action url='<%= "/DeleteService.do?select=" +
URLEncoder.encode(thisObjectName) %>'>
<bean:message key="actions.services.delete"/>
</controls:action>
1.5 +5 -4 jakarta-tomcat-4.0/webapps/admin/valve/accessLogValve.jsp
Index: accessLogValve.jsp
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/valve/accessLogValve.jsp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- accessLogValve.jsp 12 Apr 2002 22:01:46 -0000 1.4
+++ accessLogValve.jsp 16 Apr 2002 17:04:19 -0000 1.5
@@ -20,6 +20,8 @@
<bean:define id="thisObjectName" type="java.lang.String"
name="accessLogValveForm" property="objectName"/>
+ <bean:define id="thisParentName" type="java.lang.String"
+ name="accessLogValveForm" property="parentObjectName"/>
<html:hidden property="adminAction"/>
<html:hidden property="parentObjectName"/>
<html:hidden property="objectName"/>
@@ -43,12 +45,11 @@
<controls:action selected="true"> ----<bean:message
key="actions.available.actions"/>---- </controls:action>
<controls:action> --------------------------------- </controls:action>
<logic:notEqual name="accessLogValveForm" property="adminAction"
value="Create">
- <%--
- <controls:action url='<%= "/DeleteValve.do?select=" +
- URLEncoder.encode(thisObjectName) %>'>
+ <controls:action url='<%= "/DeleteValve.do?" +
+ "select=" + URLEncoder.encode(thisObjectName) +
+ "&parent="+ URLEncoder.encode(thisParentName) %>'>
<bean:message key="actions.valves.delete"/>
</controls:action>
- --%>
</logic:notEqual>
</controls:actions>
</div>
1.3 +5 -5 jakarta-tomcat-4.0/webapps/admin/valve/remoteAddrValve.jsp
Index: remoteAddrValve.jsp
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/valve/remoteAddrValve.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- remoteAddrValve.jsp 12 Apr 2002 22:01:46 -0000 1.2
+++ remoteAddrValve.jsp 16 Apr 2002 17:04:19 -0000 1.3
@@ -20,6 +20,8 @@
<bean:define id="thisObjectName" type="java.lang.String"
name="remoteAddrValveForm" property="objectName"/>
+ <bean:define id="thisParentName" type="java.lang.String"
+ name="remoteAddrValveForm" property="parentObjectName"/>
<html:hidden property="adminAction"/>
<html:hidden property="parentObjectName"/>
<html:hidden property="objectName"/>
@@ -43,12 +45,10 @@
<controls:action selected="true"> ----<bean:message
key="actions.available.actions"/>---- </controls:action>
<controls:action> --------------------------------- </controls:action>
<logic:notEqual name="remoteAddrValveForm" property="adminAction"
value="Create">
- <%--
- <controls:action url='<%= "/DeleteValve.do?select=" +
- URLEncoder.encode(thisObjectName) %>'>
+ <controls:action url='<%= "/DeleteValve.do?" +
+ "select=" + URLEncoder.encode(thisObjectName) +
+ "&parent="+ URLEncoder.encode(thisParentName) %>'>
<bean:message key="actions.valves.delete"/>
- </controls:action>
- --%>
</logic:notEqual>
</controls:actions>
</div>
1.3 +6 -6 jakarta-tomcat-4.0/webapps/admin/valve/remoteHostValve.jsp
Index: remoteHostValve.jsp
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/valve/remoteHostValve.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- remoteHostValve.jsp 12 Apr 2002 22:01:46 -0000 1.2
+++ remoteHostValve.jsp 16 Apr 2002 17:04:19 -0000 1.3
@@ -20,6 +20,8 @@
<bean:define id="thisObjectName" type="java.lang.String"
name="remoteHostValveForm" property="objectName"/>
+ <bean:define id="thisParentName" type="java.lang.String"
+ name="remoteHostValveForm" property="parentObjectName"/>
<html:hidden property="adminAction"/>
<html:hidden property="parentObjectName"/>
<html:hidden property="objectName"/>
@@ -43,13 +45,11 @@
<controls:action selected="true"> ----<bean:message
key="actions.available.actions"/>---- </controls:action>
<controls:action> --------------------------------- </controls:action>
<logic:notEqual name="remoteHostValveForm" property="adminAction"
value="Create">
- <%--
- <controls:action url='<%= "/DeleteValve.do?select=" +
- URLEncoder.encode(thisObjectName) %>'>
+ <controls:action url='<%= "/DeleteValve.do?" +
+ "select=" + URLEncoder.encode(thisObjectName) +
+ "&parent="+ URLEncoder.encode(thisParentName) %>'>
<bean:message key="actions.valves.delete"/>
- </controls:action>
- --%>
- </logic:notEqual>
+ </logic:notEqual>
</controls:actions>
</div>
</td>
1.4 +6 -6 jakarta-tomcat-4.0/webapps/admin/valve/requestDumperValve.jsp
Index: requestDumperValve.jsp
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/valve/requestDumperValve.jsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- requestDumperValve.jsp 12 Apr 2002 22:01:46 -0000 1.3
+++ requestDumperValve.jsp 16 Apr 2002 17:04:19 -0000 1.4
@@ -20,6 +20,8 @@
<bean:define id="thisObjectName" type="java.lang.String"
name="requestDumperValveForm" property="objectName"/>
+ <bean:define id="thisParentName" type="java.lang.String"
+ name="requestDumperValveForm" property="parentObjectName"/>
<html:hidden property="adminAction"/>
<html:hidden property="parentObjectName"/>
<html:hidden property="objectName"/>
@@ -43,13 +45,11 @@
<controls:action selected="true"> ----<bean:message
key="actions.available.actions"/>---- </controls:action>
<controls:action> --------------------------------- </controls:action>
<logic:notEqual name="requestDumperValveForm" property="adminAction"
value="Create">
- <%--
- <controls:action url='<%= "/DeleteValve.do?select=" +
- URLEncoder.encode(thisObjectName) %>'>
+ <controls:action url='<%= "/DeleteValve.do?" +
+ "select=" + URLEncoder.encode(thisObjectName) +
+ "&parent="+ URLEncoder.encode(thisParentName) %>'>
<bean:message key="actions.valves.delete"/>
- </controls:action>
- --%>
- </logic:notEqual>
+ </logic:notEqual>
</controls:actions>
</div>
</td>
1.3 +6 -6 jakarta-tomcat-4.0/webapps/admin/valve/singleSignOnValve.jsp
Index: singleSignOnValve.jsp
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/valve/singleSignOnValve.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- singleSignOnValve.jsp 11 Apr 2002 15:11:34 -0000 1.2
+++ singleSignOnValve.jsp 16 Apr 2002 17:04:19 -0000 1.3
@@ -20,6 +20,8 @@
<bean:define id="thisObjectName" type="java.lang.String"
name="singleSignOnValveForm" property="objectName"/>
+ <bean:define id="thisParentName" type="java.lang.String"
+ name="singleSignOnValveForm" property="parentObjectName"/>
<html:hidden property="adminAction"/>
<html:hidden property="parentObjectName"/>
<html:hidden property="objectName"/>
@@ -43,13 +45,11 @@
<controls:action selected="true"> ----<bean:message
key="actions.available.actions"/>---- </controls:action>
<controls:action> --------------------------------- </controls:action>
<logic:notEqual name="singleSignOnValveForm" property="adminAction"
value="Create">
- <%--
- <controls:action url='<%= "/DeleteValve.do?select=" +
- URLEncoder.encode(thisObjectName) %>'>
+ <controls:action url='<%= "/DeleteValve.do?" +
+ "select=" + URLEncoder.encode(thisObjectName) +
+ "&parent="+ URLEncoder.encode(thisParentName) %>'>
<bean:message key="actions.valves.delete"/>
- </controls:action>
- --%>
- </logic:notEqual>
+ </logic:notEqual>
</controls:actions>
</div>
</td>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
