geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jboy...@apache.org
Subject svn commit: r267512 - in /geronimo/trunk/modules: jetty/src/java/org/apache/geronimo/jetty/connector/HTTPSConnector.java tomcat/src/java/org/apache/geronimo/tomcat/HttpsConnectorGBean.java
Date Sat, 03 Sep 2005 23:10:28 GMT
Author: jboynes
Date: Sat Sep  3 16:10:23 2005
New Revision: 267512

URL: http://svn.apache.org/viewcvs?rev=267512&view=rev
Log:
GERONIMO-972 make ssl attributes manageable

Modified:
    geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/connector/HTTPSConnector.java
    geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/HttpsConnectorGBean.java

Modified: geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/connector/HTTPSConnector.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/connector/HTTPSConnector.java?rev=267512&r1=267511&r2=267512&view=diff
==============================================================================
--- geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/connector/HTTPSConnector.java
(original)
+++ geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/connector/HTTPSConnector.java
Sat Sep  3 16:10:23 2005
@@ -125,13 +125,13 @@
 
     static {
         GBeanInfoBuilder infoFactory = new GBeanInfoBuilder("Jetty Connector HTTPS", HTTPSConnector.class,
JettyConnector.GBEAN_INFO);
-        infoFactory.addAttribute("keystoreFileName", String.class, true);
-        infoFactory.addAttribute("algorithm", String.class, true);
-        infoFactory.addAttribute("keystorePassword", String.class, true);
-        infoFactory.addAttribute("keyPassword", String.class, true);
-        infoFactory.addAttribute("secureProtocol", String.class, true);
-        infoFactory.addAttribute("keystoreType", String.class, true);
-        infoFactory.addAttribute("clientAuthRequired", boolean.class, true);
+        infoFactory.addAttribute("keystoreFileName", String.class, true, true);
+        infoFactory.addAttribute("algorithm", String.class, true, true);
+        infoFactory.addAttribute("keystorePassword", String.class, true, true);
+        infoFactory.addAttribute("keyPassword", String.class, true, true);
+        infoFactory.addAttribute("secureProtocol", String.class, true, true);
+        infoFactory.addAttribute("keystoreType", String.class, true, true);
+        infoFactory.addAttribute("clientAuthRequired", boolean.class, true, true);
         infoFactory.addReference("ServerInfo", ServerInfo.class, NameFactory.GERONIMO_SERVICE);
         infoFactory.addInterface(JettySecureConnector.class);
         infoFactory.setConstructor(new String[]{"JettyContainer", "ServerInfo"});

Modified: geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/HttpsConnectorGBean.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/HttpsConnectorGBean.java?rev=267512&r1=267511&r2=267512&view=diff
==============================================================================
--- geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/HttpsConnectorGBean.java
(original)
+++ geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/HttpsConnectorGBean.java
Sat Sep  3 16:10:23 2005
@@ -166,8 +166,17 @@
 
     static {
         GBeanInfoBuilder infoFactory = new GBeanInfoBuilder("Tomcat Connector", HttpsConnectorGBean.class,
ConnectorGBean.GBEAN_INFO);
+        infoFactory.addAttribute("keystoreFileName", String.class, true, true);
+        infoFactory.addAttribute("algorithm", String.class, true, true);
+        infoFactory.addAttribute("keystorePassword", String.class, true, true);
+// todo should we support this?
+//        infoFactory.addAttribute("keyPassword", String.class, true, true);
+        infoFactory.addAttribute("secureProtocol", String.class, true, true);
+        infoFactory.addAttribute("keystoreType", String.class, true, true);
+        infoFactory.addAttribute("clientAuthRequired", boolean.class, true, true);
+        infoFactory.addInterface(SecureConnector.class);
+
         infoFactory.addReference("ServerInfo", ServerInfo.class, "GBean");
-        infoFactory.addInterface(SecureConnector.class, new String[]{"keystoreFileName",
"keystorePassword", "keystoreType", "algorithm", "secureProtocol", "clientAuthRequired"});
         infoFactory.setConstructor(new String[] { "name", "protocol", "host", "port", "TomcatContainer",
"ServerInfo"});
         GBEAN_INFO = infoFactory.getBeanInfo();
     }



Mime
View raw message