manveen 02/04/19 11:04:40
Modified: webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve
DeleteValveAction.java ValveUtil.java
ValvesForm.java
webapps/admin/valve valves.jsp
Log:
* Minor fixes for creating and deleting the newly created valve operation to work
* Links from the delete valves should link back to the properties of the valve.
Revision Changes Path
1.4 +5 -4
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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DeleteValveAction.java 16 Apr 2002 17:04:19 -0000 1.3
+++ DeleteValveAction.java 19 Apr 2002 18:04:40 -0000 1.4
@@ -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.3 2002/04/16 17:04:19 manveen Exp $
- * $Revision: 1.3 $
- * $Date: 2002/04/16 17:04:19 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/DeleteValveAction.java,v
1.4 2002/04/19 18:04:40 manveen Exp $
+ * $Revision: 1.4 $
+ * $Date: 2002/04/19 18:04:40 $
*
* ====================================================================
*
@@ -97,7 +97,7 @@
* The <code>Action</code> that sets up <em>Delete Valves</em> transactions.
*
* @author Manveen Kaur
- * @version $Revision: 1.3 $ $Date: 2002/04/16 17:04:19 $
+ * @version $Revision: 1.4 $ $Date: 2002/04/19 18:04:40 $
*/
public class DeleteValveAction extends Action {
@@ -170,6 +170,7 @@
// Accumulate a list of all available valves
ArrayList list = new ArrayList();
String parent = request.getParameter("parent");
+ valvesForm.setParentObjectName(parent);
try {
Iterator items = (Lists.getValves(mBServer, parent)).iterator();
1.6 +5 -5
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/ValveUtil.java
Index: ValveUtil.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/ValveUtil.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ValveUtil.java 18 Apr 2002 21:39:45 -0000 1.5
+++ ValveUtil.java 19 Apr 2002 18:04:40 -0000 1.6
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/ValveUtil.java,v
1.5 2002/04/18 21:39:45 manveen Exp $
- * $Revision: 1.5 $
- * $Date: 2002/04/18 21:39:45 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/ValveUtil.java,v
1.6 2002/04/19 18:04:40 manveen Exp $
+ * $Revision: 1.6 $
+ * $Date: 2002/04/19 18:04:40 $
*
* ====================================================================
*
@@ -94,7 +94,7 @@
* A utility class that contains methods common across valves.
*
* @author Manveen Kaur
- * @version $Revision: 1.5 $ $Date: 2002/04/18 21:39:45 $
+ * @version $Revision: 1.6 $ $Date: 2002/04/19 18:04:40 $
*/
public final class ValveUtil {
@@ -206,7 +206,7 @@
nodeLabel,
"EditValve.do?select=" + encodedName +
"&nodeLabel=" + URLEncoder.encode(nodeLabel) +
- "&parent=" + URLEncoder.encode(parent),
+ "&parent=" + URLEncoder.encode(parentNodeName),
"content",
true);
parentNode.addChild(childNode);
1.2 +18 -5
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/ValvesForm.java
Index: ValvesForm.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/ValvesForm.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ValvesForm.java 11 Apr 2002 19:17:18 -0000 1.1
+++ ValvesForm.java 19 Apr 2002 18:04:40 -0000 1.2
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/ValvesForm.java,v
1.1 2002/04/11 19:17:18 manveen Exp $
- * $Revision: 1.1 $
- * $Date: 2002/04/11 19:17:18 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/ValvesForm.java,v
1.2 2002/04/19 18:04:40 manveen Exp $
+ * $Revision: 1.2 $
+ * $Date: 2002/04/19 18:04:40 $
*
* ====================================================================
*
@@ -71,7 +71,7 @@
* Form bean for deleting valves.
*
* @author Manveen Kaur
- * @version $Revision: 1.1 $ $Date: 2002/04/11 19:17:18 $
+ * @version $Revision: 1.2 $ $Date: 2002/04/19 18:04:40 $
*/
public class ValvesForm extends ActionForm {
@@ -93,7 +93,20 @@
this.valves = valves;
}
-
+ /*
+ * The parent object name of the valve to be deleted.
+ */
+
+ private String parentObjectName = null;
+
+ public String getParentObjectName() {
+ return (this.parentObjectName);
+ }
+
+ public void setParentObjectName(String parentObjectName) {
+ this.parentObjectName = parentObjectName;
+ }
+
// --------------------------------------------------------- Public Methods
@@ -106,7 +119,7 @@
public void reset(ActionMapping mapping, HttpServletRequest request) {
this.valves = new String[0];
-
+ this.parentObjectName = null;
}
1.2 +6 -1 jakarta-tomcat-4.0/webapps/admin/valve/valves.jsp
Index: valves.jsp
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/valve/valves.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- valves.jsp 11 Apr 2002 19:25:02 -0000 1.1
+++ valves.jsp 19 Apr 2002 18:04:40 -0000 1.2
@@ -18,6 +18,10 @@
<html:form method="post" action="/DeleteValves">
+ <bean:define id="thisParentName" type="java.lang.String"
+ name="valvesForm" property="parentObjectName"/>
+ <html:hidden property="parentObjectName"/>
+
<table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr bgcolor="7171A5">
<td width="81%">
@@ -69,7 +73,8 @@
</div></td>
<td><div align="left" class="table-normal-text">
<html:link page='<%= "/EditValve.do?select=" +
- java.net.URLEncoder.encode(valve.toString()) %>'>
+ java.net.URLEncoder.encode(valve.toString()) +
+ "&parent="+ URLEncoder.encode(thisParentName) %>'>
<controls:attribute name="valve" attribute="className"/>
</html:link>
</div></td>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
