You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jg...@apache.org on 2007/01/25 23:01:44 UTC
svn commit: r500010 - in /geronimo/server/branches/1.2/modules/geronimo-tomcat/src/main/java/org/apache/geronimo/tomcat: HttpsConnectorGBean.java TomcatSecureConnector.java

Author: jgenender
Date: Thu Jan 25 14:01:43 2007
New Revision: 500010

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

Modified:
    geronimo/server/branches/1.2/modules/geronimo-tomcat/src/main/java/org/apache/geronimo/tomcat/HttpsConnectorGBean.java
    geronimo/server/branches/1.2/modules/geronimo-tomcat/src/main/java/org/apache/geronimo/tomcat/TomcatSecureConnector.java

Modified: geronimo/server/branches/1.2/modules/geronimo-tomcat/src/main/java/org/apache/geronimo/tomcat/HttpsConnectorGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/1.2/modules/geronimo-tomcat/src/main/java/org/apache/geronimo/tomcat/HttpsConnectorGBean.java?view=diff&rev=500010&r1=500009&r2=500010
==============================================================================
--- geronimo/server/branches/1.2/modules/geronimo-tomcat/src/main/java/org/apache/geronimo/tomcat/HttpsConnectorGBean.java (original)
+++ geronimo/server/branches/1.2/modules/geronimo-tomcat/src/main/java/org/apache/geronimo/tomcat/HttpsConnectorGBean.java Thu Jan 25 14:01:43 2007
@@ -223,6 +223,22 @@
         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 {
@@ -239,6 +255,7 @@
         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.2/modules/geronimo-tomcat/src/main/java/org/apache/geronimo/tomcat/TomcatSecureConnector.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/1.2/modules/geronimo-tomcat/src/main/java/org/apache/geronimo/tomcat/TomcatSecureConnector.java?view=diff&rev=500010&r1=500009&r2=500010
==============================================================================
--- geronimo/server/branches/1.2/modules/geronimo-tomcat/src/main/java/org/apache/geronimo/tomcat/TomcatSecureConnector.java (original)
+++ geronimo/server/branches/1.2/modules/geronimo-tomcat/src/main/java/org/apache/geronimo/tomcat/TomcatSecureConnector.java Thu Jan 25 14:01:43 2007
@@ -62,4 +62,16 @@
      * 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();
 }