Repository: camel Updated Branches: refs/heads/master 4593fd4bb -> 88b36db3d
CAMEL-11771: Removed commons-logging import Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/88b36db3 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/88b36db3 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/88b36db3 Branch: refs/heads/master Commit: 88b36db3d6b6ee688ef420ba5925e7ed542cdfb7 Parents: 4593fd4 Author: Viral Gohel <[email protected]> Authored: Thu Sep 14 20:13:26 2017 +0530 Committer: Claus Ibsen <[email protected]> Committed: Thu Sep 14 18:10:31 2017 +0200 ---------------------------------------------------------------------- .../component/jetty/SpringHttpsRouteTest.java | 7 ++++--- .../zookeepermaster/CuratorFactoryBean.java | 6 +++--- .../FailoverCuratorLeaderRoutePolicyTest.java | 5 ++--- .../policy/FailoverRoutePolicyTest.java | 5 ++--- .../MultiMasterCuratorLeaderRoutePolicyTest.java | 9 ++++----- parent/pom.xml | 1 - .../test/resources/commons-logging.properties | 19 ------------------- .../test/resources/commons-logging.properties | 19 ------------------- 8 files changed, 15 insertions(+), 56 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/88b36db3/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/SpringHttpsRouteTest.java ---------------------------------------------------------------------- diff --git a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/SpringHttpsRouteTest.java b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/SpringHttpsRouteTest.java index 1e14395..edfb786 100644 --- a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/SpringHttpsRouteTest.java +++ b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/SpringHttpsRouteTest.java @@ -31,13 +31,13 @@ import org.apache.camel.RuntimeCamelException; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.test.junit4.CamelTestSupport; import org.apache.camel.test.junit4.TestSupport; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.junit.After; import org.junit.Assert; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -52,7 +52,8 @@ public class SpringHttpsRouteTest { protected String expectedBody = "<hello>world!</hello>"; protected String pwd = "changeit"; protected Properties originalValues = new Properties(); - protected transient Log log = LogFactory.getLog(TestSupport.class); + protected transient Logger log = LoggerFactory.getLogger(TestSupport.class); + @EndpointInject(uri = "mock:a") MockEndpoint mockEndpoint; http://git-wip-us.apache.org/repos/asf/camel/blob/88b36db3/components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/CuratorFactoryBean.java ---------------------------------------------------------------------- diff --git a/components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/CuratorFactoryBean.java b/components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/CuratorFactoryBean.java index 6af5f26..cf86430 100644 --- a/components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/CuratorFactoryBean.java +++ b/components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/CuratorFactoryBean.java @@ -16,11 +16,11 @@ */ package org.apache.camel.component.zookeepermaster; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.curator.framework.CuratorFramework; import org.apache.curator.framework.CuratorFrameworkFactory; import org.apache.curator.retry.ExponentialBackoffRetry; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.DisposableBean; import org.springframework.beans.factory.FactoryBean; @@ -30,7 +30,7 @@ import org.springframework.beans.factory.FactoryBean; */ public class CuratorFactoryBean implements FactoryBean<CuratorFramework>, DisposableBean { - private static final transient Log LOG = LogFactory.getLog(CuratorFactoryBean.class); + private static final transient Logger LOG = LoggerFactory.getLogger(CuratorFactoryBean.class); private String connectString = "localhost:2181"; private int timeout = 30000; http://git-wip-us.apache.org/repos/asf/camel/blob/88b36db3/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/policy/FailoverCuratorLeaderRoutePolicyTest.java ---------------------------------------------------------------------- diff --git a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/policy/FailoverCuratorLeaderRoutePolicyTest.java b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/policy/FailoverCuratorLeaderRoutePolicyTest.java index 9392f79..4d6c06b 100644 --- a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/policy/FailoverCuratorLeaderRoutePolicyTest.java +++ b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/policy/FailoverCuratorLeaderRoutePolicyTest.java @@ -25,7 +25,6 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.component.zookeeper.ZooKeeperTestSupport; import org.apache.camel.impl.DefaultCamelContext; -import org.apache.commons.logging.LogFactory; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -112,9 +111,9 @@ public class FailoverCuratorLeaderRoutePolicyTest extends ZooKeeperTestSupport { } public void shutdown() throws Exception { - LogFactory.getLog(getClass()).debug("stopping"); + LoggerFactory.getLogger(getClass()).debug("stopping"); controlledContext.stop(); - LogFactory.getLog(getClass()).debug("stopped"); + LoggerFactory.getLogger(getClass()).debug("stopped"); } } http://git-wip-us.apache.org/repos/asf/camel/blob/88b36db3/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/policy/FailoverRoutePolicyTest.java ---------------------------------------------------------------------- diff --git a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/policy/FailoverRoutePolicyTest.java b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/policy/FailoverRoutePolicyTest.java index 8ee22ac..e251abd 100644 --- a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/policy/FailoverRoutePolicyTest.java +++ b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/policy/FailoverRoutePolicyTest.java @@ -25,7 +25,6 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.component.zookeeper.ZooKeeperTestSupport; import org.apache.camel.impl.DefaultCamelContext; -import org.apache.commons.logging.LogFactory; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -88,9 +87,9 @@ public class FailoverRoutePolicyTest extends ZooKeeperTestSupport { } public void shutdown() throws Exception { - LogFactory.getLog(getClass()).debug("stopping"); + LoggerFactory.getLogger(getClass()).debug("stopping"); controlledContext.stop(); - LogFactory.getLog(getClass()).debug("stopped"); + LoggerFactory.getLogger(getClass()).debug("stopped"); } } http://git-wip-us.apache.org/repos/asf/camel/blob/88b36db3/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/policy/MultiMasterCuratorLeaderRoutePolicyTest.java ---------------------------------------------------------------------- diff --git a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/policy/MultiMasterCuratorLeaderRoutePolicyTest.java b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/policy/MultiMasterCuratorLeaderRoutePolicyTest.java index a6c9946..0412e52 100644 --- a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/policy/MultiMasterCuratorLeaderRoutePolicyTest.java +++ b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/policy/MultiMasterCuratorLeaderRoutePolicyTest.java @@ -26,7 +26,6 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.component.zookeeper.ZooKeeperTestSupport; import org.apache.camel.impl.DefaultCamelContext; -import org.apache.commons.logging.LogFactory; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -418,16 +417,16 @@ public class MultiMasterCuratorLeaderRoutePolicyTest extends ZooKeeperTestSuppor } public void shutdown() throws Exception { - LogFactory.getLog(getClass()).debug("stopping"); + LoggerFactory.getLogger(getClass()).debug("stopping"); controlledContext.stop(); - LogFactory.getLog(getClass()).debug("stopped"); + LoggerFactory.getLogger(getClass()).debug("stopped"); } public void startup() throws Exception { - LogFactory.getLog(getClass()).debug("starting"); + LoggerFactory.getLogger(getClass()).debug("starting"); controlledContext.start(); - LogFactory.getLog(getClass()).debug("started"); + LoggerFactory.getLogger(getClass()).debug("started"); } } http://git-wip-us.apache.org/repos/asf/camel/blob/88b36db3/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 4b37997..51223e6 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -756,7 +756,6 @@ org.springframework.ws.*;version="[2,3)", org.springframework.xml.*;version="[2,3)", org.springframework.*;version="${spring-version-range}", - org.apache.commons.logging.*;version="[1.1,2)", org.apache.cxf.*;version="${cxf-version-range}", org.apache.qpid.*;version="[0.20,1)", org.apache.abdera.*;version="[0.4,2)", http://git-wip-us.apache.org/repos/asf/camel/blob/88b36db3/tests/camel-itest-karaf/src/test/resources/commons-logging.properties ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/resources/commons-logging.properties b/tests/camel-itest-karaf/src/test/resources/commons-logging.properties deleted file mode 100644 index ce4b52e..0000000 --- a/tests/camel-itest-karaf/src/test/resources/commons-logging.properties +++ /dev/null @@ -1,19 +0,0 @@ -## --------------------------------------------------------------------------- -## 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. -## --------------------------------------------------------------------------- - -#org.apache.commons.logging.Log=org.apache.commons.logging.impl.Jdk14Logger -org.apache.commons.logging.Log=org.apache.commons.logging.impl.Log4JLogger \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/88b36db3/tests/camel-itest/src/test/resources/commons-logging.properties ---------------------------------------------------------------------- diff --git a/tests/camel-itest/src/test/resources/commons-logging.properties b/tests/camel-itest/src/test/resources/commons-logging.properties deleted file mode 100644 index ffe9f85..0000000 --- a/tests/camel-itest/src/test/resources/commons-logging.properties +++ /dev/null @@ -1,19 +0,0 @@ -## --------------------------------------------------------------------------- -## 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. -## --------------------------------------------------------------------------- - -#org.apache.commons.logging.Log=org.apache.commons.logging.impl.Jdk14Logger -org.apache.commons.logging.Log=org.apache.commons.logging.impl.Log4JLogger
