Author: markt
Date: Mon Jan 10 16:01:09 2011
New Revision: 1057252
URL: http://svn.apache.org/viewvc?rev=1057252&view=rev
Log:
Remove Host.liveDeploy that just duplicates Host.autoDeploy
Modified:
tomcat/trunk/java/org/apache/catalina/core/StandardHost.java
tomcat/trunk/webapps/docs/html-manager-howto.xml
tomcat/trunk/webapps/docs/manager-howto.xml
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardHost.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardHost.java?rev=1057252&r1=1057251&r2=1057252&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardHost.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardHost.java Mon Jan 10
16:01:09 2011
@@ -166,7 +166,8 @@ public class StandardHost extends Contai
*/
private Map<ClassLoader, String> childClassLoaders =
new WeakHashMap<ClassLoader, String>();
-
+
+
// ------------------------------------------------------------- Properties
@@ -398,28 +399,6 @@ public class StandardHost extends Contai
/**
- * Return the value of the live deploy flag. If true, it indicates that
- * a background thread should be started that looks for web application
- * context files, WAR files, or unpacked directories being dropped in to
- * the <code>appBase</code> directory, and deploys new ones as they are
- * encountered.
- */
- public boolean getLiveDeploy() {
- return (this.autoDeploy);
- }
-
-
- /**
- * Set the live deploy flag value for this host.
- *
- * @param liveDeploy The new live deploy flag
- */
- public void setLiveDeploy(boolean liveDeploy) {
- setAutoDeploy(liveDeploy);
- }
-
-
- /**
* Return the Java class name of the error report valve class
* for new web applications.
*/
Modified: tomcat/trunk/webapps/docs/html-manager-howto.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/html-manager-howto.xml?rev=1057252&r1=1057251&r2=1057252&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/html-manager-howto.xml (original)
+++ tomcat/trunk/webapps/docs/html-manager-howto.xml Mon Jan 10 16:01:09 2011
@@ -467,9 +467,9 @@ file, the war will be unpacked into a di
directory.</p>
<p>If the application war or directory is deployed in your Host appBase
-directory and either the Host is configured with autoDeploy=true or
-liveDeploy=true, the Context path must match the directory name or
-war file name without the ".war" extension.</p>
+directory and either the Host is configured with autoDeploy=true the Context
+path must match the directory name or war file name without the ".war"
+extension.</p>
<p>For security when untrusted users can manage web applications, the
Host deployXML flag can be set to false. This prevents untrusted users
@@ -528,9 +528,9 @@ error message. Possible causes for prob
<li><em>Context path must match the directory or WAR file name:</em>
<blockquote>
If the application war or directory is deployed in your Host appBase
- directory and either the Host is configured with autoDeploy=true or
- liveDeploy=true, the Context path must match the directory name or
- war file name without the ".war" extension.
+ directory and either the Host is configured with autoDeploy=true the
Context
+ path must match the directory name or war file name without the ".war"
+ extension.
</blockquote></li>
<li><em>Only web applications in the Host web application directory can
be deployed</em>
Modified: tomcat/trunk/webapps/docs/manager-howto.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/manager-howto.xml?rev=1057252&r1=1057251&r2=1057252&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/manager-howto.xml (original)
+++ tomcat/trunk/webapps/docs/manager-howto.xml Mon Jan 10 16:01:09 2011
@@ -426,9 +426,9 @@ file, the war will be unpacked into a di
directory.</p>
<p>If the application war or directory is installed in your Host appBase
-directory and either the Host is configured with autoDeploy=true or
-liveDeploy=true, the Context path must match the directory name or
-war file name without the ".war" extension.</p>
+directory and either the Host is configured with autoDeploy=true or the
+Context path must match the directory name or war file name without the
+".war" extension.</p>
<p>For security when untrusted users can manage web applications, the
Host deployXML flag can be set to false. This prevents untrusted users
@@ -488,9 +488,9 @@ error message. Possible causes for prob
<li><em>Context path must match the directory or WAR file name:</em>
<blockquote>
If the application war or directory is installed in your Host appBase
- directory and either the Host is configured with autoDeploy=true or
- liveDeploy=true, the Context path must match the directory name or
- war file name without the ".war" extension.
+ directory and either the Host is configured with autoDeploy=true the
+ Context path must match the directory name or war file name without
+ the ".war" extension.
</blockquote></li>
<li><em>Only web applications in the Host web application directory can
be installed</em>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
