You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jmeter-dev@jakarta.apache.org by se...@apache.org on 2006/04/24 01:28:09 UTC
svn commit: r396337 -
/jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/util/keystore/JmeterKeyStore.java
Author: sebb
Date: Sun Apr 23 16:28:08 2006
New Revision: 396337
URL: http://svn.apache.org/viewcvs?rev=396337&view=rev
Log:
Simplify, now that PKCS12KeyStore class is no longer used
Modified:
jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/util/keystore/JmeterKeyStore.java
Modified: jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/util/keystore/JmeterKeyStore.java
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/util/keystore/JmeterKeyStore.java?rev=396337&r1=396336&r2=396337&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/util/keystore/JmeterKeyStore.java (original)
+++ jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/util/keystore/JmeterKeyStore.java Sun Apr 23 16:28:08 2006
@@ -1,4 +1,3 @@
-// $Header$
/*
* Copyright 2001-2004 The Apache Software Foundation.
*
@@ -49,17 +48,18 @@
public abstract PrivateKey getPrivateKey();
public static final JmeterKeyStore getInstance(String type) throws Exception {
- if ("PKCS12".equalsIgnoreCase(type)) {
- try {
- 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) {
- }
- }
-
- Class keyStore = Class.forName("org.apache.jmeter.util.keystore.DefaultKeyStore");
- Constructor con = keyStore.getConstructor(new Class[] { String.class });
- return (JmeterKeyStore) con.newInstance(new Object[] { type });
+
+ // PKCS12 is now handled by JSSE (Java 1.4+)
+ // The PKCS12KeyStore JMeter class depended on IsAsIlK, and has been removed
+// if ("PKCS12".equalsIgnoreCase(type)) {
+// try {
+// 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);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org