Author: coheigea
Date: Fri Feb 11 11:36:29 2011
New Revision: 1069759
URL: http://svn.apache.org/viewvc?rev=1069759&view=rev
Log:
Merging to tag.
Modified:
webservices/wss4j/tags/1_6_0-alpha/ (props changed)
webservices/wss4j/tags/1_6_0-alpha/src/main/java/org/apache/ws/security/WSDocInfo.java
(props changed)
webservices/wss4j/tags/1_6_0-alpha/src/main/java/org/apache/ws/security/handler/WSHandler.java
webservices/wss4j/tags/1_6_0-alpha/src/test/resources/log4j.properties
(props changed)
Propchange: webservices/wss4j/tags/1_6_0-alpha/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 11 11:36:29 2011
@@ -1,2 +1,2 @@
/webservices/wss4j/branches/1_5_x-fixes:996180,996298,996339,997529,997535,1001926,1002116,1002347,1032939,1036805,1036890,1037678
-/webservices/wss4j/trunk:1069502
+/webservices/wss4j/trunk:1069502,1069756
Propchange:
webservices/wss4j/tags/1_6_0-alpha/src/main/java/org/apache/ws/security/WSDocInfo.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 11 11:36:29 2011
@@ -1,2 +1,2 @@
/webservices/wss4j/branches/1_5_x-fixes/src/org/apache/ws/security/WSDocInfo.java:947604,996180,996298,996339,997529,997535,1001926,1002116,1002347,1032939,1036805,1036890,1037678
-/webservices/wss4j/trunk/src/main/java/org/apache/ws/security/WSDocInfo.java:1069502
+/webservices/wss4j/trunk/src/main/java/org/apache/ws/security/WSDocInfo.java:1069502,1069756
Modified:
webservices/wss4j/tags/1_6_0-alpha/src/main/java/org/apache/ws/security/handler/WSHandler.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/tags/1_6_0-alpha/src/main/java/org/apache/ws/security/handler/WSHandler.java?rev=1069759&r1=1069758&r2=1069759&view=diff
==============================================================================
---
webservices/wss4j/tags/1_6_0-alpha/src/main/java/org/apache/ws/security/handler/WSHandler.java
(original)
+++
webservices/wss4j/tags/1_6_0-alpha/src/main/java/org/apache/ws/security/handler/WSHandler.java
Fri Feb 11 11:36:29 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) {
Propchange:
webservices/wss4j/tags/1_6_0-alpha/src/test/resources/log4j.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 11 11:36:29 2011
@@ -1,2 +1,2 @@
/webservices/wss4j/branches/1_5_x-fixes/test/log4j.properties:1036805,1036890,1037678
-/webservices/wss4j/trunk/src/test/resources/log4j.properties:1069502
+/webservices/wss4j/trunk/src/test/resources/log4j.properties:1069502,1069756
