You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by da...@apache.org on 2006/10/19 19:58:48 UTC
svn commit: r465703 - /incubator/openejb/trunk/openejb2/modules/openejb-corba/src/main/java/org/apache/openejb/corba/security/config/ssl/SSLConfig.java

Author: dain
Date: Thu Oct 19 10:58:47 2006
New Revision: 465703

URL: http://svn.apache.org/viewvc?view=rev&rev=465703
Log:
GERONIMO-2504 Allow all read-only operations on KeystoreInstance to be available to services
Thanks Guillaume Nodet

Modified:
    incubator/openejb/trunk/openejb2/modules/openejb-corba/src/main/java/org/apache/openejb/corba/security/config/ssl/SSLConfig.java

Modified: incubator/openejb/trunk/openejb2/modules/openejb-corba/src/main/java/org/apache/openejb/corba/security/config/ssl/SSLConfig.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-corba/src/main/java/org/apache/openejb/corba/security/config/ssl/SSLConfig.java?view=diff&rev=465703&r1=465702&r2=465703
==============================================================================
--- incubator/openejb/trunk/openejb2/modules/openejb-corba/src/main/java/org/apache/openejb/corba/security/config/ssl/SSLConfig.java (original)
+++ incubator/openejb/trunk/openejb2/modules/openejb-corba/src/main/java/org/apache/openejb/corba/security/config/ssl/SSLConfig.java Thu Oct 19 10:58:47 2006
@@ -21,15 +21,9 @@
 import javax.net.ssl.KeyManagerFactory;
 import javax.net.ssl.SSLServerSocketFactory;
 import javax.net.ssl.SSLSocketFactory;
-import org.apache.geronimo.management.geronimo.KeyIsLocked;
-import org.apache.geronimo.management.geronimo.KeystoreIsLocked;
+import org.apache.geronimo.management.geronimo.KeystoreException;
 
-import java.security.KeyManagementException;
 import java.security.KeyStore;
-import java.security.KeyStoreException;
-import java.security.NoSuchAlgorithmException;
-import java.security.NoSuchProviderException;
-import java.security.UnrecoverableKeyException;
 
 import org.apache.openejb.corba.security.config.tss.TSSConfig;
 
@@ -81,20 +75,11 @@
      *
      * @return An SSLServerSocketFactory instance created with the
      *         SSLConfig specifices.
-     * @throws KeystoreIsLocked
-     *                Occurs when the requested key keystore cannot
-     *                be used because it has not been unlocked.
-     * @throws KeyIsLocked
-     *                Occurs when the requested private key in the key
-     *                keystore cannot be used because it has not been
-     *                unlocked.
-     * @throws NoSuchAlgorithmException
-     * @throws UnrecoverableKeyException
-     * @throws KeyStoreException
-     * @throws KeyManagementException
-     * @throws NoSuchProviderException
+     *
+     * @throws KeystoreException
+     *                When a problem occurs while creating the factory.          
      */
-    public SSLSocketFactory createSSLFactory(ClassLoader loader) throws KeystoreIsLocked, KeyIsLocked, NoSuchAlgorithmException, UnrecoverableKeyException, KeyStoreException, KeyManagementException, NoSuchProviderException {
+    public SSLSocketFactory createSSLFactory(ClassLoader loader) throws KeystoreException {
         if (manager != null) {
             // fix up the default algorithm now. 
             if ("default".equalsIgnoreCase(algorithm)) {
@@ -117,20 +102,11 @@
      *
      * @return An SSLSocketFactory instance created with the
      *         SSLConfig specifices.
-     * @throws KeystoreIsLocked
-     *                Occurs when the requested key keystore cannot
-     *                be used because it has not been unlocked.
-     * @throws KeyIsLocked
-     *                Occurs when the requested private key in the key
-     *                keystore cannot be used because it has not been
-     *                unlocked.
-     * @throws NoSuchAlgorithmException
-     * @throws UnrecoverableKeyException
-     * @throws KeyStoreException
-     * @throws KeyManagementException
-     * @throws NoSuchProviderException
+     *
+     * @throws KeystoreException
+     *                When a problem occurs while creating the factory.          
      */
-    public SSLServerSocketFactory createSSLServerFactory(ClassLoader loader) throws KeystoreIsLocked, KeyIsLocked, NoSuchAlgorithmException, UnrecoverableKeyException, KeyStoreException, KeyManagementException, NoSuchProviderException {
+    public SSLServerSocketFactory createSSLServerFactory(ClassLoader loader) throws KeystoreException {
         if (manager != null) {
             // fix up the default algorithm now. 
             if ("default".equalsIgnoreCase(algorithm)) {