amyroh 2002/09/19 15:56:05
Modified: webapps/admin/WEB-INF/classes/org/apache/webapp/admin/defaultcontext
AddDefaultContextAction.java
EditDefaultContextAction.java
SaveDefaultContextAction.java
webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources
DeleteDataSourcesAction.java
DeleteEnvEntriesAction.java
DeleteMailSessionsAction.java
DeleteResourceLinksAction.java ResourceUtils.java
SaveDataSourceAction.java SaveEnvEntryAction.java
SaveMailSessionAction.java
SaveResourceLinkAction.java
webapps/admin/defaultcontext defaultcontext.jsp
Log:
Add Loader and Manager support in DefaultContext admin.
Revision Changes Path
1.2 +11 -11
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/defaultcontext/AddDefaultContextAction.java
Index: AddDefaultContextAction.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/defaultcontext/AddDefaultContextAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AddDefaultContextAction.java 11 Sep 2002 14:20:00 -0000 1.1
+++ AddDefaultContextAction.java 19 Sep 2002 22:56:05 -0000 1.2
@@ -155,14 +155,14 @@
defaultContextFm.setSwallowOutput("false");
defaultContextFm.setUseNaming("true");
//loader initialization
- //defaultContextFm.setLdrCheckInterval("15");
- //defaultContextFm.setLdrDebugLvl("0");
- //defaultContextFm.setLdrReloadable("false");
+ defaultContextFm.setLdrCheckInterval("15");
+ defaultContextFm.setLdrDebugLvl("0");
+ defaultContextFm.setLdrReloadable("false");
//manager initialization
- //defaultContextFm.setMgrCheckInterval("60");
- //defaultContextFm.setMgrDebugLvl("0");
- //defaultContextFm.setMgrMaxSessions("-1");
- //defaultContextFm.setMgrSessionIDInit("");
+ defaultContextFm.setMgrCheckInterval("60");
+ defaultContextFm.setMgrDebugLvl("0");
+ defaultContextFm.setMgrMaxSessions("-1");
+ defaultContextFm.setMgrSessionIDInit("");
defaultContextFm.setDebugLvlVals(Lists.getDebugLevels());
defaultContextFm.setBooleanVals(Lists.getBooleanValues());
1.2 +67 -65
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/defaultcontext/EditDefaultContextAction.java
Index: EditDefaultContextAction.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/defaultcontext/EditDefaultContextAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- EditDefaultContextAction.java 11 Sep 2002 14:20:00 -0000 1.1
+++ EditDefaultContextAction.java 19 Sep 2002 22:56:05 -0000 1.2
@@ -151,9 +151,9 @@
// DefaultContext mBean
ObjectName cname = null;
// Loader mBean
- //ObjectName lname = null;
+ ObjectName lname = null;
// Manager mBean
- //ObjectName mname = null;
+ ObjectName mname = null;
StringBuffer sb = null;
try {
@@ -168,53 +168,55 @@
}
// Get the corresponding loader
- //try {
- // sb = new StringBuffer(cname.getDomain());
- // sb.append(":type=Loader");
- // sb.append(",path=");
- // sb.append(cname.getKeyProperty("path"));
- // sb.append(",host=");
- // sb.append(cname.getKeyProperty("host"));
- // sb.append(",service=");
- // sb.append(cname.getKeyProperty("service"));
- // lname = new ObjectName(sb.toString());
- // } catch (Exception e) {
- // String message =
- // resources.getMessage("error.managerName.bad",
- // sb.toString());
- // getServlet().log(message);
- // response.sendError(HttpServletResponse.SC_BAD_REQUEST, message);
- // return (null);
- //}
+ try {
+ sb = new StringBuffer(cname.getDomain());
+ sb.append(":type=DefaultLoader");
+ String host = cname.getKeyProperty("host");
+ if (host != null) {
+ sb.append(",host=");
+ sb.append(host);
+ }
+ sb.append(",service=");
+ sb.append(cname.getKeyProperty("service"));
+ lname = new ObjectName(sb.toString());
+ } catch (Exception e) {
+ String message =
+ resources.getMessage("error.managerName.bad",
+ sb.toString());
+ getServlet().log(message);
+ response.sendError(HttpServletResponse.SC_BAD_REQUEST, message);
+ return (null);
+ }
// Session manager properties
// Get the corresponding Session Manager mBean
- //try {
- // sb = new StringBuffer(cname.getDomain());
- // sb.append(":type=Manager");
- // sb.append(",path=");
- // sb.append(cname.getKeyProperty("path"));
- // sb.append(",host=");
- // sb.append(cname.getKeyProperty("host"));
- // sb.append(",service=");
- // sb.append(cname.getKeyProperty("service"));
- // mname = new ObjectName(sb.toString());
- //} catch (Exception e) {
- // String message =
- // resources.getMessage("error.managerName.bad",
- // sb.toString());
- // getServlet().log(message);
- // response.sendError(HttpServletResponse.SC_BAD_REQUEST, message);
- // return (null);
- //}
+ try {
+ sb = new StringBuffer(cname.getDomain());
+ sb.append(":type=DefaultManager");
+ String host = cname.getKeyProperty("host");
+ if (host != null) {
+ sb.append(",host=");
+ sb.append(host);
+ }
+ sb.append(",service=");
+ sb.append(cname.getKeyProperty("service"));
+ mname = new ObjectName(sb.toString());
+ } catch (Exception e) {
+ String message =
+ resources.getMessage("error.managerName.bad",
+ sb.toString());
+ getServlet().log(message);
+ response.sendError(HttpServletResponse.SC_BAD_REQUEST, message);
+ return (null);
+ }
// Fill in the form values for display and editing
DefaultContextForm defaultContextFm = new DefaultContextForm();
session.setAttribute("defaultContextForm", defaultContextFm);
defaultContextFm.setAdminAction("Edit");
defaultContextFm.setObjectName(cname.toString());
- //defaultContextFm.setLoaderObjectName(lname.toString());
- //defaultContextFm.setManagerObjectName(mname.toString());
+ defaultContextFm.setLoaderObjectName(lname.toString());
+ defaultContextFm.setManagerObjectName(mname.toString());
sb = new StringBuffer("DefaultContext");
defaultContextFm.setNodeLabel(sb.toString());
defaultContextFm.setDebugLvlVals(Lists.getDebugLevels());
@@ -241,29 +243,29 @@
(((Boolean) mBServer.getAttribute(cname, attribute)).toString());
// loader properties
- //attribute = "debug";
- //defaultContextFm.setLdrDebugLvl
- // (((Integer) mBServer.getAttribute(lname, attribute)).toString());
- //attribute = "checkInterval";
- //defaultContextFm.setLdrCheckInterval
- // (((Integer) mBServer.getAttribute(lname, attribute)).toString());
- //attribute = "reloadable";
- //defaultContextFm.setLdrReloadable
- // (((Boolean) mBServer.getAttribute(lname, attribute)).toString());
+ attribute = "debug";
+ defaultContextFm.setLdrDebugLvl
+ (((Integer) mBServer.getAttribute(lname, attribute)).toString());
+ attribute = "checkInterval";
+ defaultContextFm.setLdrCheckInterval
+ (((Integer) mBServer.getAttribute(lname, attribute)).toString());
+ attribute = "reloadable";
+ defaultContextFm.setLdrReloadable
+ (((Boolean) mBServer.getAttribute(lname, attribute)).toString());
// manager properties
- //attribute = "debug";
- //defaultContextFm.setMgrDebugLvl
- // (((Integer) mBServer.getAttribute(mname, attribute)).toString());
- //attribute = "entropy";
- //defaultContextFm.setMgrSessionIDInit
- // ((String) mBServer.getAttribute(mname, attribute));
- //attribute = "maxActiveSessions";
- //defaultContextFm.setMgrMaxSessions
- // (((Integer) mBServer.getAttribute(mname, attribute)).toString());
- //attribute = "checkInterval";
- //defaultContextFm.setMgrCheckInterval
- // (((Integer) mBServer.getAttribute(mname, attribute)).toString());
+ attribute = "debug";
+ defaultContextFm.setMgrDebugLvl
+ (((Integer) mBServer.getAttribute(mname, attribute)).toString());
+ attribute = "entropy";
+ defaultContextFm.setMgrSessionIDInit
+ ((String) mBServer.getAttribute(mname, attribute));
+ attribute = "maxActiveSessions";
+ defaultContextFm.setMgrMaxSessions
+ (((Integer) mBServer.getAttribute(mname, attribute)).toString());
+ attribute = "checkInterval";
+ defaultContextFm.setMgrCheckInterval
+ (((Integer) mBServer.getAttribute(mname, attribute)).toString());
} catch (Throwable t) {
getServlet().log
1.4 +73 -69
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/defaultcontext/SaveDefaultContextAction.java
Index: SaveDefaultContextAction.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/defaultcontext/SaveDefaultContextAction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SaveDefaultContextAction.java 18 Sep 2002 19:15:51 -0000 1.3
+++ SaveDefaultContextAction.java 19 Sep 2002 22:56:05 -0000 1.4
@@ -228,24 +228,28 @@
mBServer.invoke(fname, operation,
values, createDefaultContextTypes);
- //* Create a new Loader object
+ // Create a new Loader object
values = new String[1];
// parent of loader is the newly created context
values[0] = cObjectName.toString();
operation = "createWebappLoader";
- //lObjectName = (String)
- // mBServer.invoke(fname, operation,
- // values, createStandardLoaderTypes);
+ getServlet().log(fname.toString());
+ getServlet().log("defaultContext object name = "+values[0]);
+ lObjectName = (String)
+ mBServer.invoke(fname, operation,
+ values, createStandardLoaderTypes);
+
+ getServlet().log("loader created "+lObjectName);
// Create a new StandardManager object
values = new String[1];
// parent of manager is the newly created Context
values[0] = cObjectName.toString();
operation = "createStandardManager";
- //mObjectName = (String)
- // mBServer.invoke(fname, operation,
- // values, createStandardManagerTypes);
-
+ mObjectName = (String)
+ mBServer.invoke(fname, operation,
+ values, createStandardManagerTypes);
+ getServlet().log("manager created "+mObjectName);
// Add the new Default Context to our tree control node
addToTreeControlNode(oname, cObjectName,
parentName, resources, session);
@@ -323,70 +327,70 @@
new Attribute("useNaming", new
Boolean(useNaming)));
// Loader properties
- //attribute = "reloadable";
- //try {
- // reloadable = cform.getLdrReloadable();
- //} catch (Throwable t) {
- // reloadable = "false";
- //}
- //mBServer.setAttribute(loname,
- // new Attribute("reloadable", new
Boolean(reloadable)));
+ attribute = "reloadable";
+ try {
+ reloadable = cform.getLdrReloadable();
+ } catch (Throwable t) {
+ reloadable = "false";
+ }
+ mBServer.setAttribute(loname,
+ new Attribute("reloadable", new
Boolean(reloadable)));
- //attribute = "debug";
- //int debug = 0;
- //try {
- // debug = Integer.parseInt(cform.getLdrDebugLvl());
- //} catch (Throwable t) {
- // debug = 0;
- //}
- //mBServer.setAttribute(loname,
- // new Attribute("debug", new Integer(debug)));
+ attribute = "debug";
+ int debug = 0;
+ try {
+ debug = Integer.parseInt(cform.getLdrDebugLvl());
+ } catch (Throwable t) {
+ debug = 0;
+ }
+ mBServer.setAttribute(loname,
+ new Attribute("debug", new Integer(debug)));
- //attribute = "checkInterval";
- //int checkInterval = 15;
- //try {
- // checkInterval = Integer.parseInt(cform.getLdrCheckInterval());
- //} catch (Throwable t) {
- // checkInterval = 15;
- //}
- //mBServer.setAttribute(loname,
- // new Attribute("checkInterval", new
Integer(checkInterval)));
+ attribute = "checkInterval";
+ int checkInterval = 15;
+ try {
+ checkInterval = Integer.parseInt(cform.getLdrCheckInterval());
+ } catch (Throwable t) {
+ checkInterval = 15;
+ }
+ mBServer.setAttribute(loname,
+ new Attribute("checkInterval", new
Integer(checkInterval)));
// Manager properties
- //attribute = "entropy";
- //String entropy = cform.getMgrSessionIDInit();
- //if ((entropy!=null) && (entropy.length()>=1)) {
- // mBServer.setAttribute(moname,
- // new Attribute("entropy",entropy));
- //}
+ attribute = "entropy";
+ String entropy = cform.getMgrSessionIDInit();
+ if ((entropy!=null) && (entropy.length()>=1)) {
+ mBServer.setAttribute(moname,
+ new Attribute("entropy",entropy));
+ }
- //attribute = "debug";
- //try {
- // debug = Integer.parseInt(cform.getMgrDebugLvl());
- //} catch (Throwable t) {
- // debug = 0;
- //}
- //mBServer.setAttribute(moname,
- // new Attribute("debug", new Integer(debug)));
+ attribute = "debug";
+ try {
+ debug = Integer.parseInt(cform.getMgrDebugLvl());
+ } catch (Throwable t) {
+ debug = 0;
+ }
+ mBServer.setAttribute(moname,
+ new Attribute("debug", new Integer(debug)));
- //attribute = "checkInterval";
- //try {
- // checkInterval = Integer.parseInt(cform.getMgrCheckInterval());
- //} catch (Throwable t) {
- // checkInterval = 60;
- //}
- //mBServer.setAttribute(moname,
- // new Attribute("checkInterval", new
Integer(checkInterval)));
+ attribute = "checkInterval";
+ try {
+ checkInterval = Integer.parseInt(cform.getMgrCheckInterval());
+ } catch (Throwable t) {
+ checkInterval = 60;
+ }
+ mBServer.setAttribute(moname,
+ new Attribute("checkInterval", new
Integer(checkInterval)));
- //attribute = "maxActiveSessions";
- //int maxActiveSessions = -1;
- //try {
- // maxActiveSessions = Integer.parseInt(cform.getMgrMaxSessions());
- //} catch (Throwable t) {
- // maxActiveSessions = -1;
- //}
- //mBServer.setAttribute(moname,
- // new Attribute("maxActiveSessions", new
Integer(maxActiveSessions)));
+ attribute = "maxActiveSessions";
+ int maxActiveSessions = -1;
+ try {
+ maxActiveSessions = Integer.parseInt(cform.getMgrMaxSessions());
+ } catch (Throwable t) {
+ maxActiveSessions = -1;
+ }
+ mBServer.setAttribute(moname,
+ new Attribute("maxActiveSessions", new
Integer(maxActiveSessions)));
} catch (Exception e) {
1.5 +6 -6
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/DeleteDataSourcesAction.java
Index: DeleteDataSourcesAction.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/DeleteDataSourcesAction.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DeleteDataSourcesAction.java 11 Sep 2002 14:20:00 -0000 1.4
+++ DeleteDataSourcesAction.java 19 Sep 2002 22:56:05 -0000 1.5
@@ -194,12 +194,12 @@
if (host.length() > 0) {
dname =
new ObjectName(ResourceUtils.NAMINGRESOURCES_TYPE +
- ResourceUtils.DEFAULTCONTEXT_TYPE + ",host=" +
+ ResourceUtils.HOST_DEFAULTCONTEXT_TYPE + ",host=" +
host + ",service=" + service);
} else {
dname =
new ObjectName(ResourceUtils.NAMINGRESOURCES_TYPE +
- ResourceUtils.DEFAULTCONTEXT_TYPE + ",service=" +
+ ResourceUtils.SERVICE_DEFAULTCONTEXT_TYPE + ",service="
+
service);
}
}
1.6 +6 -6
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/DeleteEnvEntriesAction.java
Index: DeleteEnvEntriesAction.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/DeleteEnvEntriesAction.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DeleteEnvEntriesAction.java 11 Sep 2002 14:20:00 -0000 1.5
+++ DeleteEnvEntriesAction.java 19 Sep 2002 22:56:05 -0000 1.6
@@ -194,12 +194,12 @@
if (host.length() > 0) {
dname =
new ObjectName(ResourceUtils.NAMINGRESOURCES_TYPE +
- ResourceUtils.DEFAULTCONTEXT_TYPE + ",host=" +
+ ResourceUtils.HOST_DEFAULTCONTEXT_TYPE + ",host=" +
host + ",service=" + service);
} else {
dname =
new ObjectName(ResourceUtils.NAMINGRESOURCES_TYPE +
- ResourceUtils.DEFAULTCONTEXT_TYPE + ",service=" +
+ ResourceUtils.SERVICE_DEFAULTCONTEXT_TYPE + ",service="
+
service);
}
}
1.3 +6 -6
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/DeleteMailSessionsAction.java
Index: DeleteMailSessionsAction.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/DeleteMailSessionsAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DeleteMailSessionsAction.java 11 Sep 2002 14:20:00 -0000 1.2
+++ DeleteMailSessionsAction.java 19 Sep 2002 22:56:05 -0000 1.3
@@ -194,12 +194,12 @@
if (host.length() > 0) {
dname =
new ObjectName(ResourceUtils.NAMINGRESOURCES_TYPE +
- ResourceUtils.DEFAULTCONTEXT_TYPE + ",host=" +
+ ResourceUtils.HOST_DEFAULTCONTEXT_TYPE + ",host=" +
host + ",service=" + service);
} else {
dname =
new ObjectName(ResourceUtils.NAMINGRESOURCES_TYPE +
- ResourceUtils.DEFAULTCONTEXT_TYPE + ",service=" +
+ ResourceUtils.SERVICE_DEFAULTCONTEXT_TYPE + ",service="
+
service);
}
}
1.5 +6 -6
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/DeleteResourceLinksAction.java
Index: DeleteResourceLinksAction.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/DeleteResourceLinksAction.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DeleteResourceLinksAction.java 11 Sep 2002 14:20:01 -0000 1.4
+++ DeleteResourceLinksAction.java 19 Sep 2002 22:56:05 -0000 1.5
@@ -191,12 +191,12 @@
if (host.length() > 0) {
dname =
new ObjectName(ResourceUtils.NAMINGRESOURCES_TYPE +
- ResourceUtils.DEFAULTCONTEXT_TYPE + ",host=" +
+ ResourceUtils.HOST_DEFAULTCONTEXT_TYPE + ",host=" +
host + ",service=" + service);
} else {
dname =
new ObjectName(ResourceUtils.NAMINGRESOURCES_TYPE +
- ResourceUtils.DEFAULTCONTEXT_TYPE + ",service=" +
+ ResourceUtils.SERVICE_DEFAULTCONTEXT_TYPE + ",service="
+
service);
}
}
1.13 +19 -25
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/ResourceUtils.java
Index: ResourceUtils.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/ResourceUtils.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ResourceUtils.java 14 Sep 2002 23:37:39 -0000 1.12
+++ ResourceUtils.java 19 Sep 2002 22:56:05 -0000 1.13
@@ -88,7 +88,10 @@
public final static String NAMINGRESOURCES_TYPE =
"Catalina:type=NamingResources";
public final static String GLOBAL_TYPE = ",resourcetype=Global";
public final static String CONTEXT_TYPE = ",resourcetype=Context";
- public final static String DEFAULTCONTEXT_TYPE = ",resourcetype=DefaultContext";
+ public final static String SERVICE_DEFAULTCONTEXT_TYPE =
+
",resourcetype=ServiceDefaultContext";
+ public final static String HOST_DEFAULTCONTEXT_TYPE =
+ ",resourcetype=HostDefaultContext";
// resource class names
public final static String USERDB_CLASS = "org.apache.catalina.UserDatabase";
@@ -120,21 +123,12 @@
service + ",*");
} else if (resourcetype.equals("DefaultContext")) {
if (host.length() > 0) {
- sb = new StringBuffer(ENVIRONMENT_TYPE);
- sb.append(DEFAULTCONTEXT_TYPE);
- sb.append(",host=");
- sb.append(host);
- sb.append(",service=");
- sb.append(service);
- sb.append(",*");
- ename = new ObjectName(sb.toString());
+ ename = new ObjectName(ENVIRONMENT_TYPE +
+ HOST_DEFAULTCONTEXT_TYPE + ",host=" + host +
+ ",service=" + service + ",*");
} else {
- sb = new StringBuffer(ENVIRONMENT_TYPE);
- sb.append(DEFAULTCONTEXT_TYPE);
- sb.append(",service=");
- sb.append(service);
- sb.append(",*");
- ename = new ObjectName(sb.toString());
+ ename = new ObjectName(ENVIRONMENT_TYPE +
+ SERVICE_DEFAULTCONTEXT_TYPE + ",service=" + service + ",*");
}
}
}
@@ -201,12 +195,12 @@
} else if (resourcetype.equals("DefaultContext")) {
if (host.length() > 0) {
rname = new ObjectName(RESOURCE_TYPE +
- DEFAULTCONTEXT_TYPE + ",host=" + host +
+ HOST_DEFAULTCONTEXT_TYPE + ",host=" + host +
",service=" + service + ",class=" +
DATASOURCE_CLASS + ",*");
} else {
rname = new ObjectName(RESOURCE_TYPE +
- DEFAULTCONTEXT_TYPE + ",service=" + service +
+ SERVICE_DEFAULTCONTEXT_TYPE + ",service=" + service +
",class=" + DATASOURCE_CLASS + ",*");
}
}
@@ -275,12 +269,12 @@
} else if (resourcetype.equals("DefaultContext")) {
if (host.length() > 0) {
rname = new ObjectName(RESOURCE_TYPE +
- DEFAULTCONTEXT_TYPE + ",host=" + host +
+ HOST_DEFAULTCONTEXT_TYPE + ",host=" + host +
",service=" + service + ",class=" +
MAILSESSION_CLASS + ",*");
} else {
rname = new ObjectName(RESOURCE_TYPE +
- DEFAULTCONTEXT_TYPE + ",service=" + service +
+ SERVICE_DEFAULTCONTEXT_TYPE + ",service=" + service +
",class=" + MAILSESSION_CLASS + ",*");
}
}
@@ -348,11 +342,11 @@
} else if (resourcetype.equals("DefaultContext")) {
if (host.length() > 0) {
rname = new ObjectName(RESOURCELINK_TYPE +
- DEFAULTCONTEXT_TYPE + ",host=" + host +
+ HOST_DEFAULTCONTEXT_TYPE + ",host=" + host +
",service=" + service + ",*");
} else {
rname = new ObjectName(RESOURCELINK_TYPE +
- DEFAULTCONTEXT_TYPE + ",service=" + service + ",*");
+ SERVICE_DEFAULTCONTEXT_TYPE + ",service=" + service + ",*");
}
}
}
1.9 +6 -6
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SaveDataSourceAction.java
Index: SaveDataSourceAction.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SaveDataSourceAction.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- SaveDataSourceAction.java 11 Sep 2002 14:20:01 -0000 1.8
+++ SaveDataSourceAction.java 19 Sep 2002 22:56:05 -0000 1.9
@@ -201,12 +201,12 @@
if (host.length() > 0) {
oname =
new ObjectName(ResourceUtils.NAMINGRESOURCES_TYPE +
- ResourceUtils.DEFAULTCONTEXT_TYPE + ",host=" +
+ ResourceUtils.HOST_DEFAULTCONTEXT_TYPE + ",host=" +
host + ",service=" + service);
} else {
oname =
new ObjectName(ResourceUtils.NAMINGRESOURCES_TYPE +
- ResourceUtils.DEFAULTCONTEXT_TYPE + ",service=" +
+ ResourceUtils.SERVICE_DEFAULTCONTEXT_TYPE +
",service=" +
service);
}
}
1.10 +6 -6
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SaveEnvEntryAction.java
Index: SaveEnvEntryAction.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SaveEnvEntryAction.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- SaveEnvEntryAction.java 11 Sep 2002 14:20:01 -0000 1.9
+++ SaveEnvEntryAction.java 19 Sep 2002 22:56:05 -0000 1.10
@@ -205,12 +205,12 @@
if (host.length() > 0) {
oname =
new ObjectName(ResourceUtils.NAMINGRESOURCES_TYPE +
- ResourceUtils.DEFAULTCONTEXT_TYPE + ",host=" +
+ ResourceUtils.HOST_DEFAULTCONTEXT_TYPE + ",host=" +
host + ",service=" + service);
} else {
oname =
new ObjectName(ResourceUtils.NAMINGRESOURCES_TYPE +
- ResourceUtils.DEFAULTCONTEXT_TYPE + ",service=" +
+ ResourceUtils.SERVICE_DEFAULTCONTEXT_TYPE +
",service=" +
service);
}
}
1.3 +6 -6
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SaveMailSessionAction.java
Index: SaveMailSessionAction.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SaveMailSessionAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SaveMailSessionAction.java 11 Sep 2002 14:20:01 -0000 1.2
+++ SaveMailSessionAction.java 19 Sep 2002 22:56:05 -0000 1.3
@@ -201,12 +201,12 @@
if (host.length() > 0) {
oname =
new ObjectName(ResourceUtils.NAMINGRESOURCES_TYPE +
- ResourceUtils.DEFAULTCONTEXT_TYPE + ",host=" +
+ ResourceUtils.HOST_DEFAULTCONTEXT_TYPE + ",host=" +
host + ",service=" + service);
} else {
oname =
new ObjectName(ResourceUtils.NAMINGRESOURCES_TYPE +
- ResourceUtils.DEFAULTCONTEXT_TYPE + ",service=" +
+ ResourceUtils.SERVICE_DEFAULTCONTEXT_TYPE +
",service=" +
service);
}
}
1.5 +6 -6
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SaveResourceLinkAction.java
Index: SaveResourceLinkAction.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SaveResourceLinkAction.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SaveResourceLinkAction.java 11 Sep 2002 14:20:01 -0000 1.4
+++ SaveResourceLinkAction.java 19 Sep 2002 22:56:05 -0000 1.5
@@ -204,12 +204,12 @@
if (host.length() > 0) {
oname =
new ObjectName(ResourceUtils.NAMINGRESOURCES_TYPE +
- ResourceUtils.DEFAULTCONTEXT_TYPE + ",host=" +
+ ResourceUtils.HOST_DEFAULTCONTEXT_TYPE + ",host=" +
host + ",service=" + service);
} else {
oname =
new ObjectName(ResourceUtils.NAMINGRESOURCES_TYPE +
- ResourceUtils.DEFAULTCONTEXT_TYPE + ",service=" +
+ ResourceUtils.SERVICE_DEFAULTCONTEXT_TYPE +
",service=" +
service);
}
}
1.2 +4 -4
jakarta-tomcat-4.0/webapps/admin/defaultcontext/defaultcontext.jsp
Index: defaultcontext.jsp
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/defaultcontext/defaultcontext.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- defaultcontext.jsp 11 Sep 2002 14:20:01 -0000 1.1
+++ defaultcontext.jsp 19 Sep 2002 22:56:05 -0000 1.2
@@ -129,7 +129,7 @@
<br>
-<%-- Loader Properties table >
+<%-- Loader Properties table --%>
<table border="0" cellspacing="0" cellpadding="0" width="100%">
<tr> <td> <div class="table-title-text">
@@ -178,10 +178,10 @@
</controls:table>
</td>
</tr>
-</table--%>
+</table>
<BR>
-<%-- Session Manager Properties table >
+<%-- Session Manager Properties table --%>
<table border="0" cellspacing="0" cellpadding="0" width="100%">
<tr> <td> <div class="table-title-text">
<bean:message key="context.sessionmgr.properties"/>
@@ -232,7 +232,7 @@
</controls:table>
</td>
</tr>
-</table--%>
+</table>
<%@ include file="../buttons.jsp" %>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
