You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by am...@apache.org on 2003/04/18 11:52:53 UTC
cvs commit: jakarta-tomcat-catalina/webapps/admin/service service.jsp
amyroh 2003/04/18 02:52:53
Modified: webapps/admin/WEB-INF/classes/org/apache/webapp/admin
Lists.java TomcatTreeBuilder.java
webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host
AddHostAction.java HostForm.java
webapps/admin/WEB-INF/classes/org/apache/webapp/admin/logger
AddLoggerAction.java DeleteLoggerAction.java
LoggerForm.java SaveLoggerAction.java
webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm
AddRealmAction.java RealmForm.java
SaveJDBCRealmAction.java SaveJNDIRealmAction.java
SaveMemoryRealmAction.java
SaveUserDatabaseRealmAction.java
webapps/admin/WEB-INF/classes/org/apache/webapp/admin/service
EditServiceAction.java SaveServiceAction.java
webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve
AddValveAction.java SaveAccessLogValveAction.java
SaveRemoteAddrValveAction.java
SaveRemoteHostValveAction.java
SaveRequestDumperValveAction.java
SaveSingleSignOnValveAction.java ValveForm.java
ValveUtil.java
webapps/admin/service service.jsp
Log:
Update admin to engine name attribute addition.
Revision Changes Path
1.10 +48 -4 jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/Lists.java
Index: Lists.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/Lists.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Lists.java 27 Mar 2003 03:08:05 -0000 1.9
+++ Lists.java 18 Apr 2003 09:52:47 -0000 1.10
@@ -325,7 +325,51 @@
return (getContexts(mbserver, new ObjectName(host)));
}
+
+ /**
+ * Return a list of <code>Engine</code> object name strings
+ * for the specified <code>Service</code> object name.
+ *
+ * @param mbserver MBeanServer from which to retrieve the engines
+ * @param service Object name of the service for which to select engines
+ *
+ * @exception Exception if thrown while retrieving the list
+ */
+ public static List getEngines(MBeanServer mbserver, ObjectName service)
+ throws Exception {
+
+ StringBuffer sb = new StringBuffer(service.getDomain());
+ sb.append(":type=Engine,*");
+ ObjectName search = new ObjectName(sb.toString());
+ ArrayList engines = new ArrayList();
+ Iterator names = mbserver.queryNames(search, null).iterator();
+ while (names.hasNext()) {
+ engines.add(names.next().toString());
+ }
+ Collections.sort(engines);
+ return (engines);
+
+ }
+
+
+ /**
+ * Return a list of <code>Engine</code> object name strings
+ * for the specified <code>Service</code> object name.
+ *
+ * @param mbserver MBeanServer from which to retrieve the list
+ * @param service Object name of the service for which to select engines
+ *
+ * @exception Exception if thrown while retrieving the list
+ */
+ public static List getEngines(MBeanServer mbserver, String service)
+ throws Exception {
+
+ return (getEngines(mbserver, new ObjectName(service)));
+
+ }
+
+
/**
* Return a list of <code>Host</code> object name strings
* for the specified <code>Service</code> object name.
1.6 +13 -4 jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/TomcatTreeBuilder.java
Index: TomcatTreeBuilder.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/TomcatTreeBuilder.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- TomcatTreeBuilder.java 21 Mar 2003 08:19:13 -0000 1.5
+++ TomcatTreeBuilder.java 18 Apr 2003 09:52:48 -0000 1.6
@@ -200,6 +200,13 @@
String domain = serverNode.getDomain();
Iterator serviceNames =
Lists.getServices(mBServer, serverName).iterator();
+ Iterator engineNames =
+ Lists.getEngines(mBServer, serverName).iterator();
+ // single engine should exist
+ String engineName = "";
+ if (engineNames.hasNext()) {
+ engineName = (String) engineNames.next();
+ }
while (serviceNames.hasNext()) {
String serviceName = (String) serviceNames.next();
ObjectName objectName = new ObjectName(serviceName);
@@ -211,6 +218,8 @@
nodeLabel,
"EditService.do?select=" +
URLEncoder.encode(serviceName) +
+ "&engine=" +
+ URLEncoder.encode(engineName) +
"&nodeLabel=" +
URLEncoder.encode(nodeLabel),
"content",
1.5 +6 -4 jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/AddHostAction.java
Index: AddHostAction.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/AddHostAction.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AddHostAction.java 23 Mar 2003 02:10:26 -0000 1.4
+++ AddHostAction.java 18 Apr 2003 09:52:48 -0000 1.5
@@ -125,6 +125,7 @@
// the service Name is needed to retrieve the engine mBean to
// which the new host mBean will be added.
String serviceName = request.getParameter("select");
+ String engine = request.getParameter("engine");
// Fill in the form values for display and editing
HostForm hostFm = new HostForm();
@@ -134,6 +135,7 @@
hostFm.setHostName("");
hostFm.setDebugLvl("0");
hostFm.setServiceName(serviceName);
+ hostFm.setEngine(engine);
hostFm.setAppBase("");
hostFm.setAutoDeploy("true");
hostFm.setDeployXML("true");
1.6 +30 -4 jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/HostForm.java
Index: HostForm.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/HostForm.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- HostForm.java 25 Mar 2003 08:29:04 -0000 1.5
+++ HostForm.java 18 Apr 2003 09:52:48 -0000 1.6
@@ -105,6 +105,11 @@
* The object name of the service this host belongs to.
*/
private String serviceName = null;
+
+ /**
+ * The object name of the engine this host belongs to.
+ */
+ private String engine = null;
/**
* The directory for the appBase.
@@ -225,7 +230,28 @@
this.serviceName = serviceName;
}
+
+
+ /**
+ * Return the object name of the engine this host belongs to.
+ */
+ public String getEngine() {
+
+ return this.engine;
+
+ }
+
+
+ /**
+ * Set the object name of the engine this host belongs to.
+ */
+ public void setEngine(String engine) {
+ this.engine = engine;
+
+ }
+
+
/**
* Return the label of the node that was clicked.
*/
1.3 +8 -6 jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/logger/AddLoggerAction.java
Index: AddLoggerAction.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/logger/AddLoggerAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AddLoggerAction.java 18 Mar 2003 10:48:23 -0000 1.2
+++ AddLoggerAction.java 18 Apr 2003 09:52:49 -0000 1.3
@@ -130,6 +130,8 @@
loggerFm.setObjectName("");
String parent = request.getParameter("parent");
loggerFm.setParentObjectName(parent);
+ String engine = request.getParameter("engine");
+ loggerFm.setEngineObjectName(engine);
String type = request.getParameter("type");
if (type == null)
type = "FileLogger"; // default type is FileLogger
@@ -148,12 +150,12 @@
// the first element in the select list should be the type selected
types.add(new LabelValueBean(type,
"AddLogger.do?parent=" + URLEncoder.encode(parent)
- + "&type=" + type));
+ + "&type=" + type + "&engine=" + URLEncoder.encode(engine)));
for (int i=0; i< loggerTypes.length; i++) {
if (!type.equalsIgnoreCase(loggerTypes[i])) {
types.add(new LabelValueBean(loggerTypes[i],
"AddLogger.do?parent=" + URLEncoder.encode(parent)
- + "&type=" + loggerTypes[i]));
+ + "&type=" + loggerTypes[i] + "&engine=" + URLEncoder.encode(engine)));
}
}
loggerFm.setLoggerTypeVals(types);
1.5 +5 -5 jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/logger/DeleteLoggerAction.java
Index: DeleteLoggerAction.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/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 2003 09:17:02 -0000 1.4
+++ DeleteLoggerAction.java 18 Apr 2003 09:52:49 -0000 1.5
@@ -219,7 +219,7 @@
String path = "";
String host = "";
String name = poname.getKeyProperty("name");
- if ((name != null) && (name.length() > 0)) {
+ if ((name != null) && (name.length() > 0) && (name.indexOf("/")>0)) {
name = name.substring(2);
int i = name.indexOf("/");
host = name.substring(0,i);
1.3 +31 -5 jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/logger/LoggerForm.java
Index: LoggerForm.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/logger/LoggerForm.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- LoggerForm.java 25 Mar 2003 08:29:05 -0000 1.2
+++ LoggerForm.java 18 Apr 2003 09:52:49 -0000 1.3
@@ -94,7 +94,12 @@
* The object name of the parent of this Logger.
*/
private String parentObjectName = null;
-
+
+ /**
+ * The object name of the parent engine of this Logger (if exists).
+ */
+ private String engineObjectName = null;
+
/**
* The text for the logger type.
* Specifies if it is a FileLogger, or SysErr or SysOut Logger.
@@ -200,7 +205,28 @@
this.parentObjectName = parentObjectName;
}
+
+
+ /**
+ * Return the engine object name of the Logger this bean refers to.
+ */
+ public String getEngineObjectName() {
+
+ return this.engineObjectName;
+
+ }
+
+
+ /**
+ * Set the engine object name of the Logger this bean refers to.
+ */
+ public void setEngineObjectName(String engineObjectName) {
+
+ this.engineObjectName = engineObjectName;
+
+ }
+
/**
* Return the Logger type.
*/
1.5 +9 -8 jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/logger/SaveLoggerAction.java
Index: SaveLoggerAction.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/logger/SaveLoggerAction.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SaveLoggerAction.java 21 Mar 2003 08:19:15 -0000 1.4
+++ SaveLoggerAction.java 18 Apr 2003 09:52:49 -0000 1.5
@@ -176,11 +176,10 @@
try {
- String parent = lform.getParentObjectName();
- System.out.println("parent = "+parent);
+ String parent = lform.getParentObjectName();
+ String engine = lform.getEngineObjectName();
String objectName = DeleteLoggerAction.getObjectName(
parent, TomcatTreeBuilder.LOGGER_TYPE);
- System.out.println("objectName = "+objectName);
ObjectName pname = new ObjectName(parent);
StringBuffer sb = new StringBuffer(pname.getDomain());
@@ -188,7 +187,9 @@
// Parent in this case needs to be the container mBean for the service
try {
if ("Service".equalsIgnoreCase(pname.getKeyProperty("type"))) {
- sb.append(":type=Engine");;
+ ObjectName ename = new ObjectName(engine);
+ String engineName = ename.getKeyProperty("name");
+ sb.append(":type=Engine,name="+engineName);;
parent = sb.toString();
}
} catch (Exception e) {
1.4 +19 -14 jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/AddRealmAction.java
Index: AddRealmAction.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/AddRealmAction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AddRealmAction.java 18 Mar 2003 10:48:23 -0000 1.3
+++ AddRealmAction.java 18 Apr 2003 09:52:50 -0000 1.4
@@ -134,6 +134,7 @@
realmTypes[3] = "JDBCRealm";
String parent = request.getParameter("parent");
+ String engine = request.getParameter("engine");
String type = request.getParameter("type");
if (type == null)
type = "UserDatabaseRealm"; // default type is UserDatabaseRealm
@@ -142,37 +143,38 @@
// the first element in the select list should be the type selected
types.add(new LabelValueBean(type,
"AddRealm.do?parent=" + URLEncoder.encode(parent)
- + "&type=" + type));
+ + "&type=" + type + "&engine=" + URLEncoder.encode(engine)));
for (int i=0; i< realmTypes.length; i++) {
if (!type.equalsIgnoreCase(realmTypes[i])) {
types.add(new LabelValueBean(realmTypes[i],
"AddRealm.do?parent=" + URLEncoder.encode(parent)
- + "&type=" + realmTypes[i]));
+ + "&type=" + realmTypes[i] + "&engine=" + URLEncoder.encode(engine)));
}
}
if ("UserDatabaseRealm".equalsIgnoreCase(type)) {
- createUserDatabaseRealm(session, parent);
+ createUserDatabaseRealm(session, parent, engine);
} else if ("JNDIRealm".equalsIgnoreCase(type)) {
- createJNDIRealm(session, parent);
+ createJNDIRealm(session, parent, engine);
} else if ("MemoryRealm".equalsIgnoreCase(type)) {
- createMemoryRealm(session, parent);
+ createMemoryRealm(session, parent, engine);
} else {
//JDBC
- createJDBCRealm(session, parent);
+ createJDBCRealm(session, parent, engine);
}
// 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 engine) {
UserDatabaseRealmForm realmFm = new UserDatabaseRealmForm();
session.setAttribute("userDatabaseRealmForm", realmFm);
realmFm.setAdminAction("Create");
realmFm.setObjectName("");
realmFm.setParentObjectName(parent);
+ realmFm.setEngineObjectName(engine);
String realmType = "UserDatabaseRealm";
realmFm.setNodeLabel("Realm (" + realmType + ")");
realmFm.setRealmType(realmType);
@@ -182,13 +184,14 @@
realmFm.setRealmTypeVals(types);
}
- private void createJNDIRealm(HttpSession session, String parent) {
+ private void createJNDIRealm(HttpSession session, String parent, String engine) {
JNDIRealmForm realmFm = new JNDIRealmForm();
session.setAttribute("jndiRealmForm", realmFm);
realmFm.setAdminAction("Create");
realmFm.setObjectName("");
realmFm.setParentObjectName(parent);
+ realmFm.setEngineObjectName(engine);
String realmType = "JNDIRealm";
realmFm.setNodeLabel("Realm (" + realmType + ")");
realmFm.setRealmType(realmType);
@@ -213,13 +216,14 @@
realmFm.setRealmTypeVals(types);
}
- private void createMemoryRealm(HttpSession session, String parent) {
+ private void createMemoryRealm(HttpSession session, String parent, String engine) {
MemoryRealmForm realmFm = new MemoryRealmForm();
session.setAttribute("memoryRealmForm", realmFm);
realmFm.setAdminAction("Create");
realmFm.setObjectName("");
realmFm.setParentObjectName(parent);
+ realmFm.setEngineObjectName(engine);
String realmType = "MemoryRealm";
realmFm.setNodeLabel("Realm (" + realmType + ")");
realmFm.setRealmType(realmType);
@@ -229,13 +233,14 @@
realmFm.setRealmTypeVals(types);
}
- private void createJDBCRealm(HttpSession session, String parent) {
+ private void createJDBCRealm(HttpSession session, String parent, String engine) {
JDBCRealmForm realmFm = new JDBCRealmForm();
session.setAttribute("jdbcRealmForm", realmFm);
realmFm.setAdminAction("Create");
realmFm.setObjectName("");
realmFm.setParentObjectName(parent);
+ realmFm.setEngineObjectName(engine);
String realmType = "JDBCRealm";
realmFm.setNodeLabel("Realm (" + realmType + ")");
realmFm.setRealmType(realmType);
1.2 +28 -5 jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/RealmForm.java
Index: RealmForm.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/RealmForm.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RealmForm.java 18 Jul 2002 16:48:24 -0000 1.1
+++ RealmForm.java 18 Apr 2003 09:52:50 -0000 1.2
@@ -114,6 +114,11 @@
private String parentObjectName = null;
/**
+ * The object name of the parent engine of this realm (if exists).
+ */
+ private String engineObjectName = null;
+
+ /**
* Set of valid values for debug level.
*/
private List debugLvlVals = null;
@@ -221,7 +226,25 @@
this.parentObjectName = parentObjectName;
}
-
+
+ /**
+ * Return the engine object name of the Realm this bean refers to.
+ */
+ public String getEngineObjectName() {
+
+ return this.engineObjectName;
+
+ }
+
+
+ /**
+ * Set the engine object name of the Realm this bean refers to.
+ */
+ public void setEngineObjectName(String engineObjectName) {
+
+ this.engineObjectName = engineObjectName;
+
+ }
/**
* Return the realmTypeVals.
1.5 +9 -6 jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/SaveJDBCRealmAction.java
Index: SaveJDBCRealmAction.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/SaveJDBCRealmAction.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SaveJDBCRealmAction.java 27 Mar 2003 03:08:05 -0000 1.4
+++ SaveJDBCRealmAction.java 18 Apr 2003 09:52:50 -0000 1.5
@@ -176,7 +176,8 @@
try {
- String parent = rform.getParentObjectName();
+ String parent = rform.getParentObjectName();
+ String engine = rform.getEngineObjectName();
String objectName = DeleteLoggerAction.getObjectName(parent,
TomcatTreeBuilder.REALM_TYPE);
@@ -187,7 +188,9 @@
// Parent in this case needs to be the container mBean for the service
try {
if ("Service".equalsIgnoreCase(pname.getKeyProperty("type"))) {
- sb.append(":type=Engine");
+ ObjectName ename = new ObjectName(engine);
+ String engineName = ename.getKeyProperty("name");
+ sb.append(":type=Engine,name="+engineName);;
parent = sb.toString();
}
} catch (Exception e) {
1.8 +8 -5 jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/SaveJNDIRealmAction.java
Index: SaveJNDIRealmAction.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/SaveJNDIRealmAction.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- SaveJNDIRealmAction.java 27 Mar 2003 03:08:05 -0000 1.7
+++ SaveJNDIRealmAction.java 18 Apr 2003 09:52:50 -0000 1.8
@@ -178,6 +178,7 @@
try {
String parent = rform.getParentObjectName();
+ String engine = rform.getEngineObjectName();
String objectName = DeleteLoggerAction.getObjectName(parent,
TomcatTreeBuilder.REALM_TYPE);
@@ -188,7 +189,9 @@
// Parent in this case needs to be the container mBean for the service
try {
if ("Service".equalsIgnoreCase(pname.getKeyProperty("type"))) {
- sb.append(":type=Engine");
+ ObjectName ename = new ObjectName(engine);
+ String engineName = ename.getKeyProperty("name");
+ sb.append(":type=Engine,name="+engineName);;
parent = sb.toString();
}
} catch (Exception e) {
1.4 +9 -6 jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/SaveMemoryRealmAction.java
Index: SaveMemoryRealmAction.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/SaveMemoryRealmAction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SaveMemoryRealmAction.java 20 Mar 2003 05:40:10 -0000 1.3
+++ SaveMemoryRealmAction.java 18 Apr 2003 09:52:50 -0000 1.4
@@ -176,7 +176,8 @@
try {
- String parent = rform.getParentObjectName();
+ String parent = rform.getParentObjectName();
+ String engine = rform.getEngineObjectName();
String objectName = DeleteLoggerAction.getObjectName(parent,
TomcatTreeBuilder.REALM_TYPE);
@@ -187,7 +188,9 @@
// Parent in this case needs to be the container mBean for the service
try {
if ("Service".equalsIgnoreCase(pname.getKeyProperty("type"))) {
- sb.append(":type=Engine");
+ ObjectName ename = new ObjectName(engine);
+ String engineName = ename.getKeyProperty("name");
+ sb.append(":type=Engine,name="+engineName);;
parent = sb.toString();
}
} catch (Exception e) {
1.5 +9 -6 jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/SaveUserDatabaseRealmAction.java
Index: SaveUserDatabaseRealmAction.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/SaveUserDatabaseRealmAction.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SaveUserDatabaseRealmAction.java 27 Mar 2003 03:08:05 -0000 1.4
+++ SaveUserDatabaseRealmAction.java 18 Apr 2003 09:52:50 -0000 1.5
@@ -177,7 +177,8 @@
try {
- String parent = rform.getParentObjectName();
+ String parent = rform.getParentObjectName();
+ String engine = rform.getEngineObjectName();
String objectName = DeleteLoggerAction.getObjectName(parent,
TomcatTreeBuilder.REALM_TYPE);
@@ -188,7 +189,9 @@
// Parent in this case needs to be the container mBean for the service
try {
if ("Service".equalsIgnoreCase(pname.getKeyProperty("type"))) {
- sb.append(":type=Engine");
+ ObjectName ename = new ObjectName(engine);
+ String engineName = ename.getKeyProperty("name");
+ sb.append(":type=Engine,name="+engineName);;
parent = sb.toString();
}
} catch (Exception e) {
1.6 +10 -8 jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/service/EditServiceAction.java
Index: EditServiceAction.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/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 Mar 2003 03:08:05 -0000 1.5
+++ EditServiceAction.java 18 Apr 2003 09:52:52 -0000 1.6
@@ -161,10 +161,12 @@
response.sendError(HttpServletResponse.SC_BAD_REQUEST, message);
return (null);
}
- try {
- sb = new StringBuffer(sname.getDomain());
- sb.append(":type=Engine");
- ename = new ObjectName(sb.toString());
+ try {
+ Iterator engineNames =
+ Lists.getEngines(mBServer, sname).iterator();
+ // single engine should exist
+ String engineName = (String) engineNames.next();
+ ename = new ObjectName(engineName);
} catch (Exception e) {
String message =
resources.getMessage("error.engineName.bad",
1.10 +6 -5 jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/service/SaveServiceAction.java
Index: SaveServiceAction.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/service/SaveServiceAction.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- SaveServiceAction.java 9 Apr 2003 23:27:26 -0000 1.9
+++ SaveServiceAction.java 18 Apr 2003 09:52:52 -0000 1.10
@@ -326,7 +326,8 @@
"Service.gif",
nodeLabel,
"EditService.do?select=" +
- encodedName,
+ encodedName + "&engine=" +
+ eObjectName,
"content",
true, engineName);
parentNode.addChild(childNode);
1.4 +23 -17 jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/AddValveAction.java
Index: AddValveAction.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/AddValveAction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AddValveAction.java 18 Mar 2003 10:48:26 -0000 1.3
+++ AddValveAction.java 18 Apr 2003 09:52:52 -0000 1.4
@@ -135,7 +135,8 @@
valveTypes[4] = "SingleSignOn";
String parent = request.getParameter("parent");
- String type = request.getParameter("type");
+ String type = request.getParameter("type");
+ String engine = request.getParameter("engine");
if (type == null)
type = "AccessLogValve"; // default type is AccessLog
@@ -143,39 +144,40 @@
// the first element in the select list should be the type selected
types.add(new LabelValueBean(type,
"AddValve.do?parent=" + URLEncoder.encode(parent)
- + "&type=" + type));
+ + "&type=" + type + "&engine=" + URLEncoder.encode(engine)));
for (int i=0; i< valveTypes.length; i++) {
if (!type.equalsIgnoreCase(valveTypes[i])) {
types.add(new LabelValueBean(valveTypes[i],
"AddValve.do?parent=" + URLEncoder.encode(parent)
- + "&type=" + valveTypes[i]));
+ + "&type=" + valveTypes[i] + "&engine=" + URLEncoder.encode(engine)));
}
}
if ("AccessLogValve".equalsIgnoreCase(type)) {
- createAccessLogger(session, parent);
+ createAccessLogger(session, parent, engine);
} else if ("RemoteAddrValve".equalsIgnoreCase(type)) {
- createRemoteAddrValve(session, parent);
+ createRemoteAddrValve(session, parent, engine);
} else if ("RemoteHostValve".equalsIgnoreCase(type)) {
- createRemoteHostValve(session, parent);
+ createRemoteHostValve(session, parent, engine);
} else if ("RequestDumperValve".equalsIgnoreCase(type)) {
- createRequestDumperValve(session, parent);
+ createRequestDumperValve(session, parent, engine);
} else {
//SingleSignOn
- createSingleSignOnValve(session, parent);
+ createSingleSignOnValve(session, parent, engine);
}
// 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 engine) {
AccessLogValveForm valveFm = new AccessLogValveForm();
session.setAttribute("accessLogValveForm", valveFm);
valveFm.setAdminAction("Create");
valveFm.setObjectName("");
valveFm.setParentObjectName(parent);
+ valveFm.setEngineObjectName(engine);
String valveType = "AccessLogValve";
valveFm.setNodeLabel("Valve (" + valveType + ")");
valveFm.setValveType(valveType);
@@ -191,13 +193,14 @@
valveFm.setValveTypeVals(types);
}
- private void createRemoteAddrValve(HttpSession session, String parent) {
+ private void createRemoteAddrValve(HttpSession session, String parent, String engine) {
RemoteAddrValveForm valveFm = new RemoteAddrValveForm();
session.setAttribute("remoteAddrValveForm", valveFm);
valveFm.setAdminAction("Create");
valveFm.setObjectName("");
valveFm.setParentObjectName(parent);
+ valveFm.setEngineObjectName(engine);
String valveType = "RemoteAddrValve";
valveFm.setNodeLabel("Valve (" + valveType + ")");
valveFm.setValveType(valveType);
@@ -206,13 +209,14 @@
valveFm.setValveTypeVals(types);
}
- private void createRemoteHostValve(HttpSession session, String parent) {
+ private void createRemoteHostValve(HttpSession session, String parent, String engine) {
RemoteHostValveForm valveFm = new RemoteHostValveForm();
session.setAttribute("remoteHostValveForm", valveFm);
valveFm.setAdminAction("Create");
valveFm.setObjectName("");
valveFm.setParentObjectName(parent);
+ valveFm.setEngineObjectName(engine);
String valveType = "RemoteHostValve";
valveFm.setNodeLabel("Valve (" + valveType + ")");
valveFm.setValveType(valveType);
@@ -221,26 +225,28 @@
valveFm.setValveTypeVals(types);
}
- private void createRequestDumperValve(HttpSession session, String parent) {
+ private void createRequestDumperValve(HttpSession session, String parent, String engine) {
RequestDumperValveForm valveFm = new RequestDumperValveForm();
session.setAttribute("requestDumperValveForm", valveFm);
valveFm.setAdminAction("Create");
valveFm.setObjectName("");
valveFm.setParentObjectName(parent);
+ valveFm.setEngineObjectName(engine);
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 engine) {
SingleSignOnValveForm valveFm = new SingleSignOnValveForm();
session.setAttribute("singleSignOnValveForm", valveFm);
valveFm.setAdminAction("Create");
valveFm.setObjectName("");
valveFm.setParentObjectName(parent);
+ valveFm.setEngineObjectName(engine);
String valveType = "SingleSignOn";
valveFm.setNodeLabel("Valve (" + valveType + ")");
valveFm.setValveType(valveType);
1.4 +6 -5 jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/SaveAccessLogValveAction.java
Index: SaveAccessLogValveAction.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/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 10 Feb 2003 04:27:10 -0000 1.3
+++ SaveAccessLogValveAction.java 18 Apr 2003 09:52:52 -0000 1.4
@@ -150,12 +150,13 @@
String adminAction = vform.getAdminAction();
String vObjectName = vform.getObjectName();
String parent = vform.getParentObjectName();
+ String engine = vform.getEngineObjectName();
String valveType = vform.getValveType();
// Perform a "Create Valve" transaction (if requested)
if ("Create".equals(adminAction)) {
- vObjectName = ValveUtil.createValve(parent, valveType,
+ vObjectName = ValveUtil.createValve(parent, engine, valveType,
response, request, mapping,
(ApplicationServlet) getServlet());
1.3 +6 -5 jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/SaveRemoteAddrValveAction.java
Index: SaveRemoteAddrValveAction.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/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 10 Feb 2003 04:27:10 -0000 1.2
+++ SaveRemoteAddrValveAction.java 18 Apr 2003 09:52:52 -0000 1.3
@@ -150,12 +150,13 @@
String adminAction = vform.getAdminAction();
String vObjectName = vform.getObjectName();
String parent = vform.getParentObjectName();
+ String engine = vform.getEngineObjectName();
String valveType = vform.getValveType();
// Perform a "Create Valve" transaction (if requested)
if ("Create".equals(adminAction)) {
- vObjectName = ValveUtil.createValve(parent, valveType,
+ vObjectName = ValveUtil.createValve(parent, engine, valveType,
response, request, mapping,
(ApplicationServlet) getServlet());
1.3 +6 -5 jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/SaveRemoteHostValveAction.java
Index: SaveRemoteHostValveAction.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/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 10 Feb 2003 04:27:10 -0000 1.2
+++ SaveRemoteHostValveAction.java 18 Apr 2003 09:52:52 -0000 1.3
@@ -150,12 +150,13 @@
String adminAction = vform.getAdminAction();
String vObjectName = vform.getObjectName();
String parent = vform.getParentObjectName();
+ String engine = vform.getEngineObjectName();
String valveType = vform.getValveType();
// Perform a "Create Valve" transaction (if requested)
if ("Create".equals(adminAction)) {
- vObjectName = ValveUtil.createValve(parent, valveType,
+ vObjectName = ValveUtil.createValve(parent, engine, valveType,
response, request, mapping,
(ApplicationServlet) getServlet());
1.3 +6 -5 jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/SaveRequestDumperValveAction.java
Index: SaveRequestDumperValveAction.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/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 10 Feb 2003 04:27:10 -0000 1.2
+++ SaveRequestDumperValveAction.java 18 Apr 2003 09:52:52 -0000 1.3
@@ -150,12 +150,13 @@
String adminAction = vform.getAdminAction();
String vObjectName = vform.getObjectName();
String parent = vform.getParentObjectName();
+ String engine = vform.getEngineObjectName();
String valveType = vform.getValveType();
// Perform a "Create Valve" transaction (if requested)
if ("Create".equals(adminAction)) {
- vObjectName = ValveUtil.createValve(parent, valveType,
+ vObjectName = ValveUtil.createValve(parent, engine, valveType,
response, request, mapping,
(ApplicationServlet) getServlet());
1.3 +6 -5 jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/SaveSingleSignOnValveAction.java
Index: SaveSingleSignOnValveAction.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/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 10 Feb 2003 04:27:10 -0000 1.2
+++ SaveSingleSignOnValveAction.java 18 Apr 2003 09:52:52 -0000 1.3
@@ -151,12 +151,13 @@
String adminAction = vform.getAdminAction();
String vObjectName = vform.getObjectName();
String parent = vform.getParentObjectName();
+ String engine = vform.getEngineObjectName();
String valveType = vform.getValveType();
// Perform a "Create Valve" transaction (if requested)
if ("Create".equals(adminAction)) {
- vObjectName = ValveUtil.createValve(parent, valveType,
+ vObjectName = ValveUtil.createValve(parent, engine, valveType,
response, request, mapping,
(ApplicationServlet) getServlet());
1.2 +30 -5 jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/ValveForm.java
Index: ValveForm.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/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 18 Jul 2002 16:48:28 -0000 1.1
+++ ValveForm.java 18 Apr 2003 09:52:52 -0000 1.2
@@ -115,6 +115,11 @@
private String parentObjectName = null;
/**
+ * The object name of the parent engine of this valve (if exists).
+ */
+ private String engineObjectName = null;
+
+ /**
* Set of valid values for valves.
*/
private List valveTypeVals = null;
@@ -211,7 +216,27 @@
this.parentObjectName = parentObjectName;
}
-
+
+
+ /**
+ * Return the engine object name of the Valve this bean refers to.
+ */
+ public String getEngineObjectName() {
+
+ return this.engineObjectName;
+
+ }
+
+
+ /**
+ * Set the engine object name of the Valve this bean refers to.
+ */
+ public void setEngineObjectName(String engineObjectName) {
+
+ this.engineObjectName = engineObjectName;
+
+ }
+
/**
* Return the valveTypeVals.
1.7 +8 -6 jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/ValveUtil.java
Index: ValveUtil.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/ValveUtil.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ValveUtil.java 20 Mar 2003 05:40:11 -0000 1.6
+++ ValveUtil.java 18 Apr 2003 09:52:52 -0000 1.7
@@ -115,7 +115,7 @@
// --------------------------------------------------------- Public Methods
- public static String createValve(String parent, String valveType,
+ public static String createValve(String parent, String engine, String valveType,
HttpServletResponse response, HttpServletRequest request,
ActionMapping mapping, ApplicationServlet servlet)
throws IOException, ServletException {
@@ -150,7 +150,9 @@
// Parent in this case needs to be the container mBean for the service
try {
if ("Service".equalsIgnoreCase(pname.getKeyProperty("type"))) {
- sb.append(":type=Engine");
+ ObjectName ename = new ObjectName(engine);
+ String engineName = ename.getKeyProperty("name");
+ sb.append(":type=Engine,name="+engineName);;
parent = sb.toString();
}
} catch (Exception e) {
1.9 +14 -4 jakarta-tomcat-catalina/webapps/admin/service/service.jsp
Index: service.jsp
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/service/service.jsp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- service.jsp 27 Mar 2003 08:26:26 -0000 1.8
+++ service.jsp 18 Apr 2003 09:52:53 -0000 1.9
@@ -24,6 +24,8 @@
name="serviceForm" property="objectName"/>
<bean:define id="thisServiceName" type="java.lang.String"
name="serviceForm" property="serviceName"/>
+ <bean:define id="thisEngineObjectName" type="java.lang.String"
+ name="serviceForm" property="engineObjectName"/>
<html:hidden property="adminServiceName"/>
<html:hidden property="objectName"/>
<html:hidden property="engineObjectName"/>
@@ -77,7 +79,9 @@
-------------------------------------
</controls:action>
<controls:action url='<%= "/AddHost.do?select=" +
- URLEncoder.encode(thisObjectName) %>'>
+ URLEncoder.encode(thisObjectName) +
+ "&engine=" +
+ URLEncoder.encode(thisEngineObjectName)%>'>
<bean:message key="actions.hosts.create"/>
</controls:action>
<controls:action url='<%= "/DeleteHost.do?select=" +
@@ -88,7 +92,9 @@
-------------------------------------
</controls:action>
<controls:action url='<%= "/AddLogger.do?parent=" +
- URLEncoder.encode(thisObjectName) %>'>
+ URLEncoder.encode(thisObjectName) +
+ "&engine=" +
+ URLEncoder.encode(thisEngineObjectName)%>'>
<bean:message key="actions.loggers.create"/>
</controls:action>
<controls:action url='<%= "/DeleteLogger.do?parent=" +
@@ -101,7 +107,9 @@
-------------------------------------
</controls:action>
<controls:action url='<%= "/AddRealm.do?parent=" +
- URLEncoder.encode(thisObjectName) %>'>
+ URLEncoder.encode(thisObjectName) +
+ "&engine=" +
+ URLEncoder.encode(thisEngineObjectName)%>'>
<bean:message key="actions.realms.create"/>
</controls:action>
<controls:action url='<%= "/DeleteRealm.do?parent=" +
@@ -113,7 +121,9 @@
-------------------------------------
</controls:action>
<controls:action url='<%= "/AddValve.do?parent=" +
- URLEncoder.encode(thisObjectName) %>'>
+ URLEncoder.encode(thisObjectName) +
+ "&engine=" +
+ URLEncoder.encode(thisEngineObjectName)%>'>
<bean:message key="actions.valves.create"/>
</controls:action>
<controls:action url='<%= "/DeleteValve.do?parent=" +
---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org