Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 94316 invoked from network); 27 Jan 2008 21:56:45 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 27 Jan 2008 21:56:45 -0000 Received: (qmail 85150 invoked by uid 500); 27 Jan 2008 21:56:36 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 85142 invoked by uid 500); 27 Jan 2008 21:56:36 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 85130 invoked by uid 99); 27 Jan 2008 21:56:36 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 27 Jan 2008 13:56:36 -0800 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 27 Jan 2008 21:56:17 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 584621A9832; Sun, 27 Jan 2008 13:56:24 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit 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 -0000 To: scm@geronimo.apache.org From: vamsic007@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080127215624.584621A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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("clientAuth", false, Messages.getString("TomcatManagerImpl.157"), Boolean.class)); //$NON-NLS-1$ //$NON-NLS-2$ connectorAttributes.add(new ConnectorAttribute("keystoreFile", "", Messages.getString("TomcatManagerImpl.160"), String.class, true)); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ connectorAttributes.add(new ConnectorAttribute("keystorePass", null, Messages.getString("TomcatManagerImpl.162"), String.class)); //$NON-NLS-1$ //$NON-NLS-2$ - connectorAttributes.add(new ConnectorAttribute("keystoreType", "JKS", Messages.getString("TomcatManagerImpl.165"), String.class)); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + connectorAttributes.add(new ConnectorAttribute("keystoreType", KeystoreUtil.defaultType, Messages.getString("TomcatManagerImpl.165"), String.class)); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ connectorAttributes.add(new ConnectorAttribute("sslProtocol", "TLS", Messages.getString("TomcatManagerImpl.168"), String.class)); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ connectorAttributes.add(new ConnectorAttribute("ciphers", "", Messages.getString("TomcatManagerImpl.171"), String.class)); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ connectorAttributes.add(new ConnectorAttribute("keyAlias", null, Messages.getString("TomcatManagerImpl.173"), String.class)); //$NON-NLS-1$ //$NON-NLS-2$ connectorAttributes.add(new ConnectorAttribute("truststoreFile", null, Messages.getString("TomcatManagerImpl.175"), String.class)); //$NON-NLS-1$ //$NON-NLS-2$ connectorAttributes.add(new ConnectorAttribute("truststorePass", null, Messages.getString("TomcatManagerImpl.177"), String.class)); //$NON-NLS-1$ //$NON-NLS-2$ - connectorAttributes.add(new ConnectorAttribute("truststoreType", null, Messages.getString("TomcatManagerImpl.179"), String.class)); //$NON-NLS-1$ //$NON-NLS-2$ + connectorAttributes.add(new ConnectorAttribute("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