[WSS4J] wss4j/src/org/apache/ws/security/components/crypto Merlin.java,1.9,1.10

Update of /cvsroot/wss4j/wss4j/src/org/apache/ws/security/components/crypto
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26216/src/org/apache/ws/security/components/crypto

Modified Files:
	Merlin.java 
Log Message:
Patch for "Using wss4j from within a SecurityDomain" from "Jason Essington" <[email protected]> 


Index: Merlin.java
===================================================================
RCS file: /cvsroot/wss4j/wss4j/src/org/apache/ws/security/components/crypto/Merlin.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- Merlin.java	5 Feb 2004 18:28:34 -0000	1.9
+++ Merlin.java	10 Feb 2004 21:13:12 -0000	1.10
@@ -337,6 +337,16 @@
     }
 
     /**
+     * A Hook for subclasses to set the keystore without having to 
+     * load it from an <code>InputStream</code>.
+     * @param ks existing keystore
+     */
+    public void setKeyStore(KeyStore ks)
+    {
+        keystore = ks;
+    }
+    
+    /**
      * Loads the the keystore from an <code>InputStream </code>.
      * <p/>
      * 



-------------------------------------------------------
The SF.Net email is sponsored by EclipseCon 2004
Premiere Conference on Open Tools Development and Integration
See the breadth of Eclipse activity. February 3-5 in Anaheim, CA.
http://www.eclipsecon.org/osdn