You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jd...@apache.org on 2006/08/04 20:31:36 UTC

svn commit: r428833 - in /geronimo/sandbox/svkmerge/m2migration/modules/management/src: ./ java/org/apache/geronimo/management/geronimo/KeystoreInstance.java

Author: jdillon
Date: Fri Aug  4 11:31:36 2006
New Revision: 428833

URL: http://svn.apache.org/viewvc?rev=428833&view=rev
Log:
 r621@jason-dillons-computer (orig r427990):  jdillon | 2006-08-02 07:13:19 -0700
  r606@dyn456093 (orig r427270):  jbohn | 2006-07-31 14:05:15 -0700
  GERONIMO-2218 fix broken and missing function in the keystore portlet
 

Modified:
    geronimo/sandbox/svkmerge/m2migration/modules/management/src/   (props changed)
    geronimo/sandbox/svkmerge/m2migration/modules/management/src/java/org/apache/geronimo/management/geronimo/KeystoreInstance.java

Propchange: geronimo/sandbox/svkmerge/m2migration/modules/management/src/
------------------------------------------------------------------------------
--- svk:merge (added)
+++ svk:merge Fri Aug  4 11:31:36 2006
@@ -0,0 +1 @@
+13f79535-47bb-0310-9956-ffa450edef68:/geronimo/sandbox/svkmerge/trunk/modules/management/src:427990

Modified: geronimo/sandbox/svkmerge/m2migration/modules/management/src/java/org/apache/geronimo/management/geronimo/KeystoreInstance.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/modules/management/src/java/org/apache/geronimo/management/geronimo/KeystoreInstance.java?rev=428833&r1=428832&r2=428833&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/modules/management/src/java/org/apache/geronimo/management/geronimo/KeystoreInstance.java (original)
+++ geronimo/sandbox/svkmerge/m2migration/modules/management/src/java/org/apache/geronimo/management/geronimo/KeystoreInstance.java Fri Aug  4 11:31:36 2006
@@ -166,4 +166,15 @@
      * @param algorithm The SSL algorithm to use for this trust manager
      */
     public TrustManager[] getTrustManager(String algorithm) throws KeyStoreException, NoSuchAlgorithmException, KeystoreIsLocked;
+    
+    public String generateCSR(String alias);
+    
+    public void importPKCS7Certificate(String alias, String certbuf)
+    throws java.security.cert.CertificateException,
+    java.security.NoSuchProviderException,
+    java.security.KeyStoreException,
+    java.security.NoSuchAlgorithmException,
+    java.security.UnrecoverableKeyException, java.io.IOException;
+    
+    public void deleteEntry(String alias);
 }