amyroh 2003/03/11 06:15:45
Modified: webapps/admin banner.jsp
webapps/admin/WEB-INF/classes/org/apache/webapp/admin
Lists.java TomcatTreeBuilder.java
webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector
AddConnectorAction.java
webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context
AddContextAction.java DeleteContextAction.java
EditContextAction.java SaveContextAction.java
webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host
EditHostAction.java
webapps/admin/WEB-INF/classes/org/apache/webapp/admin/logger
AddLoggerAction.java DeleteLoggerAction.java
EditLoggerAction.java LoggerForm.java
SaveLoggerAction.java
webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm
AddRealmAction.java DeleteRealmAction.java
EditRealmAction.java RealmForm.java
SaveJDBCRealmAction.java SaveJNDIRealmAction.java
SaveMemoryRealmAction.java
SaveUserDatabaseRealmAction.java
webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources
ListDataSourcesAction.java
webapps/admin/WEB-INF/classes/org/apache/webapp/admin/service
EditServiceAction.java
webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve
AddValveAction.java DeleteValveAction.java
DeleteValvesAction.java EditValveAction.java
SaveAccessLogValveAction.java
SaveRemoteAddrValveAction.java
SaveRemoteHostValveAction.java
SaveRequestDumperValveAction.java
SaveSingleSignOnValveAction.java ValveForm.java
ValveUtil.java
webapps/admin/context context.jsp
webapps/admin/logger logger.jsp
webapps/admin/realm jdbcRealm.jsp jndiRealm.jsp
memoryRealm.jsp userDatabaseRealm.jsp
webapps/admin/valve accessLogValve.jsp remoteAddrValve.jsp
remoteHostValve.jsp requestDumperValve.jsp
singleSignOnValve.jsp
Log:
Update create/remove/edit for context, logger, realm, and valve to
support the new jsr77 name for context. Need to test all the component ops
more tomorrow...
Revision Changes Path
1.10 +2 -2 jakarta-tomcat-4.0/webapps/admin/banner.jsp
Index: banner.jsp
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/banner.jsp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- banner.jsp 15 Jan 2003 22:25:17 -0000 1.9
+++ banner.jsp 11 Mar 2003 14:15:38 -0000 1.10
@@ -20,7 +20,7 @@
<td align="left" valign="middle">
<div class="masthead-title-text" align="left"><img
src="images/TomcatBanner.jpg" alt="Tomcat Web Server Administration Tool"
height="120"></div>
</td>
- <form method='post' action='/admin/commitChanges.do' target='_self'>
+ <form method='post' action='commitChanges.do' target='_self'>
<td align="right" valign="middle">
<html:submit>
<bean:message key="button.commit"/>
@@ -30,7 +30,7 @@
<td width="1%">
<div class="table-normal-text" align="left">  </div>
</td>
- <form method='post' action='/admin/logOut.do' target='_top'>
+ <form method='post' action='logOut.do' target='_top'>
<td align="right" valign="middle">
<html:submit>
<bean:message key="button.logout"/>
1.16 +99 -4
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/Lists.java
Index: Lists.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/Lists.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- Lists.java 11 Mar 2003 03:26:19 -0000 1.15
+++ Lists.java 11 Mar 2003 14:15:38 -0000 1.16
@@ -78,6 +78,7 @@
* is returned.
*
* @author Craig R. McClanahan
+ * @author Amy Roh
* @version $Revision$ $Date$
*/
@@ -607,6 +608,100 @@
}
+
+ /**
+ * Return a list of <code>Valve</code> object name strings
+ * for the specified container (service, host, or context) object name.
+ *
+ * @param mbserver MBeanServer from which to retrieve the list
+ * @param container Object name of the container for which to select
+ * Valves
+ * @param host Object name of the host for which to select
+ * Valves
+ *
+ * @exception Exception if thrown while retrieving the list
+ */
+ public static List getValves(MBeanServer mbserver, String parent,
+ String hostName) throws Exception {
+
+ ObjectName container = null;
+ if (parent != null) {
+ container = new ObjectName(parent);
+ }
+ ObjectName hname = null;
+ if (hostName != null) {
+ hname = new ObjectName(hostName);
+ }
+ StringBuffer sb = new StringBuffer(container.getDomain());
+ sb.append(":type=Valve");
+ String type = container.getKeyProperty("type");
+ sb.append(TomcatTreeBuilder.WILDCARD);
+
+ String service = container.getKeyProperty("service");
+ String host = container.getKeyProperty("host");
+ String path = container.getKeyProperty("path");
+ if (service == null) {
+ service = hname.getKeyProperty("service");
+ host = hname.getKeyProperty("host");
+ String name = container.getKeyProperty("name");
+ path = name.substring(name.lastIndexOf('/'));
+ }
+
+ if ("Service".equals(type)) {
+ service = container.getKeyProperty("name");
+ }
+ if (service != null) {
+ sb.append(",service=");
+ sb.append(service);
+ }
+
+ ObjectName search = new ObjectName(sb.toString());
+ ArrayList valves = new ArrayList();
+ Iterator names = mbserver.queryNames(search, null).iterator();
+ while (names.hasNext()) {
+ ObjectName valve = (ObjectName) names.next();
+ String vpath = valve.getKeyProperty("path");
+ String vhost = valve.getKeyProperty("host");
+
+ String valveType = null;
+ String className = (String)
+ mbserver.getAttribute(valve, "className");
+ int period = className.lastIndexOf(".");
+ if (period >= 0)
+ valveType = className.substring(period + 1);
+
+ // Return only user-configurable valves.
+ if ("AccessLogValve".equalsIgnoreCase(valveType) ||
+ "RemoteAddrValve".equalsIgnoreCase(valveType) ||
+ "RemoteHostValve".equalsIgnoreCase(valveType) ||
+ "RequestDumperValve".equalsIgnoreCase(valveType) ||
+ "SingleSignOn".equalsIgnoreCase(valveType)) {
+ // if service is the container, then the valve name
+ // should not contain path or host
+ if ("Service".equalsIgnoreCase(type)) {
+ if ((vpath == null) && (vhost == null)) {
+ valves.add(valve.toString());
+ }
+ }
+
+ if ("Host".equalsIgnoreCase(type)) {
+ if ((vpath == null) && (host.equalsIgnoreCase(vhost))) {
+ valves.add(valve.toString());
+ }
+ }
+
+ if ((type == null) || "Context".equalsIgnoreCase(type)) {
+ if ((path.equalsIgnoreCase(vpath)) &&
(host.equalsIgnoreCase(vhost))) {
+ valves.add(valve.toString());
+ }
+ }
+ }
+ }
+ Collections.sort(valves);
+ return (valves);
+ }
+
+
/**
* Return a list of <code>Server</code> object name strings.
*
1.38 +5 -4
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.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- TomcatTreeBuilder.java 11 Mar 2003 03:26:19 -0000 1.37
+++ TomcatTreeBuilder.java 11 Mar 2003 14:15:38 -0000 1.38
@@ -94,6 +94,7 @@
*
* @author Jazmin Jonson
* @author Manveen Kaur
+ * @author Amy Roh
* @version $Revision$ $Date$
*/
1.7 +6 -6
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/AddConnectorAction.java
Index: AddConnectorAction.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/AddConnectorAction.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- AddConnectorAction.java 30 Apr 2002 18:10:47 -0000 1.6
+++ AddConnectorAction.java 11 Mar 2003 14:15:39 -0000 1.7
@@ -174,12 +174,12 @@
ArrayList types = new ArrayList();
// the first element in the select list should be the type selected
types.add(new LabelValueBean(type,
- "/admin/AddConnector.do?serviceName=" +
URLEncoder.encode(serviceName)
+ "AddConnector.do?serviceName=" + URLEncoder.encode(serviceName)
+ "&type=" + type));
for (int i=0; i< schemeTypes.length; i++) {
if (!type.equalsIgnoreCase(schemeTypes[i])) {
types.add(new LabelValueBean(schemeTypes[i],
- "/admin/AddConnector.do?serviceName=" +
URLEncoder.encode(serviceName)
+ "AddConnector.do?serviceName=" + URLEncoder.encode(serviceName)
+ "&type=" + schemeTypes[i]));
}
}
1.4 +5 -4
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context/AddContextAction.java
Index: AddContextAction.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context/AddContextAction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AddContextAction.java 5 Sep 2002 01:56:39 -0000 1.3
+++ AddContextAction.java 11 Mar 2003 14:15:39 -0000 1.4
@@ -81,6 +81,7 @@
* The <code>Action</code> that sets up <em>Add Context</em> transactions.
*
* @author Manveen Kaur
+ * @author Amy Roh
* @version $Revision$ $Date$
*/
1.3 +5 -4
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context/DeleteContextAction.java
Index: DeleteContextAction.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context/DeleteContextAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DeleteContextAction.java 11 Mar 2003 03:26:19 -0000 1.2
+++ DeleteContextAction.java 11 Mar 2003 14:15:39 -0000 1.3
@@ -97,6 +97,7 @@
* The <code>Action</code> that sets up <em>Delete Contexts</em> transactions.
*
* @author Manveen Kaur
+ * @author Amy Roh
* @version $Revision$ $Date$
*/
1.4 +6 -4
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context/EditContextAction.java
Index: EditContextAction.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context/EditContextAction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- EditContextAction.java 11 Mar 2003 03:26:19 -0000 1.3
+++ EditContextAction.java 11 Mar 2003 14:15:39 -0000 1.4
@@ -91,6 +91,7 @@
* The <code>Action</code> that sets up <em>Edit Context</em> transactions.
*
* @author Manveen Kaur
+ * @author Amy Roh
* @version $Revision$ $Date$
*/
@@ -229,6 +230,7 @@
session.setAttribute("contextForm", contextFm);
contextFm.setAdminAction("Edit");
contextFm.setObjectName(cname.toString());
+ contextFm.setParentObjectName(hname.toString());
contextFm.setLoaderObjectName(lname.toString());
contextFm.setManagerObjectName(mname.toString());
sb = new StringBuffer("Context (");
1.10 +5 -4
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context/SaveContextAction.java
Index: SaveContextAction.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context/SaveContextAction.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- SaveContextAction.java 11 Mar 2003 03:26:19 -0000 1.9
+++ SaveContextAction.java 11 Mar 2003 14:15:39 -0000 1.10
@@ -97,6 +97,7 @@
* <em>Edit Context</em> transactions.
*
* @author Manveen Kaur
+ * @author Amy Roh
* @version $Revision$ $Date$
*/
1.5 +5 -4
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/EditHostAction.java
Index: EditHostAction.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/EditHostAction.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- EditHostAction.java 3 Feb 2003 22:55:00 -0000 1.4
+++ EditHostAction.java 11 Mar 2003 14:15:40 -0000 1.5
@@ -92,6 +92,7 @@
* The <code>Action</code> that sets up <em>Edit Host</em> transactions.
*
* @author Manveen Kaur
+ * @author Amy Roh
* @version $Revision$ $Date$
*/
1.2 +14 -6
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/logger/AddLoggerAction.java
Index: AddLoggerAction.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/logger/AddLoggerAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AddLoggerAction.java 21 Mar 2002 17:11:28 -0000 1.1
+++ AddLoggerAction.java 11 Mar 2003 14:15:40 -0000 1.2
@@ -82,6 +82,7 @@
* The <code>Action</code> that sets up <em>Add Logger</em> transactions.
*
* @author Manveen Kaur
+ * @author Amy Roh
* @version $Revision$ $Date$
*/
@@ -129,7 +130,12 @@
loggerFm.setAdminAction("Create");
loggerFm.setObjectName("");
String parent = request.getParameter("parent");
+ String host = request.getParameter("host");
+ if (host == null) {
+ host = "";
+ }
loggerFm.setParentObjectName(parent);
+ loggerFm.setHostName(host);
String type = request.getParameter("type");
if (type == null)
type = "FileLogger"; // default type is FileLogger
@@ -147,12 +153,14 @@
ArrayList types = new ArrayList();
// the first element in the select list should be the type selected
types.add(new LabelValueBean(type,
- "/admin/AddLogger.do?parent=" + URLEncoder.encode(parent)
+ "AddLogger.do?parent=" + URLEncoder.encode(parent)
+ + "&host=" + URLEncoder.encode(host)
+ "&type=" + type));
for (int i=0; i< loggerTypes.length; i++) {
if (!type.equalsIgnoreCase(loggerTypes[i])) {
types.add(new LabelValueBean(loggerTypes[i],
- "/admin/AddLogger.do?parent=" + URLEncoder.encode(parent)
+ "AddLogger.do?parent=" + URLEncoder.encode(parent)
+ + "&host=" + URLEncoder.encode(host)
+ "&type=" + loggerTypes[i]));
}
}
1.5 +25 -9
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/logger/DeleteLoggerAction.java
Index: DeleteLoggerAction.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/logger/DeleteLoggerAction.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DeleteLoggerAction.java 24 Mar 2002 04:13:23 -0000 1.4
+++ DeleteLoggerAction.java 11 Mar 2003 14:15:40 -0000 1.5
@@ -96,6 +96,7 @@
* The <code>Action</code> that sets up <em>Delete Loggers</em> transactions.
*
* @author Manveen Kaur
+ * @author Amy Roh
* @version $Revision$ $Date$
*/
@@ -169,10 +170,11 @@
// Accumulate a list of all available loggers
ArrayList list = new ArrayList();
String parent = request.getParameter("parent");
+ String host = request.getParameter("host");
if (parent != null) {
try {
- pattern = getObjectName(parent, TomcatTreeBuilder.LOGGER_TYPE);
+ pattern = getObjectName(parent, host,
TomcatTreeBuilder.LOGGER_TYPE);
} catch (Exception e) {
getServlet().log
(resources.getMessage(locale, "users.error.select"));
@@ -207,20 +209,34 @@
}
public static String getObjectName(String parent, String MBeanType)
+ throws Exception {
+
+ return getObjectName(parent, null, MBeanType);
+
+ }
+
+
+ public static String getObjectName(String parent, String host, String MBeanType)
throws Exception{
// Form the pattern that gets the logger for this particular
// service, host or context.
StringBuffer sb = new StringBuffer(MBeanType);
ObjectName poname = new ObjectName(parent);
+ ObjectName honame = null;
+ if (host != null) {
+ honame = new ObjectName(host);
+ }
String type = poname.getKeyProperty("type");
- if ("Context".equalsIgnoreCase(type)) { // container is context
+ //if ("Context".equalsIgnoreCase(type)) { // container is context
+ if (type == null) { // container is context
sb.append(",path=");
- sb.append(poname.getKeyProperty("path"));
+ String name = poname.getKeyProperty("name");
+ sb.append(name.substring(name.lastIndexOf('/')));
sb.append(",host=");
- sb.append(poname.getKeyProperty("host"));
+ sb.append(honame.getKeyProperty("host"));
sb.append(",service=");
- sb.append(poname.getKeyProperty("service"));
+ sb.append(honame.getKeyProperty("service"));
}
if ("Host".equalsIgnoreCase(type)) { // container is host
sb.append(",host=");
1.4 +6 -5
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/logger/EditLoggerAction.java
Index: EditLoggerAction.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/logger/EditLoggerAction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- EditLoggerAction.java 21 May 2002 00:36:42 -0000 1.3
+++ EditLoggerAction.java 11 Mar 2003 14:15:40 -0000 1.4
@@ -166,7 +166,8 @@
session.setAttribute("loggerForm", loggerFm);
loggerFm.setAdminAction("Edit");
loggerFm.setObjectName(lname.toString());
- loggerFm.setParentObjectName("");
+ loggerFm.setParentObjectName("");
+ loggerFm.setHostName("");
sb = new StringBuffer("");
String host = lname.getKeyProperty("host");
String context = lname.getKeyProperty("path");
1.5 +35 -6
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/logger/LoggerForm.java
Index: LoggerForm.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/logger/LoggerForm.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- LoggerForm.java 24 Mar 2002 04:13:23 -0000 1.4
+++ LoggerForm.java 11 Mar 2003 14:15:40 -0000 1.5
@@ -85,7 +85,7 @@
*/
private String adminAction = "Edit";
- /**
+ /**
* The object name of the Logger this bean refers to.
*/
private String objectName = null;
@@ -94,7 +94,12 @@
* The object name of the parent of this Logger.
*/
private String parentObjectName = null;
-
+
+ /**
+ * The object name of the host of this Logger (if exists).
+ */
+ private String hostName = null;
+
/**
* The text for the logger type.
* Specifies if it is a FileLogger, or SysErr or SysOut Logger.
@@ -201,6 +206,27 @@
}
+
+ /**
+ * Return the host object name of the Logger this bean refers to.
+ */
+ public String getHostName() {
+
+ return this.hostName;
+
+ }
+
+
+ /**
+ * Set the host object name of the Logger this bean refers to.
+ */
+ public void setHostName(String hostName) {
+
+ this.hostName = hostName;
+
+ }
+
+
/**
* Return the Logger type.
*/
@@ -430,6 +456,7 @@
this.objectName = null;
this.loggerType = null;
this.parentObjectName = null;
+ this.hostName = null;
this.debugLvl = "0";
this.verbosityLvl = "0";
this.directory = null;
@@ -462,6 +489,8 @@
sb.append(objectName);
sb.append(",parentObjectName=");
sb.append(parentObjectName);
+ sb.append(",hostName=");
+ sb.append(hostName);
sb.append("]");
return (sb.toString());
1.6 +12 -8
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/logger/SaveLoggerAction.java
Index: SaveLoggerAction.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/logger/SaveLoggerAction.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- SaveLoggerAction.java 9 May 2002 01:07:31 -0000 1.5
+++ SaveLoggerAction.java 11 Mar 2003 14:15:40 -0000 1.6
@@ -97,6 +97,7 @@
* <em>Edit Logger</em> transactions.
*
* @author Manveen Kaur
+ * @author Amy Roh
* @version $Revision$ $Date$
*/
@@ -109,7 +110,8 @@
* Signature for the <code>createStandardLogger</code> operation.
*/
private String createStandardLoggerTypes[] =
- { "java.lang.String" // parent
+ { "java.lang.String", // parent
+ "java.lang.String" // host
};
@@ -176,9 +178,10 @@
try {
- String parent = lform.getParentObjectName();
+ String parent = lform.getParentObjectName();
+ String host = lform.getHostName();
String objectName = DeleteLoggerAction.getObjectName(
- parent, TomcatTreeBuilder.LOGGER_TYPE);
+ parent, host,
TomcatTreeBuilder.LOGGER_TYPE);
ObjectName pname = new ObjectName(parent);
StringBuffer sb = new StringBuffer(pname.getDomain());
@@ -216,8 +219,9 @@
new ObjectName(TomcatTreeBuilder.FACTORY_TYPE);
// Create a new StandardLogger object
- values = new String[1];
+ values = new String[2];
values[0] = parent;
+ values[1] = host;
operation = "create" + loggerType;
lObjectName = (String)
mBServer.invoke(fname, operation,
1.6 +31 -15
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/AddRealmAction.java
Index: AddRealmAction.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/AddRealmAction.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- AddRealmAction.java 13 Aug 2002 22:35:20 -0000 1.5
+++ AddRealmAction.java 11 Mar 2003 14:15:41 -0000 1.6
@@ -82,6 +82,7 @@
* The <code>Action</code> that sets up <em>Add Realm</em> transactions.
*
* @author Manveen Kaur
+ * @author Amy Roh
* @version $Revision$ $Date$
*/
@@ -137,42 +138,51 @@
String type = request.getParameter("type");
if (type == null)
type = "UserDatabaseRealm"; // default type is UserDatabaseRealm
-
+
+ String host = request.getParameter("host");
+ if (host == null) {
+ host = "";
+ }
+
types = new ArrayList();
// the first element in the select list should be the type selected
types.add(new LabelValueBean(type,
- "/admin/AddRealm.do?parent=" + URLEncoder.encode(parent)
+ "AddRealm.do?parent=" + URLEncoder.encode(parent)
+ + "&host=" + URLEncoder.encode(host)
+ "&type=" + type));
for (int i=0; i< realmTypes.length; i++) {
if (!type.equalsIgnoreCase(realmTypes[i])) {
types.add(new LabelValueBean(realmTypes[i],
- "/admin/AddRealm.do?parent=" + URLEncoder.encode(parent)
+ "AddRealm.do?parent=" + URLEncoder.encode(parent)
+ + "&host=" + URLEncoder.encode(host)
+ "&type=" + realmTypes[i]));
}
}
if ("UserDatabaseRealm".equalsIgnoreCase(type)) {
- createUserDatabaseRealm(session, parent);
+ createUserDatabaseRealm(session, parent, host);
} else if ("JNDIRealm".equalsIgnoreCase(type)) {
- createJNDIRealm(session, parent);
+ createJNDIRealm(session, parent, host);
} else if ("MemoryRealm".equalsIgnoreCase(type)) {
- createMemoryRealm(session, parent);
+ createMemoryRealm(session, parent, host);
} else {
//JDBC
- createJDBCRealm(session, parent);
+ createJDBCRealm(session, parent, host);
}
// Forward to the realm display page
return (mapping.findForward(type));
}
- private void createUserDatabaseRealm(HttpSession session, String parent) {
+ private void createUserDatabaseRealm(HttpSession session, String parent,
+ String host) {
UserDatabaseRealmForm realmFm = new UserDatabaseRealmForm();
session.setAttribute("userDatabaseRealmForm", realmFm);
realmFm.setAdminAction("Create");
realmFm.setObjectName("");
realmFm.setParentObjectName(parent);
+ realmFm.setHostName(host);
String realmType = "UserDatabaseRealm";
realmFm.setNodeLabel("Realm (" + realmType + ")");
realmFm.setRealmType(realmType);
@@ -182,13 +192,15 @@
realmFm.setRealmTypeVals(types);
}
- private void createJNDIRealm(HttpSession session, String parent) {
+ private void createJNDIRealm(HttpSession session, String parent,
+ String host) {
JNDIRealmForm realmFm = new JNDIRealmForm();
session.setAttribute("jndiRealmForm", realmFm);
realmFm.setAdminAction("Create");
realmFm.setObjectName("");
realmFm.setParentObjectName(parent);
+ realmFm.setHostName(host);
String realmType = "JNDIRealm";
realmFm.setNodeLabel("Realm (" + realmType + ")");
realmFm.setRealmType(realmType);
@@ -214,13 +226,15 @@
realmFm.setRealmTypeVals(types);
}
- private void createMemoryRealm(HttpSession session, String parent) {
+ private void createMemoryRealm(HttpSession session, String parent,
+ String host) {
MemoryRealmForm realmFm = new MemoryRealmForm();
session.setAttribute("memoryRealmForm", realmFm);
realmFm.setAdminAction("Create");
realmFm.setObjectName("");
realmFm.setParentObjectName(parent);
+ realmFm.setHostName(host);
String realmType = "MemoryRealm";
realmFm.setNodeLabel("Realm (" + realmType + ")");
realmFm.setRealmType(realmType);
@@ -230,13 +244,15 @@
realmFm.setRealmTypeVals(types);
}
- private void createJDBCRealm(HttpSession session, String parent) {
+ private void createJDBCRealm(HttpSession session, String parent,
+ String host) {
JDBCRealmForm realmFm = new JDBCRealmForm();
session.setAttribute("jdbcRealmForm", realmFm);
realmFm.setAdminAction("Create");
realmFm.setObjectName("");
realmFm.setParentObjectName(parent);
+ realmFm.setHostName(host);
String realmType = "JDBCRealm";
realmFm.setNodeLabel("Realm (" + realmType + ")");
realmFm.setRealmType(realmType);
1.4 +6 -5
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/DeleteRealmAction.java
Index: DeleteRealmAction.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/DeleteRealmAction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DeleteRealmAction.java 19 Jul 2002 00:23:18 -0000 1.3
+++ DeleteRealmAction.java 11 Mar 2003 14:15:41 -0000 1.4
@@ -170,11 +170,12 @@
// Accumulate a list of all available realms
ArrayList list = new ArrayList();
String parent = request.getParameter("parent");
+ String host = request.getParameter("host");
if (parent != null) {
try {
pattern = DeleteLoggerAction.getObjectName(
- parent,TomcatTreeBuilder.REALM_TYPE);
+ parent, host, TomcatTreeBuilder.REALM_TYPE);
} catch (Exception e) {
getServlet().log
(resources.getMessage(locale, "users.error.select"));
1.12 +18 -5
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/EditRealmAction.java
Index: EditRealmAction.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/EditRealmAction.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- EditRealmAction.java 13 Aug 2002 22:35:20 -0000 1.11
+++ EditRealmAction.java 11 Mar 2003 14:15:41 -0000 1.12
@@ -92,6 +92,7 @@
* Realm </em> transactions, based on the type of Realm.
*
* @author Manveen Kaur
+ * @author Amy Roh
* @version $Revision$ $Date$
*/
@@ -113,6 +114,8 @@
private Locale locale = null;
private HttpServletRequest request = null;
+ private String parent = null;
+ private String host = null;
// --------------------------------------------------------- Public Methods
/**
@@ -168,6 +171,8 @@
String realmType = null;
String attribute = null;
+ parent = request.getParameter("parent");
+ host = request.getParameter("host");
// Find what type of Realm this is
try {
@@ -187,7 +192,7 @@
attribute));
return (null);
}
-
+
// Forward to the appropriate realm display page
if ("UserDatabaseRealm".equalsIgnoreCase(realmType)) {
@@ -212,6 +217,8 @@
session.setAttribute("userDatabaseRealmForm", realmFm);
realmFm.setAdminAction("Edit");
realmFm.setObjectName(rname.toString());
+ realmFm.setParentObjectName(parent);
+ realmFm.setHostName(host);
String realmType = "UserDatabaseRealm";
StringBuffer sb = new StringBuffer("");
String host = rname.getKeyProperty("host");
@@ -258,6 +265,8 @@
session.setAttribute("memoryRealmForm", realmFm);
realmFm.setAdminAction("Edit");
realmFm.setObjectName(rname.toString());
+ realmFm.setParentObjectName(parent);
+ realmFm.setHostName(host);
String realmType = "MemoryRealm";
StringBuffer sb = new StringBuffer("Realm (");
sb.append(realmType);
@@ -297,6 +306,8 @@
session.setAttribute("jdbcRealmForm", realmFm);
realmFm.setAdminAction("Edit");
realmFm.setObjectName(rname.toString());
+ realmFm.setParentObjectName(parent);
+ realmFm.setHostName(host);
String realmType = "JDBCRealm";
StringBuffer sb = new StringBuffer("Realm (");
sb.append(realmType);
@@ -363,6 +374,8 @@
session.setAttribute("jndiRealmForm", realmFm);
realmFm.setAdminAction("Edit");
realmFm.setObjectName(rname.toString());
+ realmFm.setParentObjectName(parent);
+ realmFm.setHostName(host);
String realmType = "JNDIRealm";
StringBuffer sb = new StringBuffer("Realm (");
sb.append(realmType);
1.3 +30 -5
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/RealmForm.java
Index: RealmForm.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/RealmForm.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- RealmForm.java 19 Jul 2002 00:23:18 -0000 1.2
+++ RealmForm.java 11 Mar 2003 14:15:41 -0000 1.3
@@ -112,6 +112,11 @@
* The object name of the parent of this realm.
*/
private String parentObjectName = null;
+
+ /**
+ * The object name of the host of this Logger (if exists).
+ */
+ private String hostName = null;
/**
* Set of valid values for debug level.
@@ -222,8 +227,28 @@
}
+
+ /**
+ * Return the host object name of the Logger this bean refers to.
+ */
+ public String getHostName() {
+
+ return this.hostName;
+
+ }
+
+
+ /**
+ * Set the host object name of the Logger this bean refers to.
+ */
+ public void setHostName(String hostName) {
+
+ this.hostName = hostName;
+
+ }
+
- /**
+ /**
* Return the realmTypeVals.
*/
public List getRealmTypeVals() {
1.6 +11 -7
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/SaveJDBCRealmAction.java
Index: SaveJDBCRealmAction.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/SaveJDBCRealmAction.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- SaveJDBCRealmAction.java 19 Jul 2002 00:23:18 -0000 1.5
+++ SaveJDBCRealmAction.java 11 Mar 2003 14:15:41 -0000 1.6
@@ -96,6 +96,7 @@
* <em>Edit Realm</em> transactions for JDBC realm.
*
* @author Manveen Kaur
+ * @author Amy Roh
* @version $Revision$ $Date$
*/
@@ -109,6 +110,7 @@
*/
private String createStandardRealmTypes[] =
{ "java.lang.String", // parent
+ "java.lang.String" // host
};
@@ -176,8 +178,9 @@
try {
- String parent = rform.getParentObjectName();
- String objectName = DeleteLoggerAction.getObjectName(parent,
+ String parent = rform.getParentObjectName();
+ String host = rform.getHostName();
+ String objectName = DeleteLoggerAction.getObjectName(parent, host,
TomcatTreeBuilder.REALM_TYPE);
ObjectName pname = new ObjectName(parent);
@@ -216,8 +219,9 @@
new ObjectName(TomcatTreeBuilder.FACTORY_TYPE);
// Create a new StandardRealm object
- values = new String[1];
+ values = new String[2];
values[0] = parent;
+ values[1] = host;
operation = "createJDBCRealm";
rObjectName = (String)
mBServer.invoke(fname, operation,
1.11 +9 -6
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/SaveJNDIRealmAction.java
Index: SaveJNDIRealmAction.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/SaveJNDIRealmAction.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- SaveJNDIRealmAction.java 5 Feb 2003 23:24:46 -0000 1.10
+++ SaveJNDIRealmAction.java 11 Mar 2003 14:15:41 -0000 1.11
@@ -110,6 +110,7 @@
*/
private String createStandardRealmTypes[] =
{ "java.lang.String", // parent
+ "java.lang.String", // host
};
@@ -178,7 +179,8 @@
try {
String parent = rform.getParentObjectName();
- String objectName = DeleteLoggerAction.getObjectName(parent,
+ String host = rform.getHostName();
+ String objectName = DeleteLoggerAction.getObjectName(parent, host,
TomcatTreeBuilder.REALM_TYPE);
ObjectName pname = new ObjectName(parent);
@@ -217,8 +219,9 @@
new ObjectName(TomcatTreeBuilder.FACTORY_TYPE);
// Create a new StandardRealm object
- values = new String[1];
+ values = new String[2];
values[0] = parent;
+ values[1] = host;
operation = "createJNDIRealm";
rObjectName = (String)
mBServer.invoke(fname, operation,
1.5 +11 -7
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/SaveMemoryRealmAction.java
Index: SaveMemoryRealmAction.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/SaveMemoryRealmAction.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SaveMemoryRealmAction.java 19 Jul 2002 00:23:18 -0000 1.4
+++ SaveMemoryRealmAction.java 11 Mar 2003 14:15:41 -0000 1.5
@@ -96,6 +96,7 @@
* <em>Edit Realm</em> transactions for Memory realm.
*
* @author Manveen Kaur
+ * @author Amy Roh
* @version $Revision$ $Date$
*/
@@ -109,6 +110,7 @@
*/
private String createStandardRealmTypes[] =
{ "java.lang.String", // parent
+ "java.lang.String", // host
};
@@ -176,8 +178,9 @@
try {
- String parent = rform.getParentObjectName();
- String objectName = DeleteLoggerAction.getObjectName(parent,
+ String parent = rform.getParentObjectName();
+ String host = rform.getHostName();
+ String objectName = DeleteLoggerAction.getObjectName(parent, host,
TomcatTreeBuilder.REALM_TYPE);
ObjectName pname = new ObjectName(parent);
@@ -216,8 +219,9 @@
new ObjectName(TomcatTreeBuilder.FACTORY_TYPE);
// Create a new StandardRealm object
- values = new String[1];
+ values = new String[2];
values[0] = parent;
+ values[1] = host;
operation = "createMemoryRealm";
rObjectName = (String)
mBServer.invoke(fname, operation,
1.7 +11 -7
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/SaveUserDatabaseRealmAction.java
Index: SaveUserDatabaseRealmAction.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/SaveUserDatabaseRealmAction.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- SaveUserDatabaseRealmAction.java 19 Jul 2002 00:23:18 -0000 1.6
+++ SaveUserDatabaseRealmAction.java 11 Mar 2003 14:15:41 -0000 1.7
@@ -96,6 +96,7 @@
* <em>Edit Realm</em> transactions for UserDatabase realm.
*
* @author Manveen Kaur
+ * @author Amy Roh
* @version $Revision$ $Date$
*/
@@ -110,6 +111,7 @@
private String createUserDatabaseRealmTypes[] =
{ "java.lang.String", // parent
"java.lang.String", // name
+ "java.lang.String", // host
};
@@ -177,8 +179,9 @@
try {
- String parent = rform.getParentObjectName();
- String objectName = DeleteLoggerAction.getObjectName(parent,
+ String parent = rform.getParentObjectName();
+ String host = rform.getHostName();
+ String objectName = DeleteLoggerAction.getObjectName(parent, host,
TomcatTreeBuilder.REALM_TYPE);
ObjectName pname = new ObjectName(parent);
@@ -217,9 +220,10 @@
new ObjectName(TomcatTreeBuilder.FACTORY_TYPE);
// Create a new StandardRealm object
- values = new String[2];
+ values = new String[3];
values[0] = parent;
values[1] = rform.getResource();
+ values[2] = host;
operation = "createUserDatabaseRealm";
rObjectName = (String)
mBServer.invoke(fname, operation,
1.4 +5 -4
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/ListDataSourcesAction.java
Index: ListDataSourcesAction.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/ListDataSourcesAction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ListDataSourcesAction.java 14 Jun 2002 13:29:29 -0000 1.3
+++ ListDataSourcesAction.java 11 Mar 2003 14:15:43 -0000 1.4
@@ -90,6 +90,7 @@
* </ul>
*
* @author Manveen Kaur
+ * @author Amy Roh
* @version $Revision$ $Date$
* @since 4.1
*/
1.6 +5 -4
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/service/EditServiceAction.java
Index: EditServiceAction.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/service/EditServiceAction.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- EditServiceAction.java 27 Apr 2002 01:05:03 -0000 1.5
+++ EditServiceAction.java 11 Mar 2003 14:15:43 -0000 1.6
@@ -91,6 +91,7 @@
* The <code>Action</code> that sets up <em>Edit Service</em> transactions.
*
* @author Manveen Kaur
+ * @author Amy Roh
* @version $Revision$ $Date$
*/
1.3 +34 -16
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/AddValveAction.java
Index: AddValveAction.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/AddValveAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AddValveAction.java 22 Nov 2002 21:49:46 -0000 1.2
+++ AddValveAction.java 11 Mar 2003 14:15:43 -0000 1.3
@@ -82,6 +82,7 @@
* The <code>Action</code> that sets up <em>Add Valve</em> transactions.
*
* @author Manveen Kaur
+ * @author Amy Roh
* @version $Revision$ $Date$
*/
@@ -138,44 +139,53 @@
String type = request.getParameter("type");
if (type == null)
type = "AccessLogValve"; // default type is AccessLog
+
+ String host = request.getParameter("host");
+ if (host == null) {
+ host = "";
+ }
types = new ArrayList();
// the first element in the select list should be the type selected
types.add(new LabelValueBean(type,
- "/admin/AddValve.do?parent=" + URLEncoder.encode(parent)
+ "AddValve.do?parent=" + URLEncoder.encode(parent)
+ + "&host=" + URLEncoder.encode(host)
+ "&type=" + type));
for (int i=0; i< valveTypes.length; i++) {
if (!type.equalsIgnoreCase(valveTypes[i])) {
types.add(new LabelValueBean(valveTypes[i],
- "/admin/AddValve.do?parent=" + URLEncoder.encode(parent)
+ "AddValve.do?parent=" + URLEncoder.encode(parent)
+ + "&host=" + URLEncoder.encode(host)
+ "&type=" + valveTypes[i]));
}
}
if ("AccessLogValve".equalsIgnoreCase(type)) {
- createAccessLogger(session, parent);
+ createAccessLogger(session, parent, host);
} else if ("RemoteAddrValve".equalsIgnoreCase(type)) {
- createRemoteAddrValve(session, parent);
+ createRemoteAddrValve(session, parent, host);
} else if ("RemoteHostValve".equalsIgnoreCase(type)) {
- createRemoteHostValve(session, parent);
+ createRemoteHostValve(session, parent, host);
} else if ("RequestDumperValve".equalsIgnoreCase(type)) {
- createRequestDumperValve(session, parent);
+ createRequestDumperValve(session, parent, host);
} else {
//SingleSignOn
- createSingleSignOnValve(session, parent);
+ createSingleSignOnValve(session, parent, host);
}
// Forward to the valve display page
return (mapping.findForward(type));
}
- private void createAccessLogger(HttpSession session, String parent) {
+ private void createAccessLogger(HttpSession session, String parent,
+ String host) {
AccessLogValveForm valveFm = new AccessLogValveForm();
session.setAttribute("accessLogValveForm", valveFm);
valveFm.setAdminAction("Create");
valveFm.setObjectName("");
valveFm.setParentObjectName(parent);
+ valveFm.setHostName(host);
String valveType = "AccessLogValve";
valveFm.setNodeLabel("Valve (" + valveType + ")");
valveFm.setValveType(valveType);
@@ -191,13 +201,15 @@
valveFm.setValveTypeVals(types);
}
- private void createRemoteAddrValve(HttpSession session, String parent) {
+ private void createRemoteAddrValve(HttpSession session, String parent,
+ String host) {
RemoteAddrValveForm valveFm = new RemoteAddrValveForm();
session.setAttribute("remoteAddrValveForm", valveFm);
valveFm.setAdminAction("Create");
valveFm.setObjectName("");
valveFm.setParentObjectName(parent);
+ valveFm.setHostName(host);
String valveType = "RemoteAddrValve";
valveFm.setNodeLabel("Valve (" + valveType + ")");
valveFm.setValveType(valveType);
@@ -206,13 +218,15 @@
valveFm.setValveTypeVals(types);
}
- private void createRemoteHostValve(HttpSession session, String parent) {
+ private void createRemoteHostValve(HttpSession session, String parent,
+ String host) {
RemoteHostValveForm valveFm = new RemoteHostValveForm();
session.setAttribute("remoteHostValveForm", valveFm);
valveFm.setAdminAction("Create");
valveFm.setObjectName("");
valveFm.setParentObjectName(parent);
+ valveFm.setHostName(host);
String valveType = "RemoteHostValve";
valveFm.setNodeLabel("Valve (" + valveType + ")");
valveFm.setValveType(valveType);
@@ -221,26 +235,30 @@
valveFm.setValveTypeVals(types);
}
- private void createRequestDumperValve(HttpSession session, String parent) {
+ private void createRequestDumperValve(HttpSession session, String parent,
+ String host) {
RequestDumperValveForm valveFm = new RequestDumperValveForm();
session.setAttribute("requestDumperValveForm", valveFm);
valveFm.setAdminAction("Create");
valveFm.setObjectName("");
valveFm.setParentObjectName(parent);
+ valveFm.setHostName(host);
String valveType = "RequestDumperValve";
valveFm.setNodeLabel("Valve (" + valveType + ")");
valveFm.setValveType(valveType);
valveFm.setValveTypeVals(types);
}
- private void createSingleSignOnValve(HttpSession session, String parent) {
+ private void createSingleSignOnValve(HttpSession session, String parent,
+ String host) {
SingleSignOnValveForm valveFm = new SingleSignOnValveForm();
session.setAttribute("singleSignOnValveForm", valveFm);
valveFm.setAdminAction("Create");
valveFm.setObjectName("");
valveFm.setParentObjectName(parent);
+ valveFm.setHostName(host);
String valveType = "SingleSignOn";
valveFm.setNodeLabel("Valve (" + valveType + ")");
valveFm.setValveType(valveType);
1.5 +7 -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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DeleteValveAction.java 19 Apr 2002 18:04:40 -0000 1.4
+++ DeleteValveAction.java 11 Mar 2003 14:15:43 -0000 1.5
@@ -97,6 +97,7 @@
* The <code>Action</code> that sets up <em>Delete Valves</em> transactions.
*
* @author Manveen Kaur
+ * @author Amy Roh
* @version $Revision$ $Date$
*/
@@ -171,9 +172,10 @@
ArrayList list = new ArrayList();
String parent = request.getParameter("parent");
valvesForm.setParentObjectName(parent);
+ String host = request.getParameter("host");
try {
- Iterator items = (Lists.getValves(mBServer, parent)).iterator();
+ Iterator items = (Lists.getValves(mBServer, parent, host)).iterator();
while (items.hasNext()) {
list.add(items.next().toString());
}
1.2 +4 -3
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/DeleteValvesAction.java
Index: DeleteValvesAction.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/DeleteValvesAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DeleteValvesAction.java 11 Apr 2002 19:17:18 -0000 1.1
+++ DeleteValvesAction.java 11 Mar 2003 14:15:43 -0000 1.2
@@ -93,6 +93,7 @@
* transactions.
*
* @author Manveen Kaur
+ * @author Amy Roh
* @version $Revision$ $Date$
*/
1.6 +13 -5
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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- EditValveAction.java 22 Nov 2002 21:49:46 -0000 1.5
+++ EditValveAction.java 11 Mar 2003 14:15:43 -0000 1.6
@@ -92,6 +92,7 @@
* Valve </em> transactions, based on the type of Valve.
*
* @author Manveen Kaur
+ * @author Amy Roh
* @version $Revision$ $Date$
*/
@@ -112,6 +113,7 @@
private HttpSession session = null;
private Locale locale = null;
private String parent = null;
+ private String host = null;
// --------------------------------------------------------- Public Methods
@@ -166,6 +168,7 @@
}
parent = request.getParameter("parent");
+ host = request.getParameter("host");
String valveType = null;
String attribute = null;
@@ -214,7 +217,8 @@
session.setAttribute("accessLogValveForm", valveFm);
valveFm.setAdminAction("Edit");
valveFm.setObjectName(vname.toString());
- valveFm.setParentObjectName(parent);
+ valveFm.setParentObjectName(parent);
+ valveFm.setHostName(host);
String valveType = "AccessLogValve";
StringBuffer sb = new StringBuffer("");
String host = vname.getKeyProperty("host");
@@ -276,6 +280,7 @@
valveFm.setAdminAction("Edit");
valveFm.setObjectName(vname.toString());
valveFm.setParentObjectName(parent);
+ valveFm.setHostName(host);
String valveType = "RequestDumperValve";
StringBuffer sb = new StringBuffer("Valve (");
sb.append(valveType);
@@ -293,6 +298,7 @@
valveFm.setAdminAction("Edit");
valveFm.setObjectName(vname.toString());
valveFm.setParentObjectName(parent);
+ valveFm.setHostName(host);
String valveType = "SingleSignOn";
StringBuffer sb = new StringBuffer("Valve (");
sb.append(valveType);
@@ -328,6 +334,7 @@
valveFm.setAdminAction("Edit");
valveFm.setObjectName(vname.toString());
valveFm.setParentObjectName(parent);
+ valveFm.setHostName(host);
String valveType = "RemoteAddrValve";
StringBuffer sb = new StringBuffer("Valve (");
sb.append(valveType);
@@ -365,6 +372,7 @@
valveFm.setAdminAction("Edit");
valveFm.setObjectName(vname.toString());
valveFm.setParentObjectName(parent);
+ valveFm.setHostName(host);
String valveType = "RemoteHostValve";
StringBuffer sb = new StringBuffer("Valve (");
sb.append(valveType);
1.5 +7 -5
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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SaveAccessLogValveAction.java 10 Feb 2003 04:25:26 -0000 1.4
+++ SaveAccessLogValveAction.java 11 Mar 2003 14:15:43 -0000 1.5
@@ -88,6 +88,7 @@
* <em>Edit Valve</em> transactions for AccessLog valve.
*
* @author Manveen Kaur
+ * @author Amy Roh
* @version $Revision$ $Date$
*/
@@ -150,12 +151,13 @@
String adminAction = vform.getAdminAction();
String vObjectName = vform.getObjectName();
String parent = vform.getParentObjectName();
+ String host = vform.getHostName();
String valveType = vform.getValveType();
// Perform a "Create Valve" transaction (if requested)
if ("Create".equals(adminAction)) {
- vObjectName = ValveUtil.createValve(parent, valveType,
+ vObjectName = ValveUtil.createValve(parent, host, valveType,
response, request, mapping,
(ApplicationServlet) getServlet());
1.5 +6 -5
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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SaveRemoteAddrValveAction.java 10 Feb 2003 04:25:26 -0000 1.4
+++ SaveRemoteAddrValveAction.java 11 Mar 2003 14:15:43 -0000 1.5
@@ -150,12 +150,13 @@
String adminAction = vform.getAdminAction();
String vObjectName = vform.getObjectName();
String parent = vform.getParentObjectName();
+ String host = vform.getHostName();
String valveType = vform.getValveType();
// Perform a "Create Valve" transaction (if requested)
if ("Create".equals(adminAction)) {
- vObjectName = ValveUtil.createValve(parent, valveType,
+ vObjectName = ValveUtil.createValve(parent, host, valveType,
response, request, mapping,
(ApplicationServlet) getServlet());
1.5 +6 -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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SaveRemoteHostValveAction.java 10 Feb 2003 04:25:26 -0000 1.4
+++ SaveRemoteHostValveAction.java 11 Mar 2003 14:15:43 -0000 1.5
@@ -150,12 +150,13 @@
String adminAction = vform.getAdminAction();
String vObjectName = vform.getObjectName();
String parent = vform.getParentObjectName();
+ String host = vform.getHostName();
String valveType = vform.getValveType();
// Perform a "Create Valve" transaction (if requested)
if ("Create".equals(adminAction)) {
- vObjectName = ValveUtil.createValve(parent, valveType,
+ vObjectName = ValveUtil.createValve(parent, host, valveType,
response, request, mapping,
(ApplicationServlet) getServlet());
1.4 +7 -5
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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SaveRequestDumperValveAction.java 10 Feb 2003 04:25:26 -0000 1.3
+++ SaveRequestDumperValveAction.java 11 Mar 2003 14:15:43 -0000 1.4
@@ -88,6 +88,7 @@
* <em>Edit Valve</em> transactions for Request Dumper valve.
*
* @author Manveen Kaur
+ * @author Amy Roh
* @version $Revision$ $Date$
*/
@@ -150,12 +151,13 @@
String adminAction = vform.getAdminAction();
String vObjectName = vform.getObjectName();
String parent = vform.getParentObjectName();
+ String host = vform.getHostName();
String valveType = vform.getValveType();
// Perform a "Create Valve" transaction (if requested)
if ("Create".equals(adminAction)) {
- vObjectName = ValveUtil.createValve(parent, valveType,
+ vObjectName = ValveUtil.createValve(parent, host, valveType,
response, request, mapping,
(ApplicationServlet) getServlet());
1.6 +6 -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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- SaveSingleSignOnValveAction.java 10 Feb 2003 04:25:26 -0000 1.5
+++ SaveSingleSignOnValveAction.java 11 Mar 2003 14:15:43 -0000 1.6
@@ -151,12 +151,13 @@
String adminAction = vform.getAdminAction();
String vObjectName = vform.getObjectName();
String parent = vform.getParentObjectName();
+ String host = vform.getHostName();
String valveType = vform.getValveType();
// Perform a "Create Valve" transaction (if requested)
if ("Create".equals(adminAction)) {
- vObjectName = ValveUtil.createValve(parent, valveType,
+ vObjectName = ValveUtil.createValve(parent, host, valveType,
response, request, mapping,
(ApplicationServlet) getServlet());
1.2 +27 -4
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/ValveForm.java
Index: ValveForm.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/ValveForm.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ValveForm.java 11 Apr 2002 07:42:04 -0000 1.1
+++ ValveForm.java 11 Mar 2003 14:15:43 -0000 1.2
@@ -113,6 +113,11 @@
* The object name of the parent of this valve.
*/
private String parentObjectName = null;
+
+ /**
+ * The object name of the host of this Logger (if exists).
+ */
+ private String hostName = null;
/**
* Set of valid values for valves.
@@ -152,7 +157,6 @@
* Set the Object Name.
*/
public void setObjectName(String objectName) {
-
this.objectName = objectName;
}
@@ -212,6 +216,25 @@
}
+
+ /**
+ * Return the host object name of the Logger this bean refers to.
+ */
+ public String getHostName() {
+
+ return this.hostName;
+
+ }
+
+
+ /**
+ * Set the host object name of the Logger this bean refers to.
+ */
+ public void setHostName(String hostName) {
+
+ this.hostName = hostName;
+
+ }
/**
* Return the valveTypeVals.
1.10 +13 -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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ValveUtil.java 11 Feb 2003 02:27:15 -0000 1.9
+++ ValveUtil.java 11 Mar 2003 14:15:43 -0000 1.10
@@ -97,6 +97,7 @@
* A utility class that contains methods common across valves.
*
* @author Manveen Kaur
+ * @author Amy Roh
* @version $Revision$ $Date$
*/
@@ -110,12 +111,13 @@
*/
private static String createStandardValveTypes[] =
{ "java.lang.String", // parent
+ "java.lang.String" // host
};
// --------------------------------------------------------- Public Methods
- public static String createValve(String parent, String valveType,
+ public static String createValve(String parent, String host, String valveType,
HttpServletResponse response, HttpServletRequest request,
ActionMapping mapping, ApplicationServlet servlet)
throws IOException, ServletException {
@@ -139,7 +141,7 @@
try {
- String objectName = DeleteLoggerAction.getObjectName(parent,
+ String objectName = DeleteLoggerAction.getObjectName(parent, host,
TomcatTreeBuilder.VALVE_TYPE);
String parentNodeName = parent;
@@ -184,8 +186,9 @@
new ObjectName(TomcatTreeBuilder.FACTORY_TYPE);
// Create a new StandardValve object
- values = new String[1];
- values[0] = parent;
+ values = new String[2];
+ values[0] = parent;
+ values[1] = host;
operation = "create" + valveType;
if ("AccessLogValve".equalsIgnoreCase(valveType))
@@ -210,7 +213,8 @@
nodeLabel,
"EditValve.do?select=" + encodedName +
"&nodeLabel=" + URLEncoder.encode(nodeLabel) +
- "&parent=" + URLEncoder.encode(parentNodeName),
+ "&parent=" + URLEncoder.encode(parentNodeName) +
+ "&host=" + URLEncoder.encode(host),
"content",
true);
parentNode.addChild(childNode);
1.13 +24 -8 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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- context.jsp 15 Jan 2003 22:25:19 -0000 1.12
+++ context.jsp 11 Mar 2003 14:15:44 -0000 1.13
@@ -17,13 +17,17 @@
<html:errors/>
<html:form method="POST" action="/SaveContext">
+
+ <bean:define id="parentObjectName" type="java.lang.String"
+ name="contextForm" property="parentObjectName"/>
<bean:define id="thisObjectName" type="java.lang.String"
- name="contextForm" property="objectName"/>
+ name="contextForm" property="objectName"/>
+
<html:hidden property="adminAction"/>
<html:hidden property="objectName"/>
- <html:hidden property="parentObjectName"/>
<html:hidden property="loaderObjectName"/>
<html:hidden property="managerObjectName"/>
+ <html:hidden property="parentObjectName"/>
<table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr bgcolor="7171A5">
@@ -44,11 +48,15 @@
<controls:action disabled="true"> ---------------------------------
</controls:action>
<logic:notEqual name="contextForm" property="adminAction"
value="Create">
<controls:action url='<%= "/AddLogger.do?parent=" +
- URLEncoder.encode(thisObjectName) %>'>
+ URLEncoder.encode(thisObjectName) +
+ "&host=" +
+ URLEncoder.encode(parentObjectName) %>'>
<bean:message key="actions.loggers.create"/>
</controls:action>
<controls:action url='<%= "/DeleteLogger.do?parent=" +
- URLEncoder.encode(thisObjectName) %>'>
+ URLEncoder.encode(thisObjectName) +
+ "&host=" +
+ URLEncoder.encode(parentObjectName) %>'>
<bean:message key="actions.loggers.deletes"/>
</controls:action>
<%-- cannot delete or add the realm of the context of the admin app --%>
@@ -56,21 +64,29 @@
value='<%= request.getContextPath() %>'>
<controls:action disabled="true"> -------------------------------------
</controls:action>
<controls:action url='<%= "/AddRealm.do?parent=" +
- URLEncoder.encode(thisObjectName) %>'>
+ URLEncoder.encode(thisObjectName) +
+ "&host=" +
+ URLEncoder.encode(parentObjectName) %>'>
<bean:message key="actions.realms.create"/>
</controls:action>
<controls:action url='<%= "/DeleteRealm.do?parent=" +
- URLEncoder.encode(thisObjectName) %>'>
+ URLEncoder.encode(thisObjectName) +
+ "&host=" +
+ URLEncoder.encode(parentObjectName) %>'>
<bean:message key="actions.realms.deletes"/>
</controls:action>
</logic:notEqual>
<controls:action disabled="true">
------------------------------------- </controls:action>
<controls:action url='<%= "/AddValve.do?parent=" +
- URLEncoder.encode(thisObjectName) %>'>
+ URLEncoder.encode(thisObjectName) +
+ "&host=" +
+ URLEncoder.encode(parentObjectName) %>'>
<bean:message key="actions.valves.create"/>
</controls:action>
<controls:action url='<%= "/DeleteValve.do?parent=" +
- URLEncoder.encode(thisObjectName) %>'>
+ URLEncoder.encode(thisObjectName) +
+ "&host=" +
+ URLEncoder.encode(parentObjectName) %>'>
<bean:message key="actions.valves.deletes"/>
</controls:action>
<%-- cannot delete the context of the admin app from the tool --%>
1.8 +5 -1 jakarta-tomcat-4.0/webapps/admin/logger/logger.jsp
Index: logger.jsp
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/logger/logger.jsp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- logger.jsp 15 Jan 2003 22:25:19 -0000 1.7
+++ logger.jsp 11 Mar 2003 14:15:44 -0000 1.8
@@ -21,10 +21,13 @@
<bean:define id="thisObjectName" type="java.lang.String"
name="loggerForm" property="objectName"/>
+ <bean:define id="thisHostName" type="java.lang.String"
+ name="loggerForm" property="hostName"/>
<html:hidden property="parentObjectName"/>
<html:hidden property="adminAction"/>
<html:hidden property="objectName"/>
<html:hidden property="loggerType"/>
+ <html:hidden property="hostName"/>
<table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr bgcolor="7171A5">
@@ -45,7 +48,8 @@
<controls:action disabled="true"> ---------------------------------
</controls:action>
<logic:notEqual name="loggerForm" property="adminAction" value="Create">
<controls:action url='<%= "/DeleteLogger.do?select=" +
- URLEncoder.encode(thisObjectName) %>'>
+ URLEncoder.encode(thisObjectName) +
+ "&host="+ URLEncoder.encode(thisHostName) %>'>
<bean:message key="actions.loggers.delete"/>
</controls:action>
</logic:notEqual>
1.11 +5 -1 jakarta-tomcat-4.0/webapps/admin/realm/jdbcRealm.jsp
Index: jdbcRealm.jsp
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/realm/jdbcRealm.jsp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- jdbcRealm.jsp 5 Feb 2003 02:19:30 -0000 1.10
+++ jdbcRealm.jsp 11 Mar 2003 14:15:44 -0000 1.11
@@ -20,10 +20,13 @@
<bean:define id="thisObjectName" type="java.lang.String"
name="jdbcRealmForm" property="objectName"/>
+ <bean:define id="thisHostName" type="java.lang.String"
+ name="jdbcRealmForm" property="hostName"/>
<html:hidden property="adminAction"/>
<html:hidden property="parentObjectName"/>
<html:hidden property="objectName"/>
<html:hidden property="allowDeletion"/>
+ <html:hidden property="hostName"/>
<table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr bgcolor="7171A5">
@@ -45,7 +48,8 @@
<logic:notEqual name="jdbcRealmForm" property="adminAction"
value="Create">
<logic:notEqual name="jdbcRealmForm" property="allowDeletion"
value="false">
<controls:action url='<%= "/DeleteRealm.do?select=" +
- URLEncoder.encode(thisObjectName) %>'>
+ URLEncoder.encode(thisObjectName) +
+ "&host="+ URLEncoder.encode(thisHostName) %>'>
<bean:message key="actions.realms.delete"/>
</controls:action>
</logic:notEqual>
1.14 +5 -1 jakarta-tomcat-4.0/webapps/admin/realm/jndiRealm.jsp
Index: jndiRealm.jsp
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/realm/jndiRealm.jsp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- jndiRealm.jsp 15 Jan 2003 22:25:20 -0000 1.13
+++ jndiRealm.jsp 11 Mar 2003 14:15:45 -0000 1.14
@@ -19,10 +19,13 @@
<html:form method="POST" action="/SaveJNDIRealm">
<bean:define id="thisObjectName" type="java.lang.String"
name="jndiRealmForm" property="objectName"/>
+ <bean:define id="thisHostName" type="java.lang.String"
+ name="jndiRealmForm" property="hostName"/>
<html:hidden property="adminAction"/>
<html:hidden property="objectName"/>
<html:hidden property="parentObjectName"/>
<html:hidden property="allowDeletion"/>
+ <html:hidden property="hostName"/>
<table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr bgcolor="7171A5">
@@ -44,7 +47,8 @@
<logic:notEqual name="jndiRealmForm" property="adminAction"
value="Create">
<logic:notEqual name="jndiRealmForm" property="allowDeletion"
value="false">
<controls:action url='<%= "/DeleteRealm.do?select=" +
- URLEncoder.encode(thisObjectName) %>'>
+ URLEncoder.encode(thisObjectName) +
+ "&host="+ URLEncoder.encode(thisHostName) %>'>
<bean:message key="actions.realms.delete"/>
</controls:action>
</logic:notEqual>
1.10 +5 -1 jakarta-tomcat-4.0/webapps/admin/realm/memoryRealm.jsp
Index: memoryRealm.jsp
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/realm/memoryRealm.jsp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- memoryRealm.jsp 15 Jan 2003 22:25:20 -0000 1.9
+++ memoryRealm.jsp 11 Mar 2003 14:15:45 -0000 1.10
@@ -20,10 +20,13 @@
<bean:define id="thisObjectName" type="java.lang.String"
name="memoryRealmForm" property="objectName"/>
+ <bean:define id="thisHostName" type="java.lang.String"
+ name="memoryRealmForm" property="hostName"/>
<html:hidden property="parentObjectName"/>
<html:hidden property="adminAction"/>
<html:hidden property="objectName"/>
<html:hidden property="allowDeletion"/>
+ <html:hidden property="hostName"/>
<table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr bgcolor="7171A5">
@@ -45,7 +48,8 @@
<logic:notEqual name="memoryRealmForm" property="adminAction"
value="Create">
<logic:notEqual name="memoryRealmForm" property="allowDeletion"
value="false">
<controls:action url='<%= "/DeleteRealm.do?select=" +
- URLEncoder.encode(thisObjectName) %>'>
+ URLEncoder.encode(thisObjectName) +
+ "&host="+ URLEncoder.encode(thisHostName) %>'>
<bean:message key="actions.realms.delete"/>
</controls:action>
</logic:notEqual>
1.11 +5 -1 jakarta-tomcat-4.0/webapps/admin/realm/userDatabaseRealm.jsp
Index: userDatabaseRealm.jsp
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/realm/userDatabaseRealm.jsp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- userDatabaseRealm.jsp 7 Feb 2003 05:53:00 -0000 1.10
+++ userDatabaseRealm.jsp 11 Mar 2003 14:15:45 -0000 1.11
@@ -20,10 +20,13 @@
<bean:define id="thisObjectName" type="java.lang.String"
name="userDatabaseRealmForm" property="objectName"/>
+ <bean:define id="thisHostName" type="java.lang.String"
+ name="userDatabaseRealmForm" property="hostName"/>
<html:hidden property="parentObjectName"/>
<html:hidden property="adminAction"/>
<html:hidden property="objectName"/>
<html:hidden property="allowDeletion"/>
+ <html:hidden property="hostName"/>
<table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr bgcolor="7171A5">
@@ -45,7 +48,8 @@
<logic:notEqual name="userDatabaseRealmForm" property="adminAction"
value="Create">
<logic:notEqual name="userDatabaseRealmForm"
property="allowDeletion" value="false">
<controls:action url='<%= "/DeleteRealm.do?select=" +
- URLEncoder.encode(thisObjectName) %>'>
+ URLEncoder.encode(thisObjectName) +
+ "&host="+ URLEncoder.encode(thisHostName) %>'>
<bean:message key="actions.realms.delete"/>
</controls:action>
</logic:notEqual>
1.11 +5 -1 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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- accessLogValve.jsp 15 Jan 2003 22:25:22 -0000 1.10
+++ accessLogValve.jsp 11 Mar 2003 14:15:45 -0000 1.11
@@ -22,10 +22,13 @@
name="accessLogValveForm" property="objectName"/>
<bean:define id="thisParentName" type="java.lang.String"
name="accessLogValveForm" property="parentObjectName"/>
+ <bean:define id="thisHostName" type="java.lang.String"
+ name="accessLogValveForm" property="hostName"/>
<html:hidden property="adminAction"/>
<html:hidden property="parentObjectName"/>
<html:hidden property="objectName"/>
<html:hidden property="valveType"/>
+ <html:hidden property="hostName"/>
<table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr bgcolor="7171A5">
@@ -47,7 +50,8 @@
<logic:notEqual name="accessLogValveForm" property="adminAction"
value="Create">
<controls:action url='<%= "/DeleteValve.do?" +
"select=" + URLEncoder.encode(thisObjectName) +
- "&parent="+ URLEncoder.encode(thisParentName) %>'>
+ "&parent="+ URLEncoder.encode(thisParentName) +
+ "&host="+ URLEncoder.encode(thisHostName) %>'>
<bean:message key="actions.valves.delete"/>
</controls:action>
</logic:notEqual>
1.9 +5 -1 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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- remoteAddrValve.jsp 15 Jan 2003 22:25:22 -0000 1.8
+++ remoteAddrValve.jsp 11 Mar 2003 14:15:45 -0000 1.9
@@ -22,10 +22,13 @@
name="remoteAddrValveForm" property="objectName"/>
<bean:define id="thisParentName" type="java.lang.String"
name="remoteAddrValveForm" property="parentObjectName"/>
+ <bean:define id="thisHostName" type="java.lang.String"
+ name="remoteAddrValveForm" property="hostName"/>
<html:hidden property="adminAction"/>
<html:hidden property="parentObjectName"/>
<html:hidden property="objectName"/>
<html:hidden property="valveType"/>
+ <html:hidden property="hostName"/>
<table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr bgcolor="7171A5">
@@ -47,7 +50,8 @@
<logic:notEqual name="remoteAddrValveForm" property="adminAction"
value="Create">
<controls:action url='<%= "/DeleteValve.do?" +
"select=" + URLEncoder.encode(thisObjectName) +
- "&parent="+ URLEncoder.encode(thisParentName) %>'>
+ "&parent="+ URLEncoder.encode(thisParentName) +
+ "&host="+ URLEncoder.encode(thisHostName) %>'>
<bean:message key="actions.valves.delete"/>
</controls:action>
</logic:notEqual>
1.9 +5 -1 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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- remoteHostValve.jsp 15 Jan 2003 22:25:22 -0000 1.8
+++ remoteHostValve.jsp 11 Mar 2003 14:15:45 -0000 1.9
@@ -22,10 +22,13 @@
name="remoteHostValveForm" property="objectName"/>
<bean:define id="thisParentName" type="java.lang.String"
name="remoteHostValveForm" property="parentObjectName"/>
+ <bean:define id="thisHostName" type="java.lang.String"
+ name="removeHostValveForm" property="hostName"/>
<html:hidden property="adminAction"/>
<html:hidden property="parentObjectName"/>
<html:hidden property="objectName"/>
<html:hidden property="valveType"/>
+ <html:hidden property="hostName"/>
<table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr bgcolor="7171A5">
@@ -47,7 +50,8 @@
<logic:notEqual name="remoteHostValveForm" property="adminAction"
value="Create">
<controls:action url='<%= "/DeleteValve.do?" +
"select=" + URLEncoder.encode(thisObjectName) +
- "&parent="+ URLEncoder.encode(thisParentName) %>'>
+ "&parent="+ URLEncoder.encode(thisParentName) +
+ "&host="+ URLEncoder.encode(thisHostName) %>'>
<bean:message key="actions.valves.delete"/>
</controls:action>
</logic:notEqual>
1.10 +5 -1 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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- requestDumperValve.jsp 15 Jan 2003 22:25:22 -0000 1.9
+++ requestDumperValve.jsp 11 Mar 2003 14:15:45 -0000 1.10
@@ -22,10 +22,13 @@
name="requestDumperValveForm" property="objectName"/>
<bean:define id="thisParentName" type="java.lang.String"
name="requestDumperValveForm" property="parentObjectName"/>
+ <bean:define id="thisHostName" type="java.lang.String"
+ name="requestDumperValveForm" property="hostName"/>
<html:hidden property="adminAction"/>
<html:hidden property="parentObjectName"/>
<html:hidden property="objectName"/>
<html:hidden property="valveType"/>
+ <html:hidden property="hostName"/>
<table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr bgcolor="7171A5">
@@ -47,7 +50,8 @@
<logic:notEqual name="requestDumperValveForm" property="adminAction"
value="Create">
<controls:action url='<%= "/DeleteValve.do?" +
"select=" + URLEncoder.encode(thisObjectName) +
- "&parent="+ URLEncoder.encode(thisParentName) %>'>
+ "&parent="+ URLEncoder.encode(thisParentName) +
+ "&host="+ URLEncoder.encode(thisHostName) %>'>
<bean:message key="actions.valves.delete"/>
</controls:action>
</logic:notEqual>
1.9 +5 -1 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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- singleSignOnValve.jsp 15 Jan 2003 22:25:22 -0000 1.8
+++ singleSignOnValve.jsp 11 Mar 2003 14:15:45 -0000 1.9
@@ -22,10 +22,13 @@
name="singleSignOnValveForm" property="objectName"/>
<bean:define id="thisParentName" type="java.lang.String"
name="singleSignOnValveForm" property="parentObjectName"/>
+ <bean:define id="thisHostName" type="java.lang.String"
+ name="singleSignOnValveForm" property="hostName"/>
<html:hidden property="adminAction"/>
<html:hidden property="parentObjectName"/>
<html:hidden property="objectName"/>
<html:hidden property="valveType"/>
+ <html:hidden property="hostName"/>
<table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr bgcolor="7171A5">
@@ -47,7 +50,8 @@
<logic:notEqual name="singleSignOnValveForm" property="adminAction"
value="Create">
<controls:action url='<%= "/DeleteValve.do?" +
"select=" + URLEncoder.encode(thisObjectName) +
- "&parent="+ URLEncoder.encode(thisParentName) %>'>
+ "&parent="+ URLEncoder.encode(thisParentName) +
+ "&host="+ URLEncoder.encode(thisHostName) %>'>
<bean:message key="actions.valves.delete"/>
</controls:action>
</logic:notEqual>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
