amyroh 2003/08/24 15:52:46 Modified: webapps/admin/WEB-INF/classes/org/apache/webapp/admin ApplicationResources_en.properties ApplicationResources_es.properties webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host AddHostAction.java EditHostAction.java HostForm.java SaveHostAction.java webapps/admin/host host.jsp Log: Update the host properties in admin. - liveDeploy -> autoDeploy: dynamic deployement of webapps put in the host appBase - autoDeploy -> deployOnStartup: Deploy webapps from appBase on startup Revision Changes Path 1.15 +1 -1 jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_en.properties Index: ApplicationResources_en.properties =================================================================== RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_en.properties,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- ApplicationResources_en.properties 13 May 2003 08:33:14 -0000 1.14 +++ ApplicationResources_en.properties 24 Aug 2003 22:52:45 -0000 1.15 @@ -133,7 +133,7 @@ host.base=Application Base host.autoDeploy=Auto Deploy host.deployXML=Deploy XML -host.liveDeploy=Live Deploy +host.deployOnStartup=Deploy On Startup host.wars=Unpack WARs host.aliases=Aliases host.alias.name=Alias Name 1.14 +1 -1 jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_es.properties Index: ApplicationResources_es.properties =================================================================== RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_es.properties,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- ApplicationResources_es.properties 13 May 2003 08:33:14 -0000 1.13 +++ ApplicationResources_es.properties 24 Aug 2003 22:52:45 -0000 1.14 @@ -133,7 +133,7 @@ host.base=Base De la Aplicacion host.autoDeploy=El Automóvil Despliega host.deployXML=Despliegue XML -host.liveDeploy=Vivo Despliegue +host.deployOnStartup=Despliegue En Arranque host.wars=Desempaquetar WARs host.aliases=Aliases host.alias.name=Alias Nombre 1.7 +5 -5 jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/AddHostAction.java Index: AddHostAction.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/AddHostAction.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- AddHostAction.java 24 Apr 2003 07:56:33 -0000 1.6 +++ AddHostAction.java 24 Aug 2003 22:52:45 -0000 1.7 @@ -137,7 +137,7 @@ hostFm.setAppBase(""); hostFm.setAutoDeploy("true"); hostFm.setDeployXML("true"); - hostFm.setLiveDeploy("true"); + hostFm.setDeployOnStartup("true"); hostFm.setUnpackWARs("true"); hostFm.setXmlNamespaceAware("false"); hostFm.setXmlValidation("false"); 1.6 +6 -6 jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/EditHostAction.java Index: EditHostAction.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/EditHostAction.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- EditHostAction.java 18 Mar 2003 10:48:22 -0000 1.5 +++ EditHostAction.java 24 Aug 2003 22:52:45 -0000 1.6 @@ -209,8 +209,8 @@ attribute = "deployXML"; hostFm.setDeployXML (((Boolean) mBServer.getAttribute(hname, attribute)).toString()); - attribute = "liveDeploy"; - hostFm.setLiveDeploy + attribute = "deployOnStartup"; + hostFm.setDeployOnStartup (((Boolean) mBServer.getAttribute(hname, attribute)).toString()); attribute = "unpackWARs"; hostFm.setUnpackWARs 1.8 +15 -15 jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/HostForm.java Index: HostForm.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/HostForm.java,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- HostForm.java 24 Apr 2003 07:56:33 -0000 1.7 +++ HostForm.java 24 Aug 2003 22:52:45 -0000 1.8 @@ -127,9 +127,9 @@ private String deployXML = "true"; /** - * Boolean for liveDeploy. + * Boolean for deployOnStartup. */ - private String liveDeploy = "true"; + private String deployOnStartup = "true"; /** * Boolean for unpack WARs. @@ -310,21 +310,21 @@ } /** - * Return the liveDeploy. + * Return the deployOnStartup. */ - public String getLiveDeploy() { + public String getDeployOnStartup() { - return this.liveDeploy; + return this.deployOnStartup; } /** - * Set the liveDeploy. + * Set the deployOnStartup. */ - public void setLiveDeploy(String liveDeploy) { + public void setDeployOnStartup(String deployOnStartup) { - this.liveDeploy = liveDeploy; + this.deployOnStartup = deployOnStartup; } @@ -485,7 +485,7 @@ this.appBase = null; this.autoDeploy = "true"; this.deployXML = "true"; - this.liveDeploy = "true"; + this.deployOnStartup = "true"; this.debugLvl = "0"; this.unpackWARs = "true"; @@ -506,8 +506,8 @@ sb.append(autoDeploy); sb.append(",deployXML="); sb.append(deployXML); - sb.append(",liveDeploy="); - sb.append(liveDeploy); + sb.append(",deployOnStartup="); + sb.append(deployOnStartup); sb.append(",unpackWARs="); sb.append(unpackWARs); sb.append("',objectName='"); 1.7 +11 -11 jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/SaveHostAction.java Index: SaveHostAction.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/SaveHostAction.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- SaveHostAction.java 21 Mar 2003 08:19:14 -0000 1.6 +++ SaveHostAction.java 24 Aug 2003 22:52:45 -0000 1.7 @@ -114,7 +114,7 @@ "java.lang.String", // appBase "boolean", // autoDeploy "boolean", // deployXML - "boolean", // liveDeploy + "boolean", // deployOnStartup "boolean", // unpackWARs "boolean", // xmlNamespaceAware "boolean", // xmlValidation @@ -210,7 +210,7 @@ values[2] = hform.getAppBase(); values[3] = new Boolean(hform.getAutoDeploy()); values[4] = new Boolean(hform.getDeployXML()); - values[5] = new Boolean(hform.getLiveDeploy()); + values[5] = new Boolean(hform.getDeployOnStartup()); values[6] = new Boolean(hform.getUnpackWARs()); values[7] = new Boolean(hform.getXmlNamespaceAware()); values[8] = new Boolean(hform.getXmlValidation()); @@ -311,15 +311,15 @@ mBServer.setAttribute(honame, new Attribute("deployXML", new Boolean(deployXML))); - attribute = "liveDeploy"; - String liveDeploy = "true"; + attribute = "deployOnStartup"; + String deployOnStartup = "true"; try { - liveDeploy = hform.getLiveDeploy(); + deployOnStartup = hform.getDeployOnStartup(); } catch (Throwable t) { - liveDeploy = "true"; + deployOnStartup = "true"; } mBServer.setAttribute(honame, - new Attribute("liveDeploy", new Boolean(liveDeploy))); + new Attribute("deployOnStartup", new Boolean(deployOnStartup))); attribute = "unpackWARs"; String unpackWARs = "false"; 1.10 +6 -6 jakarta-tomcat-catalina/webapps/admin/host/host.jsp Index: host.jsp =================================================================== RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/host/host.jsp,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- host.jsp 27 Mar 2003 08:26:25 -0000 1.9 +++ host.jsp 24 Aug 2003 22:52:46 -0000 1.10 @@ -195,10 +195,10 @@ </controls:data> </controls:row> - <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="deployxml"> - <controls:label><bean:message key="host.deployXML"/>:</controls:label> + <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="deployOnStartup"> + <controls:label><bean:message key="host.deployOnStartup"/>:</controls:label> <controls:data> - <html:select property="deployXML" styleId="deployxml"> + <html:select property="deployOnStartup" styleId="deployOnStartup"> <bean:define id="booleanVals" name="hostForm" property="booleanVals"/> <html:options collection="booleanVals" property="value" labelProperty="label"/> @@ -206,10 +206,10 @@ </controls:data> </controls:row> - <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="livedeploy"> - <controls:label><bean:message key="host.liveDeploy"/>:</controls:label> + <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="deployxml"> + <controls:label><bean:message key="host.deployXML"/>:</controls:label> <controls:data> - <html:select property="liveDeploy" styleId="livedeploy"> + <html:select property="deployXML" styleId="deployxml"> <bean:define id="booleanVals" name="hostForm" property="booleanVals"/> <html:options collection="booleanVals" property="value" labelProperty="label"/>
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]