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 2007/02/03 14:36:17 UTC
svn commit: r503205 -
/jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/util/keystore/JmeterKeyStore.java
Author: sebb
Date: Sat Feb 3 05:36:16 2007
New Revision: 503205
URL: http://svn.apache.org/viewvc?view=rev&rev=503205
Log:
JAVA 1.4 now handles all keystore types, so just use default
Modified:
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/util/keystore/JmeterKeyStore.java
Modified: jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/util/keystore/JmeterKeyStore.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/util/keystore/JmeterKeyStore.java?view=diff&rev=503205&r1=503204&r2=503205
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/util/keystore/JmeterKeyStore.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/util/keystore/JmeterKeyStore.java Sat Feb 3 05:36:16 2007
@@ -48,18 +48,7 @@
public abstract PrivateKey getPrivateKey();
public static final JmeterKeyStore getInstance(String type) throws Exception {
-
- // 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) {
-// }
-// }
-
+ // JAVA 1.4 now handles all keystore types, so just use default
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