You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fx-dev@ws.apache.org by we...@apache.org on 2004/04/01 21:21:52 UTC
cvs commit: ws-fx/wss4j/src/org/apache/ws/security/components/crypto Merlin.java
werner 2004/04/01 11:21:52
Modified: wss4j/src/org/apache/ws/security/components/crypto
Merlin.java
Log:
Somer modifications proposed by Rami Jaamour.
Revision Changes Path
1.12 +3 -3 ws-fx/wss4j/src/org/apache/ws/security/components/crypto/Merlin.java
Index: Merlin.java
===================================================================
RCS file: /home/cvs/ws-fx/wss4j/src/org/apache/ws/security/components/crypto/Merlin.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Merlin.java 21 Mar 2004 14:40:40 -0000 1.11
+++ Merlin.java 1 Apr 2004 19:21:52 -0000 1.12
@@ -59,7 +59,7 @@
private static Log log = LogFactory.getLog(Merlin.class);
private static CertificateFactory certFact;
private Properties properties = null;
- private KeyStore keystore = null;
+ protected KeyStore keystore = null;
/**
* Constructor.
@@ -68,7 +68,7 @@
* @param properties
* @throws Exception
*/
- public Merlin(Properties properties) throws Exception {
+ public Merlin(Properties properties) throws CredentialException, IOException {
/*
* if no properties .. just return an instance, the rest will be
* done later or this instance is just used to handle certificate
@@ -456,7 +456,7 @@
* @param input <code>InputStream</code> to read from
* @throws Exception
*/
- public void load(InputStream input) throws Exception {
+ public void load(InputStream input) throws CredentialException {
if (input == null) {
throw new IllegalArgumentException("input stream cannot be null");
}