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/05/19 01:35:10 UTC
svn commit: r407663 - in /jakarta/jmeter/branches/rel-2-1/src:
core/org/apache/jmeter/JMeter.java
protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampler2.java
Author: sebb
Date: Thu May 18 16:35:09 2006
New Revision: 407663
URL: http://svn.apache.org/viewvc?rev=407663&view=rev
Log:
Move commons logging setup earlier so works in GUI mode
Modified:
jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/JMeter.java
jakarta/jmeter/branches/rel-2-1/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampler2.java
Modified: jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/JMeter.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/JMeter.java?rev=407663&r1=407662&r2=407663&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/JMeter.java (original)
+++ jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/JMeter.java Thu May 18 16:35:09 2006
@@ -238,7 +238,19 @@
return;
}
try {
- initializeProperties(parser); // Also initialises logging
+ initializeProperties(parser); // Also initialises JMeter logging
+
+ /*
+ * The following is needed for HTTPClient.
+ * (originally tried doing this in HTTPSampler2,
+ * but it appears that it was done too late when running in GUI mode)
+ * Set the commons logging default to Avalon Logkit, if not already defined
+ */
+ if (System.getProperty("org.apache.commons.logging.Log") == null) { // $NON-NLS-1$
+ System.setProperty("org.apache.commons.logging.Log" // $NON-NLS-1$
+ , "org.apache.commons.logging.impl.LogKitLogger"); // $NON-NLS-1$
+ }
+
log.info(JMeterUtils.getJMeterCopyright());
log.info("Version " + JMeterUtils.getJMeterVersion());
log.info("java.version=" + System.getProperty("java.version"));// $NON-NLS-1$ $NON-NLS-2$
Modified: jakarta/jmeter/branches/rel-2-1/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampler2.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-1/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampler2.java?rev=407663&r1=407662&r2=407663&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampler2.java (original)
+++ jakarta/jmeter/branches/rel-2-1/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampler2.java Thu May 18 16:35:09 2006
@@ -133,11 +133,6 @@
}
}
nonProxyHostSuffixSize=nonProxyHostSuffix.size();
- // Set the default to Avalon Logkit, if not already defined:
- if (System.getProperty("org.apache.commons.logging.Log") == null) { // $NON-NLS-1$
- System.setProperty("org.apache.commons.logging.Log" // $NON-NLS-1$
- , "org.apache.commons.logging.impl.LogKitLogger"); // $NON-NLS-1$
- }
int cps =
JMeterUtils.getPropDefault("httpclient.socket.http.cps", 0); // $NON-NLS-1$
---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org