amyroh 2003/02/09 20:25:26
Modified: webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve
SaveAccessLogValveAction.java
SaveRemoteAddrValveAction.java
SaveRemoteHostValveAction.java
SaveRequestDumperValveAction.java
SaveSingleSignOnValveAction.java ValveUtil.java
Log:
Correct the behavior of valve creation - it wasn't saving its attributes during
creation.
Revision Changes Path
1.4 +7 -7
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/SaveAccessLogValveAction.java
Index: SaveAccessLogValveAction.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/SaveAccessLogValveAction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SaveAccessLogValveAction.java 22 Nov 2002 21:49:46 -0000 1.3
+++ SaveAccessLogValveAction.java 10 Feb 2003 04:25:26 -0000 1.4
@@ -155,9 +155,9 @@
// Perform a "Create Valve" transaction (if requested)
if ("Create".equals(adminAction)) {
- return ValveUtil.
- createValve(parent, valveType, response, request, mapping,
- (ApplicationServlet) getServlet());
+ vObjectName = ValveUtil.createValve(parent, valveType,
+ response, request, mapping,
+ (ApplicationServlet) getServlet());
}
1.4 +8 -7
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/SaveRemoteAddrValveAction.java
Index: SaveRemoteAddrValveAction.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/SaveRemoteAddrValveAction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SaveRemoteAddrValveAction.java 12 Apr 2002 22:06:30 -0000 1.3
+++ SaveRemoteAddrValveAction.java 10 Feb 2003 04:25:26 -0000 1.4
@@ -154,9 +154,10 @@
// Perform a "Create Valve" transaction (if requested)
if ("Create".equals(adminAction)) {
- return ValveUtil.
- createValve(parent, valveType, response, request, mapping,
- (ApplicationServlet) getServlet());
+
+ vObjectName = ValveUtil.createValve(parent, valveType,
+ response, request, mapping,
+ (ApplicationServlet) getServlet());
}
1.4 +7 -7
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/SaveRemoteHostValveAction.java
Index: SaveRemoteHostValveAction.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/SaveRemoteHostValveAction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SaveRemoteHostValveAction.java 12 Apr 2002 22:06:30 -0000 1.3
+++ SaveRemoteHostValveAction.java 10 Feb 2003 04:25:26 -0000 1.4
@@ -155,9 +155,9 @@
// Perform a "Create Valve" transaction (if requested)
if ("Create".equals(adminAction)) {
- return ValveUtil.
- createValve(parent, valveType, response, request, mapping,
- (ApplicationServlet) getServlet());
+ vObjectName = ValveUtil.createValve(parent, valveType,
+ response, request, mapping,
+ (ApplicationServlet) getServlet());
}
1.3 +7 -7
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/SaveRequestDumperValveAction.java
Index: SaveRequestDumperValveAction.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/SaveRequestDumperValveAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SaveRequestDumperValveAction.java 12 Apr 2002 22:06:30 -0000 1.2
+++ SaveRequestDumperValveAction.java 10 Feb 2003 04:25:26 -0000 1.3
@@ -155,9 +155,9 @@
// Perform a "Create Valve" transaction (if requested)
if ("Create".equals(adminAction)) {
- return ValveUtil.
- createValve(parent, valveType, response, request, mapping,
- (ApplicationServlet) getServlet());
+ vObjectName = ValveUtil.createValve(parent, valveType,
+ response, request, mapping,
+ (ApplicationServlet) getServlet());
}
1.5 +7 -7
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/SaveSingleSignOnValveAction.java
Index: SaveSingleSignOnValveAction.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/SaveSingleSignOnValveAction.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SaveSingleSignOnValveAction.java 18 Apr 2002 21:39:45 -0000 1.4
+++ SaveSingleSignOnValveAction.java 10 Feb 2003 04:25:26 -0000 1.5
@@ -156,9 +156,9 @@
// Perform a "Create Valve" transaction (if requested)
if ("Create".equals(adminAction)) {
- return ValveUtil.
- createValve(parent, valveType, response, request, mapping,
- (ApplicationServlet) getServlet());
+ vObjectName = ValveUtil.createValve(parent, valveType,
+ response, request, mapping,
+ (ApplicationServlet) getServlet());
}
1.8 +10 -9
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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ValveUtil.java 9 May 2002 01:07:31 -0000 1.7
+++ ValveUtil.java 10 Feb 2003 04:25:26 -0000 1.8
@@ -112,7 +112,7 @@
// --------------------------------------------------------- Public Methods
- public static ActionForward createValve(String parent, String valveType,
+ public static String createValve(String parent, String valveType,
HttpServletResponse response, HttpServletRequest request,
ActionMapping mapping, ApplicationServlet servlet)
throws IOException, ServletException {
@@ -132,6 +132,7 @@
String operation = null;
String values[] = null;
+ String vObjectName = null;
try {
@@ -157,8 +158,7 @@
servlet.log(message);
response.sendError(HttpServletResponse.SC_BAD_REQUEST, message);
return (null);
- }
-
+ }
// Ensure that the requested valve name is unique
// TBD -- do we need this check?
@@ -187,7 +187,8 @@
operation = "create" + valveType;
if ("AccessLogValve".equalsIgnoreCase(valveType))
operation = "createAccessLoggerValve";
- String vObjectName = (String)
+
+ vObjectName = (String)
mBServer.invoke(fname, operation, values,
createStandardValveTypes);
// Add the new Valve to our tree control node
@@ -235,6 +236,6 @@
// Forward to the success reporting page
session.removeAttribute(mapping.getAttribute());
- return (mapping.findForward("Save Successful"));
+ return vObjectName;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
