Author: kwall
Date: Sun Jul 12 22:26:30 2015
New Revision: 1690540
URL: http://svn.apache.org/r1690540
Log:
QPID-6533: [Tools/Systests] Remove redundant log4j references
Modified:
qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/logging/AbstractTestLogging.java
qpid/java/trunk/systests/src/test/java/org/apache/qpid/util/LogMonitor.java
qpid/java/trunk/tools/bin/Profile-run-from-source
qpid/java/trunk/tools/bin/check-qpid-java-env
qpid/java/trunk/tools/pom.xml
qpid/java/trunk/tools/src/main/java/org/apache/qpid/testkit/TestLauncher.java
Modified:
qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/logging/AbstractTestLogging.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/logging/AbstractTestLogging.java?rev=1690540&r1=1690539&r2=1690540&view=diff
==============================================================================
---
qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/logging/AbstractTestLogging.java
(original)
+++
qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/logging/AbstractTestLogging.java
Sun Jul 12 22:26:30 2015
@@ -235,8 +235,7 @@ public class AbstractTestLogging extends
}
/**
- * Extract the log entry from the raw log line which will contain other
- * log4j formatting.
+ * Extract the log entry from the raw log.
*
* This formatting may impead our testing process so extract the log
message
* as we know it to be formatted.
@@ -245,7 +244,7 @@ public class AbstractTestLogging extends
*
* @param rawLog the raw log
*
- * @return the log we are expecting to be printed without the log4j
prefixes
+ * @return the log we are expecting to be printed without the log
formating prefixes
*/
protected String getLog(String rawLog)
{
Modified:
qpid/java/trunk/systests/src/test/java/org/apache/qpid/util/LogMonitor.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/util/LogMonitor.java?rev=1690540&r1=1690539&r2=1690540&view=diff
==============================================================================
--- qpid/java/trunk/systests/src/test/java/org/apache/qpid/util/LogMonitor.java
(original)
+++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/util/LogMonitor.java
Sun Jul 12 22:26:30 2015
@@ -35,11 +35,7 @@ import java.util.List;
import java.util.Map;
/**
- * Utility to simplify the monitoring of Log4j file output
- *
- * Monitoring of a given log file can be done alternatively the Monitor will
- * add a new log4j FileAppender to the root Logger to gather all the available
- * logging for monitoring
+ * Utility to simplify the monitoring of the output of a log file
*/
public class LogMonitor
{
Modified: qpid/java/trunk/tools/bin/Profile-run-from-source
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/tools/bin/Profile-run-from-source?rev=1690540&r1=1690539&r2=1690540&view=diff
==============================================================================
--- qpid/java/trunk/tools/bin/Profile-run-from-source (original)
+++ qpid/java/trunk/tools/bin/Profile-run-from-source Sun Jul 12 22:26:30 2015
@@ -44,7 +44,6 @@ fi
export VENDOR_LIB=$QPID_CHECKOUT/java/build/lib
export CLASSPATH=`find $VENDOR_LIB -name '*.jar' | tr '\n' ':'`
-export
LOG_CONFIG="-Dlog4j.configuration=file:///$QPID_CHECKOUT/java/tools/etc/test.log4j"
#------------- Required for qpid-python-testkit
-----------------------------------------
Modified: qpid/java/trunk/tools/bin/check-qpid-java-env
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/tools/bin/check-qpid-java-env?rev=1690540&r1=1690539&r2=1690540&view=diff
==============================================================================
--- qpid/java/trunk/tools/bin/check-qpid-java-env (original)
+++ qpid/java/trunk/tools/bin/check-qpid-java-env Sun Jul 12 22:26:30 2015
@@ -19,7 +19,7 @@
#
if [ -z "$LOG_CONFIG" ]; then
- echo "Please set the appropriate parameters for logging as it may affect
performance. Ex log4j defaults to DEBUG if not configured properly"
+ echo "Please set the appropriate parameters for logging as it may affect
performance. Ex logback defaults to DEBUG if not configured"
exit -1
fi
Modified: qpid/java/trunk/tools/pom.xml
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/tools/pom.xml?rev=1690540&r1=1690539&r2=1690540&view=diff
==============================================================================
--- qpid/java/trunk/tools/pom.xml (original)
+++ qpid/java/trunk/tools/pom.xml Sun Jul 12 22:26:30 2015
@@ -36,15 +36,9 @@
</dependency>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>${log4j-version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>${slf4j-version}</version>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ <version>${logback-version}</version>
</dependency>
<dependency>
Modified:
qpid/java/trunk/tools/src/main/java/org/apache/qpid/testkit/TestLauncher.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/tools/src/main/java/org/apache/qpid/testkit/TestLauncher.java?rev=1690540&r1=1690539&r2=1690540&view=diff
==============================================================================
---
qpid/java/trunk/tools/src/main/java/org/apache/qpid/testkit/TestLauncher.java
(original)
+++
qpid/java/trunk/tools/src/main/java/org/apache/qpid/testkit/TestLauncher.java
Sun Jul 12 22:26:30 2015
@@ -37,11 +37,6 @@ import javax.jms.MessageProducer;
import javax.jms.Session;
import javax.jms.TextMessage;
-import org.apache.log4j.BasicConfigurator;
-import org.apache.log4j.ConsoleAppender;
-import org.apache.log4j.Level;
-import org.apache.log4j.Logger;
-import org.apache.log4j.PatternLayout;
import org.apache.qpid.client.AMQAnyDestination;
import org.apache.qpid.client.AMQConnection;
import org.apache.qpid.thread.Threading;
@@ -112,26 +107,8 @@ public class TestLauncher implements Err
System.out.println("Failover exchange " + url );
}
-
- configureLogging();
}
- protected void configureLogging()
- {
- PatternLayout layout = new PatternLayout();
- layout.setConversionPattern("%t %d %p [%c{4}] %m%n");
- BasicConfigurator.configure(new ConsoleAppender(layout));
-
- String logLevel = System.getProperty("log.level","warn");
- String logComponent = System.getProperty("log.comp","org.apache.qpid");
-
- Logger logger = Logger.getLogger(logComponent);
- logger.setLevel(Level.toLevel(logLevel, Level.WARN));
-
- System.out.println("Level " + logger.getLevel());
-
- }
-
public void setUpControlChannel()
{
try
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
