cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dval...@apache.org
Subject svn commit: r1024236 - in /cxf/branches/2.3.x-fixes: ./ rt/transports/http/src/main/java/org/apache/cxf/configuration/jsse/spring/TLSParameterJaxBUtils.java
Date Tue, 19 Oct 2010 14:00:16 GMT
Author: dvaleri
Date: Tue Oct 19 14:00:16 2010
New Revision: 1024236

URL: http://svn.apache.org/viewvc?rev=1024236&view=rev
Log:
Merged revisions 1024070 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1024070 | dvaleri | 2010-10-18 20:28:54 -0400 (Mon, 18 Oct 2010) | 1 line
  
  [CXF-3072] Added support for PKCS#11 providers.
........

Modified:
    cxf/branches/2.3.x-fixes/   (props changed)
    cxf/branches/2.3.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/configuration/jsse/spring/TLSParameterJaxBUtils.java

Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Oct 19 14:00:16 2010
@@ -1 +1 @@
-/cxf/trunk:1024006
+/cxf/trunk:1024006,1024070

Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Oct 19 14:00:16 2010
@@ -1 +1 @@
-/cxf/trunk:1-1022129,1022154,1022194,1022401-1022402,1022911,1023068,1023121,1023804,1023971-1023973,1024006
+/cxf/trunk:1-1022129,1022154,1022194,1022401-1022402,1022911,1023068,1023121,1023804,1023971-1023973,1024006,1024070

Modified: cxf/branches/2.3.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/configuration/jsse/spring/TLSParameterJaxBUtils.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/configuration/jsse/spring/TLSParameterJaxBUtils.java?rev=1024236&r1=1024235&r2=1024236&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/configuration/jsse/spring/TLSParameterJaxBUtils.java
(original)
+++ cxf/branches/2.3.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/configuration/jsse/spring/TLSParameterJaxBUtils.java
Tue Oct 19 14:00:16 2010
@@ -110,22 +110,26 @@ public final class TLSParameterJaxBUtils
                     ? KeyStore.getInstance(type)
                     : KeyStore.getInstance(type, kst.getProvider());
         
-        if (kst.isSetFile()) {
-            keyStore.load(new FileInputStream(kst.getFile()), password);
-        }
-        if (kst.isSetResource()) {
-            final java.io.InputStream is =
-                ClassLoaderUtils.getResourceAsStream(kst.getResource(), kst.getClass());
-            if (is == null) {
-                final String msg =
-                    "Could not load keystore resource " + kst.getResource();
-                LOG.severe(msg);
-                throw new java.io.IOException(msg);
+        if (!"PKCS11".equals(type)) {
+            if (kst.isSetFile()) {
+                keyStore.load(new FileInputStream(kst.getFile()), password);
             }
-            keyStore.load(is, password);
-        }
-        if (kst.isSetUrl()) {
-            keyStore.load(new URL(kst.getUrl()).openStream(), password);
+            if (kst.isSetResource()) {
+                final java.io.InputStream is =
+                    ClassLoaderUtils.getResourceAsStream(kst.getResource(), kst.getClass());
+                if (is == null) {
+                    final String msg =
+                        "Could not load keystore resource " + kst.getResource();
+                    LOG.severe(msg);
+                    throw new java.io.IOException(msg);
+                }
+                keyStore.load(is, password);
+            }
+            if (kst.isSetUrl()) {
+                keyStore.load(new URL(kst.getUrl()).openStream(), password);
+            }
+        } else {
+            keyStore.load(null, password);
         }
         return keyStore;
     }



Mime
View raw message