tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From amy...@apache.org
Subject cvs commit: jakarta-tomcat-4.0/webapps/admin/host host.jsp
Date Mon, 09 Sep 2002 19:57:24 GMT
amyroh      2002/09/09 12:57:24

  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:
  Add additonal Host attributes to be set in admin webapp.
  
  Revision  Changes    Path
  1.69      +3 -0      jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_en.properties
  
  Index: ApplicationResources_en.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_en.properties,v
  retrieving revision 1.68
  retrieving revision 1.69
  diff -u -r1.68 -r1.69
  --- ApplicationResources_en.properties	5 Sep 2002 01:56:39 -0000	1.68
  +++ ApplicationResources_en.properties	9 Sep 2002 19:57:23 -0000	1.69
  @@ -125,6 +125,9 @@
   host.properties=Host Properties
   host.name=Name
   host.base=Application Base
  +host.autoDeploy=Auto Deploy
  +host.deployXML=Deploy XML
  +host.liveDeploy=Live Deploy
   host.wars=Unpack WARs
   host.aliases=Aliases
   host.alias.name=Alias Name
  
  
  
  1.58      +3 -0      jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_es.properties
  
  Index: ApplicationResources_es.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_es.properties,v
  retrieving revision 1.57
  retrieving revision 1.58
  diff -u -r1.57 -r1.58
  --- ApplicationResources_es.properties	5 Sep 2002 01:56:39 -0000	1.57
  +++ ApplicationResources_es.properties	9 Sep 2002 19:57:23 -0000	1.58
  @@ -126,6 +126,9 @@
   host.properties=Propiedades del ordenador principal
   host.name=Nombre
   host.base=Base De la Aplicacion
  +host.autoDeploy=El Automóvil Despliega 
  +host.deployXML=Despliegue XML 
  +host.liveDeploy=Vivo Despliegue 
   host.wars=Desempaquetar WARs
   host.aliases=Aliases
   host.alias.name=Alias Nombre
  
  
  
  1.3       +8 -5      jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/AddHostAction.java
  
  Index: AddHostAction.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/AddHostAction.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- AddHostAction.java	14 Mar 2002 08:49:41 -0000	1.2
  +++ AddHostAction.java	9 Sep 2002 19:57:23 -0000	1.3
  @@ -135,7 +135,10 @@
           hostFm.setDebugLvl("0");
           hostFm.setServiceName(serviceName);
           hostFm.setAppBase("");
  -        hostFm.setUnpackWARs("false");
  +        hostFm.setAutoDeploy("true");
  +        hostFm.setDeployXML("true");
  +        hostFm.setLiveDeploy("true");
  +        hostFm.setUnpackWARs("true");
           hostFm.setDebugLvlVals(Lists.getDebugLevels());
           hostFm.setBooleanVals(Lists.getBooleanValues());        
           
  
  
  
  1.3       +13 -4     jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/EditHostAction.java
  
  Index: EditHostAction.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/EditHostAction.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- EditHostAction.java	22 Mar 2002 21:45:07 -0000	1.2
  +++ EditHostAction.java	9 Sep 2002 19:57:23 -0000	1.3
  @@ -186,6 +186,15 @@
               attribute = "appBase";
               hostFm.setAppBase
                   ((String) mBServer.getAttribute(hname, attribute));
  +            attribute = "autoDeploy";
  +            hostFm.setAutoDeploy
  +                (((Boolean) mBServer.getAttribute(hname, attribute)).toString());
  +            attribute = "deployXML";
  +            hostFm.setDeployXML
  +                (((Boolean) mBServer.getAttribute(hname, attribute)).toString());
  +            attribute = "liveDeploy";
  +            hostFm.setLiveDeploy
  +                (((Boolean) mBServer.getAttribute(hname, attribute)).toString());
               attribute = "unpackWARs";
               hostFm.setUnpackWARs
                   (((Boolean) mBServer.getAttribute(hname, attribute)).toString());
  
  
  
  1.4       +90 -7     jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/HostForm.java
  
  Index: HostForm.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/HostForm.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- HostForm.java	14 Mar 2002 08:49:41 -0000	1.3
  +++ HostForm.java	9 Sep 2002 19:57:23 -0000	1.4
  @@ -41,7 +41,9 @@
    * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
    * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
    * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  - * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
  + * DISCLAIMED.  IN NO EVENT SHALL THE APACHE S            attribute = "appBase";
  +            hostFm.setAppBase
  +                ((String) mBServer.getAttribute(hname, attribute));OFTWARE FOUNDATION OR
    * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
    * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
    * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
  @@ -115,11 +117,26 @@
        * The text for the debug level.
        */
       private String debugLvl = "0";
  +
  +    /**
  +     * Boolean for autoDeploy.
  +     */
  +    private String autoDeploy = "true";
  +
  +    /**
  +     * Boolean for deployXML.
  +     */
  +    private String deployXML = "true";
  +
  +    /**
  +     * Boolean for liveDeploy.
  +     */
  +    private String liveDeploy = "true";
       
       /**
        * Boolean for unpack WARs.
        */
  -    private String unpackWARs = "false";
  +    private String unpackWARs = "true";
       
       /**
        * The text for the port. -- TBD
  @@ -256,6 +273,63 @@
           this.appBase = appBase;
           
       }
  +
  +    /**
  +     * Return the autoDeploy.
  +     */
  +    public String getAutoDeploy() {
  +        
  +        return this.autoDeploy;
  +        
  +    }
  +    
  +    /**
  +     * Set the autoDeploy.
  +     */
  +    
  +    public void setAutoDeploy(String autoDeploy) {
  +        
  +        this.autoDeploy = autoDeploy;
  +        
  +    }
  +
  +    /**
  +     * Return the deployXML.
  +     */
  +    public String getDeployXML() {
  +        
  +        return this.deployXML;
  +        
  +    }
  +    
  +    /**
  +     * Set the deployXML.
  +     */
  +    
  +    public void setDeployXML(String deployXML) {
  +        
  +        this.deployXML = deployXML;
  +        
  +    }
  +
  +    /**
  +     * Return the liveDeploy.
  +     */
  +    public String getLiveDeploy() {
  +        
  +        return this.liveDeploy;
  +        
  +    }
  +    
  +    /**
  +     * Set the liveDeploy.
  +     */
  +    
  +    public void setLiveDeploy(String liveDeploy) {
  +        
  +        this.liveDeploy = liveDeploy;
  +        
  +    }
       
       /**
        * Return the unpackWARs.
  @@ -364,8 +438,11 @@
           this.serviceName = null;
           this.hostName = null;
           this.appBase = null;
  +        this.autoDeploy = "true";
  +        this.deployXML = "true";
  +        this.liveDeploy = "true";
           this.debugLvl = "0";
  -        this.unpackWARs = "false";
  +        this.unpackWARs = "true";
           
       }
       
  @@ -380,6 +457,12 @@
           sb.append(debugLvl);
           sb.append(",appBase=");
           sb.append(appBase);
  +        sb.append(",autoDeploy=");
  +        sb.append(autoDeploy);
  +        sb.append(",deployXML=");
  +        sb.append(deployXML);
  +        sb.append(",liveDeploy=");
  +        sb.append(liveDeploy);
           sb.append(",unpackWARs=");
           sb.append(unpackWARs);
           sb.append("',objectName='");
  
  
  
  1.4       +43 -8     jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/SaveHostAction.java
  
  Index: SaveHostAction.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/SaveHostAction.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- SaveHostAction.java	9 May 2002 01:07:30 -0000	1.3
  +++ SaveHostAction.java	9 Sep 2002 19:57:23 -0000	1.4
  @@ -112,6 +112,9 @@
       { "java.lang.String",     // parent
         "java.lang.String",     // name
         "java.lang.String",     // appBase
  +      "boolean",              // autoDeploy
  +      "boolean",              // deployXML
  +      "boolean",              // liveDeploy
         "boolean",              // unpackWARs
       };
   
  @@ -199,12 +202,15 @@
                       new ObjectName(TomcatTreeBuilder.FACTORY_TYPE);
   
                   // Create a new StandardHost object
  -                values = new Object[4];
  +                values = new Object[7];
                   values[0] = 
                       TomcatTreeBuilder.ENGINE_TYPE + ",service=" + serviceName;
                   values[1] = hform.getHostName();
                   values[2] = hform.getAppBase();
  -                values[3] = new Boolean(hform.getUnpackWARs());
  +                values[3] = new Boolean(hform.getAutoDeploy());
  +                values[4] = new Boolean(hform.getDeployXML());
  +                values[5] = new Boolean(hform.getLiveDeploy());
  +                values[6] = new Boolean(hform.getUnpackWARs());
                   
                   operation = "createStandardHost";
                   hObjectName = (String)
  @@ -281,7 +287,37 @@
               }
               mBServer.setAttribute(honame,
                                     new Attribute("appBase", appBase));
  -            
  +
  +            attribute = "autoDeploy";
  +            String autoDeploy = "true";
  +            try {
  +                autoDeploy = hform.getAutoDeploy();
  +            } catch (Throwable t) {
  +                autoDeploy = "true";
  +            }
  +            mBServer.setAttribute(honame,
  +                                  new Attribute("autoDeploy", new Boolean(autoDeploy)));
  +
  +            attribute = "deployXML";
  +            String deployXML = "true";
  +            try {
  +                deployXML = hform.getDeployXML();
  +            } catch (Throwable t) {
  +                deployXML = "true";
  +            }
  +            mBServer.setAttribute(honame,
  +                                  new Attribute("deployXML", new Boolean(deployXML)));
  +
  +            attribute = "liveDeploy";
  +            String liveDeploy = "true";
  +            try {
  +                liveDeploy = hform.getLiveDeploy();
  +            } catch (Throwable t) {
  +                liveDeploy = "true";
  +            }
  +            mBServer.setAttribute(honame,
  +                                  new Attribute("liveDeploy", new Boolean(liveDeploy)));
  +
               attribute = "unpackWARs";
               String unpackWARs = "false";
               try {
  @@ -291,7 +327,6 @@
               }
               mBServer.setAttribute(honame,
                                     new Attribute("unpackWARs", new Boolean(unpackWARs)));
  -
           } catch (Exception e) {
   
               getServlet().log
  
  
  
  1.19      +34 -1     jakarta-tomcat-4.0/webapps/admin/host/host.jsp
  
  Index: host.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/host/host.jsp,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- host.jsp	14 Aug 2002 13:43:28 -0000	1.18
  +++ host.jsp	9 Sep 2002 19:57:23 -0000	1.19
  @@ -149,7 +149,6 @@
               </controls:data>
           </controls:row>
   
  -
           <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
               <controls:label><bean:message key="host.base"/>:</controls:label>
               <controls:data>
  @@ -163,12 +162,46 @@
               </controls:data>
           </controls:row>
   
  +       <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
  +            <controls:label><bean:message key="host.autoDeploy"/>:</controls:label>
  +            <controls:data>
  +               <html:select property="autoDeploy">
  +                     <bean:define id="booleanVals" name="hostForm" property="booleanVals"/>
  +                     <html:options collection="booleanVals" property="value"
  +                   labelProperty="label"/>
  +                </html:select>
  +            </controls:data>
  +        </controls:row>
  +
           <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
               <controls:label><bean:message key="server.debuglevel"/>:</controls:label>
               <controls:data>
                   <html:select property="debugLvl">
                        <bean:define id="debugLvlVals" name="hostForm" property="debugLvlVals"/>
                        <html:options collection="debugLvlVals" property="value"
  +                   labelProperty="label"/>
  +                </html:select>
  +            </controls:data>
  +        </controls:row>
  +
  +
  +       <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
  +            <controls:label><bean:message key="host.deployXML"/>:</controls:label>
  +            <controls:data>
  +               <html:select property="deployXML">
  +                     <bean:define id="booleanVals" name="hostForm" property="booleanVals"/>
  +                     <html:options collection="booleanVals" property="value"
  +                   labelProperty="label"/>
  +                </html:select>
  +            </controls:data>
  +        </controls:row>
  +
  +       <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
  +            <controls:label><bean:message key="host.liveDeploy"/>:</controls:label>
  +            <controls:data>
  +               <html:select property="liveDeploy">
  +                     <bean:define id="booleanVals" name="hostForm" property="booleanVals"/>
  +                     <html:options collection="booleanVals" property="value"
                      labelProperty="label"/>
                   </html:select>
               </controls:data>
  
  
  

--
To unsubscribe, e-mail:   <mailto:tomcat-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:tomcat-dev-help@jakarta.apache.org>


Mime
View raw message