geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ammul...@apache.org
Subject svn commit: r394178 - in /geronimo/branches/1.1: applications/console-standard/src/java/org/apache/geronimo/console/keystores/ applications/console-standard/src/webapp/WEB-INF/view/keystore/ configs/console-jetty/ configs/console-tomcat/
Date Fri, 14 Apr 2006 19:28:27 GMT
Author: ammulder
Date: Fri Apr 14 12:28:23 2006
New Revision: 394178

URL: http://svn.apache.org/viewcvs?rev=394178&view=rev
Log:
Editing keystores and Jetty HTTPS connectors based on keystores works

Modified:
    geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/keystores/BaseKeystoreHandler.java
    geronimo/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/keystore/confirmKey.jsp
    geronimo/branches/1.1/configs/console-jetty/project.xml
    geronimo/branches/1.1/configs/console-tomcat/project.xml

Modified: geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/keystores/BaseKeystoreHandler.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/keystores/BaseKeystoreHandler.java?rev=394178&r1=394177&r2=394178&view=diff
==============================================================================
--- geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/keystores/BaseKeystoreHandler.java
(original)
+++ geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/keystores/BaseKeystoreHandler.java
Fri Apr 14 12:28:23 2006
@@ -147,6 +147,9 @@
                 System.arraycopy(certificates, 0, update, 0, certificates.length);
                 update[certificates.length] = alias;
                 certificates = update;
+                if(fingerprints == null) {
+                    getFingerprints();
+                }
                 try {
                     fingerprints.put(alias, CertificateUtil.generateFingerprint(instance.getCertificate(alias,
password), "MD5"));
                 } catch (Exception e) {
@@ -166,6 +169,9 @@
                 System.arraycopy(keys, 0, update, 0, keys.length);
                 update[keys.length] = alias;
                 keys = update;
+                if(fingerprints == null) {
+                    getFingerprints();
+                }
                 try {
                     fingerprints.put(alias, CertificateUtil.generateFingerprint(instance.getCertificate(alias,
password), "MD5"));
                 } catch (Exception e) {

Modified: geronimo/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/keystore/confirmKey.jsp
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/keystore/confirmKey.jsp?rev=394178&r1=394177&r2=394178&view=diff
==============================================================================
--- geronimo/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/keystore/confirmKey.jsp
(original)
+++ geronimo/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/keystore/confirmKey.jsp
Fri Apr 14 12:28:23 2006
@@ -3,7 +3,7 @@
 <%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
 <portlet:defineObjects/>
 
-<p>Please confirm that this is the correct certificate to import:</p>
+<p>Please confirm that this is the correct information for the key I'm about to generate:</p>
 
 <form name="<portlet:namespace/>KeystoreForm" action="<portlet:actionURL/>">
     <input type="hidden" name="mode" value="confirmKey-after" />

Modified: geronimo/branches/1.1/configs/console-jetty/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/console-jetty/project.xml?rev=394178&r1=394177&r2=394178&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/console-jetty/project.xml (original)
+++ geronimo/branches/1.1/configs/console-jetty/project.xml Fri Apr 14 12:28:23 2006
@@ -314,7 +314,10 @@
             <groupId>geronimo</groupId>
             <artifactId>geronimo-jetty</artifactId>
             <version>${geronimo_version}</version>
-        </dependency>
+            <properties>
+                <geronimo.dependency>true</geronimo.dependency>
+            </properties>
+         </dependency>
 
         <dependency>
             <groupId>concurrent</groupId>

Modified: geronimo/branches/1.1/configs/console-tomcat/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/console-tomcat/project.xml?rev=394178&r1=394177&r2=394178&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/console-tomcat/project.xml (original)
+++ geronimo/branches/1.1/configs/console-tomcat/project.xml Fri Apr 14 12:28:23 2006
@@ -40,6 +40,15 @@
         </dependency>
         <dependency>
             <groupId>geronimo</groupId>
+            <artifactId>tomcat</artifactId>
+            <version>${geronimo_version}</version>
+            <type>car</type>
+            <properties>
+                <geronimo.dependency>true</geronimo.dependency>
+            </properties>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
             <artifactId>j2ee-deployer</artifactId>
             <version>${geronimo_version}</version>
             <type>car</type>



Mime
View raw message