You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2002/05/05 21:08:26 UTC
cvs commit: jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources EnvEntryForm.java SaveEnvEntryAction.java SetUpEnvEntryAction.java
manveen 02/05/05 12:08:26
Modified: webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources
EnvEntryForm.java SaveEnvEntryAction.java
SetUpEnvEntryAction.java
Log:
Support for adding "override" attribute in the form bean and action classes.
Revision Changes Path
1.4 +22 -4 jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/EnvEntryForm.java
Index: EnvEntryForm.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/EnvEntryForm.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- EnvEntryForm.java 4 May 2002 19:56:29 -0000 1.3
+++ EnvEntryForm.java 5 May 2002 19:08:26 -0000 1.4
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/EnvEntryForm.java,v 1.3 2002/05/04 19:56:29 manveen Exp $
- * $Revision: 1.3 $
- * $Date: 2002/05/04 19:56:29 $
+ * $Header: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/EnvEntryForm.java,v 1.4 2002/05/05 19:08:26 manveen Exp $
+ * $Revision: 1.4 $
+ * $Date: 2002/05/05 19:08:26 $
*
* ====================================================================
*
@@ -77,7 +77,7 @@
* Form bean for the individual environment entry page.
*
* @author Manveen Kaur
- * @version $Revision: 1.3 $ $Date: 2002/05/04 19:56:29 $
+ * @version $Revision: 1.4 $ $Date: 2002/05/05 19:08:26 $
* @since 4.1
*/
@@ -144,6 +144,20 @@
}
/**
+ * The value of override appl level entries.
+ */
+ private boolean override = true;
+
+ public boolean getOverride() {
+ return (this.override);
+ }
+
+ public void setOverride(boolean override) {
+ this.override = override;
+ }
+
+
+ /**
* Precomputed list of entry type labels and values.
*/
private static List typeVals = new ArrayList();
@@ -194,6 +208,7 @@
entryType = null;
value = null;
description = null;
+ override = false;
}
@@ -247,6 +262,9 @@
errors.add("description",
new ActionError("users.error.quotes"));
}
+
+ // if cehcked, override will be sent as a request parameter
+ override = (request.getParameter("override") != null);
if (validateType(entryType, value)) {
errors.add("value",
1.4 +8 -4 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SaveEnvEntryAction.java 4 May 2002 16:36:22 -0000 1.3
+++ SaveEnvEntryAction.java 5 May 2002 19:08:26 -0000 1.4
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SaveEnvEntryAction.java,v 1.3 2002/05/04 16:36:22 manveen Exp $
- * $Revision: 1.3 $
- * $Date: 2002/05/04 16:36:22 $
+ * $Header: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SaveEnvEntryAction.java,v 1.4 2002/05/05 19:08:26 manveen Exp $
+ * $Revision: 1.4 $
+ * $Date: 2002/05/05 19:08:26 $
*
* ====================================================================
*
@@ -96,7 +96,7 @@
* updated Env Entry.</p>
*
* @author Manveen Kaur
- * @version $Revision: 1.3 $ $Date: 2002/05/04 16:36:22 $
+ * @version $Revision: 1.4 $ $Date: 2002/05/05 19:08:26 $
* @since 4.1
*/
@@ -218,6 +218,10 @@
ObjectName oname = new ObjectName(objectName);
// Update the specified env entry
+ attribute = "override";
+ mserver.setAttribute
+ (oname,
+ new Attribute(attribute, new Boolean(envEntryForm.getOverride())));
attribute = "description";
mserver.setAttribute
(oname,
1.2 +7 -4 jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SetUpEnvEntryAction.java
Index: SetUpEnvEntryAction.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SetUpEnvEntryAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SetUpEnvEntryAction.java 4 May 2002 14:40:09 -0000 1.1
+++ SetUpEnvEntryAction.java 5 May 2002 19:08:26 -0000 1.2
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SetUpEnvEntryAction.java,v 1.1 2002/05/04 14:40:09 manveen Exp $
- * $Revision: 1.1 $
- * $Date: 2002/05/04 14:40:09 $
+ * $Header: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SetUpEnvEntryAction.java,v 1.2 2002/05/05 19:08:26 manveen Exp $
+ * $Revision: 1.2 $
+ * $Date: 2002/05/05 19:08:26 $
*
* ====================================================================
*
@@ -96,7 +96,7 @@
* being added, or a non-null value for an existing EnvEntry.</p>
*
* @author Manveen Kaur
- * @version $Revision: 1.1 $ $Date: 2002/05/04 14:40:09 $
+ * @version $Revision: 1.2 $ $Date: 2002/05/05 19:08:26 $
* @since 4.1
*/
@@ -176,6 +176,9 @@
attribute = "value";
envEntryForm.setValue
((String) mserver.getAttribute(oname, attribute));
+ attribute = "override";
+ envEntryForm.setOverride(
+ ((Boolean) mserver.getAttribute(oname, attribute)).booleanValue());
attribute = "description";
envEntryForm.setDescription
((String) mserver.getAttribute(oname, attribute));
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>