flink-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From u..@apache.org
Subject [1/5] [FLINK-1086] Replace JCL with SLF4J and Log4j with LOGBack
Date Fri, 05 Sep 2014 09:57:54 GMT
Repository: incubator-flink
Updated Branches:
  refs/heads/master 3aa5511dd -> 08188508d


http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-runtime/src/test/java/org/apache/flink/runtime/operators/chaining/ChainTaskTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/chaining/ChainTaskTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/chaining/ChainTaskTest.java
index 5609128..070097c 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/chaining/ChainTaskTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/chaining/ChainTaskTest.java
@@ -32,7 +32,6 @@ import org.apache.flink.runtime.operators.DriverStrategy;
 import org.apache.flink.runtime.operators.RegularPactTask;
 import org.apache.flink.runtime.operators.MapTaskTest.MockMapStub;
 import org.apache.flink.runtime.operators.ReduceTaskTest.MockReduceStub;
-import org.apache.flink.runtime.operators.chaining.SynchronousChainedCombineDriver;
 import org.apache.flink.runtime.operators.shipping.ShipStrategyType;
 import org.apache.flink.runtime.operators.testutils.TaskTestBase;
 import org.apache.flink.runtime.operators.testutils.UniformRecordGenerator;
@@ -40,8 +39,6 @@ import org.apache.flink.runtime.operators.util.TaskConfig;
 import org.apache.flink.types.IntValue;
 import org.apache.flink.types.Record;
 import org.apache.flink.util.Collector;
-import org.apache.flink.util.LogUtils;
-import org.apache.log4j.Level;
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -59,14 +56,6 @@ public class ChainTaskTest extends TaskTestBase {
 	private final RecordComparatorFactory compFact = new RecordComparatorFactory(new int[]{0}, new Class[]{IntValue.class}, new boolean[] {true});
 	private final RecordSerializerFactory serFact = RecordSerializerFactory.get();
 	
-	
-	
-	public ChainTaskTest() {
-		// suppress log output, as this class produces errors on purpose to test exception handling
-		LogUtils.initializeDefaultConsoleLogger(Level.OFF);
-	}
-	
-	
 	@Test
 	public void testMapTask() {
 		final int keyCnt = 100;

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-runtime/src/test/java/org/apache/flink/runtime/operators/hash/HashFunctionCollisionBenchmark.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/hash/HashFunctionCollisionBenchmark.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/hash/HashFunctionCollisionBenchmark.java
index 6c8c8f4..8cff293 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/hash/HashFunctionCollisionBenchmark.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/hash/HashFunctionCollisionBenchmark.java
@@ -26,8 +26,8 @@ import java.util.Iterator;
 import java.util.SortedMap;
 import java.util.TreeMap;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.flink.runtime.operators.hash.MutableHashTable;
 import org.apache.flink.runtime.operators.hash.MultiLevelHashTester.BucketBoundaries;
 import org.apache.flink.runtime.operators.hash.util.LastBitsToRange;
@@ -45,7 +45,7 @@ import org.junit.Test;
  */
 public class HashFunctionCollisionBenchmark {
 
-	private static final Log LOG = LogFactory.getLog(HashFunctionCollisionBenchmark.class);
+	private static final Logger LOG = LoggerFactory.getLogger(HashFunctionCollisionBenchmark.class);
 
 	private static final long SEED = 561349061987311L;
 
@@ -155,7 +155,7 @@ public class HashFunctionCollisionBenchmark {
 
 class MultiLevelHashTester {
 
-	private static final Log LOG = LogFactory.getLog(MultiLevelHashTester.class);
+	private static final Logger LOG = LoggerFactory.getLogger(MultiLevelHashTester.class);
 
 	private final int maxLevel;
 	private final Iterator<Integer> importIterator;
@@ -304,10 +304,10 @@ class MultiLevelHashTester {
 					formatter.format(" %10d | %10d", bucketSize, countForBucketSize);
 
 					if (levelMap.size() < 20 || i < 3 || i >= (levelMap.size() - 3)) {
-						LOG.debug(formatter.out());
+						LOG.debug(formatter.out().toString());
 					} else if (levelMap.size() / 2 == i) {
 						LOG.debug("         .. |         ..");
-						LOG.debug(formatter.out());
+						LOG.debug(formatter.out().toString());
 						LOG.debug("         .. |         ..");
 					}
 					i++;

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-runtime/src/test/java/org/apache/flink/runtime/operators/hash/HashTableITCase.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/hash/HashTableITCase.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/hash/HashTableITCase.java
index 6df8d2c..7ae3d40 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/hash/HashTableITCase.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/hash/HashTableITCase.java
@@ -39,7 +39,6 @@ import org.apache.flink.runtime.jobgraph.tasks.AbstractInvokable;
 import org.apache.flink.runtime.memorymanager.DefaultMemoryManager;
 import org.apache.flink.runtime.memorymanager.MemoryAllocationException;
 import org.apache.flink.runtime.memorymanager.MemoryManager;
-import org.apache.flink.runtime.operators.hash.MutableHashTable;
 import org.apache.flink.runtime.operators.hash.MutableHashTable.HashBucketIterator;
 import org.apache.flink.runtime.operators.testutils.DummyInvokable;
 import org.apache.flink.runtime.operators.testutils.UniformIntPairGenerator;
@@ -57,6 +56,7 @@ import org.apache.flink.util.MutableObjectIterator;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
+import org.junit.BeforeClass;
 import org.junit.Test;
 
 public class HashTableITCase {
@@ -77,7 +77,7 @@ public class HashTableITCase {
 	private TypeComparator<IntPair> pairBuildSideComparator;
 	private TypeComparator<IntPair> pairProbeSideComparator;
 	private TypePairComparator<IntPair, IntPair> pairComparator;
-	
+
 	@Before
 	public void setup()
 	{

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-runtime/src/test/java/org/apache/flink/runtime/operators/hash/ReOpenableHashTableITCase.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/hash/ReOpenableHashTableITCase.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/hash/ReOpenableHashTableITCase.java
index e0c3a83..84225fb 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/hash/ReOpenableHashTableITCase.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/hash/ReOpenableHashTableITCase.java
@@ -42,8 +42,6 @@ import org.apache.flink.runtime.jobgraph.tasks.AbstractInvokable;
 import org.apache.flink.runtime.memorymanager.DefaultMemoryManager;
 import org.apache.flink.runtime.memorymanager.MemoryAllocationException;
 import org.apache.flink.runtime.memorymanager.MemoryManager;
-import org.apache.flink.runtime.operators.hash.BuildFirstReOpenableHashMatchIterator;
-import org.apache.flink.runtime.operators.hash.ReOpenableMutableHashTable;
 import org.apache.flink.runtime.operators.hash.HashMatchIteratorITCase.RecordMatch;
 import org.apache.flink.runtime.operators.hash.HashMatchIteratorITCase.RecordMatchRemovingJoin;
 import org.apache.flink.runtime.operators.hash.HashTableITCase.ConstantsKeyValuePairsIterator;
@@ -100,7 +98,6 @@ public class ReOpenableHashTableITCase {
 	private TypeComparator<Record> recordBuildSideComparator;
 	private TypeComparator<Record> recordProbeSideComparator;
 	private TypePairComparator<Record, Record> pactRecordComparator;
-	
 
 	@SuppressWarnings("unchecked")
 	@Before

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-runtime/src/test/java/org/apache/flink/runtime/operators/sort/CombiningUnilateralSortMergerITCase.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/sort/CombiningUnilateralSortMergerITCase.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/sort/CombiningUnilateralSortMergerITCase.java
index 4b3c197..9a18742 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/sort/CombiningUnilateralSortMergerITCase.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/sort/CombiningUnilateralSortMergerITCase.java
@@ -25,8 +25,8 @@ import java.util.Iterator;
 import java.util.NoSuchElementException;
 
 import org.junit.Assert;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.flink.api.common.typeutils.TypeComparator;
 import org.apache.flink.api.common.typeutils.TypeSerializer;
 import org.apache.flink.api.common.typeutils.TypeSerializerFactory;
@@ -38,8 +38,6 @@ import org.apache.flink.runtime.io.disk.iomanager.IOManager;
 import org.apache.flink.runtime.jobgraph.tasks.AbstractInvokable;
 import org.apache.flink.runtime.memorymanager.DefaultMemoryManager;
 import org.apache.flink.runtime.memorymanager.MemoryManager;
-import org.apache.flink.runtime.operators.sort.CombiningUnilateralSortMerger;
-import org.apache.flink.runtime.operators.sort.Sorter;
 import org.apache.flink.runtime.operators.testutils.DummyInvokable;
 import org.apache.flink.runtime.operators.testutils.TestData;
 import org.apache.flink.runtime.operators.testutils.TestData.Key;
@@ -49,7 +47,6 @@ import org.apache.flink.runtime.util.KeyGroupedIterator;
 import org.apache.flink.types.IntValue;
 import org.apache.flink.types.Record;
 import org.apache.flink.util.Collector;
-import org.apache.flink.util.LogUtils;
 import org.apache.flink.util.MutableObjectIterator;
 import org.junit.After;
 import org.junit.Before;
@@ -59,7 +56,7 @@ import org.junit.Test;
 
 public class CombiningUnilateralSortMergerITCase {
 	
-	private static final Log LOG = LogFactory.getLog(CombiningUnilateralSortMergerITCase.class);
+	private static final Logger LOG = LoggerFactory.getLogger(CombiningUnilateralSortMergerITCase.class);
 
 	private static final long SEED = 649180756312423613L;
 
@@ -81,12 +78,6 @@ public class CombiningUnilateralSortMergerITCase {
 	
 	private TypeComparator<Record> comparator;
 
-	
-	@BeforeClass
-	public static void setup() {
-		LogUtils.initializeDefaultTestConsoleLogger();
-	}
-	
 	@SuppressWarnings("unchecked")
 	@Before
 	public void beforeTest() {

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-runtime/src/test/java/org/apache/flink/runtime/operators/sort/ExternalSortITCase.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/sort/ExternalSortITCase.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/sort/ExternalSortITCase.java
index 1ac2c04..5c6bb5a 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/sort/ExternalSortITCase.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/sort/ExternalSortITCase.java
@@ -23,8 +23,8 @@ import java.util.Comparator;
 
 import org.junit.Assert;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.flink.api.common.typeutils.TypeComparator;
 import org.apache.flink.api.common.typeutils.TypeSerializerFactory;
 import org.apache.flink.api.java.typeutils.runtime.record.RecordComparator;
@@ -33,8 +33,6 @@ import org.apache.flink.runtime.io.disk.iomanager.IOManager;
 import org.apache.flink.runtime.jobgraph.tasks.AbstractInvokable;
 import org.apache.flink.runtime.memorymanager.DefaultMemoryManager;
 import org.apache.flink.runtime.memorymanager.MemoryManager;
-import org.apache.flink.runtime.operators.sort.Sorter;
-import org.apache.flink.runtime.operators.sort.UnilateralSortMerger;
 import org.apache.flink.runtime.operators.testutils.DummyInvokable;
 import org.apache.flink.runtime.operators.testutils.RandomIntPairGenerator;
 import org.apache.flink.runtime.operators.testutils.TestData;
@@ -54,7 +52,7 @@ import org.junit.Test;
 
 public class ExternalSortITCase {
 	
-	private static final Log LOG = LogFactory.getLog(ExternalSortITCase.class);
+	private static final Logger LOG = LoggerFactory.getLogger(ExternalSortITCase.class);
 
 	private static final long SEED = 649180756312423613L;
 

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-runtime/src/test/java/org/apache/flink/runtime/operators/sort/SortMergeCoGroupIteratorITCase.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/sort/SortMergeCoGroupIteratorITCase.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/sort/SortMergeCoGroupIteratorITCase.java
index 48a4b91..4b3f638 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/sort/SortMergeCoGroupIteratorITCase.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/sort/SortMergeCoGroupIteratorITCase.java
@@ -34,7 +34,6 @@ import org.apache.flink.api.common.typeutils.TypeSerializer;
 import org.apache.flink.api.java.typeutils.runtime.record.RecordComparator;
 import org.apache.flink.api.java.typeutils.runtime.record.RecordPairComparator;
 import org.apache.flink.api.java.typeutils.runtime.record.RecordSerializer;
-import org.apache.flink.runtime.operators.sort.SortMergeCoGroupIterator;
 import org.apache.flink.runtime.operators.testutils.TestData;
 import org.apache.flink.runtime.operators.testutils.TestData.Generator;
 import org.apache.flink.runtime.operators.testutils.TestData.Generator.KeyMode;

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/DriverTestBase.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/DriverTestBase.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/DriverTestBase.java
index e6661ec..ccb5215 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/DriverTestBase.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/DriverTestBase.java
@@ -25,7 +25,6 @@ import java.util.List;
 import org.junit.Assert;
 
 import org.apache.flink.api.common.functions.Function;
-import org.apache.flink.api.common.functions.RichFunction;
 import org.apache.flink.api.common.functions.util.FunctionUtils;
 import org.apache.flink.api.common.typeutils.TypeComparator;
 import org.apache.flink.api.common.typeutils.TypeSerializerFactory;
@@ -43,11 +42,8 @@ import org.apache.flink.runtime.operators.sort.UnilateralSortMerger;
 import org.apache.flink.runtime.operators.util.TaskConfig;
 import org.apache.flink.types.Record;
 import org.apache.flink.util.Collector;
-import org.apache.flink.util.LogUtils;
 import org.apache.flink.util.MutableObjectIterator;
-import org.apache.log4j.Level;
 import org.junit.After;
-import org.junit.BeforeClass;
 
 public class DriverTestBase<S extends Function> implements PactTaskContext<S, Record> {
 	
@@ -85,14 +81,6 @@ public class DriverTestBase<S extends Function> implements PactTaskContext<S, Re
 	
 	private volatile boolean running;
 	
-	
-	@BeforeClass
-	public static void setupLog() {
-		/// suppress log output, as this class produces errors on purpose to test exception handling
-		LogUtils.initializeDefaultConsoleLogger(Level.OFF);
-	}
-	
-	
 	protected DriverTestBase(long memory, int maxNumSorters) {
 		this(memory, maxNumSorters, DEFAULT_PER_SORT_MEM);
 	}

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-runtime/src/test/resources/logback-test.xml
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/resources/logback-test.xml b/flink-runtime/src/test/resources/logback-test.xml
new file mode 100644
index 0000000..cb2f164
--- /dev/null
+++ b/flink-runtime/src/test/resources/logback-test.xml
@@ -0,0 +1,36 @@
+<!--
+  ~ 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
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<configuration>
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{60} %X{sourceThread} - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <root level="WARN">
+        <appender-ref ref="STDOUT"/>
+    </root>
+
+    <logger name="org.apache.flink.runtime.operators.DataSinkTask" level="OFF"/>
+    <logger name="org.apache.flink.runtime.operators.RegularPactTask" level="OFF"/>
+    <logger name="org.apache.flink.runtime.client.JobClient" level="OFF"/>
+    <logger name="org.apache.flink.runtime.taskmanager.Task" level="OFF"/>
+    <logger name="org.apache.flink.runtime.jobmanager.JobManager" level="OFF"/>
+    <logger name="org.apache.flink.runtime.taskmanager.TaskManager" level="OFF"/>
+</configuration>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-test-utils/src/main/java/org/apache/flink/test/compiler/util/CompilerTestBase.java
----------------------------------------------------------------------
diff --git a/flink-test-utils/src/main/java/org/apache/flink/test/compiler/util/CompilerTestBase.java b/flink-test-utils/src/main/java/org/apache/flink/test/compiler/util/CompilerTestBase.java
index ccdd52e..e71f982 100644
--- a/flink-test-utils/src/main/java/org/apache/flink/test/compiler/util/CompilerTestBase.java
+++ b/flink-test-utils/src/main/java/org/apache/flink/test/compiler/util/CompilerTestBase.java
@@ -66,7 +66,7 @@ public abstract class CompilerTestBase {
 	// ------------------------------------------------------------------------	
 	
 	@Before
-	public void setup() {		
+	public void setup() {
 		this.dataStats = new DataStatistics();
 		this.withStatsCompiler = new PactCompiler(this.dataStats, new DefaultCostEstimator());
 		this.withStatsCompiler.setDefaultDegreeOfParallelism(DEFAULT_PARALLELISM);

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-test-utils/src/main/java/org/apache/flink/test/util/AbstractTestBase.java
----------------------------------------------------------------------
diff --git a/flink-test-utils/src/main/java/org/apache/flink/test/util/AbstractTestBase.java b/flink-test-utils/src/main/java/org/apache/flink/test/util/AbstractTestBase.java
index 22138c2..3ef137e 100644
--- a/flink-test-utils/src/main/java/org/apache/flink/test/util/AbstractTestBase.java
+++ b/flink-test-utils/src/main/java/org/apache/flink/test/util/AbstractTestBase.java
@@ -40,9 +40,7 @@ import java.util.List;
 import org.apache.commons.io.FileUtils;
 import org.apache.flink.client.minicluster.NepheleMiniCluster;
 import org.apache.flink.configuration.Configuration;
-import org.apache.flink.util.LogUtils;
 import org.apache.hadoop.fs.FileSystem;
-import org.apache.log4j.Level;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
@@ -73,8 +71,6 @@ public abstract class AbstractTestBase {
 		verifyJvmOptions();
 		this.config = config;
 		this.tempFiles = new ArrayList<File>();
-
-		LogUtils.initializeDefaultConsoleLogger(Level.WARN);
 	}
 
 	private void verifyJvmOptions() {

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-tests/src/test/java/org/apache/flink/test/broadcastvars/KMeansIterativeNepheleITCase.java
----------------------------------------------------------------------
diff --git a/flink-tests/src/test/java/org/apache/flink/test/broadcastvars/KMeansIterativeNepheleITCase.java b/flink-tests/src/test/java/org/apache/flink/test/broadcastvars/KMeansIterativeNepheleITCase.java
index 2217679..77d68f8 100644
--- a/flink-tests/src/test/java/org/apache/flink/test/broadcastvars/KMeansIterativeNepheleITCase.java
+++ b/flink-tests/src/test/java/org/apache/flink/test/broadcastvars/KMeansIterativeNepheleITCase.java
@@ -54,9 +54,6 @@ import org.apache.flink.test.testdata.KMeansData;
 import org.apache.flink.test.util.RecordAPITestBase;
 import org.apache.flink.types.DoubleValue;
 import org.apache.flink.types.IntValue;
-import org.apache.flink.util.LogUtils;
-import org.apache.log4j.Level;
-
 
 public class KMeansIterativeNepheleITCase extends RecordAPITestBase {
 
@@ -74,7 +71,6 @@ public class KMeansIterativeNepheleITCase extends RecordAPITestBase {
 
 	
 	public KMeansIterativeNepheleITCase() {
-		LogUtils.initializeDefaultConsoleLogger(Level.ERROR);
 		setTaskManagerNumSlots(DOP);
 	}
 	

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-tests/src/test/java/org/apache/flink/test/cancelling/CancellingTestBase.java
----------------------------------------------------------------------
diff --git a/flink-tests/src/test/java/org/apache/flink/test/cancelling/CancellingTestBase.java b/flink-tests/src/test/java/org/apache/flink/test/cancelling/CancellingTestBase.java
index ccd5804..c512525 100644
--- a/flink-tests/src/test/java/org/apache/flink/test/cancelling/CancellingTestBase.java
+++ b/flink-tests/src/test/java/org/apache/flink/test/cancelling/CancellingTestBase.java
@@ -23,8 +23,8 @@ import java.util.Iterator;
 
 import org.junit.Assert;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.flink.api.common.Plan;
 import org.apache.flink.client.minicluster.NepheleMiniCluster;
 import org.apache.flink.compiler.DataStatistics;
@@ -40,20 +40,17 @@ import org.apache.flink.runtime.event.job.AbstractEvent;
 import org.apache.flink.runtime.event.job.JobEvent;
 import org.apache.flink.runtime.jobgraph.JobGraph;
 import org.apache.flink.runtime.jobgraph.JobStatus;
-import org.apache.flink.util.LogUtils;
 import org.apache.flink.util.StringUtils;
 import org.apache.hadoop.fs.FileSystem;
-import org.apache.log4j.Level;
 import org.junit.After;
 import org.junit.Before;
-import org.junit.BeforeClass;
 
 /**
  * 
  */
 public abstract class CancellingTestBase {
 	
-	private static final Log LOG = LogFactory.getLog(CancellingTestBase.class);
+	private static final Logger LOG = LoggerFactory.getLogger(CancellingTestBase.class);
 
 	private static final int MINIMUM_HEAP_SIZE_MB = 192;
 	
@@ -79,12 +76,6 @@ public abstract class CancellingTestBase {
 				+ "m", heap > MINIMUM_HEAP_SIZE_MB - 50);
 	}
 
-	@BeforeClass
-	public static void initLogging() {
-		// suppress warnings because this test prints cancel warnings
-		LogUtils.initializeDefaultConsoleLogger(Level.ERROR);
-	}
-	
 	@Before
 	public void startCluster() throws Exception {
 		verifyJvmOptions();
@@ -226,7 +217,7 @@ public abstract class CancellingTestBase {
 			}
 
 		} catch (Exception e) {
-			LOG.error(e);
+			LOG.error("Exception while running runAndCancelJob.", e);
 			Assert.fail(StringUtils.stringifyException(e));
 			return;
 		}

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-tests/src/test/java/org/apache/flink/test/clients/examples/LocalExecutorITCase.java
----------------------------------------------------------------------
diff --git a/flink-tests/src/test/java/org/apache/flink/test/clients/examples/LocalExecutorITCase.java b/flink-tests/src/test/java/org/apache/flink/test/clients/examples/LocalExecutorITCase.java
index 7fff4d3..44be7d7 100644
--- a/flink-tests/src/test/java/org/apache/flink/test/clients/examples/LocalExecutorITCase.java
+++ b/flink-tests/src/test/java/org/apache/flink/test/clients/examples/LocalExecutorITCase.java
@@ -24,7 +24,6 @@ import java.io.FileWriter;
 import org.apache.flink.client.LocalExecutor;
 import org.apache.flink.test.recordJobs.wordcount.WordCount;
 import org.apache.flink.test.testdata.WordCountData;
-import org.apache.log4j.Level;
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -50,7 +49,6 @@ public class LocalExecutorITCase {
 			WordCount wc = new WordCount();
 
 			LocalExecutor executor = new LocalExecutor();
-			LocalExecutor.setLoggingLevel(Level.WARN);
 			executor.setDefaultOverwriteFiles(true);
 			executor.setTaskManagerNumSlots(DOP);
 			executor.start();

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-tests/src/test/java/org/apache/flink/test/compiler/plandump/PreviewPlanDumpTest.java
----------------------------------------------------------------------
diff --git a/flink-tests/src/test/java/org/apache/flink/test/compiler/plandump/PreviewPlanDumpTest.java b/flink-tests/src/test/java/org/apache/flink/test/compiler/plandump/PreviewPlanDumpTest.java
index e272de9..039ada9 100644
--- a/flink-tests/src/test/java/org/apache/flink/test/compiler/plandump/PreviewPlanDumpTest.java
+++ b/flink-tests/src/test/java/org/apache/flink/test/compiler/plandump/PreviewPlanDumpTest.java
@@ -47,7 +47,7 @@ public class PreviewPlanDumpTest {
 	protected static final String OUT_FILE = OperatingSystem.isWindows() ?  "file:/c:/test/output" : "file:///test/output";
 	
 	protected static final String[] NO_ARGS = new String[0];
-	
+
 	@Test
 	public void dumpWordCount() {
 		dump(new WordCount().getPlan("4", IN_FILE, OUT_FILE));

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-tests/src/test/java/org/apache/flink/test/iterative/nephele/danglingpagerank/DiffL1NormConvergenceCriterion.java
----------------------------------------------------------------------
diff --git a/flink-tests/src/test/java/org/apache/flink/test/iterative/nephele/danglingpagerank/DiffL1NormConvergenceCriterion.java b/flink-tests/src/test/java/org/apache/flink/test/iterative/nephele/danglingpagerank/DiffL1NormConvergenceCriterion.java
index 5371d10..422df7b 100644
--- a/flink-tests/src/test/java/org/apache/flink/test/iterative/nephele/danglingpagerank/DiffL1NormConvergenceCriterion.java
+++ b/flink-tests/src/test/java/org/apache/flink/test/iterative/nephele/danglingpagerank/DiffL1NormConvergenceCriterion.java
@@ -19,8 +19,8 @@
 
 package org.apache.flink.test.iterative.nephele.danglingpagerank;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.flink.api.common.aggregators.ConvergenceCriterion;
 
 @SuppressWarnings("serial")
@@ -28,7 +28,7 @@ public class DiffL1NormConvergenceCriterion implements ConvergenceCriterion<Page
 
 	private static final double EPSILON = 0.00005;
 
-	private static final Log log = LogFactory.getLog(DiffL1NormConvergenceCriterion.class);
+	private static final Logger log = LoggerFactory.getLogger(DiffL1NormConvergenceCriterion.class);
 
 	@Override
 	public boolean isConverged(int iteration, PageRankStats pageRankStats) {

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-tests/src/test/java/org/apache/flink/test/localDistributed/PackagedProgramEndToEndITCase.java
----------------------------------------------------------------------
diff --git a/flink-tests/src/test/java/org/apache/flink/test/localDistributed/PackagedProgramEndToEndITCase.java b/flink-tests/src/test/java/org/apache/flink/test/localDistributed/PackagedProgramEndToEndITCase.java
index 353f474..d77c653 100644
--- a/flink-tests/src/test/java/org/apache/flink/test/localDistributed/PackagedProgramEndToEndITCase.java
+++ b/flink-tests/src/test/java/org/apache/flink/test/localDistributed/PackagedProgramEndToEndITCase.java
@@ -24,7 +24,6 @@ import java.io.FileWriter;
 import org.apache.flink.client.RemoteExecutor;
 import org.apache.flink.client.minicluster.NepheleMiniCluster;
 import org.apache.flink.test.testdata.KMeansData;
-import org.apache.flink.util.LogUtils;
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -33,10 +32,6 @@ import org.junit.Test;
 
 public class PackagedProgramEndToEndITCase {
 
-	static {
-		LogUtils.initializeDefaultTestConsoleLogger();
-	}
-	
 	@Test
 	public void testEverything() {
 		NepheleMiniCluster cluster = new NepheleMiniCluster();

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-tests/src/test/java/org/apache/flink/test/operators/JoinITCase.java
----------------------------------------------------------------------
diff --git a/flink-tests/src/test/java/org/apache/flink/test/operators/JoinITCase.java b/flink-tests/src/test/java/org/apache/flink/test/operators/JoinITCase.java
index 814bad0..3df60ff 100644
--- a/flink-tests/src/test/java/org/apache/flink/test/operators/JoinITCase.java
+++ b/flink-tests/src/test/java/org/apache/flink/test/operators/JoinITCase.java
@@ -19,8 +19,8 @@
 
 package org.apache.flink.test.operators;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.flink.api.common.Plan;
 import org.apache.flink.api.java.record.functions.JoinFunction;
 import org.apache.flink.api.java.record.io.DelimitedInputFormat;
@@ -49,7 +49,7 @@ import java.util.LinkedList;
 @RunWith(Parameterized.class)
 public class JoinITCase extends RecordAPITestBase {
 
-	private static final Log LOG = LogFactory.getLog(JoinITCase.class);
+	private static final Logger LOG = LoggerFactory.getLogger(JoinITCase.class);
 
 	String leftInPath = null;
 	String rightInPath = null;

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-tests/src/test/java/org/apache/flink/test/operators/MapITCase.java
----------------------------------------------------------------------
diff --git a/flink-tests/src/test/java/org/apache/flink/test/operators/MapITCase.java b/flink-tests/src/test/java/org/apache/flink/test/operators/MapITCase.java
index ee2f132..cbb546b 100644
--- a/flink-tests/src/test/java/org/apache/flink/test/operators/MapITCase.java
+++ b/flink-tests/src/test/java/org/apache/flink/test/operators/MapITCase.java
@@ -19,8 +19,8 @@
 
 package org.apache.flink.test.operators;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.flink.api.common.Plan;
 import org.apache.flink.api.java.record.functions.MapFunction;
 import org.apache.flink.api.java.record.io.DelimitedInputFormat;
@@ -48,7 +48,7 @@ import java.util.LinkedList;
 @RunWith(Parameterized.class)
 public class MapITCase extends RecordAPITestBase {
 	
-	private static final Log LOG = LogFactory.getLog(MapITCase.class);
+	private static final Logger LOG = LoggerFactory.getLogger(MapITCase.class);
 
 	String inPath = null;
 	String resultPath = null;

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-tests/src/test/java/org/apache/flink/test/operators/UnionITCase.java
----------------------------------------------------------------------
diff --git a/flink-tests/src/test/java/org/apache/flink/test/operators/UnionITCase.java b/flink-tests/src/test/java/org/apache/flink/test/operators/UnionITCase.java
index b62892a..7a1957c 100644
--- a/flink-tests/src/test/java/org/apache/flink/test/operators/UnionITCase.java
+++ b/flink-tests/src/test/java/org/apache/flink/test/operators/UnionITCase.java
@@ -19,8 +19,8 @@
 
 package org.apache.flink.test.operators;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.flink.api.common.Plan;
 import org.apache.flink.api.java.record.functions.MapFunction;
 import org.apache.flink.api.java.record.io.DelimitedInputFormat;
@@ -47,7 +47,7 @@ import java.util.LinkedList;
 
 @RunWith(Parameterized.class)
 public class UnionITCase extends RecordAPITestBase {
-	private static final Log LOG = LogFactory.getLog(UnionITCase.class);
+	private static final Logger LOG = LoggerFactory.getLogger(UnionITCase.class);
 
 	String inPath = null;
 	String emptyInPath = null;

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-tests/src/test/java/org/apache/flink/test/operators/io/ContractITCaseIOFormats.java
----------------------------------------------------------------------
diff --git a/flink-tests/src/test/java/org/apache/flink/test/operators/io/ContractITCaseIOFormats.java b/flink-tests/src/test/java/org/apache/flink/test/operators/io/ContractITCaseIOFormats.java
index bbb7ded..1e0fc7e 100644
--- a/flink-tests/src/test/java/org/apache/flink/test/operators/io/ContractITCaseIOFormats.java
+++ b/flink-tests/src/test/java/org/apache/flink/test/operators/io/ContractITCaseIOFormats.java
@@ -21,8 +21,8 @@ package org.apache.flink.test.operators.io;
 
 import java.io.IOException;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.flink.api.java.record.io.DelimitedInputFormat;
 import org.apache.flink.api.java.record.io.FileOutputFormat;
 import org.apache.flink.core.fs.FileSystem.WriteMode;
@@ -32,7 +32,7 @@ import org.apache.flink.types.StringValue;
 
 public class ContractITCaseIOFormats {
 
-	private static final Log LOG = LogFactory.getLog(ContractITCaseIOFormats.class);
+	private static final Logger LOG = LoggerFactory.getLogger(ContractITCaseIOFormats.class);
 	
 	public static class ContractITCaseInputFormat extends DelimitedInputFormat {
 		private static final long serialVersionUID = 1L;

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-tests/src/test/java/org/apache/flink/test/recordJobs/graph/pageRankUtil/DiffL1NormConvergenceCriterion.java
----------------------------------------------------------------------
diff --git a/flink-tests/src/test/java/org/apache/flink/test/recordJobs/graph/pageRankUtil/DiffL1NormConvergenceCriterion.java b/flink-tests/src/test/java/org/apache/flink/test/recordJobs/graph/pageRankUtil/DiffL1NormConvergenceCriterion.java
index e4df56a..a94d1c3 100644
--- a/flink-tests/src/test/java/org/apache/flink/test/recordJobs/graph/pageRankUtil/DiffL1NormConvergenceCriterion.java
+++ b/flink-tests/src/test/java/org/apache/flink/test/recordJobs/graph/pageRankUtil/DiffL1NormConvergenceCriterion.java
@@ -19,8 +19,8 @@
 
 package org.apache.flink.test.recordJobs.graph.pageRankUtil;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.flink.api.common.aggregators.ConvergenceCriterion;
 
 @SuppressWarnings("serial")
@@ -28,7 +28,7 @@ public class DiffL1NormConvergenceCriterion implements ConvergenceCriterion<Page
 
 	private static final double EPSILON = 0.00005;
 
-	private static final Log log = LogFactory.getLog(DiffL1NormConvergenceCriterion.class);
+	private static final Logger log = LoggerFactory.getLogger(DiffL1NormConvergenceCriterion.class);
 
 	@Override
 	public boolean isConverged(int iteration, PageRankStats pageRankStats) {

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-tests/src/test/java/org/apache/flink/test/recordJobs/relational/TPCHQuery4.java
----------------------------------------------------------------------
diff --git a/flink-tests/src/test/java/org/apache/flink/test/recordJobs/relational/TPCHQuery4.java b/flink-tests/src/test/java/org/apache/flink/test/recordJobs/relational/TPCHQuery4.java
index 0db22cb..86b27f9 100644
--- a/flink-tests/src/test/java/org/apache/flink/test/recordJobs/relational/TPCHQuery4.java
+++ b/flink-tests/src/test/java/org/apache/flink/test/recordJobs/relational/TPCHQuery4.java
@@ -45,7 +45,8 @@ import org.apache.flink.types.IntValue;
 import org.apache.flink.types.Record;
 import org.apache.flink.types.StringValue;
 import org.apache.flink.util.Collector;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Implementation of the TPC-H Query 4 as a Flink program.
@@ -53,7 +54,7 @@ import org.apache.log4j.Logger;
 @SuppressWarnings("serial")
 public class TPCHQuery4 implements Program, ProgramDescription {
 
-	private static Logger LOGGER = Logger.getLogger(TPCHQuery4.class);
+	private static Logger LOG = LoggerFactory.getLogger(TPCHQuery4.class);
 	
 	private int degreeOfParallelism = 1;
 	private String ordersInputPath;
@@ -206,7 +207,7 @@ public class TPCHQuery4 implements Program, ProgramDescription {
 		
 		if(args == null || args.length != 4)
 		{
-			LOGGER.warn("number of arguments do not match!");
+			LOG.warn("number of arguments do not match!");
 			this.ordersInputPath = "";
 			this.lineItemInputPath = "";
 			this.outputPath = "";

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-tests/src/test/java/org/apache/flink/test/recordJobs/relational/TPCHQuery9.java
----------------------------------------------------------------------
diff --git a/flink-tests/src/test/java/org/apache/flink/test/recordJobs/relational/TPCHQuery9.java b/flink-tests/src/test/java/org/apache/flink/test/recordJobs/relational/TPCHQuery9.java
index 2d84ea8..21a0ac1 100644
--- a/flink-tests/src/test/java/org/apache/flink/test/recordJobs/relational/TPCHQuery9.java
+++ b/flink-tests/src/test/java/org/apache/flink/test/recordJobs/relational/TPCHQuery9.java
@@ -43,7 +43,8 @@ import org.apache.flink.test.recordJobs.relational.query9Util.SupplierMap;
 import org.apache.flink.test.recordJobs.relational.query9Util.SuppliersJoin;
 import org.apache.flink.test.recordJobs.util.IntTupleDataInFormat;
 import org.apache.flink.types.IntValue;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Quote from the TPC-H homepage:
@@ -83,7 +84,7 @@ import org.apache.log4j.Logger;
 public class TPCHQuery9 implements Program, ProgramDescription {
 	public final String ARGUMENTS = "dop partInputPath partSuppInputPath ordersInputPath lineItemInputPath supplierInputPath nationInputPath outputPath";
 
-	private static Logger LOGGER = Logger.getLogger(TPCHQuery9.class);
+	private static Logger LOG = LoggerFactory.getLogger(TPCHQuery9.class);
 
 	private int degreeOfParallelism = 1;
 
@@ -98,7 +99,7 @@ public class TPCHQuery9 implements Program, ProgramDescription {
 
 		if (args.length != 8)
 		{
-			LOGGER.warn("number of arguments do not match!");
+			LOG.warn("number of arguments do not match!");
 			
 			this.degreeOfParallelism = 1;
 			this.partInputPath = "";

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-tests/src/test/java/org/apache/flink/test/recordJobs/relational/query1Util/LineItemFilter.java
----------------------------------------------------------------------
diff --git a/flink-tests/src/test/java/org/apache/flink/test/recordJobs/relational/query1Util/LineItemFilter.java b/flink-tests/src/test/java/org/apache/flink/test/recordJobs/relational/query1Util/LineItemFilter.java
index b8f191a..262c92d 100644
--- a/flink-tests/src/test/java/org/apache/flink/test/recordJobs/relational/query1Util/LineItemFilter.java
+++ b/flink-tests/src/test/java/org/apache/flink/test/recordJobs/relational/query1Util/LineItemFilter.java
@@ -29,7 +29,8 @@ import org.apache.flink.test.recordJobs.util.Tuple;
 import org.apache.flink.types.Record;
 import org.apache.flink.types.StringValue;
 import org.apache.flink.util.Collector;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Filters the line item tuples according to the filter condition
@@ -43,7 +44,7 @@ public class LineItemFilter extends MapFunction {
 
 	private static final long serialVersionUID = 1L;
 	
-	private static final Logger LOGGER = Logger.getLogger(LineItemFilter.class);
+	private static final Logger LOG = LoggerFactory.getLogger(LineItemFilter.class);
 	private static final String DATE_CONSTANT = "1998-09-03";
 	
 	private static final DateFormat format = new SimpleDateFormat("yyyy-MM-dd");
@@ -57,7 +58,7 @@ public class LineItemFilter extends MapFunction {
 			this.constantDate = format.parse(DATE_CONSTANT);
 		}
 		catch (ParseException e) {
-			LOGGER.error("Date constant could not be parsed.", e);
+			LOG.error("Date constant could not be parsed.", e);
 			throw new RuntimeException("Date constant could not be parsed.");
 		}
 	}
@@ -80,7 +81,7 @@ public class LineItemFilter extends MapFunction {
 				}
 			}
 			catch (ParseException e) {
-				LOGGER.error(e);
+				LOG.warn("ParseException while parsing the shipping date.", e);
 			}
 
 		}

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-tests/src/test/java/org/apache/flink/test/recordJobs/relational/query1Util/LineItemFilterTest.java
----------------------------------------------------------------------
diff --git a/flink-tests/src/test/java/org/apache/flink/test/recordJobs/relational/query1Util/LineItemFilterTest.java b/flink-tests/src/test/java/org/apache/flink/test/recordJobs/relational/query1Util/LineItemFilterTest.java
index e5249c7..f7a08aa 100644
--- a/flink-tests/src/test/java/org/apache/flink/test/recordJobs/relational/query1Util/LineItemFilterTest.java
+++ b/flink-tests/src/test/java/org/apache/flink/test/recordJobs/relational/query1Util/LineItemFilterTest.java
@@ -47,7 +47,7 @@ public class LineItemFilterTest {
 	RecordWriter<Record> recordWriterMock;
 	
 	private List<RecordWriter<Record>> writerList = new ArrayList<RecordWriter<Record>>();
-	
+
 	@Before
 	public void setUp()
 	{

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-tests/src/test/java/org/apache/flink/test/runtime/NetworkStackThroughput.java
----------------------------------------------------------------------
diff --git a/flink-tests/src/test/java/org/apache/flink/test/runtime/NetworkStackThroughput.java b/flink-tests/src/test/java/org/apache/flink/test/runtime/NetworkStackThroughput.java
index c13fa24..953b5b7 100644
--- a/flink-tests/src/test/java/org/apache/flink/test/runtime/NetworkStackThroughput.java
+++ b/flink-tests/src/test/java/org/apache/flink/test/runtime/NetworkStackThroughput.java
@@ -21,8 +21,8 @@ package org.apache.flink.test.runtime;
 
 import java.io.IOException;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.flink.configuration.Configuration;
 import org.apache.flink.core.io.IOReadableWritable;
 import org.apache.flink.core.memory.DataInputView;
@@ -38,12 +38,11 @@ import org.apache.flink.runtime.jobgraph.JobOutputVertex;
 import org.apache.flink.runtime.jobgraph.JobTaskVertex;
 import org.apache.flink.runtime.jobgraph.tasks.AbstractInvokable;
 import org.apache.flink.test.util.RecordAPITestBase;
-import org.apache.flink.util.LogUtils;
 import org.junit.After;
 
 public class NetworkStackThroughput {
 
-	private static final Log LOG = LogFactory.getLog(NetworkStackThroughput.class);
+	private static final Logger LOG = LoggerFactory.getLogger(NetworkStackThroughput.class);
 
 	private static final String DATA_VOLUME_GB_CONFIG_KEY = "data.volume.gb";
 
@@ -89,8 +88,6 @@ public class NetworkStackThroughput {
 
 			setNumTaskTracker(parallelism / numSlots);
 			setTaskManagerNumSlots(numSlots);
-
-			LogUtils.initializeDefaultConsoleLogger();
 		}
 
 		@Override

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-tests/src/test/java/org/apache/flink/test/util/FailingTestBase.java
----------------------------------------------------------------------
diff --git a/flink-tests/src/test/java/org/apache/flink/test/util/FailingTestBase.java b/flink-tests/src/test/java/org/apache/flink/test/util/FailingTestBase.java
index cc45ec5..f012791 100644
--- a/flink-tests/src/test/java/org/apache/flink/test/util/FailingTestBase.java
+++ b/flink-tests/src/test/java/org/apache/flink/test/util/FailingTestBase.java
@@ -25,20 +25,11 @@ import org.apache.flink.client.minicluster.NepheleMiniCluster;
 import org.apache.flink.runtime.client.JobClient;
 import org.apache.flink.runtime.client.JobExecutionException;
 import org.apache.flink.runtime.jobgraph.JobGraph;
-import org.apache.flink.test.util.AbstractTestBase;
-import org.apache.flink.test.util.RecordAPITestBase;
-import org.apache.flink.util.LogUtils;
-import org.apache.log4j.Level;
 
 /**
  * Base class for integration tests which test whether the system recovers from failed executions.
  */
 public abstract class FailingTestBase extends RecordAPITestBase {
-
-	public FailingTestBase() {
-		LogUtils.initializeDefaultConsoleLogger(Level.OFF);
-	}
-	
 	/**
 	 * Returns the {@link JobGraph} of the failing job. 
 	 * 

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-tests/src/test/resources/logback-test.xml
----------------------------------------------------------------------
diff --git a/flink-tests/src/test/resources/logback-test.xml b/flink-tests/src/test/resources/logback-test.xml
new file mode 100644
index 0000000..7c47e0b
--- /dev/null
+++ b/flink-tests/src/test/resources/logback-test.xml
@@ -0,0 +1,34 @@
+<!--
+  ~ 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
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<configuration>
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{60} %X{sourceThread} - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <root level="WARN">
+        <appender-ref ref="STDOUT"/>
+    </root>
+
+    <logger name="org.apache.flink.test.recordJobs.relational.query1Util.LineItemFilter" level="ERROR"/>
+    <logger name="org.apache.flink.runtime.operators.RegularPactTask" level="OFF"/>
+    <logger name="org.apache.flink.runtime.taskmanager.Task" level="OFF"/>
+    <logger name="org.apache.flink.runtime.jobmanager.JobManager" level="OFF"/>
+</configuration>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 8c28e9f..6e9edc0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -85,21 +85,18 @@ under the License.
 			<version>3.1</version>
 		</dependency>
 
-		<dependency>
-			<groupId>commons-logging</groupId>
-			<artifactId>commons-logging</artifactId>
-			<version>1.1.3</version>
-			<type>jar</type>
-			<scope>compile</scope>
-		</dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>1.7.7</version>
+        </dependency>
 
-		<dependency>
-			<groupId>log4j</groupId>
-			<artifactId>log4j</artifactId>
-			<version>1.2.17</version>
-			<type>jar</type>
-			<scope>compile</scope>
-		</dependency>
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+            <version>1.0.13</version>
+            <scope>runtime</scope>
+        </dependency>
 
 		<dependency>
 			<groupId>com.google.guava</groupId>
@@ -388,16 +385,6 @@ under the License.
 			</dependency>
 			<!-- Managed dependency required for HBase in pact-hbase  -->
 			<dependency>
-				<groupId>org.slf4j</groupId>
-				<artifactId>slf4j-api</artifactId>
-				<version>1.6.6</version>
-			</dependency>
-			<dependency>
-				<groupId>org.slf4j</groupId>
-				<artifactId>slf4j-log4j12</artifactId>
-				<version>1.6.6</version>
-			</dependency>
-			<dependency>
 				<groupId>org.javassist</groupId>
 				<artifactId>javassist</artifactId>
 				<version>3.18.1-GA</version>


Mime
View raw message