geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vamsic...@apache.org
Subject svn commit: r615660 - in /geronimo/server/trunk/plugins: console/console-base-portlets/src/main/java/org/apache/geronimo/console/webmanager/ConnectorPortlet.java tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/TomcatManagerImpl.java
Date Sun, 27 Jan 2008 21:56:23 GMT
Author: vamsic007
Date: Sun Jan 27 13:56:22 2008
New Revision: 615660

URL: http://svn.apache.org/viewvc?rev=615660&view=rev
Log:
GERONIMO-3757 KeyStore type can't be changed
 o Allow selecting any keystore type supported by the JVM in Tomcat HTTPS Connector pages.

Modified:
    geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/webmanager/ConnectorPortlet.java
    geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/TomcatManagerImpl.java

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/webmanager/ConnectorPortlet.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/webmanager/ConnectorPortlet.java?rev=615660&r1=615659&r2=615660&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/webmanager/ConnectorPortlet.java
(original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/webmanager/ConnectorPortlet.java
Sun Jan 27 13:56:22 2008
@@ -52,6 +52,7 @@
 import org.apache.geronimo.management.geronimo.WebManager;
 import org.apache.geronimo.management.geronimo.WebManager.ConnectorAttribute;
 import org.apache.geronimo.management.geronimo.WebManager.ConnectorType;
+import org.apache.geronimo.util.KeystoreUtil;
 
 /**
  * A portlet that lets you list, add, remove, start, stop, restart and edit web
@@ -474,8 +475,8 @@
         enumValues.put("sslProtocol", new String[] { "TLS", "SSL" }); //tomcat
         
         // keystore and truststore types for tomcat
-        enumValues.put("keystoreType", new String[] { "JKS", "PKCS12" });
-        enumValues.put("truststoreType", new String[] { "JKS", "PKCS12" });
+        enumValues.put("keystoreType", KeystoreUtil.keystoreTypes.toArray(new String[0]));
+        enumValues.put("truststoreType", KeystoreUtil.keystoreTypes.toArray(new String[0]));
 
         // provide the three possible values for secure algorithm - Default, SunX509, and
IbmX509 
         enumValues.put("algorithm", new String[] { "Default", "SunX509", "IbmX509" });

Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/TomcatManagerImpl.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/TomcatManagerImpl.java?rev=615660&r1=615659&r2=615660&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/TomcatManagerImpl.java
(original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/TomcatManagerImpl.java
Sun Jan 27 13:56:22 2008
@@ -56,6 +56,7 @@
 import org.apache.geronimo.tomcat.connector.Https11ConnectorGBean;
 import org.apache.geronimo.tomcat.connector.Https11NIOConnectorGBean;
 import org.apache.geronimo.tomcat.connector.TomcatWebConnector;
+import org.apache.geronimo.util.KeystoreUtil;
 
 /**
  * Tomcat implementation of the WebManager management API.  Knows how to
@@ -446,13 +447,13 @@
         connectorAttributes.add(new ConnectorAttribute<Boolean>("clientAuth", false,
Messages.getString("TomcatManagerImpl.157"), Boolean.class)); //$NON-NLS-1$ //$NON-NLS-2$
         connectorAttributes.add(new ConnectorAttribute<String>("keystoreFile", "",
Messages.getString("TomcatManagerImpl.160"), String.class, true)); //$NON-NLS-1$ //$NON-NLS-2$
//$NON-NLS-3$
         connectorAttributes.add(new ConnectorAttribute<String>("keystorePass", null,
Messages.getString("TomcatManagerImpl.162"), String.class)); //$NON-NLS-1$ //$NON-NLS-2$
-        connectorAttributes.add(new ConnectorAttribute<String>("keystoreType", "JKS",
Messages.getString("TomcatManagerImpl.165"), String.class)); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+        connectorAttributes.add(new ConnectorAttribute<String>("keystoreType", KeystoreUtil.defaultType,
Messages.getString("TomcatManagerImpl.165"), String.class)); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
         connectorAttributes.add(new ConnectorAttribute<String>("sslProtocol", "TLS",
Messages.getString("TomcatManagerImpl.168"), String.class)); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
         connectorAttributes.add(new ConnectorAttribute<String>("ciphers", "", Messages.getString("TomcatManagerImpl.171"),
String.class)); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
         connectorAttributes.add(new ConnectorAttribute<String>("keyAlias", null, Messages.getString("TomcatManagerImpl.173"),
String.class)); //$NON-NLS-1$ //$NON-NLS-2$
         connectorAttributes.add(new ConnectorAttribute<String>("truststoreFile", null,
Messages.getString("TomcatManagerImpl.175"), String.class)); //$NON-NLS-1$ //$NON-NLS-2$
         connectorAttributes.add(new ConnectorAttribute<String>("truststorePass", null,
Messages.getString("TomcatManagerImpl.177"), String.class)); //$NON-NLS-1$ //$NON-NLS-2$
-        connectorAttributes.add(new ConnectorAttribute<String>("truststoreType", null,
Messages.getString("TomcatManagerImpl.179"), String.class)); //$NON-NLS-1$ //$NON-NLS-2$
+        connectorAttributes.add(new ConnectorAttribute<String>("truststoreType", KeystoreUtil.defaultType,
Messages.getString("TomcatManagerImpl.179"), String.class)); //$NON-NLS-1$ //$NON-NLS-2$
     }
     
     // see http://tomcat.apache.org/tomcat-6.0-doc/config/http.html



Mime
View raw message