tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From billbar...@apache.org
Subject cvs commit: jakarta-tomcat-4.0/webapps/admin/connector connector.jsp
Date Sun, 25 Jan 2004 22:58:15 GMT
billbarker    2004/01/25 14:58:15

  Modified:    webapps/admin/WEB-INF/classes/org/apache/webapp/admin
                        Lists.java
               webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector
                        AddConnectorAction.java ConnectorForm.java
                        EditConnectorAction.java SaveConnectorAction.java
               webapps/admin/connector connector.jsp
  Log:
  Adding support for the new clientAuth values to the admin webapp.
  
  Revision  Changes    Path
  1.18      +24 -4     jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/Lists.java
  
  Index: Lists.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/Lists.java,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- Lists.java	14 Mar 2003 16:00:15 -0000	1.17
  +++ Lists.java	25 Jan 2004 22:58:15 -0000	1.18
  @@ -137,6 +137,16 @@
               booleanValues.add(new LabelValueBean("False", "false"));
       }
       
  +    /**
  +     * Precomputed list of clientAuth lables and values.
  +     */
  +    private static List clientAuthValues = new ArrayList();
  +
  +    static {
  +            clientAuthValues.add(new LabelValueBean("True","true"));
  +            clientAuthValues.add(new LabelValueBean("False","false"));
  +            clientAuthValues.add(new LabelValueBean("Want","want"));
  +    }
   
       // --------------------------------------------------------- Public Methods
   
  @@ -168,6 +178,16 @@
       public static List getBooleanValues() {
   
           return (booleanValues);
  +
  +    }
  +
  +    /**
  +     * Return a <code>List</code> of {@link LabelValueBean}s for the legal
  +     * settings for <code>clientAuth</code> properties.
  +     */
  +    public static List getClientAuthValues() {
  +
  +        return (clientAuthValues);
   
       }
   
  
  
  
  1.10      +5 -4      jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/AddConnectorAction.java
  
  Index: AddConnectorAction.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/AddConnectorAction.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- AddConnectorAction.java	14 Mar 2003 17:53:50 -0000	1.9
  +++ AddConnectorAction.java	25 Jan 2004 22:58:15 -0000	1.10
  @@ -165,6 +165,7 @@
           
           connectorFm.setDebugLvlVals(Lists.getDebugLevels());
           connectorFm.setBooleanVals(Lists.getBooleanValues());                
  +        connectorFm.setClientAuthVals(Lists.getClientAuthValues());
           
           String schemeTypes[]= new String[3];
           schemeTypes[0] = "HTTP";
  
  
  
  1.14      +23 -4     jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/ConnectorForm.java
  
  Index: ConnectorForm.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/ConnectorForm.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- ConnectorForm.java	24 Jan 2004 13:47:26 -0000	1.13
  +++ ConnectorForm.java	25 Jan 2004 22:58:15 -0000	1.14
  @@ -225,6 +225,11 @@
        */    
       private List connectorTypeVals = null;
   
  +    /**
  +     * Represent supported clientAuth values.
  +     */
  +    private List clientAuthVals = null;
  +
       // ------------------------------------------------------------- Properties
       
      /**
  @@ -585,6 +590,20 @@
           
           this.booleanVals = booleanVals;
           
  +    }
  +    
  +    /**
  +     * Return the clientAuth values.
  +     */
  +    public List getClientAuthVals() {
  +        return clientAuthVals;
  +    }
  +
  +    /**
  +     * Set the clientAuth vaues.
  +     */
  +    public void setClientAuthVals(List clientAuthVals) {
  +        this.clientAuthVals = clientAuthVals;
       }
       
       /**
  
  
  
  1.7       +6 -5      jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/EditConnectorAction.java
  
  Index: EditConnectorAction.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/EditConnectorAction.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- EditConnectorAction.java	22 Jan 2004 02:39:33 -0000	1.6
  +++ EditConnectorAction.java	25 Jan 2004 22:58:15 -0000	1.7
  @@ -172,6 +172,7 @@
           connectorFm.setNodeLabel(sb.toString());
           connectorFm.setDebugLvlVals(Lists.getDebugLevels());               
           connectorFm.setBooleanVals(Lists.getBooleanValues());        
  +        connectorFm.setClientAuthVals(Lists.getClientAuthValues());
           
           String attribute = null;
           try {
  @@ -255,7 +256,7 @@
                   // These are set only for SSL connectors.
                   attribute = "clientAuth";
                   connectorFm.setClientAuthentication
  -                    (((Boolean) mBServer.getAttribute(cname, attribute)).toString());
  +                    ((String) mBServer.getAttribute(cname, attribute));
                   attribute = "keystoreFile";
                   connectorFm.setKeyStoreFileName
                       ((String) mBServer.getAttribute(cname, attribute));
  
  
  
  1.14      +6 -6      jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/SaveConnectorAction.java
  
  Index: SaveConnectorAction.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/SaveConnectorAction.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- SaveConnectorAction.java	22 Jan 2004 02:39:33 -0000	1.13
  +++ SaveConnectorAction.java	25 Jan 2004 22:58:15 -0000	1.14
  @@ -373,8 +373,8 @@
               if("HTTPS".equalsIgnoreCase(connectorType)) {
                   attribute = "clientAuth";              
                   mBServer.setAttribute(coname,
  -                              new Attribute("clientAuth", new Boolean(
  -                                             cform.getClientAuthentication())));      
     
  +                              new Attribute("clientAuth", 
  +                                             cform.getClientAuthentication()));       
    
                   
                   attribute = "keystoreFile";
                   String keyFile = cform.getKeyStoreFileName();
  
  
  
  1.23      +2 -2      jakarta-tomcat-4.0/webapps/admin/connector/connector.jsp
  
  Index: connector.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/connector/connector.jsp,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- connector.jsp	22 Jan 2004 02:39:33 -0000	1.22
  +++ connector.jsp	25 Jan 2004 22:58:15 -0000	1.23
  @@ -264,8 +264,8 @@
               <controls:label><bean:message key="connector.client.auth"/>:</controls:label>
               <controls:data>
                   <html:select property="clientAuthentication" styleId="clientauth">
  -                     <bean:define id="booleanVals" name="connectorForm" property="booleanVals"/>
  -                     <html:options collection="booleanVals" property="value"
  +                     <bean:define id="clientAuthVals" name="connectorForm" property="clientAuthVals"/>
  +                     <html:options collection="clientAuthVals" property="value"
                      labelProperty="label"/>
                   </html:select>
               </controls:data>
  
  
  

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


Mime
View raw message