manveen 02/04/12 15:06:30
Modified: webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve
DeleteValveAction.java
SaveAccessLogValveAction.java
SaveRemoteAddrValveAction.java
SaveRemoteHostValveAction.java
SaveRequestDumperValveAction.java
SaveSingleSignOnValveAction.java ValveUtil.java
Log:
Implemented remote valves.
Minor fixes for create valve. -- creating all types of valves operational.
Revision Changes Path
1.2 +7 -22
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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DeleteValveAction.java 11 Apr 2002 19:17:18 -0000 1.1
+++ DeleteValveAction.java 12 Apr 2002 22:06:30 -0000 1.2
@@ -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.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/DeleteValveAction.java,v
1.2 2002/04/12 22:06:30 manveen Exp $
+ * $Revision: 1.2 $
+ * $Date: 2002/04/12 22:06:30 $
*
* ====================================================================
*
@@ -91,13 +91,13 @@
import org.apache.webapp.admin.ApplicationServlet;
import org.apache.webapp.admin.TomcatTreeBuilder;
-import org.apache.webapp.admin.logger.DeleteLoggerAction;
+import org.apache.webapp.admin.Lists;
/**
* The <code>Action</code> that sets up <em>Delete Valves</em> transactions.
*
* @author Manveen Kaur
- * @version $Revision: 1.1 $ $Date: 2002/04/11 19:17:18 $
+ * @version $Revision: 1.2 $ $Date: 2002/04/12 22:06:30 $
*/
public class DeleteValveAction extends Action {
@@ -170,24 +170,9 @@
// Accumulate a list of all available valves
ArrayList list = new ArrayList();
String parent = request.getParameter("parent");
-
- if (parent != null) {
- try {
- pattern = DeleteLoggerAction.getObjectName(
- parent,TomcatTreeBuilder.REALM_TYPE);
- } catch (Exception e) {
- getServlet().log
- (resources.getMessage(locale, "users.error.select"));
- response.sendError
- (HttpServletResponse.SC_INTERNAL_SERVER_ERROR,
- resources.getMessage(locale, "users.error.select"));
- return (null);
- }
- }
-
+
try {
- Iterator items =
- mBServer.queryNames(new ObjectName(pattern), null).iterator();
+ Iterator items = (Lists.getValves(mBServer, parent)).iterator();
while (items.hasNext()) {
list.add(items.next().toString());
}
1.2 +6 -6
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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SaveAccessLogValveAction.java 11 Apr 2002 14:47:47 -0000 1.1
+++ SaveAccessLogValveAction.java 12 Apr 2002 22:06:30 -0000 1.2
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/SaveAccessLogValveAction.java,v
1.1 2002/04/11 14:47:47 manveen Exp $
- * $Revision: 1.1 $
- * $Date: 2002/04/11 14:47:47 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/SaveAccessLogValveAction.java,v
1.2 2002/04/12 22:06:30 manveen Exp $
+ * $Revision: 1.2 $
+ * $Date: 2002/04/12 22:06:30 $
*
* ====================================================================
*
@@ -88,7 +88,7 @@
* <em>Edit Valve</em> transactions for AccessLog valve.
*
* @author Manveen Kaur
- * @version $Revision: 1.1 $ $Date: 2002/04/11 14:47:47 $
+ * @version $Revision: 1.2 $ $Date: 2002/04/12 22:06:30 $
*/
public final class SaveAccessLogValveAction extends Action {
@@ -149,12 +149,12 @@
AccessLogValveForm vform = (AccessLogValveForm) form;
String adminAction = vform.getAdminAction();
String vObjectName = vform.getObjectName();
- String parent = vform.getObjectName();
+ String parent = vform.getParentObjectName();
String valveType = vform.getValveType();
-
+
// Perform a "Create Valve" transaction (if requested)
if ("Create".equals(adminAction)) {
-
+
return ValveUtil.
createValve(parent, valveType, response, request, mapping,
(ApplicationServlet) getServlet());
1.3 +5 -6
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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SaveRemoteAddrValveAction.java 11 Apr 2002 14:47:47 -0000 1.2
+++ SaveRemoteAddrValveAction.java 12 Apr 2002 22:06:30 -0000 1.3
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/SaveRemoteAddrValveAction.java,v
1.2 2002/04/11 14:47:47 manveen Exp $
- * $Revision: 1.2 $
- * $Date: 2002/04/11 14:47:47 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/SaveRemoteAddrValveAction.java,v
1.3 2002/04/12 22:06:30 manveen Exp $
+ * $Revision: 1.3 $
+ * $Date: 2002/04/12 22:06:30 $
*
* ====================================================================
*
@@ -88,7 +88,7 @@
* <em>Edit Valve</em> transactions for Remote Addr valve.
*
* @author Manveen Kaur
- * @version $Revision: 1.2 $ $Date: 2002/04/11 14:47:47 $
+ * @version $Revision: 1.3 $ $Date: 2002/04/12 22:06:30 $
*/
public final class SaveRemoteAddrValveAction extends Action {
@@ -149,12 +149,11 @@
RemoteAddrValveForm vform = (RemoteAddrValveForm) form;
String adminAction = vform.getAdminAction();
String vObjectName = vform.getObjectName();
- String parent = vform.getObjectName();
+ String parent = vform.getParentObjectName();
String valveType = vform.getValveType();
// Perform a "Create Valve" transaction (if requested)
if ("Create".equals(adminAction)) {
-
return ValveUtil.
createValve(parent, valveType, response, request, mapping,
(ApplicationServlet) getServlet());
1.3 +5 -5
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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SaveRemoteHostValveAction.java 11 Apr 2002 14:47:47 -0000 1.2
+++ SaveRemoteHostValveAction.java 12 Apr 2002 22:06:30 -0000 1.3
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/SaveRemoteHostValveAction.java,v
1.2 2002/04/11 14:47:47 manveen Exp $
- * $Revision: 1.2 $
- * $Date: 2002/04/11 14:47:47 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/SaveRemoteHostValveAction.java,v
1.3 2002/04/12 22:06:30 manveen Exp $
+ * $Revision: 1.3 $
+ * $Date: 2002/04/12 22:06:30 $
*
* ====================================================================
*
@@ -88,7 +88,7 @@
* <em>Edit Valve</em> transactions for Remote Host valve.
*
* @author Manveen Kaur
- * @version $Revision: 1.2 $ $Date: 2002/04/11 14:47:47 $
+ * @version $Revision: 1.3 $ $Date: 2002/04/12 22:06:30 $
*/
public final class SaveRemoteHostValveAction extends Action {
@@ -149,7 +149,7 @@
RemoteHostValveForm vform = (RemoteHostValveForm) form;
String adminAction = vform.getAdminAction();
String vObjectName = vform.getObjectName();
- String parent = vform.getObjectName();
+ String parent = vform.getParentObjectName();
String valveType = vform.getValveType();
// Perform a "Create Valve" transaction (if requested)
1.2 +6 -6
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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SaveRequestDumperValveAction.java 11 Apr 2002 14:47:47 -0000 1.1
+++ SaveRequestDumperValveAction.java 12 Apr 2002 22:06:30 -0000 1.2
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/SaveRequestDumperValveAction.java,v
1.1 2002/04/11 14:47:47 manveen Exp $
- * $Revision: 1.1 $
- * $Date: 2002/04/11 14:47:47 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/SaveRequestDumperValveAction.java,v
1.2 2002/04/12 22:06:30 manveen Exp $
+ * $Revision: 1.2 $
+ * $Date: 2002/04/12 22:06:30 $
*
* ====================================================================
*
@@ -88,7 +88,7 @@
* <em>Edit Valve</em> transactions for Request Dumper valve.
*
* @author Manveen Kaur
- * @version $Revision: 1.1 $ $Date: 2002/04/11 14:47:47 $
+ * @version $Revision: 1.2 $ $Date: 2002/04/12 22:06:30 $
*/
public final class SaveRequestDumperValveAction extends Action {
@@ -149,12 +149,12 @@
RequestDumperValveForm vform = (RequestDumperValveForm) form;
String adminAction = vform.getAdminAction();
String vObjectName = vform.getObjectName();
- String parent = vform.getObjectName();
+ String parent = vform.getParentObjectName();
String valveType = vform.getValveType();
-
+
// Perform a "Create Valve" transaction (if requested)
if ("Create".equals(adminAction)) {
-
+
return ValveUtil.
createValve(parent, valveType, response, request, mapping,
(ApplicationServlet) getServlet());
1.3 +5 -5
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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SaveSingleSignOnValveAction.java 11 Apr 2002 14:47:47 -0000 1.2
+++ SaveSingleSignOnValveAction.java 12 Apr 2002 22:06:30 -0000 1.3
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/SaveSingleSignOnValveAction.java,v
1.2 2002/04/11 14:47:47 manveen Exp $
- * $Revision: 1.2 $
- * $Date: 2002/04/11 14:47:47 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/SaveSingleSignOnValveAction.java,v
1.3 2002/04/12 22:06:30 manveen Exp $
+ * $Revision: 1.3 $
+ * $Date: 2002/04/12 22:06:30 $
*
* ====================================================================
*
@@ -89,7 +89,7 @@
* <em>Edit Valve</em> transactions for Single Sign On valve.
*
* @author Manveen Kaur
- * @version $Revision: 1.2 $ $Date: 2002/04/11 14:47:47 $
+ * @version $Revision: 1.3 $ $Date: 2002/04/12 22:06:30 $
*/
public final class SaveSingleSignOnValveAction extends Action {
@@ -150,7 +150,7 @@
SingleSignOnValveForm vform = (SingleSignOnValveForm) form;
String adminAction = vform.getAdminAction();
String vObjectName = vform.getObjectName();
- String parent = vform.getObjectName();
+ String parent = vform.getParentObjectName();
String valveType = vform.getValveType();
// Perform a "Create Valve" transaction (if requested)
1.3 +6 -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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ValveUtil.java 11 Apr 2002 19:09:05 -0000 1.2
+++ ValveUtil.java 12 Apr 2002 22:06:30 -0000 1.3
@@ -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.2 2002/04/11 19:09:05 manveen Exp $
- * $Revision: 1.2 $
- * $Date: 2002/04/11 19:09:05 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/ValveUtil.java,v
1.3 2002/04/12 22:06:30 manveen Exp $
+ * $Revision: 1.3 $
+ * $Date: 2002/04/12 22:06:30 $
*
* ====================================================================
*
@@ -94,7 +94,7 @@
* A utility class that contains methods common across valves.
*
* @author Manveen Kaur
- * @version $Revision: 1.2 $ $Date: 2002/04/11 19:09:05 $
+ * @version $Revision: 1.3 $ $Date: 2002/04/12 22:06:30 $
*/
public final class ValveUtil {
@@ -168,7 +168,6 @@
String message =
resources.getMessage("error.valveName.exists", sb.toString());
response.sendError(HttpServletResponse.SC_BAD_REQUEST, message);
- //saveErrors(request, errors);
return (new ActionForward(mapping.getInput()));
}
@@ -180,6 +179,8 @@
values = new String[1];
values[0] = parent;
operation = "create" + valveType;
+ if ("AccessLogValve".equalsIgnoreCase(valveType))
+ operation = "createAccessLoggerValve";
String vObjectName = (String)
mBServer.invoke(fname, operation, values,
createStandardValveTypes);
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
