[PATCH] Make PKCS12KeyStore optional

[Sam Ruby]

Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-jmeter/build.xml,v
retrieving revision 1.42
diff -u -r1.42 build.xml
--- build.xml  2001/10/29 22:03:13 1.42
+++ build.xml  2001/10/30 12:48:58
@@ -99,7 +99,7 @@
                    <exclude name="**/*.orig"/>
                    <exclude name="**/JsseSSLManager.java" unless="jsse.present"/>
                    <exclude name="**/IaikSSLManager.java" unless="isasilk.present"/>
-                <exclude name="**/PKCSKeyStore.java" unless="isasilk.present"/>
+                <exclude name="**/PKCS12KeyStore.java" unless="isasilk.present"/>
                 <exclude name="**/DefaultKeyStore.java" unless="jsse.present"/>
                    <exclude 
name="org/apache/jmeter/visualizers/MailerVisualizer.java" unless="javamail.complete"/>
                    <exclude 
name="org/apache/jmeter/reporters/MailerResultCollector.java" 
unless="javamail.complete"/>
Index: src/org/apache/jmeter/util/keystore/JmeterKeyStore.java
===================================================================
RCS file: 
/home/cvs/jakarta-jmeter/src/org/apache/jmeter/util/keystore/JmeterKeyStore.java,v
retrieving revision 1.1
diff -u -r1.1 JmeterKeyStore.java
--- src/org/apache/jmeter/util/keystore/JmeterKeyStore.java  2001/10/29 22:03:13 1.1
+++ src/org/apache/jmeter/util/keystore/JmeterKeyStore.java  2001/10/30 12:48:58
@@ -55,6 +55,7 @@
 package org.apache.jmeter.util.keystore;

 import java.io.InputStream;
+import java.lang.reflect.Constructor;
 import java.security.PrivateKey;
 import java.security.cert.X509Certificate;
 import org.apache.jmeter.util.JMeterUtils;
@@ -89,10 +90,14 @@
     throws Exception {
         if ("PKCS12".equalsIgnoreCase(type)) {
             try {
-                return new PKCS12KeyStore(type);
+                Class PKCS12 = Class.forName
+                    ("org.apache.jmeter.util.keystore.PKCS12KeyStore");
+                Constructor con = PKCS12.getConstructor(
+                    new Class[] {String.class});
+                return (JmeterKeyStore) con.newInstance(new Object[] {type});
             } catch (Exception e) {}
         }

         return new DefaultKeyStore(type);
     }
-}
\ No newline at end of file
+}

- Sam Ruby


--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>