geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jgenen...@apache.org
Subject svn commit: r500046 - in /geronimo/server/branches/1.1/modules/tomcat/src/java/org/apache/geronimo/tomcat: HttpsConnectorGBean.java TomcatSecureConnector.java
Date Thu, 25 Jan 2007 23:16:58 GMT
Author: jgenender
Date: Thu Jan 25 15:16:57 2007
New Revision: 500046

URL: http://svn.apache.org/viewvc?view=rev&rev=500046
Log:
GERONIMO-2780 - Add keyAlias and ciphers to the connector

Modified:
    geronimo/server/branches/1.1/modules/tomcat/src/java/org/apache/geronimo/tomcat/HttpsConnectorGBean.java
    geronimo/server/branches/1.1/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatSecureConnector.java

Modified: geronimo/server/branches/1.1/modules/tomcat/src/java/org/apache/geronimo/tomcat/HttpsConnectorGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/1.1/modules/tomcat/src/java/org/apache/geronimo/tomcat/HttpsConnectorGBean.java?view=diff&rev=500046&r1=500045&r2=500046
==============================================================================
--- geronimo/server/branches/1.1/modules/tomcat/src/java/org/apache/geronimo/tomcat/HttpsConnectorGBean.java
(original)
+++ geronimo/server/branches/1.1/modules/tomcat/src/java/org/apache/geronimo/tomcat/HttpsConnectorGBean.java
Thu Jan 25 15:16:57 2007
@@ -191,6 +191,38 @@
         connector.setAttribute("clientAuth", new Boolean(clientCert));
     }
 
+    /**
+     * Gets a comma seperated list of the encryption ciphers that may be used. If not
+     * specified, then any available cipher may be used.
+     */
+     public String getCiphers() {
+        return (String)connector.getAttribute("ciphers");
+    }
+
+    /**
+     * Sets a comma seperated list of the encryption ciphers that may be used. If not
+     * specified, then any available cipher may be used.
+     */
+     public void setCiphers(String ciphers) {
+        connector.setAttribute("ciphers", ciphers);
+    }
+
+    /**
+     * Sets a keyAlias if one is being used
+     * @param keyAlias
+     */
+     public void setKeyAlias(String keyAlias) {
+        connector.setAttribute("keyAlias", keyAlias);
+    }
+
+    /**
+     * Gets the key alias
+     * @return key alias
+     */
+     public String getKeyAlias() {
+        return (String)connector.getAttribute("keyAlias");
+    }
+ 
     public static final GBeanInfo GBEAN_INFO;
 
     static {
@@ -206,6 +238,9 @@
         infoFactory.addAttribute("keystoreType", String.class, true, true);
         infoFactory.addAttribute("truststoreType", String.class, true, true);
         infoFactory.addAttribute("clientAuthRequired", boolean.class, true, true);
+        infoFactory.addAttribute("ciphers", String.class, true, true);
+        infoFactory.addAttribute("keyAlias", String.class, true, true);
+                 
         infoFactory.addInterface(TomcatSecureConnector.class);
 
         infoFactory.addReference("ServerInfo", ServerInfo.class, "GBean");

Modified: geronimo/server/branches/1.1/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatSecureConnector.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/1.1/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatSecureConnector.java?view=diff&rev=500046&r1=500045&r2=500046
==============================================================================
--- geronimo/server/branches/1.1/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatSecureConnector.java
(original)
+++ geronimo/server/branches/1.1/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatSecureConnector.java
Thu Jan 25 15:16:57 2007
@@ -50,4 +50,27 @@
      * PCKS12 (and possibly other formats).
      */
     public void setTruststoreType(String type);
+    /**
+     * Gets a comma seperated list of the encryption ciphers that may be used. If not
+     * specified, then any available cipher may be used.
+     */
+    public String getCiphers();
+
+    /**
+     * Sets a comma seperated list of the encryption ciphers that may be used. If not
+     * specified, then any available cipher may be used.
+     */
+    public void setCiphers(String ciphers);
+
+    /**
+     * Sets a keyAlias if one is being used
+     * @param keyAlias
+     */
+    public void setKeyAlias(String keyAlias);
+
+    /**
+     * Gets the key alias
+     * @return key alias
+     */
+    public String getKeyAlias();
 }



Mime
View raw message