amyroh 2002/09/04 18:56:40
Modified: webapps/admin/WEB-INF/classes/org/apache/webapp/admin
ApplicationResources_en.properties
ApplicationResources_es.properties
webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context
AddContextAction.java ContextForm.java
EditContextAction.java SaveContextAction.java
webapps/admin/context context.jsp
Log:
Add "swallowOutput" property to Context admin page.
Revision Changes Path
1.68 +1 -0
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_en.properties
Index: ApplicationResources_en.properties
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_en.properties,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- ApplicationResources_en.properties 16 Aug 2002 00:30:45 -0000 1.67
+++ ApplicationResources_en.properties 5 Sep 2002 01:56:39 -0000 1.68
@@ -137,6 +137,7 @@
context.override=Override
context.path=Path
context.reloadable=Reloadable
+context.swallowOutput=Swallow Output
context.usenaming=Use Naming
context.workdir=Working Directory
context.loader.properties=Loader Properties
1.57 +1 -0
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_es.properties
Index: ApplicationResources_es.properties
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_es.properties,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- ApplicationResources_es.properties 16 Aug 2002 00:30:45 -0000 1.56
+++ ApplicationResources_es.properties 5 Sep 2002 01:56:39 -0000 1.57
@@ -138,6 +138,7 @@
context.override=Invalidaci\u00f3n
context.path=Camino
context.reloadable=Reloadable
+context.swallowOutput=Salida Del Trago
context.usenaming=Utilice El Nombramiento
context.workdir=Directorio De Trabajo
context.loader.properties=Propiedades del cargador
1.3 +5 -4
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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AddContextAction.java 26 Mar 2002 00:04:44 -0000 1.2
+++ AddContextAction.java 5 Sep 2002 01:56:39 -0000 1.3
@@ -143,6 +143,7 @@
contextFm.setOverride("false");
contextFm.setPath("");
contextFm.setReloadable("false");
+ contextFm.setSwallowOutput("false");
contextFm.setUseNaming("false");
contextFm.setWorkDir("");
contextFm.setPath("");
1.9 +37 -10
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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ContextForm.java 20 Jun 2002 22:53:15 -0000 1.8
+++ ContextForm.java 5 Sep 2002 01:56:39 -0000 1.9
@@ -145,7 +145,12 @@
* The text for reloadable boolean.
*/
private String reloadable = "false";
-
+
+ /**
+ * The text for swallowOutput boolean.
+ */
+ private String swallowOutput = "false";
+
/**
* The text for use naming boolean.
*/
@@ -472,22 +477,41 @@
/**
* Return the reloadable boolean value.
*/
-
+
public String getReloadable() {
return this.reloadable;
-
+
}
-
+
/**
* Set the reloadable value.
*/
public void setReloadable(String reloadable) {
-
+
this.reloadable = reloadable;
+
+ }
+
+ /**
+ * Return the swallowOutput boolean value.
+ */
+
+ public String getSwallowOutput() {
+ return this.swallowOutput;
+
}
-
+
+ /**
+ * Set the swallowOutput value.
+ */
+ public void setSwallowOutput(String swallowOutput) {
+
+ this.swallowOutput = swallowOutput;
+
+ }
+
/**
* Return the use naming boolean value.
*/
@@ -678,6 +702,7 @@
this.override= "false";
this.path = null;
this.reloadable = "false";
+ this.swallowOutput = "false";
// loader properties
this.ldrCheckInterval = "15";
@@ -712,6 +737,8 @@
sb.append(override);
sb.append(",reloadable=");
sb.append(reloadable);
+ sb.append(",swallowOutput=");
+ sb.append(swallowOutput);
// loader properties
sb.append(",ldrCheckInterval=");
sb.append(ldrCheckInterval);
1.2 +7 -4
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context/EditContextAction.java
Index: EditContextAction.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context/EditContextAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- EditContextAction.java 23 Mar 2002 22:13:42 -0000 1.1
+++ EditContextAction.java 5 Sep 2002 01:56:39 -0000 1.2
@@ -250,6 +250,9 @@
attribute = "reloadable";
contextFm.setReloadable
(((Boolean) mBServer.getAttribute(cname, attribute)).toString());
+ attribute = "swallowOutput";
+ contextFm.setSwallowOutput
+ (((Boolean) mBServer.getAttribute(cname, attribute)).toString());
attribute = "override";
contextFm.setOverride
(((Boolean) mBServer.getAttribute(cname, attribute)).toString());
1.5 +14 -4
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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SaveContextAction.java 20 Jun 2002 22:53:15 -0000 1.4
+++ SaveContextAction.java 5 Sep 2002 01:56:39 -0000 1.5
@@ -367,6 +367,16 @@
mBServer.setAttribute(coname,
new Attribute("reloadable", new
Boolean(reloadable)));
+ attribute = "swallowOutput";
+ String swallowOutput = "false";
+ try {
+ swallowOutput = cform.getSwallowOutput();
+ } catch (Throwable t) {
+ swallowOutput = "false";
+ }
+ mBServer.setAttribute(coname,
+ new Attribute("swallowOutput", new
Boolean(swallowOutput)));
+
attribute = "useNaming";
String useNaming = "false";
try {
1.11 +11 -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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- context.jsp 19 Aug 2002 23:10:17 -0000 1.10
+++ context.jsp 5 Sep 2002 01:56:40 -0000 1.11
@@ -193,6 +193,17 @@
</controls:row>
<controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
+ <controls:label><bean:message
key="context.swallowOutput"/>:</controls:label>
+ <controls:data>
+ <html:select property="swallowOutput">
+ <bean:define id="booleanVals" name="contextForm"
property="booleanVals"/>
+ <html:options collection="booleanVals" property="value"
+ labelProperty="label"/>
+ </html:select>
+ </controls:data>
+ </controls:row>
+
+ <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
<controls:label><bean:message
key="context.usenaming"/>:</controls:label>
<controls:data>
<html:select property="useNaming">
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
