billbarker 2004/07/28 23:31:59
Modified: webapps/admin/WEB-INF/classes/org/apache/webapp/admin
ApplicationResources.properties
webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context
ContextForm.java EditContextAction.java
SaveContextAction.java
webapps/admin/context context.jsp
Log:
Adding support for modifying the antiResourceLocking and antiJarLocking attributes
on the Context.
Translations for Spanish and Japanese still needed.
Revision Changes Path
1.5 +2 -0
jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources.properties
Index: ApplicationResources.properties
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources.properties,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ApplicationResources.properties 27 May 2004 16:10:35 -0000 1.4
+++ ApplicationResources.properties 29 Jul 2004 06:31:59 -0000 1.5
@@ -175,6 +175,8 @@
context.checkInterval=Check interval
context.sessionId=Session ID Initializer
context.max.sessions=Maximum Active Sessions
+context.antiResourceLocking=Prevent Locking Resources
+context.antiJarLocking=Prevent Jar Locking
defaultcontext.properties=DefaultContext Properties
error.context.directory=Document base does not exist or is not a readable directory
error.docBase.required=<li>Document base cannot be null</li>
1.7 +44 -3
jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context/ContextForm.java
Index: ContextForm.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context/ContextForm.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ContextForm.java 28 Jun 2004 02:14:50 -0000 1.6
+++ ContextForm.java 29 Jul 2004 06:31:59 -0000 1.7
@@ -137,6 +137,16 @@
*/
private String mgrMaxSessions = "0";
+ /**
+ * The text for the anti resource locking flag.
+ */
+ private String antiResourceLocking = "false";
+
+ /**
+ * The text for the anti jar locking flag.
+ */
+ private String antiJarLocking = "false";
+
/*
* Represent boolean (true, false) values for cookies etc.
*/
@@ -539,7 +549,36 @@
this.mgrMaxSessions = mgrMaxSessions;
}
-
+
+ /**
+ * Get the anti resouce locking flag
+ */
+ public String getAntiResourceLocking() {
+ return antiResourceLocking;
+ }
+
+ /**
+ * Set the anti resource locking flag
+ */
+ public void setAntiResourceLocking(String arl) {
+ antiResourceLocking = arl;
+ }
+
+
+ /**
+ * Get the anti jar locking flag
+ */
+ public String getAntiJarLocking() {
+ return antiJarLocking;
+ }
+
+ /**
+ * Set the anti jar locking flag
+ */
+ public void setAntiJarLocking(String ajl) {
+ antiJarLocking = ajl;
+ }
+
// --------------------------------------------------------- Public Methods
/**
@@ -563,7 +602,9 @@
this.path = null;
this.reloadable = "false";
this.swallowOutput = "false";
-
+ this.antiResourceLocking = "false";
+ this.antiJarLocking = "false";
+
// loader properties
this.ldrCheckInterval = "15";
this.ldrReloadable = "true";
1.10 +7 -1
jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context/EditContextAction.java
Index: EditContextAction.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context/EditContextAction.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- EditContextAction.java 10 Jul 2004 06:56:14 -0000 1.9
+++ EditContextAction.java 29 Jul 2004 06:31:59 -0000 1.10
@@ -198,6 +198,12 @@
contextFm.setOverride
(((Boolean) mBServer.getAttribute(cname, attribute)).toString());
+ attribute = "antiJARLocking";
+ contextFm.setAntiJarLocking
+ (((Boolean) mBServer.getAttribute(cname, attribute)).toString());
+ attribute = "antiResourceLocking";
+ contextFm.setAntiResourceLocking
+ (((Boolean) mBServer.getAttribute(cname, attribute)).toString());
// loader properties
//attribute = "checkInterval";
//contextFm.setLdrCheckInterval
1.16 +12 -1
jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context/SaveContextAction.java
Index: SaveContextAction.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context/SaveContextAction.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- SaveContextAction.java 10 Jul 2004 06:56:14 -0000 1.15
+++ SaveContextAction.java 29 Jul 2004 06:31:59 -0000 1.16
@@ -322,6 +322,17 @@
mBServer.setAttribute(coname,
new Attribute("useNaming", new
Boolean(useNaming)));
+ attribute = "antiJARLocking";
+ String antiJarLocking = cform.getAntiJarLocking();
+ mBServer.setAttribute(coname,
+ new Attribute("antiJARLocking", new
Boolean(antiJarLocking)));
+
+ attribute = "antiResourceLocking";
+ String antiResourceLocking = cform.getAntiResourceLocking();
+ mBServer.setAttribute(coname,
+ new Attribute("antiResourceLocking", new
Boolean(antiResourceLocking)));
+
+
// Loader properties
attribute = "reloadable";
try {
1.7 +22 -0 jakarta-tomcat-catalina/webapps/admin/context/context.jsp
Index: context.jsp
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/context/context.jsp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- context.jsp 28 Jun 2004 02:14:52 -0000 1.6
+++ context.jsp 29 Jul 2004 06:31:59 -0000 1.7
@@ -194,6 +194,28 @@
</controls:data>
</controls:row>
+ <controls:row labelStyle="table-label-text" dataStyle="table-normal-text"
styleId="antiJarLocking">
+ <controls:label><bean:message
key="context.antiJarLocking"/>:</controls:label>
+ <controls:data>
+ <html:select property="antiJarLocking" styleId="antiJarLocking">
+ <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"
styleId="antiResourceLocking">
+ <controls:label><bean:message
key="context.antiResourceLocking"/>:</controls:label>
+ <controls:data>
+ <html:select property="antiResourceLocking"
styleId="antiResourceLocking">
+ <bean:define id="booleanVals" name="contextForm"
property="booleanVals"/>
+ <html:options collection="booleanVals" property="value"
+ labelProperty="label"/>
+ </html:select>
+ </controls:data>
+ </controls:row>
+
<%-- input only allowed on create transaction >
<controls:row labelStyle="table-label-text" dataStyle="table-normal-text"
styleId="workdir">
<controls:label><bean:message key="context.workdir"/>:</controls:label>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
