manveen 02/01/28 09:44:42 Modified: webapps/admin context.jsp webapps/admin/WEB-INF/classes/org/apache/webapp/admin ContextAction.java ContextForm.java SetUpContextAction.java TomcatTreeBuilder.java Log: Using the context's loader and manager mBeans to read/write properties, now that these mBeans are visible from the mBServer. Revision Changes Path 1.3 +3 -1 jakarta-tomcat-4.0/webapps/admin/context.jsp Index: context.jsp =================================================================== RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/context.jsp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- context.jsp 26 Jan 2002 20:52:58 -0000 1.2 +++ context.jsp 28 Jan 2002 17:44:42 -0000 1.3 @@ -21,6 +21,8 @@ <tr bgcolor="7171A5"> <td width="81%"> <html:hidden property="contextName"/> + <html:hidden property="loaderName"/> + <html:hidden property="managerName"/> <div class="page-title-text" align="left"> <bean:write name="contextForm" property="nodeLabel" scope="session"/> </div> @@ -254,7 +256,7 @@ <controls:row labelStyle="table-label-text" dataStyle="table-normal-text"> <controls:label><bean:message key="context.sessionId"/>:</controls:label> <controls:data> - <html:text property="mgrSessionIDInit" size="20"/> + <html:textarea property="mgrSessionIDInit" cols="30" rows="2"/> </controls:data> </controls:row> 1.2 +78 -7 jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ContextAction.java Index: ContextAction.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ContextAction.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ContextAction.java 18 Jan 2002 05:53:26 -0000 1.1 +++ ContextAction.java 28 Jan 2002 17:44:42 -0000 1.2 @@ -1,7 +1,7 @@ /* - * $Header: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ContextAction.java,v 1.1 2002/01/18 05:53:26 patrickl Exp $ - * $Revision: 1.1 $ - * $Date: 2002/01/18 05:53:26 $ + * $Header: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ContextAction.java,v 1.2 2002/01/28 17:44:42 manveen Exp $ + * $Revision: 1.2 $ + * $Date: 2002/01/28 17:44:42 $ * * ==================================================================== * @@ -91,7 +91,7 @@ * actions on a Context. * * @author Manveen Kaur - * @version $Revision: 1.1 $ $Date: 2002/01/18 05:53:26 $ + * @version $Revision: 1.2 $ $Date: 2002/01/28 17:44:42 $ */ public final class ContextAction extends Action { @@ -231,9 +231,80 @@ workDir)); } - // FIXME - // Need to write loader and session mgr properties back - // once their mBeans are available through code! + // writing loader properties + // retrieve the corresponding loader mBean + String loaderName = request.getParameter("loaderName"); + + Iterator loaderItr = + mBServer.queryMBeans(new ObjectName(loaderName), null).iterator(); + + objInstance = (ObjectInstance)loaderItr.next(); + ObjectName loaderObjName = (objInstance).getObjectName(); + + String ldrCheckInterval = request.getParameter("ldrCheckInterval"); + if(ldrCheckInterval != null) { + Integer ldrCheckInt = new Integer(ldrCheckInterval); + mBServer.setAttribute(loaderObjName, + new Attribute(SetUpContextAction.CHECKINTERVAL_PROP_NAME, + ldrCheckInt)); + } + + String ldrDebugLvlText = request.getParameter("ldrDebugLvl"); + if(ldrCheckInterval != null) { + Integer ldrDebugLvl = new Integer(ldrDebugLvlText); + mBServer.setAttribute(loaderObjName, + new Attribute(SetUpContextAction.DEBUG_PROP_NAME, + ldrDebugLvl)); + } + + String ldrReloadable = request.getParameter("ldrReloadable"); + if(ldrReloadable != null) { + Boolean ldrReload = new Boolean(ldrReloadable); + mBServer.setAttribute(loaderObjName, + new Attribute(SetUpContextAction.RELOADABLE_PROP_NAME, + ldrReload)); + } + + // write session manager properties + // retrieve the corresponding manager mBean + String managerName = request.getParameter("managerName"); + + Iterator managerItr = + mBServer.queryMBeans(new ObjectName(managerName), null).iterator(); + + objInstance = (ObjectInstance)managerItr.next(); + ObjectName managerObjName = (objInstance).getObjectName(); + + String mgrCheckInterval = request.getParameter("mgrCheckInterval"); + if(mgrCheckInterval != null) { + Integer mgrCheckInt = new Integer(mgrCheckInterval); + mBServer.setAttribute(managerObjName, + new Attribute(SetUpContextAction.CHECKINTERVAL_PROP_NAME, + mgrCheckInt)); + } + + String mgrDebugLvlText = request.getParameter("mgrDebugLvl"); + if(mgrDebugLvlText != null) { + Integer mgrDebugLvl = new Integer(mgrDebugLvlText); + mBServer.setAttribute(managerObjName, + new Attribute(SetUpContextAction.DEBUG_PROP_NAME, + mgrDebugLvl)); + } + + String mgrSessionIDInit = request.getParameter("mgrSessionIDInit"); + if(mgrSessionIDInit != null) { + mBServer.setAttribute(managerObjName, + new Attribute(SetUpContextAction.SESSIONID_INIT_PROP_NAME, + mgrSessionIDInit)); + } + + String mgrMaxSessions = request.getParameter("mgrMaxSessions"); + if(mgrMaxSessions != null) { + Integer mgrMaxSess = new Integer(mgrMaxSessions); + mBServer.setAttribute(managerObjName, + new Attribute(SetUpContextAction.MAXACTIVE_SESSIONS_PROP_NAME, + mgrMaxSess)); + } }catch(Throwable t){ t.printStackTrace(System.out); 1.2 +49 -6 jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ContextForm.java Index: ContextForm.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ContextForm.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ContextForm.java 18 Jan 2002 05:53:26 -0000 1.1 +++ ContextForm.java 28 Jan 2002 17:44:42 -0000 1.2 @@ -1,7 +1,7 @@ /* - * $Header: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ContextForm.java,v 1.1 2002/01/18 05:53:26 patrickl Exp $ - * $Revision: 1.1 $ - * $Date: 2002/01/18 05:53:26 $ + * $Header: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ContextForm.java,v 1.2 2002/01/28 17:44:42 manveen Exp $ + * $Revision: 1.2 $ + * $Date: 2002/01/28 17:44:42 $ * * ==================================================================== * @@ -74,7 +74,7 @@ * Form bean for the context page. * * @author Manveen Kaur - * @version $Revision: 1.1 $ $Date: 2002/01/18 05:53:26 $ + * @version $Revision: 1.2 $ $Date: 2002/01/28 17:44:42 $ */ public final class ContextForm extends ActionForm { @@ -164,7 +164,7 @@ /** * The text for the session mgr session ID initializer. */ - private String mgrSessionIDInit = "0"; + private String mgrSessionIDInit = ""; /** * The text for the session mgr max active sessions. @@ -177,6 +177,16 @@ private String contextName = null; /** + * The text for the loaderName. + */ + private String loaderName = null; + + /** + * The text for the managerName. + */ + private String managerName = null; + + /** * Set of valid values for debug level. */ private ArrayList debugLvlVals = null; @@ -567,6 +577,40 @@ } + /** + * Return the loader Name. + */ + public String getLoaderName() { + + return this.loaderName; + + } + + /** + * Set the loader Name. + */ + public void setLoaderName(String loaderName) { + + this.loaderName = loaderName; + + } + /** + * Return the manager Name. + */ + public String getManagerName() { + + return this.managerName; + + } + + /** + * Set the manager Name. + */ + public void setManagerName(String managerName) { + + this.managerName = managerName; + + } // --------------------------------------------------------- Public Methods /** @@ -640,7 +684,6 @@ // session manager properties numberCheck("mgrCheckInterval", mgrCheckInterval, true, 0, 10000); - numberCheck("mgrSessionIDInit", mgrSessionIDInit, false, 0, 65535); numberCheck("mgrMaxSessions", mgrMaxSessions, false, -1, 100); } 1.3 +55 -19 jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/SetUpContextAction.java Index: SetUpContextAction.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/SetUpContextAction.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- SetUpContextAction.java 20 Jan 2002 00:51:53 -0000 1.2 +++ SetUpContextAction.java 28 Jan 2002 17:44:42 -0000 1.3 @@ -1,7 +1,7 @@ /* - * $Header: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/SetUpContextAction.java,v 1.2 2002/01/20 00:51:53 patrickl Exp $ - * $Revision: 1.2 $ - * $Date: 2002/01/20 00:51:53 $ + * $Header: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/SetUpContextAction.java,v 1.3 2002/01/28 17:44:42 manveen Exp $ + * $Revision: 1.3 $ + * $Date: 2002/01/28 17:44:42 $ * * ==================================================================== * @@ -99,7 +99,7 @@ * a context is chosen. * * @author Manveen Kaur - * @version $Revision: 1.2 $ $Date: 2002/01/20 00:51:53 $ + * @version $Revision: 1.3 $ $Date: 2002/01/28 17:44:42 $ */ public class SetUpContextAction extends Action { @@ -121,7 +121,7 @@ public final static String CHECKINTERVAL_PROP_NAME = "checkInterval"; // -- Session manager properties -- - public final static String SESSIONID_INIT_PROP_NAME = "sessionID"; + public final static String SESSIONID_INIT_PROP_NAME = "entropy"; public final static String MAXACTIVE_SESSIONS_PROP_NAME = "maxActiveSessions"; private ArrayList debugLvlList = null; @@ -193,6 +193,8 @@ } String contextName = null; + String loaderName = null; + String managerName = null; // context properties Boolean cookies = null; @@ -213,7 +215,7 @@ // session properties Integer mgrCheckInterval = null; Integer mgrDebug = null; - Integer mgrSessionIDInit = null; + String mgrSessionIDInit = null; Integer mgrMaxSessions = null; try{ @@ -260,19 +262,51 @@ WORKDIR_PROP_NAME); // Loader properties - // FIXME -- will update these to read from the Loader mBean - // after code that allows access to this mBean has been checked in. - ldrCheckInterval = Integer.valueOf("15"); - ldrDebug = Integer.valueOf("0"); - ldrReloadable = Boolean.valueOf("true"); - - // Session manager properties - // FIXME -- will update this later, after code that allows access to - // SessionManager mBean has been checked in. - mgrCheckInterval = Integer.valueOf("60"); - mgrDebug = Integer.valueOf("0"); - mgrSessionIDInit = Integer.valueOf("0"); - mgrMaxSessions = Integer.valueOf("-1"); + // Get the corresponding Loader mBean + int i = selectedName.indexOf(","); + if (i != -1) + loaderName = TomcatTreeBuilder.LOADER_TYPE + + selectedName.substring(i, selectedName.length()); + + Iterator loaderItr = + mBServer.queryMBeans(new ObjectName(loaderName), null).iterator(); + + objInstance = (ObjectInstance)loaderItr.next(); + ObjectName loaderObjName = (objInstance).getObjectName(); + + ldrCheckInterval = (Integer) mBServer.getAttribute(loaderObjName, + CHECKINTERVAL_PROP_NAME); + + ldrDebug = (Integer) mBServer.getAttribute(loaderObjName, + DEBUG_PROP_NAME); + + ldrReloadable = (Boolean) mBServer.getAttribute(loaderObjName, + RELOADABLE_PROP_NAME); + + // Session manager properties + // Get the corresponding Session Manager mBean + i = selectedName.indexOf(","); + if (i != -1) + managerName = TomcatTreeBuilder.MANAGER_TYPE + + selectedName.substring(i, selectedName.length()); + + Iterator managerItr = + mBServer.queryMBeans(new ObjectName(managerName), null).iterator(); + + objInstance = (ObjectInstance)managerItr.next(); + ObjectName managerObjName = (objInstance).getObjectName(); + + mgrCheckInterval = (Integer) mBServer.getAttribute(managerObjName, + CHECKINTERVAL_PROP_NAME); + + mgrDebug = (Integer) mBServer.getAttribute(managerObjName, + DEBUG_PROP_NAME); + + mgrSessionIDInit = (String) mBServer.getAttribute(managerObjName, + SESSIONID_INIT_PROP_NAME); + + mgrMaxSessions = (Integer) mBServer.getAttribute(managerObjName, + MAXACTIVE_SESSIONS_PROP_NAME); } catch(Throwable t){ t.printStackTrace(System.out); @@ -283,6 +317,8 @@ contextFm.setNodeLabel(nodeLabel); contextFm.setContextName(selectedName); + contextFm.setLoaderName(loaderName); + contextFm.setManagerName(managerName); contextFm.setDebugLvlVals(debugLvlList); contextFm.setBooleanVals(booleanList); 1.11 +6 -6 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.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- TomcatTreeBuilder.java 26 Jan 2002 22:39:45 -0000 1.10 +++ TomcatTreeBuilder.java 28 Jan 2002 17:44:42 -0000 1.11 @@ -1,7 +1,7 @@ /* - * $Header: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/TomcatTreeBuilder.java,v 1.10 2002/01/26 22:39:45 manveen Exp $ - * $Revision: 1.10 $ - * $Date: 2002/01/26 22:39:45 $ + * $Header: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/TomcatTreeBuilder.java,v 1.11 2002/01/28 17:44:42 manveen Exp $ + * $Revision: 1.11 $ + * $Date: 2002/01/28 17:44:42 $ * * ==================================================================== * @@ -92,7 +92,7 @@ * * @author Jazmin Jonson * @author Manveen Kaur - * @version $Revision: 1.10 $ $Date: 2002/01/26 22:39:45 $ + * @version $Revision: 1.11 $ $Date: 2002/01/28 17:44:42 $ */ @@ -107,8 +107,8 @@ public final static String CONNECTOR_TYPE = "Catalina:type=Connector"; public final static String HOST_TYPE = "Catalina:type=Host"; public final static String CONTEXT_TYPE = "Catalina:type=Context"; - public final static String LOADER_TYPE = "Catalina:type=WebappLoader"; - public final static String MANAGER_TYPE = "Catalina:type=StandardManager"; + public final static String LOADER_TYPE = "Catalina:type=Loader"; + public final static String MANAGER_TYPE = "Catalina:type=Manager"; public final static String LOGGER_TYPE = "Catalina:type=Logger"; public final static String WILDCARD = ",*";
-- To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]> For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>