amyroh 2002/11/22 13:49:47
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/valve
AccessLogValveForm.java AddValveAction.java
EditValveAction.java SaveAccessLogValveAction.java
webapps/admin/valve accessLogValve.jsp
Log:
Make new "rotatable" attribute of AccessLogValve visible from admin webapp.
Revision Changes Path
1.71 +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.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- ApplicationResources_en.properties 11 Sep 2002 14:20:00 -0000 1.70
+++ ApplicationResources_en.properties 22 Nov 2002 21:49:46 -0000 1.71
@@ -244,6 +244,7 @@
valve.remotehost.properties=Remote Host Valve Properties
valve.remoteaddress.properties=Remote Address Valve Properties
valve.resolveHosts=Resolve Hosts
+valve.rotatable=Rotatable
valve.pattern=Pattern
valve.allowHosts=Allow these Hosts
valve.denyHosts=Deny these Hosts
1.60 +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.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- ApplicationResources_es.properties 11 Sep 2002 14:20:00 -0000 1.59
+++ ApplicationResources_es.properties 22 Nov 2002 21:49:46 -0000 1.60
@@ -243,6 +243,7 @@
valve.remotehost.properties=Propiedades del Remote Host Valve
valve.remoteaddress.properties=Propiedades del Remote Address Valve
valve.resolveHosts=Resolve Hosts
+valve.rotatable=Rotativo
valve.pattern=Pattern
valve.allowHosts=Permita estos Hosts
valve.denyHosts=Niegue estos Hosts
1.3 +30 -4
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/AccessLogValveForm.java
Index: AccessLogValveForm.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/AccessLogValveForm.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AccessLogValveForm.java 11 Apr 2002 14:47:47 -0000 1.2
+++ AccessLogValveForm.java 22 Nov 2002 21:49:46 -0000 1.3
@@ -112,6 +112,11 @@
* The text for the connection URL.
*/
private String resolveHosts = "false";
+
+ /**
+ * The text for the rotatable.
+ */
+ private String rotatable = "true";
/**
* Set of boolean values.
@@ -263,7 +268,25 @@
this.resolveHosts = resolveHosts;
}
+
+ /**
+ * Return the rotatable.
+ */
+ public String getRotatable() {
+
+ return this.rotatable;
+
+ }
+ /**
+ * Set the rotatable.
+ */
+ public void setRotatable(String rotatable) {
+
+ this.rotatable = rotatable;
+
+ }
+
// --------------------------------------------------------- Public Methods
/**
@@ -282,6 +305,7 @@
this.suffix = null;
this.pattern = null;
this.resolveHosts = "false";
+ this.rotatable = "true";
}
@@ -304,6 +328,8 @@
sb.append(pattern);
sb.append(",resolveHosts=");
sb.append(resolveHosts);
+ sb.append(",rotatable=");
+ sb.append(rotatable);
sb.append("',objectName='");
sb.append(getObjectName());
sb.append("]");
1.2 +4 -3
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/AddValveAction.java
Index: AddValveAction.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/AddValveAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AddValveAction.java 17 Apr 2002 19:53:27 -0000 1.1
+++ AddValveAction.java 22 Nov 2002 21:49:46 -0000 1.2
@@ -185,6 +185,7 @@
valveFm.setPrefix("access_log.");
valveFm.setSuffix("");
valveFm.setResolveHosts("false");
+ valveFm.setRotatable("true");
valveFm.setDebugLvlVals(Lists.getDebugLevels());
valveFm.setBooleanVals(Lists.getBooleanValues());
valveFm.setValveTypeVals(types);
1.5 +7 -4
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/EditValveAction.java
Index: EditValveAction.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/EditValveAction.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- EditValveAction.java 21 May 2002 00:36:43 -0000 1.4
+++ EditValveAction.java 22 Nov 2002 21:49:46 -0000 1.5
@@ -252,6 +252,9 @@
attribute = "resolveHosts";
valveFm.setResolveHosts
(((Boolean) mBServer.getAttribute(vname, attribute)).toString());
+ attribute = "rotatable";
+ valveFm.setRotatable
+ (((Boolean) mBServer.getAttribute(vname, attribute)).toString());
} catch (Throwable t) {
getServlet().log
1.3 +7 -4
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/SaveAccessLogValveAction.java
Index: SaveAccessLogValveAction.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/SaveAccessLogValveAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SaveAccessLogValveAction.java 12 Apr 2002 22:06:30 -0000 1.2
+++ SaveAccessLogValveAction.java 22 Nov 2002 21:49:46 -0000 1.3
@@ -192,6 +192,9 @@
attribute = "resolveHosts";
mBServer.setAttribute(voname,
new Attribute("resolveHosts", new
Boolean(vform.getResolveHosts())));
+ attribute = "rotatable";
+ mBServer.setAttribute(voname,
+ new Attribute("rotatable", new
Boolean(vform.getRotatable())));
} catch (Exception e) {
1.9 +11 -0 jakarta-tomcat-4.0/webapps/admin/valve/accessLogValve.jsp
Index: accessLogValve.jsp
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/valve/accessLogValve.jsp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- accessLogValve.jsp 24 Jul 2002 00:03:25 -0000 1.8
+++ accessLogValve.jsp 22 Nov 2002 21:49:46 -0000 1.9
@@ -135,6 +135,17 @@
</controls:row>
<controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
+ <controls:label><bean:message key="valve.rotatable"/>:</controls:label>
+ <controls:data>
+ <html:select property="rotatable">
+ <bean:define id="booleanVals" name="accessLogValveForm"
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="logger.suffix"/>:</controls:label>
<controls:data>
<html:text property="suffix" size="30"/>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
