tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r...@apache.org
Subject cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/connector Connector.java
Date Mon, 04 Oct 2004 13:49:12 GMT
remm        2004/10/04 06:49:12

  Modified:    catalina/src/share/org/apache/catalina/connector
                        Connector.java
  Log:
  - Add SSL attributes translation.
  - Remove all direct get/set for SSL (again, protocol specific, so it should be in the protocol
handler).
  
  Revision  Changes    Path
  1.10      +9 -128    jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/connector/Connector.java
  
  Index: Connector.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/connector/Connector.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- Connector.java	4 Oct 2004 11:17:08 -0000	1.9
  +++ Connector.java	4 Oct 2004 13:49:12 -0000	1.10
  @@ -258,6 +258,14 @@
            replacements.put("connectionLinger", "soLinger");
            replacements.put("connectionTimeout", "soTimeout");
            replacements.put("connectionUploadTimeout", "timeout");
  +         replacements.put("clientAuth", "clientauth");
  +         replacements.put("keystoreFile", "keystore");
  +         replacements.put("randomFile", "randomfile");
  +         replacements.put("rootFile", "rootfile");
  +         replacements.put("keystorePass", "keypass");
  +         replacements.put("keystoreType", "keytype");
  +         replacements.put("sslProtocol", "protocol");
  +         replacements.put("sslProtocols", "protocols");
        }
        
        
  @@ -1008,133 +1016,6 @@
                    ("coyoteConnector.protocolHandlerDestroyFailed", e));
           }
   
  -    }
  -
  -    // -------------------- Management methods --------------------
  -
  -    
  -    public String getClientAuth() {
  -        String ret = "false";
  -
  -        String prop = (String) getProperty("clientauth");
  -        if (prop != null) {
  -            ret = prop;
  -        }
  -
  -        return ret;
  -    }
  -
  -    public void setClientAuth(String clientAuth) {
  -        setProperty("clientauth", clientAuth);
  -    }
  -
  -
  -    public String getKeystoreFile() {
  -        String ret = (String) getProperty("keystore");
  -        return ret;
  -    }
  -
  -    public void setKeystoreFile(String keystoreFile) {
  -        setProperty("keystore", keystoreFile);
  -    }
  -
  -    /**
  -     * Return keystorePass
  -     */
  -    public String getKeystorePass() {
  -        String ret = (String) getProperty("keypass");
  -        return ret;
  -    }
  -
  -    /**
  -     * Set keystorePass
  -     */
  -    public void setKeystorePass(String keystorePass) {
  -        setProperty("keypass", keystorePass);
  -    }
  -    
  -    /**
  -     * Gets the list of SSL cipher suites that are to be enabled
  -     *
  -     * @return Comma-separated list of SSL cipher suites, or null if all
  -     * cipher suites supported by the underlying SSL implementation are being
  -     * enabled
  -     */
  -    public String getCiphers() {
  -        String ret = (String) getProperty("ciphers");
  -        return ret;
  -    }
  -
  -    /**
  -     * Sets the SSL cipher suites that are to be enabled.
  -     *
  -     * Only those SSL cipher suites that are actually supported by
  -     * the underlying SSL implementation will be enabled.
  -     *
  -     * @param ciphers Comma-separated list of SSL cipher suites
  -     */
  -    public void setCiphers(String ciphers) {
  -        setProperty("ciphers", ciphers);
  -    }
  -
  -    /**
  -     * Gets the alias name of the keypair and supporting certificate chain
  -     * used by this Connector to authenticate itself to SSL clients.
  -     *
  -     * @return The alias name of the keypair and supporting certificate chain
  -     */
  -    public String getKeyAlias() {
  -        String ret = (String) getProperty("keyAlias");
  -        return ret;
  -    }
  -
  -    /**
  -     * Sets the alias name of the keypair and supporting certificate chain
  -     * used by this Connector to authenticate itself to SSL clients.
  -     *
  -     * @param alias The alias name of the keypair and supporting certificate
  -     * chain
  -     */
  -    public void setKeyAlias(String alias) {
  -        setProperty("keyAlias", alias);
  -    }
  -
  -    /**
  -     * Gets the SSL protocol variant to be used.
  -     *
  -     * @return SSL protocol variant
  -     */
  -    public String getSslProtocol() {
  -        String ret = (String) getProperty("sslProtocol");
  -        return ret;
  -    }
  -
  -    /**
  -     * Sets the SSL protocol variant to be used.
  -     *
  -     * @param sslProtocol SSL protocol variant
  -     */
  -    public void setSslProtocol(String sslProtocol) {
  -        setProperty("sslProtocol", sslProtocol);
  -    }
  -
  -    /**
  -     * Gets the SSL protocol variants to be enabled.
  -     *
  -     * @return Comma-separated list of SSL protocol variants
  -     */
  -    public String getSslProtocols() {
  -        String ret = (String) getProperty("sslProtocols");
  -        return ret;
  -    }
  -
  -    /**
  -     * Sets the SSL protocol variants to be enabled.
  -     *
  -     * @param sslProtocols Comma-separated list of SSL protocol variants
  -     */
  -    public void setSslProtocols(String sslProtocols) {
  -        setProperty("sslProtocols", sslProtocols);
       }
   
   
  
  
  

---------------------------------------------------------------------
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