Remove Host.liveDeploy that just duplicates Host.autoDeploy

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1057252 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/catalina/core/StandardHost.java b/java/org/apache/catalina/core/StandardHost.java
index bda6008..1d7422c 100644 (file)
--- a/java/org/apache/catalina/core/StandardHost.java
+++ b/java/org/apache/catalina/core/StandardHost.java
@@ -166,7 +166,8 @@ public class StandardHost extends ContainerBase implements Host {
       */
      private Map<ClassLoader, String> childClassLoaders =
          new WeakHashMap<ClassLoader, String>();
-
+     
+     
     // ------------------------------------------------------------- Properties
 
 
@@ -398,28 +399,6 @@ public class StandardHost extends ContainerBase implements Host {
     
     
     /**
-     * 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.
      */

diff --git a/webapps/docs/html-manager-howto.xml b/webapps/docs/html-manager-howto.xml
index e8d5990..1dd65f4 100644 (file)
--- a/webapps/docs/html-manager-howto.xml
+++ b/webapps/docs/html-manager-howto.xml
@@ -467,9 +467,9 @@ file, the war will be unpacked into a directory in your Host appBase
 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 problems include:</p>
 <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>

diff --git a/webapps/docs/manager-howto.xml b/webapps/docs/manager-howto.xml
index 3bc29b6..cac1592 100644 (file)
--- a/webapps/docs/manager-howto.xml
+++ b/webapps/docs/manager-howto.xml
@@ -426,9 +426,9 @@ file, the war will be unpacked into a directory in your Host appBase
 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 problems include:</p>
 <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>