amyroh 2003/05/27 16:11:25
Modified: webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context
AddContextAction.java EditContextAction.java
SaveContextAction.java
webapps/admin/context context.jsp
Log:
Remove checkInterval attribute since it no longer exists.
Revision Changes Path
1.4 +6 -6
jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context/AddContextAction.java
Index: AddContextAction.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/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 18 Mar 2003 10:48:15 -0000 1.3
+++ AddContextAction.java 27 May 2003 23:11:25 -0000 1.4
@@ -151,11 +151,11 @@
contextFm.setPath("");
contextFm.setDebugLvl("0");
//loader initialization
- contextFm.setLdrCheckInterval("15");
+ //contextFm.setLdrCheckInterval("15");
contextFm.setLdrDebugLvl("0");
contextFm.setLdrReloadable("false");
//manager initialization
- contextFm.setMgrCheckInterval("60");
+ //contextFm.setMgrCheckInterval("60");
contextFm.setMgrDebugLvl("0");
contextFm.setMgrMaxSessions("-1");
contextFm.setMgrSessionIDInit("");
1.5 +10 -10
jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context/EditContextAction.java
Index: EditContextAction.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context/EditContextAction.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- EditContextAction.java 20 Mar 2003 05:40:09 -0000 1.4
+++ EditContextAction.java 27 May 2003 23:11:25 -0000 1.5
@@ -257,9 +257,9 @@
attribute = "debug";
contextFm.setLdrDebugLvl
(((Integer) mBServer.getAttribute(lname, attribute)).toString());
- attribute = "checkInterval";
- contextFm.setLdrCheckInterval
- (((Integer) mBServer.getAttribute(lname, attribute)).toString());
+ //attribute = "checkInterval";
+ //contextFm.setLdrCheckInterval
+ // (((Integer) mBServer.getAttribute(lname, attribute)).toString());
attribute = "reloadable";
contextFm.setLdrReloadable
(((Boolean) mBServer.getAttribute(lname, attribute)).toString());
@@ -274,9 +274,9 @@
attribute = "maxActiveSessions";
contextFm.setMgrMaxSessions
(((Integer) mBServer.getAttribute(mname, attribute)).toString());
- attribute = "checkInterval";
- contextFm.setMgrCheckInterval
- (((Integer) mBServer.getAttribute(mname, attribute)).toString());
+ //attribute = "checkInterval";
+ //contextFm.setMgrCheckInterval
+ // (((Integer) mBServer.getAttribute(mname, attribute)).toString());
} catch (Throwable t) {
getServlet().log
1.11 +21 -21
jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context/SaveContextAction.java
Index: SaveContextAction.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context/SaveContextAction.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- SaveContextAction.java 13 May 2003 01:15:08 -0000 1.10
+++ SaveContextAction.java 27 May 2003 23:11:25 -0000 1.11
@@ -404,15 +404,15 @@
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";
@@ -431,14 +431,14 @@
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;
1.5 +4 -4 jakarta-tomcat-catalina/webapps/admin/context/context.jsp
Index: context.jsp
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/context/context.jsp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- context.jsp 23 Jan 2003 00:07:08 -0000 1.4
+++ context.jsp 27 May 2003 23:11:25 -0000 1.5
@@ -252,12 +252,12 @@
<controls:data><bean:message key="service.value"/></controls:data>
</controls:row>
- <controls:row labelStyle="table-label-text" dataStyle="table-normal-text"
styleId="checkInterval">
+ <%--controls:row labelStyle="table-label-text"
dataStyle="table-normal-text" styleId="checkInterval">
<controls:label><bean:message
key="context.checkInterval"/>:</controls:label>
<controls:data>
<html:text property="ldrCheckInterval" size="5"
styleId="checkInterval"/>
</controls:data>
- </controls:row>
+ </controls:row--%>
<controls:row labelStyle="table-label-text" dataStyle="table-normal-text"
styleId="debugLvlVals">
<controls:label><bean:message
key="server.debuglevel"/>:</controls:label>
@@ -303,12 +303,12 @@
<controls:data><bean:message key="service.value"/></controls:data>
</controls:row>
- <controls:row labelStyle="table-label-text" dataStyle="table-normal-text"
styleId="checkInterval">
+ <%--controls:row labelStyle="table-label-text"
dataStyle="table-normal-text" styleId="checkInterval">
<controls:label><bean:message
key="context.checkInterval"/>:</controls:label>
<controls:data>
<html:text property="mgrCheckInterval" size="5"
styleId="checkInterval"/>
</controls:data>
- </controls:row>
+ </controls:row--%>
<controls:row labelStyle="table-label-text" dataStyle="table-normal-text"
styleId="debuglevel">
<controls:label><bean:message
key="server.debuglevel"/>:</controls:label>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
