remm 2003/06/15 06:03:36
Modified: catalina/src/share/org/apache/catalina/core
mbeans-descriptors.xml StandardHost.java
Log:
- Update the host properties, as discussed earlier:
- liveDeploy -> autoDeploy: dynamic deployement of webapps put in the host
appBase
- autoDeploy -> deployOnStartup: Deploy webapps from appBase on startup
- Neither of these have a good reason to be false by default (IMO).
Revision Changes Path
1.17 +4 -0
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/mbeans-descriptors.xml
Index: mbeans-descriptors.xml
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/mbeans-descriptors.xml,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- mbeans-descriptors.xml 15 May 2003 08:31:58 -0000 1.16
+++ mbeans-descriptors.xml 15 Jun 2003 13:03:35 -0000 1.17
@@ -445,6 +445,10 @@
description="The debugging detail level for this component"
type="int"/>
+ <attribute name="deploy"
+ description="The deploy on startup flag for this Host"
+ type="boolean"/>
+
<attribute name="deployXML"
description="deploy Context XML config files property"
is="true"
1.17 +38 -12
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardHost.java
Index: StandardHost.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardHost.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- StandardHost.java 23 May 2003 10:54:35 -0000 1.16
+++ StandardHost.java 15 Jun 2003 13:03:35 -0000 1.17
@@ -158,6 +158,12 @@
/**
+ * The deploy on startup flag for this Host.
+ */
+ private boolean deployOnStartup = true;
+
+
+ /**
* deploy Context XML config files property.
*/
private boolean deployXML = true;
@@ -247,8 +253,7 @@
/**
* Return the value of the auto deploy flag. If true, it indicates that
- * this host's child webapps should be discovred and automatically
- * deployed at startup time.
+ * this host's child webapps will be dynamically deployed.
*/
public boolean getAutoDeploy() {
@@ -322,6 +327,7 @@
return (this.defaultContext);
}
+
/**
* Return the Java class name of the Context implementation class
* for new web applications.
@@ -350,6 +356,33 @@
/**
+ * Return the value of the deploy on startup flag. If true, it indicates
+ * that this host's child webapps should be discovred and automatically
+ * deployed at startup time.
+ */
+ public boolean getDeployOnStartup() {
+
+ return (this.deployOnStartup);
+
+ }
+
+
+ /**
+ * Set the deploy on startup flag value for this host.
+ *
+ * @param autoDeploy The new deploy on startup flag
+ */
+ public void setDeployOnStartup(boolean deployOnStartup) {
+
+ boolean oldDeployOnStartup = this.deployOnStartup;
+ this.deployOnStartup = deployOnStartup;
+ support.firePropertyChange("deployOnStartup", oldDeployOnStartup,
+ this.deployOnStartup);
+
+ }
+
+
+ /**
* Deploy XML Context config files flag accessor.
*/
public boolean isDeployXML() {
@@ -377,9 +410,7 @@
* encountered.
*/
public boolean getLiveDeploy() {
-
- return (this.liveDeploy);
-
+ return (this.autoDeploy);
}
@@ -389,12 +420,7 @@
* @param liveDeploy The new live deploy flag
*/
public void setLiveDeploy(boolean liveDeploy) {
-
- boolean oldLiveDeploy = this.liveDeploy;
- this.liveDeploy = liveDeploy;
- support.firePropertyChange("liveDeploy", oldLiveDeploy,
- this.liveDeploy);
-
+ setAutoDeploy(liveDeploy);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
