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/02 20:09:00 UTC
svn commit: r502692 - in /jakarta/jmeter/branches/rel-2-2:
bin/jmeter.properties
src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampler.java
Author: sebb
Date: Fri Feb 2 11:09:00 2007
New Revision: 502692
URL: http://svn.apache.org/viewvc?view=rev&rev=502692
Log:
Java1.4+ no longer requires java.protocol.handler.pkgs to be set
Modified:
jakarta/jmeter/branches/rel-2-2/bin/jmeter.properties
jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampler.java
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=502692&r1=502691&r2=502692
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/bin/jmeter.properties (original)
+++ jakarta/jmeter/branches/rel-2-2/bin/jmeter.properties Fri Feb 2 11:09:00 2007
@@ -2,12 +2,12 @@
# Apache JMeter Property file
################################################################################
-## $Id$
-## Copyright 2001-2006 The Apache Software Foundation
-##
-## Licensed under the Apache License, Version 2.0 (the "License");
-## you may not use this file except in compliance with the License.
-## You may obtain a copy of the License at
+## Licensed to the Apache Software Foundation (ASF) under one or more
+## contributor license agreements. See the NOTICE file distributed with
+## this work for additional information regarding copyright ownership.
+## The ASF licenses this file to You under the Apache License, Version 2.0
+## (the "License"); you may not use this file except in compliance with
+## the License. You may obtain a copy of the License at
##
## http://www.apache.org/licenses/LICENSE-2.0
##
@@ -49,15 +49,7 @@
# SSL configuration
#---------------------------------------------------------------------------
-#Classname of the ssl provider to be used (to enable testing of https urls)
-#And the package name where Stream Handlers can be found
-#These provided defaults can be uncommented, and they will work if you are using
-#Sun's JSSE implementation.
-
-#ssl.provider=com.sun.net.ssl.internal.ssl.Provider
-#ssl.pkgs=com.sun.net.ssl.internal.www.protocol
-
-#The location of the truststore (trusted certificates) and keystore ( if other than the default.
+#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
@@ -65,10 +57,7 @@
#The password to your keystore
#javax.net.ssl.keyStorePassword=changeit
-#Flag for whether to output debug messages to System.err
-#To enable it, set the value to "all" Note, for it to work with
-#JSSE, it needs to be done from the Java command (i.e. -Djavax.net.debug=all)
-#javax.net.debug=all
+# See system.properties for debugging properties that can be set
#---------------------------------------------------------------------------
# Look and Feel configuration
Modified: jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampler.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampler.java?view=diff&rev=502692&r1=502691&r2=502692
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampler.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampler.java Fri Feb 2 11:09:00 2007
@@ -58,12 +58,6 @@
private static final int MAX_CONN_RETRIES = 10; // Maximum connection retries
- static {// TODO - document what this is doing and why
- System.setProperty("java.protocol.handler.pkgs", // $NON-NLS-1$
- JMeterUtils.getPropDefault("ssl.pkgs", // $NON-NLS-1$
- "com.sun.net.ssl.internal.www.protocol")); // $NON-NLS-1$
- }
-
/**
* Constructor for the HTTPSampler object.
*
---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org