Author: sebb
Date: Fri Feb 2 14:12:46 2007
New Revision: 502772
URL: http://svn.apache.org/viewvc?view=rev&rev=502772
Log:
Move SSL properties to system.properties
Modified:
jakarta/jmeter/branches/rel-2-2/bin/jmeter.properties
jakarta/jmeter/branches/rel-2-2/bin/system.properties
Modified: jakarta/jmeter/branches/rel-2-2/bin/jmeter.properties
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/bin/jmeter.properties?view=diff&rev=502772&r1=502771&r2=502772
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/bin/jmeter.properties (original)
+++ jakarta/jmeter/branches/rel-2-2/bin/jmeter.properties Fri Feb 2 14:12:46
2007
@@ -49,15 +49,7 @@
# SSL configuration
#---------------------------------------------------------------------------
-#The location of the truststore (trusted certificates) and keystore (if other
than the default)
-#you can uncomment this and change the path to the correct location.
-#javax.net.ssl.trustStore=/path/to/cacerts
-#javax.net.ssl.keyStore=/usr/java/jdk1.5.0_02/jre/lib/security/cacerts
-
-#The password to your keystore
-#javax.net.ssl.keyStorePassword=changeit
-
-# See system.properties for debugging properties that can be set
+## Moved to system.properties
#---------------------------------------------------------------------------
# Look and Feel configuration
Modified: jakarta/jmeter/branches/rel-2-2/bin/system.properties
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/bin/system.properties?view=diff&rev=502772&r1=502771&r2=502772
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/bin/system.properties (original)
+++ jakarta/jmeter/branches/rel-2-2/bin/system.properties Fri Feb 2 14:12:46
2007
@@ -20,6 +20,17 @@
#networkaddress.cache.ttl=-1
#networkaddress.cache.negative.ttl=10
#
+#
+# SSL properties (moved from jmeter.properties)
+
+#The location of the truststore (trusted certificates) and keystore (if other
than the default)
+#you can uncomment this and change the path to the correct location.
+#javax.net.ssl.trustStore=/path/to/cacerts
+#javax.net.ssl.keyStore=/usr/java/jdk1.5.0_02/jre/lib/security/cacerts
+
+#The password to your keystore
+javax.net.ssl.keyStorePassword=changeit
+
# SSL debugging:
# See docs/guide/security/jsse/JSSERefGuide.html#Debug in the appropiate JDK
docs
#
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
