ws-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject svn commit: r1069756 - /webservices/wss4j/trunk/src/main/java/org/apache/ws/security/handler/WSHandler.java
Date Fri, 11 Feb 2011 11:29:13 GMT
Author: coheigea
Date: Fri Feb 11 11:29:13 2011
New Revision: 1069756

URL: http://svn.apache.org/viewvc?rev=1069756&view=rev
Log:
Adding a hook to allow subclass of WSHandler to load crypto properties in different ways.

Modified:
    webservices/wss4j/trunk/src/main/java/org/apache/ws/security/handler/WSHandler.java

Modified: webservices/wss4j/trunk/src/main/java/org/apache/ws/security/handler/WSHandler.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/main/java/org/apache/ws/security/handler/WSHandler.java?rev=1069756&r1=1069755&r2=1069756&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/main/java/org/apache/ws/security/handler/WSHandler.java (original)
+++ webservices/wss4j/trunk/src/main/java/org/apache/ws/security/handler/WSHandler.java Fri
Feb 11 11:29:13 2011
@@ -433,10 +433,7 @@ public abstract class WSHandler {
         if (sigPropFile != null) {
             crypto = (Crypto) cryptos.get(sigPropFile);
             if (crypto == null) {
-                crypto = 
-                    CryptoFactory.getInstance(
-                        sigPropFile, this.getClassLoader(reqData.getMsgContext())
-                    );
+                crypto = loadCryptoFromPropertiesFile(sigPropFile, reqData);
                 cryptos.put(sigPropFile, crypto);
             }
         } else if (getString(WSHandlerConstants.SIG_PROP_REF_ID, reqData.getMsgContext())
!= null) {
@@ -459,6 +456,20 @@ public abstract class WSHandler {
         
         return crypto;
     }
+    
+    /**
+     * A hook to allow subclass to load Crypto instances from property files in a different
+     * way.
+     * @param propFilename The property file name
+     * @param reqData The RequestData object
+     * @return A Crypto instance that has been loaded
+     */
+    protected Crypto loadCryptoFromPropertiesFile(String propFilename, RequestData reqData)
{
+        return 
+            CryptoFactory.getInstance(
+                propFilename, this.getClassLoader(reqData.getMsgContext())
+            );
+    }
 
     /**
      * Hook to allow subclasses to load their Encryption Crypto however they
@@ -476,10 +487,7 @@ public abstract class WSHandler {
         if (encPropFile != null) {
             crypto = (Crypto) cryptos.get(encPropFile);
             if (crypto == null) {
-                crypto = 
-                    CryptoFactory.getInstance(
-                        encPropFile, this.getClassLoader(reqData.getMsgContext())
-                    );
+                crypto = loadCryptoFromPropertiesFile(encPropFile, reqData);
                 cryptos.put(encPropFile, crypto);
             }
         } else if (getString(WSHandlerConstants.ENC_PROP_REF_ID, reqData.getMsgContext())
!= null) {
@@ -995,10 +1003,7 @@ public abstract class WSHandler {
         if (decPropFile != null) {
             crypto = (Crypto) cryptos.get(decPropFile);
             if (crypto == null) {
-                crypto = 
-                    CryptoFactory.getInstance(
-                        decPropFile, this.getClassLoader(reqData.getMsgContext())
-                    );
+                crypto = loadCryptoFromPropertiesFile(decPropFile, reqData);
                 cryptos.put(decPropFile, crypto);
             }
         } else if (getString(WSHandlerConstants.DEC_PROP_REF_ID, reqData.getMsgContext())
!= null) {



Mime
View raw message