svn commit: r907847 - in /jakarta/jmeter/trunk: src/protocol/http/org/apache/jmeter/protocol/http/proxy/Proxy.java xdocs/usermanual/component_reference.xml

[se...@apache.org]

Author: sebb
Date: Mon Feb  8 23:50:02 2010
New Revision: 907847

URL: http://svn.apache.org/viewvc?rev=907847&view=rev
Log:
Bug 47622 - dummy JMeter certificate resides in the bin directory
Document the properties

Modified:
    jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/Proxy.java
    jakarta/jmeter/trunk/xdocs/usermanual/component_reference.xml

Modified: jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/Proxy.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/Proxy.java?rev=907847&r1=907846&r2=907847&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/Proxy.java (original)
+++ jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/Proxy.java Mon Feb  8 23:50:02 2010
@@ -97,10 +97,12 @@
     
     // Proxy configuration SSL
     private static final String CERT_DIRECTORY =
-        JMeterUtils.getPropDefault("proxy.cert.directory", "."); // $NON-NLS-1$ $NON-NLS-2$
+        JMeterUtils.getPropDefault("proxy.cert.directory", JMeterUtils.getJMeterBinDir()); // $NON-NLS-1$
     
+    private static final String CERT_FILE_DEFAULT = "proxyserver.jks";// $NON-NLS-1$
+
     private static final String CERT_FILE =
-        JMeterUtils.getPropDefault("proxy.cert.file", "proxyserver.jks"); // $NON-NLS-1$ $NON-NLS-2$
+        JMeterUtils.getPropDefault("proxy.cert.file", CERT_FILE_DEFAULT); // $NON-NLS-1$
     
     private static final char[] KEYSTORE_PASSWORD =
         JMeterUtils.getPropDefault("proxy.cert.keystorepass", "password").toCharArray(); // $NON-NLS-1$ $NON-NLS-2$

Modified: jakarta/jmeter/trunk/xdocs/usermanual/component_reference.xml
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/xdocs/usermanual/component_reference.xml?rev=907847&r1=907846&r2=907847&view=diff
==============================================================================
--- jakarta/jmeter/trunk/xdocs/usermanual/component_reference.xml (original)
+++ jakarta/jmeter/trunk/xdocs/usermanual/component_reference.xml Mon Feb  8 23:50:02 2010
@@ -4504,6 +4504,18 @@
 You will need to accept the certificate in order to allow the JMeter Proxy to intercept the SSL traffic in order to
 record it. You should only accept the certificate temporarily.
 </p>
+<p>
+The following properties can be used to change the certificate that is used:
+<ul>
+<li>proxy.cert.directory - the directory in which to find the certificate (default = JMeter bin/)</li>
+<li>proxy.cert.file - name of the keystore file (default "proxyserver.jks")</li>
+<li>proxy.cert.keystorepass - keystore password (default "password")</li>
+<li>proxy.cert.keypassword - certificate key password (default "password")</li>
+<li>proxy.cert.type - the certificate type (default "JKS")</li>
+<li>proxy.cert.factory - the factory (default "SunX509")</li>
+<li>proxy.ssl.protocol - the protocol to be used (default "SSLv3")</li>
+</ul>
+</p>
 <note>
 If your browser currently uses a proxy (e.g. a company intranet may route all external requests via a proxy),
 then you need to <a href="get-started.html#proxy_server">tell JMeter to use that proxy</a> before starting JMeter, 



---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org