geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sppa...@apache.org
Subject svn commit: r425081 - in /geronimo/branches/1.1/applications: console-core/src/java/org/apache/geronimo/console/core/keystore/ console-standard/src/java/org/apache/geronimo/console/certmanager/ console-standard/src/webapp/WEB-INF/view/certmanager/
Date Mon, 24 Jul 2006 14:54:32 GMT
Author: sppatel
Date: Mon Jul 24 07:54:32 2006
New Revision: 425081

URL: http://svn.apache.org/viewvc?rev=425081&view=rev
Log:
GERONIMO-1037...committed too many items in previous commit 425077.   This commit reverses
the extra items and makes things whole.

Modified:
    geronimo/branches/1.1/applications/console-core/src/java/org/apache/geronimo/console/core/keystore/KeyStoreGBean.java
    geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/certmanager/CertManagerPortlet.java
    geronimo/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/certmanager/viewCertificateNormal.jsp

Modified: geronimo/branches/1.1/applications/console-core/src/java/org/apache/geronimo/console/core/keystore/KeyStoreGBean.java
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/applications/console-core/src/java/org/apache/geronimo/console/core/keystore/KeyStoreGBean.java?rev=425081&r1=425080&r2=425081&view=diff
==============================================================================
--- geronimo/branches/1.1/applications/console-core/src/java/org/apache/geronimo/console/core/keystore/KeyStoreGBean.java
(original)
+++ geronimo/branches/1.1/applications/console-core/src/java/org/apache/geronimo/console/core/keystore/KeyStoreGBean.java
Mon Jul 24 07:54:32 2006
@@ -22,18 +22,15 @@
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
-import java.io.IOException;
 import java.io.InputStream;
 import java.math.BigInteger;
 import java.security.KeyPair;
 import java.security.KeyPairGenerator;
 import java.security.KeyStore;
 import java.security.KeyStoreException;
-import java.security.NoSuchAlgorithmException;
 import java.security.PrivateKey;
 import java.security.PublicKey;
 import java.security.cert.Certificate;
-import java.security.cert.CertificateException;
 import java.security.cert.CertificateFactory;
 import java.security.cert.X509Certificate;
 import java.util.ArrayList;
@@ -459,15 +456,6 @@
         saveKeyStore();
     }
 
-    public void deleteEntry(String alias)
-            throws KeyStoreException,
-            CertificateException,
-            NoSuchAlgorithmException, IOException {
-
-        keystore.deleteEntry(alias);
-
-        saveKeyStore();
-    }
 
     public static final GBeanInfo GBEAN_INFO;
 
@@ -498,8 +486,6 @@
                 String.class, String.class });
         infoFactory.addOperation("importPKCS7Certificate", new Class[] {
                 String.class, String.class });
-
-        infoFactory.addOperation("deleteEntry", new Class[] {String.class });
 
         GBEAN_INFO = infoFactory.getBeanInfo();
     }

Modified: geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/certmanager/CertManagerPortlet.java
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/certmanager/CertManagerPortlet.java?rev=425081&r1=425080&r2=425081&view=diff
==============================================================================
--- geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/certmanager/CertManagerPortlet.java
(original)
+++ geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/certmanager/CertManagerPortlet.java
Mon Jul 24 07:54:32 2006
@@ -30,7 +30,6 @@
 import javax.portlet.RenderResponse;
 
 import org.apache.geronimo.console.certmanager.actions.ChangeStorePassword;
-import org.apache.geronimo.console.certmanager.actions.DeleteEntry;
 import org.apache.geronimo.console.certmanager.actions.GenerateCSR;
 import org.apache.geronimo.console.certmanager.actions.GenerateKeyPair;
 import org.apache.geronimo.console.certmanager.actions.ImportCAReply;
@@ -90,8 +89,6 @@
             ImportCAReply.action(this, request, response);
         } else if (action.equals("generate-key-pair")) {
             GenerateKeyPair.action(this, request, response);
-        } else if (action.equals("delete-entry")) {
-            DeleteEntry.action(this, request, response);
         }
     }
 
@@ -130,8 +127,6 @@
             ImportCAReply.render(this, request, response);
         } else if (action.equals("generate-key-pair")) {
             GenerateKeyPair.render(this, request, response);
-        } else if (action.equals("delete-entry")) {
-            DeleteEntry.render(this, request, response);
         }
     }
 

Modified: geronimo/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/certmanager/viewCertificateNormal.jsp
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/certmanager/viewCertificateNormal.jsp?rev=425081&r1=425080&r2=425081&view=diff
==============================================================================
--- geronimo/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/certmanager/viewCertificateNormal.jsp
(original)
+++ geronimo/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/certmanager/viewCertificateNormal.jsp
Mon Jul 24 07:54:32 2006
@@ -15,9 +15,9 @@
 </table>
 <br/>
 
+<c:if test="${info.privateKey}">
 <table cellspacing="5">
 <tr>
-<c:if test="${info.privateKey}">
 <td><a href="<portlet:renderURL>
 <portlet:param name='action' value='generate-csr'/>
 <portlet:param name='alias' value='${info.alias}'/>
@@ -28,18 +28,13 @@
 <portlet:param name='alias' value='${info.alias}'/>
 </portlet:renderURL>">
 import CA reply</a></td>
-</c:if>
-<td><a href="<portlet:actionURL>
-<portlet:param name='action' value='delete-entry'/>
-<portlet:param name='alias' value='${info.alias}'/>
-</portlet:actionURL>" onClick="return confirm('Are you sure you want to delete entry
${info.alias}?');">
-Delete Entry</a></td>
 <td><a href="<portlet:renderURL>
 </portlet:renderURL>">
 keystore list</a></td>
 </tr>
 </table>
 <br/>
+</c:if>
 
 <c:set var="certs" value="${requestScope['org.apache.geronimo.console.certs']}"/>
 



Mime
View raw message