manveen 02/03/25 16:04:45
Modified: webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context
AddContextAction.java ContextForm.java
SaveContextAction.java
webapps/admin/context context.jsp
webapps/admin/host host.jsp
Log:
* Implemented add context operation
* Enabled selecting add context through host. (now delete and add contexts
operations both are possible through admin tool)
* added method toString() to ContextForm to print out values in the form.
Revision Changes Path
1.2 +6 -6
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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AddContextAction.java 24 Mar 2002 21:41:58 -0000 1.1
+++ AddContextAction.java 26 Mar 2002 00:04:44 -0000 1.2
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context/AddContextAction.java,v
1.1 2002/03/24 21:41:58 manveen Exp $
- * $Revision: 1.1 $
- * $Date: 2002/03/24 21:41:58 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context/AddContextAction.java,v
1.2 2002/03/26 00:04:44 manveen Exp $
+ * $Revision: 1.2 $
+ * $Date: 2002/03/26 00:04:44 $
*
* ====================================================================
*
@@ -81,7 +81,7 @@
* The <code>Action</code> that sets up <em>Add Context</em> transactions.
*
* @author Manveen Kaur
- * @version $Revision: 1.1 $ $Date: 2002/03/24 21:41:58 $
+ * @version $Revision: 1.2 $ $Date: 2002/03/26 00:04:44 $
*/
public class AddContextAction extends Action {
@@ -148,11 +148,11 @@
contextFm.setPath("");
contextFm.setDebugLvl("0");
//loader initialization
- contextFm.setLdrCheckInterval("0");
+ contextFm.setLdrCheckInterval("15");
contextFm.setLdrDebugLvl("0");
contextFm.setLdrReloadable("false");
//manager initialization
- contextFm.setMgrCheckInterval("0");
+ contextFm.setMgrCheckInterval("60");
contextFm.setMgrDebugLvl("0");
contextFm.setMgrMaxSessions("-1");
contextFm.setMgrSessionIDInit("");
1.4 +59 -8
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context/ContextForm.java
Index: ContextForm.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context/ContextForm.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ContextForm.java 23 Mar 2002 22:13:42 -0000 1.3
+++ ContextForm.java 26 Mar 2002 00:04:44 -0000 1.4
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context/ContextForm.java,v
1.3 2002/03/23 22:13:42 manveen Exp $
- * $Revision: 1.3 $
- * $Date: 2002/03/23 22:13:42 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context/ContextForm.java,v
1.4 2002/03/26 00:04:44 manveen Exp $
+ * $Revision: 1.4 $
+ * $Date: 2002/03/26 00:04:44 $
*
* ====================================================================
*
@@ -74,7 +74,7 @@
* Form bean for the context page.
*
* @author Manveen Kaur
- * @version $Revision: 1.3 $ $Date: 2002/03/23 22:13:42 $
+ * @version $Revision: 1.4 $ $Date: 2002/03/26 00:04:44 $
*/
public final class ContextForm extends ActionForm {
@@ -159,7 +159,7 @@
/**
* The text for the loader check interval.
*/
- private String ldrCheckInterval = "0";
+ private String ldrCheckInterval = "15";
/**
* The text for the loader Debug level.
@@ -174,7 +174,7 @@
/**
* The text for the session manager check interval.
*/
- private String mgrCheckInterval = "0";
+ private String mgrCheckInterval = "60";
/**
* The text for the session manager Debug level.
@@ -666,6 +666,7 @@
public void reset(ActionMapping mapping, HttpServletRequest request) {
this.objectName = null;
+ this.parentObjectName = null;
this.loaderObjectName = null;
this.managerObjectName = null;
@@ -679,17 +680,67 @@
this.reloadable = "false";
// loader properties
- this.ldrCheckInterval = "0";
+ this.ldrCheckInterval = "15";
this.ldrDebugLvl = "0";
this.ldrReloadable = "true";
// session manager properties
- this.mgrCheckInterval = "0";
+ this.mgrCheckInterval = "60";
this.mgrDebugLvl = "0";
this.mgrSessionIDInit = "0";
this.mgrMaxSessions = "-1";
}
+ /**
+ * Render this object as a String.
+ */
+ public String toString() {
+
+ StringBuffer sb = new StringBuffer("ContextForm[adminAction=");
+ sb.append(adminAction);
+ sb.append(",debugLvl=");
+ sb.append(debugLvl);
+ sb.append(",docBase=");
+ sb.append(docBase);
+ sb.append(",path=");
+ sb.append(path);
+ sb.append(",cookies=");
+ sb.append(cookies);
+ sb.append(",crossContext=");
+ sb.append(crossContext);
+ sb.append(",override=");
+ sb.append(override);
+ sb.append(",reloadable=");
+ sb.append(reloadable);
+ // loader properties
+ sb.append(",ldrCheckInterval=");
+ sb.append(ldrCheckInterval);
+ sb.append(",ldrDebugLvl=");
+ sb.append(ldrDebugLvl);
+ sb.append(",ldrReloadable=");
+ sb.append(ldrReloadable);
+ // manager properties
+ sb.append(",mgrDebugLvl=");
+ sb.append(mgrDebugLvl);
+ sb.append(",mgrCheckInterval=");
+ sb.append(mgrCheckInterval);
+ sb.append(",mgrSessionIDInit=");
+ sb.append(mgrSessionIDInit);
+ sb.append(",mgrMaxSessions=");
+ sb.append(mgrMaxSessions);
+ // object names
+ sb.append("',objectName='");
+ sb.append(objectName);
+ sb.append("',parentObjectName=");
+ sb.append(parentObjectName);
+ sb.append("',loaderObjectName=");
+ sb.append(loaderObjectName);
+ sb.append("',managerObjectName=");
+ sb.append(managerObjectName);
+ sb.append("]");
+ return (sb.toString());
+
+ }
/**
* Validate the properties that have been set from this HTTP request,
* and return an <code>ActionErrors</code> object that encapsulates any
1.2 +13 -11
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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SaveContextAction.java 23 Mar 2002 22:13:42 -0000 1.1
+++ SaveContextAction.java 26 Mar 2002 00:04:44 -0000 1.2
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context/SaveContextAction.java,v
1.1 2002/03/23 22:13:42 manveen Exp $
- * $Revision: 1.1 $
- * $Date: 2002/03/23 22:13:42 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context/SaveContextAction.java,v
1.2 2002/03/26 00:04:44 manveen Exp $
+ * $Revision: 1.2 $
+ * $Date: 2002/03/26 00:04:44 $
*
* ====================================================================
*
@@ -97,7 +97,7 @@
* <em>Edit Context</em> transactions.
*
* @author Manveen Kaur
- * @version $Revision: 1.1 $ $Date: 2002/03/23 22:13:42 $
+ * @version $Revision: 1.2 $ $Date: 2002/03/26 00:04:44 $
*/
public final class SaveContextAction extends Action {
@@ -227,17 +227,19 @@
mBServer.invoke(fname, operation,
values, createStandardContextTypes);
- // Create a new StandardLoader object
+ // Create a new Loader object
values = new String[1];
- values[0] = parentName;
- operation = "createStandardLoader";
+ // parent of loader is the newly created context
+ values[0] = cObjectName.toString();
+ operation = "createWebappLoader";
lObjectName = (String)
mBServer.invoke(fname, operation,
values, createStandardLoaderTypes);
// Create a new StandardManager object
values = new String[1];
- values[0] = parentName;
+ // parent of manager is the newly created Context
+ values[0] = cObjectName.toString();
operation = "createStandardManager";
mObjectName = (String)
mBServer.invoke(fname, operation,
@@ -394,11 +396,11 @@
new Attribute("debug", new Integer(debug)));
attribute = "checkInterval";
- int checkInterval = 0;
+ int checkInterval = 15;
try {
checkInterval = Integer.parseInt(cform.getLdrCheckInterval());
} catch (Throwable t) {
- checkInterval = 0;
+ checkInterval = 15;
}
mBServer.setAttribute(loname,
new Attribute("checkInterval", new
Integer(checkInterval)));
@@ -427,7 +429,7 @@
try {
checkInterval = Integer.parseInt(cform.getMgrCheckInterval());
} catch (Throwable t) {
- checkInterval = 0;
+ checkInterval = 60;
}
mBServer.setAttribute(moname,
new Attribute("checkInterval", new
Integer(checkInterval)));
1.3 +1 -0 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- context.jsp 24 Mar 2002 02:44:30 -0000 1.2
+++ context.jsp 26 Mar 2002 00:04:45 -0000 1.3
@@ -21,6 +21,7 @@
name="contextForm" property="objectName"/>
<html:hidden property="adminAction"/>
<html:hidden property="objectName"/>
+ <html:hidden property="parentObjectName"/>
<html:hidden property="loaderObjectName"/>
<html:hidden property="managerObjectName"/>
1.10 +1 -1 jakarta-tomcat-4.0/webapps/admin/host/host.jsp
Index: host.jsp
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/host/host.jsp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- host.jsp 24 Mar 2002 04:13:24 -0000 1.9
+++ host.jsp 26 Mar 2002 00:04:45 -0000 1.10
@@ -67,11 +67,11 @@
<controls:action url=""> <bean:message key="actions.valves.create"/>
</controls:action>
<controls:action url=""> <bean:message key="actions.valves.deletes"/>
</controls:action>
<controls:action disabled="true"> -------------------------------------
</controls:action>
+ --%>
<controls:action url='<%= "/AddContext.do?parent=" +
URLEncoder.encode(thisObjectName) %>'>
<bean:message key="actions.contexts.create"/>
</controls:action>
- --%>
<controls:action url='<%= "/DeleteContext.do?parent=" +
URLEncoder.encode(thisObjectName) %>'>
<bean:message key="actions.contexts.deletes"/>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
