sebb 2004/10/12 17:30:31
Modified: src/protocol/http/org/apache/jmeter/protocol/http/control
Tag: rel-2_0 AuthManager.java
src/protocol/http/org/apache/jmeter/protocol/http/sampler
Tag: rel-2_0 HTTPSamplerBase.java
src/components/org/apache/jmeter/assertions Tag: rel-2_0
MD5HexAssertion.java XMLAssertion.java
src/core/org/apache/jmeter/testelement Tag: rel-2_0
AbstractTestElement.java
src/protocol/http/org/apache/jmeter/protocol/http/util Tag:
rel-2_0 HTTPArgument.java
Log:
Don't share logs between classes
Revision Changes Path
No revision
No revision
1.11.2.1 +6 -2
jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/control/AuthManager.java
Index: AuthManager.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/control/AuthManager.java,v
retrieving revision 1.11
retrieving revision 1.11.2.1
diff -u -r1.11 -r1.11.2.1
--- AuthManager.java 20 Mar 2004 00:35:27 -0000 1.11
+++ AuthManager.java 13 Oct 2004 00:30:31 -0000 1.11.2.1
@@ -39,6 +39,8 @@
import org.apache.jmeter.testelement.property.PropertyIterator;
import org.apache.jmeter.testelement.property.TestElementProperty;
import org.apache.jmeter.util.JMeterUtils;
+import org.apache.jorphan.logging.LoggingManager;
+import org.apache.log.Logger;
/**
* This class provides a way to provide Authorization in jmeter requests. The
@@ -52,6 +54,8 @@
extends ConfigTestElement
implements ConfigElement, Serializable
{
+ private static final Logger log = LoggingManager.getLoggerForClass();
+
private final static String AUTH_LIST = "AuthManager.auth_list";
private final static int columnCount = 3;
No revision
No revision
1.1.2.5 +6 -3
jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java
Index: HTTPSamplerBase.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- HTTPSamplerBase.java 17 Jun 2004 15:18:00 -0000 1.1.2.4
+++ HTTPSamplerBase.java 13 Oct 2004 00:30:31 -0000 1.1.2.5
@@ -42,7 +42,9 @@
import org.apache.jmeter.testelement.property.PropertyIterator;
import org.apache.jmeter.testelement.property.StringProperty;
import org.apache.jmeter.testelement.property.TestElementProperty;
+import org.apache.jorphan.logging.LoggingManager;
import org.apache.jorphan.util.JOrphanUtils;
+import org.apache.log.Logger;
import org.apache.oro.text.regex.MalformedPatternException;
import org.apache.oro.text.regex.Pattern;
import org.apache.oro.text.regex.Perl5Compiler;
@@ -58,7 +60,8 @@
*/
public abstract class HTTPSamplerBase extends AbstractSampler implements
TestListener
{
-
+ private static final Logger log = LoggingManager.getLoggerForClass();
+
public static final int DEFAULT_HTTPS_PORT = 443;
public static final int DEFAULT_HTTP_PORT = 80;
No revision
No revision
1.2.2.1 +6 -2
jakarta-jmeter/src/components/org/apache/jmeter/assertions/MD5HexAssertion.java
Index: MD5HexAssertion.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/components/org/apache/jmeter/assertions/MD5HexAssertion.java,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- MD5HexAssertion.java 13 Feb 2004 01:27:26 -0000 1.2
+++ MD5HexAssertion.java 13 Oct 2004 00:30:31 -0000 1.2.2.1
@@ -38,11 +38,15 @@
import org.apache.jmeter.testelement.AbstractTestElement;
import org.apache.jmeter.testelement.property.StringProperty;
import org.apache.jmeter.util.JMeterUtils;
+import org.apache.jorphan.logging.LoggingManager;
+import org.apache.log.Logger;
public class MD5HexAssertion
extends AbstractTestElement
implements Serializable, Assertion {
+ private static final Logger log = LoggingManager.getLoggerForClass();
+
/** Key for storing assertion-informations in the jmx-file. */
private static final String MD5HEX_KEY = "MD5HexAssertion.size";
1.4.2.1 +6 -2
jakarta-jmeter/src/components/org/apache/jmeter/assertions/XMLAssertion.java
Index: XMLAssertion.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/components/org/apache/jmeter/assertions/XMLAssertion.java,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -r1.4 -r1.4.2.1
--- XMLAssertion.java 13 Feb 2004 01:27:26 -0000 1.4
+++ XMLAssertion.java 13 Oct 2004 00:30:31 -0000 1.4.2.1
@@ -23,6 +23,8 @@
import org.apache.jmeter.samplers.SampleResult;
import org.apache.jmeter.testelement.AbstractTestElement;
+import org.apache.jorphan.logging.LoggingManager;
+import org.apache.log.Logger;
import org.jdom.input.SAXBuilder;
/**
@@ -35,6 +37,8 @@
extends AbstractTestElement
implements Serializable, Assertion
{
+ private static final Logger log = LoggingManager.getLoggerForClass();
+
// one builder for all requests
private static SAXBuilder builder = null;
No revision
No revision
1.36.2.3 +3 -3
jakarta-jmeter/src/core/org/apache/jmeter/testelement/AbstractTestElement.java
Index: AbstractTestElement.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/testelement/AbstractTestElement.java,v
retrieving revision 1.36.2.2
retrieving revision 1.36.2.3
diff -u -r1.36.2.2 -r1.36.2.3
--- AbstractTestElement.java 20 Sep 2004 11:57:44 -0000 1.36.2.2
+++ AbstractTestElement.java 13 Oct 2004 00:30:31 -0000 1.36.2.3
@@ -47,7 +47,7 @@
*/
public abstract class AbstractTestElement implements TestElement, Serializable
{
- protected static final Logger log = LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggingManager.getLoggerForClass();
private Map propMap = Collections.synchronizedMap(new HashMap());
private Set temporaryProperties;
No revision
No revision
1.13.2.2 +5 -2
jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/util/HTTPArgument.java
Index: HTTPArgument.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/util/HTTPArgument.java,v
retrieving revision 1.13.2.1
retrieving revision 1.13.2.2
diff -u -r1.13.2.1 -r1.13.2.2
--- HTTPArgument.java 11 Oct 2004 00:51:30 -0000 1.13.2.1
+++ HTTPArgument.java 13 Oct 2004 00:30:31 -0000 1.13.2.2
@@ -30,7 +30,9 @@
import org.apache.jmeter.testelement.property.BooleanProperty;
import org.apache.jmeter.testelement.property.CollectionProperty;
import org.apache.jmeter.testelement.property.PropertyIterator;
+import org.apache.jorphan.logging.LoggingManager;
import org.apache.jorphan.util.JOrphanUtils;
+import org.apache.log.Logger;
/*
*
@@ -39,6 +41,7 @@
*/
public class HTTPArgument extends Argument implements Serializable
{
+ private static final Logger log = LoggingManager.getLoggerForClass();
private static final String ALWAYS_ENCODE = "HTTPArgument.always_encode";
private static final String USE_EQUALS = "HTTPArgument.use_equals";
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
