Author: markt
Date: Tue Nov 5 00:00:23 2013
New Revision: 1538822
URL: http://svn.apache.org/r1538822
Log:
More removal of anti JAR locking
Modified:
tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
tomcat/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml
tomcat/trunk/java/org/apache/catalina/loader/mbeans-descriptors.xml
tomcat/trunk/webapps/docs/config/context.xml
tomcat/trunk/webapps/host-manager/manager.xml
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardContext.java?rev=1538822&r1=1538821&r2=1538822&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardContext.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardContext.java Tue Nov 5
00:00:23 2013
@@ -215,12 +215,6 @@ public class StandardContext extends Con
/**
- * The antiJARLocking flag for this Context.
- */
- private boolean antiJARLocking = false;
-
-
- /**
* The antiResourceLocking flag for this Context.
*/
private boolean antiResourceLocking = false;
@@ -1290,16 +1284,6 @@ public class StandardContext extends Con
/**
- * Return the antiJARLocking flag for this Context.
- */
- public boolean getAntiJARLocking() {
-
- return (this.antiJARLocking);
-
- }
-
-
- /**
* Return the antiResourceLocking flag for this Context.
*/
public boolean getAntiResourceLocking() {
@@ -1310,22 +1294,6 @@ public class StandardContext extends Con
/**
- * Set the antiJARLocking feature for this Context.
- *
- * @param antiJARLocking The new flag value
- */
- public void setAntiJARLocking(boolean antiJARLocking) {
-
- boolean oldAntiJARLocking = this.antiJARLocking;
- this.antiJARLocking = antiJARLocking;
- support.firePropertyChange("antiJARLocking",
- oldAntiJARLocking,
- this.antiJARLocking);
-
- }
-
-
- /**
* Set the antiResourceLocking feature for this Context.
*
* @param antiResourceLocking The new flag value
@@ -5135,7 +5103,6 @@ public class StandardContext extends Con
// since the loader just started, the webapp classloader is now
// created.
- setClassLoaderProperty("antiJARLocking", getAntiJARLocking());
setClassLoaderProperty("clearReferencesStatic",
getClearReferencesStatic());
setClassLoaderProperty("clearReferencesStopThreads",
Modified: tomcat/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml?rev=1538822&r1=1538821&r2=1538822&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml (original)
+++ tomcat/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml Tue Nov
5 00:00:23 2013
@@ -74,10 +74,6 @@
description="The alternate deployment descriptor name."
type="java.lang.String" />
- <attribute name="antiJARLocking"
- description="Take care to not lock jar files"
- type="boolean" />
-
<attribute name="antiResourceLocking"
description="Take care to not lock resources"
type="boolean" />
Modified: tomcat/trunk/java/org/apache/catalina/loader/mbeans-descriptors.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/mbeans-descriptors.xml?rev=1538822&r1=1538821&r2=1538822&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/loader/mbeans-descriptors.xml
(original)
+++ tomcat/trunk/java/org/apache/catalina/loader/mbeans-descriptors.xml Tue Nov
5 00:00:23 2013
@@ -79,10 +79,6 @@
description="The 'follow standard delegation model' flag that will
be used to configure our ClassLoader"
type="boolean"/>
- <attribute name="antiJARLocking"
- description="The antiJARLocking flag for this Loader"
- type="boolean"/>
-
<attribute name="stateName"
description="The name of the LifecycleState that this component is
currently in"
type="java.lang.String"
Modified: tomcat/trunk/webapps/docs/config/context.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/context.xml?rev=1538822&r1=1538821&r2=1538822&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/config/context.xml (original)
+++ tomcat/trunk/webapps/docs/config/context.xml Tue Nov 5 00:00:23 2013
@@ -573,19 +573,6 @@
disclosure, among other security problems.</b></p>
</attribute>
- <attribute name="antiJARLocking" required="false">
- <p>If true, the Tomcat classloader will take extra measures to avoid
- JAR file locking when resources are accessed inside JARs through URLs.
- This will impact startup time of applications, but could prove to be
- useful on platforms or configurations where file locking can occur.
- If not specified, the default value is <code>false</code>.</p>
-
- <p><code>antiJARLocking</code> is a subset of
- <code>antiResourceLocking</code> and therefore, to prevent duplicate
- work and possible issues, only one of these attributes should be set
- to <code>true</code> at any one time.</p>
- </attribute>
-
<attribute name="antiResourceLocking" required="false">
<p>If true, Tomcat will prevent any file locking.
This will significantly impact startup time of applications,
@@ -593,11 +580,6 @@
or configurations where file locking can occur.
If not specified, the default value is <code>false</code>.</p>
- <p><code>antiJARLocking</code> is a subset of
- <code>antiResourceLocking</code> and therefore, to prevent duplicate
- work and possible issues, only one of these attributes should be set
- to <code>true</code> at any one time.</p>
-
<p>Please note that setting this to <code>true</code> has some side
effects, including the disabling of JSP reloading in a running server:
see <a href="http://issues.apache.org/bugzilla/show_bug.cgi?id=37668";>
Modified: tomcat/trunk/webapps/host-manager/manager.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/host-manager/manager.xml?rev=1538822&r1=1538821&r2=1538822&view=diff
==============================================================================
--- tomcat/trunk/webapps/host-manager/manager.xml (original)
+++ tomcat/trunk/webapps/host-manager/manager.xml Tue Nov 5 00:00:23 2013
@@ -25,6 +25,6 @@
<Context docBase="${catalina.home}/webapps/manager"
- privileged="true" antiResourceLocking="false" antiJARLocking="false">
+ privileged="true" antiResourceLocking="false" >
</Context>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
