You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2011/02/01 08:41:10 UTC
svn commit: r1065931 [3/6] - in /camel/trunk/components: camel-amqp/
camel-atom/ camel-atom/src/main/java/org/apache/camel/component/atom/
camel-atom/src/test/java/org/apache/camel/component/atom/
camel-aws/src/main/java/org/apache/camel/component/aws/...
Modified: camel/trunk/components/camel-irc/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-irc/pom.xml?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-irc/pom.xml (original)
+++ camel/trunk/components/camel-irc/pom.xml Tue Feb 1 07:41:02 2011
@@ -54,13 +54,13 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Modified: camel/trunk/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcComponent.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcComponent.java?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcComponent.java (original)
+++ camel/trunk/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcComponent.java Tue Feb 1 07:41:02 2011
@@ -22,8 +22,8 @@ import java.util.Map;
import org.apache.camel.CamelContext;
import org.apache.camel.RuntimeCamelException;
import org.apache.camel.impl.DefaultComponent;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.schwering.irc.lib.IRCConnection;
import org.schwering.irc.lib.IRCEventListener;
import org.schwering.irc.lib.ssl.SSLIRCConnection;
@@ -34,7 +34,7 @@ import org.schwering.irc.lib.ssl.SSLIRCC
* @version $Revision$
*/
public class IrcComponent extends DefaultComponent {
- private static final transient Log LOG = LogFactory.getLog(IrcComponent.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(IrcComponent.class);
private final Map<String, IRCConnection> connectionCache = new HashMap<String, IRCConnection>();
public IrcEndpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception {
Modified: camel/trunk/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcConsumer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcConsumer.java?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcConsumer.java (original)
+++ camel/trunk/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcConsumer.java Tue Feb 1 07:41:02 2011
@@ -19,15 +19,15 @@ package org.apache.camel.component.irc;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.impl.DefaultConsumer;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.schwering.irc.lib.IRCConnection;
import org.schwering.irc.lib.IRCEventAdapter;
import org.schwering.irc.lib.IRCModeParser;
import org.schwering.irc.lib.IRCUser;
public class IrcConsumer extends DefaultConsumer {
- private static final transient Log LOG = LogFactory.getLog(IrcConsumer.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(IrcConsumer.class);
private final IrcConfiguration configuration;
private final IrcEndpoint endpoint;
Modified: camel/trunk/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcEndpoint.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcEndpoint.java?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcEndpoint.java (original)
+++ camel/trunk/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcEndpoint.java Tue Feb 1 07:41:02 2011
@@ -25,8 +25,8 @@ import org.apache.camel.impl.DefaultEndp
import org.apache.camel.impl.DefaultExchange;
import org.apache.camel.util.ObjectHelper;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.schwering.irc.lib.IRCConnection;
import org.schwering.irc.lib.IRCEventAdapter;
@@ -39,7 +39,7 @@ import org.schwering.irc.lib.IRCUser;
* @version $Revision$
*/
public class IrcEndpoint extends DefaultEndpoint {
- private static final transient Log LOG = LogFactory.getLog(IrcEndpoint.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(IrcEndpoint.class);
private IrcBinding binding;
private IrcConfiguration configuration;
Modified: camel/trunk/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcLogger.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcLogger.java?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcLogger.java (original)
+++ camel/trunk/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcLogger.java Tue Feb 1 07:41:02 2011
@@ -16,7 +16,7 @@
*/
package org.apache.camel.component.irc;
-import org.apache.commons.logging.Log;
+import org.slf4j.Logger;
import org.schwering.irc.lib.IRCEventAdapter;
import org.schwering.irc.lib.IRCModeParser;
import org.schwering.irc.lib.IRCUser;
@@ -27,10 +27,10 @@ import org.schwering.irc.lib.IRCUser;
* @version $Revision$
*/
public class IrcLogger extends IRCEventAdapter {
- private Log log;
+ private Logger log;
private String server;
- public IrcLogger(Log log, String server) {
+ public IrcLogger(Logger log, String server) {
this.log = log;
this.server = server;
}
Modified: camel/trunk/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcProducer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcProducer.java?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcProducer.java (original)
+++ camel/trunk/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcProducer.java Tue Feb 1 07:41:02 2011
@@ -19,8 +19,8 @@ package org.apache.camel.component.irc;
import org.apache.camel.Exchange;
import org.apache.camel.RuntimeCamelException;
import org.apache.camel.impl.DefaultProducer;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.schwering.irc.lib.IRCConnection;
import org.schwering.irc.lib.IRCEventAdapter;
import org.schwering.irc.lib.IRCModeParser;
@@ -31,7 +31,7 @@ public class IrcProducer extends Default
public static final String[] COMMANDS = new String[]{"AWAY", "INVITE", "ISON", "JOIN", "KICK", "LIST", "NAMES",
"PRIVMSG", "MODE", "NICK", "NOTICE", "PART", "PONG", "QUIT", "TOPIC", "WHO", "WHOIS", "WHOWAS", "USERHOST"};
- private static final transient Log LOG = LogFactory.getLog(IrcProducer.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(IrcProducer.class);
private IRCConnection connection;
private IrcEndpoint endpoint;
Modified: camel/trunk/components/camel-jackson/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jackson/pom.xml?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-jackson/pom.xml (original)
+++ camel/trunk/components/camel-jackson/pom.xml Tue Feb 1 07:41:02 2011
@@ -15,7 +15,8 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -50,7 +51,7 @@
<!-- testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
+ <artifactId>camel-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -65,8 +66,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Modified: camel/trunk/components/camel-javaspace/src/main/java/org/apache/camel/component/javaspace/JavaSpaceConsumer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-javaspace/src/main/java/org/apache/camel/component/javaspace/JavaSpaceConsumer.java?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-javaspace/src/main/java/org/apache/camel/component/javaspace/JavaSpaceConsumer.java (original)
+++ camel/trunk/components/camel-javaspace/src/main/java/org/apache/camel/component/javaspace/JavaSpaceConsumer.java Tue Feb 1 07:41:02 2011
@@ -40,8 +40,8 @@ import org.apache.camel.RuntimeCamelExce
import org.apache.camel.impl.DefaultConsumer;
import org.apache.camel.impl.DefaultExchange;
import org.apache.camel.util.ExchangeHelper;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* @{link Consumer} implementation for Javaspaces
@@ -54,7 +54,7 @@ public class JavaSpaceConsumer extends D
public static final int TAKE = 0;
@SuppressWarnings("unused")
- private static final transient Log LOG = LogFactory.getLog(JavaSpaceConsumer.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(JavaSpaceConsumer.class);
private final int concurrentConsumers;
private final boolean transactional;
Modified: camel/trunk/components/camel-javaspace/src/main/java/org/apache/camel/component/javaspace/JavaSpaceProducer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-javaspace/src/main/java/org/apache/camel/component/javaspace/JavaSpaceProducer.java?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-javaspace/src/main/java/org/apache/camel/component/javaspace/JavaSpaceProducer.java (original)
+++ camel/trunk/components/camel-javaspace/src/main/java/org/apache/camel/component/javaspace/JavaSpaceProducer.java Tue Feb 1 07:41:02 2011
@@ -33,8 +33,8 @@ import org.apache.camel.Producer;
import org.apache.camel.component.bean.BeanInvocation;
import org.apache.camel.impl.DefaultProducer;
import org.apache.camel.util.ExchangeHelper;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* A {@link Producer} implementation for JavaSpaces
@@ -42,7 +42,7 @@ import org.apache.commons.logging.LogFac
* @version $Revision$
*/
public class JavaSpaceProducer extends DefaultProducer {
- private static final transient Log LOG = LogFactory.getLog(JavaSpaceProducer.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(JavaSpaceProducer.class);
private final boolean transactional;
private final long transactionTimeout;
Modified: camel/trunk/components/camel-jaxb/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jaxb/pom.xml?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-jaxb/pom.xml (original)
+++ camel/trunk/components/camel-jaxb/pom.xml Tue Feb 1 07:41:02 2011
@@ -43,11 +43,6 @@
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging-api</artifactId>
- </dependency>
-
- <dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
</dependency>
@@ -56,7 +51,6 @@
<artifactId>jaxb-impl</artifactId>
</dependency>
-
<!-- for testing -->
<dependency>
<groupId>junit</groupId>
@@ -74,8 +68,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Modified: camel/trunk/components/camel-jdbc-aggregator/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jdbc-aggregator/pom.xml?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-jdbc-aggregator/pom.xml (original)
+++ camel/trunk/components/camel-jdbc-aggregator/pom.xml Tue Feb 1 07:41:02 2011
@@ -54,10 +54,6 @@
<groupId>org.springframework</groupId>
<artifactId>spring-tx</artifactId>
</dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging-api</artifactId>
- </dependency>
<!-- testing -->
<dependency>
@@ -85,6 +81,11 @@
<artifactId>log4j</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <scope>test</scope>
+ </dependency>
<!-- In Memory database -->
<dependency>
<groupId>com.h2database</groupId>
Modified: camel/trunk/components/camel-jdbc-aggregator/src/main/java/org/apache/camel/component/jdbc/aggregationrepository/JdbcAggregationRepository.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jdbc-aggregator/src/main/java/org/apache/camel/component/jdbc/aggregationrepository/JdbcAggregationRepository.java?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-jdbc-aggregator/src/main/java/org/apache/camel/component/jdbc/aggregationrepository/JdbcAggregationRepository.java (original)
+++ camel/trunk/components/camel-jdbc-aggregator/src/main/java/org/apache/camel/component/jdbc/aggregationrepository/JdbcAggregationRepository.java Tue Feb 1 07:41:02 2011
@@ -32,8 +32,8 @@ import org.apache.camel.Exchange;
import org.apache.camel.impl.ServiceSupport;
import org.apache.camel.spi.RecoverableAggregationRepository;
import org.apache.camel.util.ObjectHelper;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.dao.EmptyResultDataAccessException;
import org.springframework.jdbc.core.JdbcTemplate;
@@ -53,7 +53,7 @@ import org.springframework.transaction.s
*/
public class JdbcAggregationRepository extends ServiceSupport implements RecoverableAggregationRepository {
- private static final transient Log LOG = LogFactory.getLog(JdbcAggregationRepository.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(JdbcAggregationRepository.class);
private static final String ID = "id";
private static final String EXCHANGE = "exchange";
private PlatformTransactionManager transactionManager;
Modified: camel/trunk/components/camel-jdbc-aggregator/src/test/java/org/apache/camel/component/jdbc/aggregationrepository/JdbcAggregateLoadAndRecoverTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jdbc-aggregator/src/test/java/org/apache/camel/component/jdbc/aggregationrepository/JdbcAggregateLoadAndRecoverTest.java?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-jdbc-aggregator/src/test/java/org/apache/camel/component/jdbc/aggregationrepository/JdbcAggregateLoadAndRecoverTest.java (original)
+++ camel/trunk/components/camel-jdbc-aggregator/src/test/java/org/apache/camel/component/jdbc/aggregationrepository/JdbcAggregateLoadAndRecoverTest.java Tue Feb 1 07:41:02 2011
@@ -26,8 +26,8 @@ import org.apache.camel.builder.RouteBui
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.processor.aggregate.AggregationStrategy;
import org.apache.camel.test.junit4.CamelTestSupport;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.junit.Before;
import org.junit.Test;
import org.springframework.context.ApplicationContext;
@@ -35,7 +35,7 @@ import org.springframework.context.suppo
public class JdbcAggregateLoadAndRecoverTest extends CamelTestSupport {
- private static final Log LOG = LogFactory.getLog(JdbcAggregateLoadAndRecoverTest.class);
+ private static final Logger LOG = LoggerFactory.getLogger(JdbcAggregateLoadAndRecoverTest.class);
private static final int SIZE = 200;
private static AtomicInteger counter = new AtomicInteger();
@@ -130,4 +130,4 @@ public class JdbcAggregateLoadAndRecover
}
}
-}
\ No newline at end of file
+}
Modified: camel/trunk/components/camel-jdbc-aggregator/src/test/java/org/apache/camel/component/jdbc/aggregationrepository/JdbcAggregateLoadConcurrentTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jdbc-aggregator/src/test/java/org/apache/camel/component/jdbc/aggregationrepository/JdbcAggregateLoadConcurrentTest.java?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-jdbc-aggregator/src/test/java/org/apache/camel/component/jdbc/aggregationrepository/JdbcAggregateLoadConcurrentTest.java (original)
+++ camel/trunk/components/camel-jdbc-aggregator/src/test/java/org/apache/camel/component/jdbc/aggregationrepository/JdbcAggregateLoadConcurrentTest.java Tue Feb 1 07:41:02 2011
@@ -25,8 +25,8 @@ import org.apache.camel.builder.RouteBui
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.processor.aggregate.AggregationStrategy;
import org.apache.camel.test.junit4.CamelTestSupport;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.junit.Before;
import org.junit.Test;
import org.springframework.context.ApplicationContext;
@@ -34,7 +34,7 @@ import org.springframework.context.suppo
public class JdbcAggregateLoadConcurrentTest extends CamelTestSupport {
- private static final Log LOG = LogFactory.getLog(JdbcAggregateLoadConcurrentTest.class);
+ private static final Logger LOG = LoggerFactory.getLogger(JdbcAggregateLoadConcurrentTest.class);
private static final char[] KEYS = new char[]{'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J'};
private static final int SIZE = 500;
@@ -112,4 +112,4 @@ public class JdbcAggregateLoadConcurrent
return oldExchange;
}
}
-}
\ No newline at end of file
+}
Modified: camel/trunk/components/camel-jdbc-aggregator/src/test/java/org/apache/camel/component/jdbc/aggregationrepository/JdbcAggregateLoadTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jdbc-aggregator/src/test/java/org/apache/camel/component/jdbc/aggregationrepository/JdbcAggregateLoadTest.java?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-jdbc-aggregator/src/test/java/org/apache/camel/component/jdbc/aggregationrepository/JdbcAggregateLoadTest.java (original)
+++ camel/trunk/components/camel-jdbc-aggregator/src/test/java/org/apache/camel/component/jdbc/aggregationrepository/JdbcAggregateLoadTest.java Tue Feb 1 07:41:02 2011
@@ -21,8 +21,8 @@ import org.apache.camel.builder.RouteBui
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.processor.aggregate.AggregationStrategy;
import org.apache.camel.test.junit4.CamelTestSupport;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.junit.Before;
import org.junit.Test;
import org.springframework.context.ApplicationContext;
@@ -30,7 +30,7 @@ import org.springframework.context.suppo
public class JdbcAggregateLoadTest extends CamelTestSupport {
- private static final Log LOG = LogFactory.getLog(JdbcAggregateLoadTest.class);
+ private static final Logger LOG = LoggerFactory.getLogger(JdbcAggregateLoadTest.class);
private static final int SIZE = 500;
private JdbcAggregationRepository repo;
@@ -97,4 +97,4 @@ public class JdbcAggregateLoadTest exten
}
}
-}
\ No newline at end of file
+}
Modified: camel/trunk/components/camel-jdbc-aggregator/src/test/java/org/apache/camel/component/jdbc/aggregationrepository/JdbcGrowIssueTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jdbc-aggregator/src/test/java/org/apache/camel/component/jdbc/aggregationrepository/JdbcGrowIssueTest.java?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-jdbc-aggregator/src/test/java/org/apache/camel/component/jdbc/aggregationrepository/JdbcGrowIssueTest.java (original)
+++ camel/trunk/components/camel-jdbc-aggregator/src/test/java/org/apache/camel/component/jdbc/aggregationrepository/JdbcGrowIssueTest.java Tue Feb 1 07:41:02 2011
@@ -59,7 +59,7 @@ public class JdbcGrowIssueTest extends C
// get the last
Exchange data = repo.get(context, key);
- log.info(data);
+ log.info(data.toString());
assertTrue("Should start with 'XXX'", data.getIn().getBody(String.class).startsWith("XXX"));
int length = data.getIn().getBody(String.class).length();
Modified: camel/trunk/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/JdbcProducer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/JdbcProducer.java?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/JdbcProducer.java (original)
+++ camel/trunk/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/JdbcProducer.java Tue Feb 1 07:41:02 2011
@@ -30,14 +30,14 @@ import javax.sql.DataSource;
import org.apache.camel.Exchange;
import org.apache.camel.impl.DefaultProducer;
import org.apache.camel.util.IntrospectionSupport;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* @version $Revision$
*/
public class JdbcProducer extends DefaultProducer {
- private static final transient Log LOG = LogFactory.getLog(JdbcProducer.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(JdbcProducer.class);
private DataSource dataSource;
private int readSize;
private Map<String, Object> parameters;
Modified: camel/trunk/components/camel-jing/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jing/pom.xml?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-jing/pom.xml (original)
+++ camel/trunk/components/camel-jing/pom.xml Tue Feb 1 07:41:02 2011
@@ -15,67 +15,68 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
+ <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-parent</artifactId>
- <version>2.7-SNAPSHOT</version>
- <relativePath>../../parent</relativePath>
- </parent>
-
- <artifactId>camel-jing</artifactId>
- <packaging>bundle</packaging>
- <name>Camel :: Jing</name>
- <description>Camel Jing support</description>
-
- <properties>
- <camel.osgi.export.pkg>org.apache.camel.component.validator.jing.*</camel.osgi.export.pkg>
- </properties>
-
- <dependencies>
-
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-spring</artifactId>
- </dependency>
- <dependency>
- <groupId>thaiopensource</groupId>
- <artifactId>jing</artifactId>
- <version>20030619</version>
- </dependency>
-
-
- <!-- for testing -->
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-core</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-spring</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
+ <parent>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-parent</artifactId>
+ <version>2.7-SNAPSHOT</version>
+ <relativePath>../../parent</relativePath>
+ </parent>
+
+ <artifactId>camel-jing</artifactId>
+ <packaging>bundle</packaging>
+ <name>Camel :: Jing</name>
+ <description>Camel Jing support</description>
+
+ <properties>
+ <camel.osgi.export.pkg>org.apache.camel.component.validator.jing.*</camel.osgi.export.pkg>
+ </properties>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-spring</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>thaiopensource</groupId>
+ <artifactId>jing</artifactId>
+ <version>20030619</version>
+ </dependency>
+
+ <!-- for testing -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-core</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-spring</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
</project>
Modified: camel/trunk/components/camel-jing/src/main/java/org/apache/camel/component/validator/jing/JingValidator.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jing/src/main/java/org/apache/camel/component/validator/jing/JingValidator.java?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-jing/src/main/java/org/apache/camel/component/validator/jing/JingValidator.java (original)
+++ camel/trunk/components/camel-jing/src/main/java/org/apache/camel/component/validator/jing/JingValidator.java Tue Feb 1 07:41:02 2011
@@ -41,8 +41,8 @@ import org.apache.camel.Message;
import org.apache.camel.Processor;
import org.apache.camel.processor.validation.DefaultValidationErrorHandler;
import org.apache.camel.util.ExchangeHelper;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.core.io.Resource;
@@ -54,7 +54,7 @@ import org.springframework.core.io.Resou
* @version $Revision$
*/
public class JingValidator implements Processor {
- //private static final transient Log LOG = LogFactory.getLog(JingValidator.class);
+ //private static final transient Logger LOG = LoggerFactory.getLogger(JingValidator.class);
private Schema schema;
private SchemaFactory schemaFactory;
private String schemaNamespace = XMLConstants.RELAXNG_NS_URI;
Modified: camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/EndpointMessageListener.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/EndpointMessageListener.java?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/EndpointMessageListener.java (original)
+++ camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/EndpointMessageListener.java Tue Feb 1 07:41:02 2011
@@ -31,8 +31,8 @@ import org.apache.camel.impl.DefaultExch
import org.apache.camel.impl.LoggingExceptionHandler;
import org.apache.camel.spi.ExceptionHandler;
import org.apache.camel.util.ObjectHelper;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.jms.core.JmsOperations;
import org.springframework.jms.core.MessageCreator;
@@ -47,7 +47,7 @@ import static org.apache.camel.util.Obje
* @version $Revision$
*/
public class EndpointMessageListener implements MessageListener {
- private static final transient Log LOG = LogFactory.getLog(EndpointMessageListener.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(EndpointMessageListener.class);
private ExceptionHandler exceptionHandler;
private JmsEndpoint endpoint;
private Processor processor;
Modified: camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsBinding.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsBinding.java?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsBinding.java (original)
+++ camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsBinding.java Tue Feb 1 07:41:02 2011
@@ -51,8 +51,8 @@ import org.apache.camel.spi.HeaderFilter
import org.apache.camel.util.CamelContextHelper;
import org.apache.camel.util.ExchangeHelper;
import org.apache.camel.util.ObjectHelper;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import static org.apache.camel.component.jms.JmsMessageHelper.normalizeDestinationName;
import static org.apache.camel.component.jms.JmsMessageType.Bytes;
@@ -67,7 +67,7 @@ import static org.apache.camel.component
* @version $Revision$
*/
public class JmsBinding {
- private static final transient Log LOG = LogFactory.getLog(JmsBinding.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(JmsBinding.class);
private final JmsEndpoint endpoint;
private final HeaderFilterStrategy headerFilterStrategy;
private final JmsKeyFormatStrategy jmsKeyFormatStrategy;
Modified: camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsComponent.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsComponent.java?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsComponent.java (original)
+++ camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsComponent.java Tue Feb 1 07:41:02 2011
@@ -28,8 +28,8 @@ import org.apache.camel.spi.HeaderFilter
import org.apache.camel.spi.HeaderFilterStrategyAware;
import org.apache.camel.util.CastUtils;
import org.apache.camel.util.ObjectHelper;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.beans.BeansException;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware;
@@ -50,7 +50,7 @@ import static org.apache.camel.util.Obje
*/
public class JmsComponent extends DefaultComponent implements ApplicationContextAware, HeaderFilterStrategyAware {
- private static final transient Log LOG = LogFactory.getLog(JmsComponent.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(JmsComponent.class);
private static final String DEFAULT_QUEUE_BROWSE_STRATEGY = "org.apache.camel.component.jms.DefaultQueueBrowseStrategy";
private static final String KEY_FORMAT_STRATEGY_PARAM = "jmsKeyFormatStrategy";
private JmsConfiguration configuration;
Modified: camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java (original)
+++ camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java Tue Feb 1 07:41:02 2011
@@ -28,8 +28,8 @@ import org.apache.camel.RuntimeCamelExce
import org.apache.camel.util.IntrospectionSupport;
import org.apache.camel.util.ObjectHelper;
import org.apache.camel.util.PackageHelper;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.core.task.TaskExecutor;
import org.springframework.jms.JmsException;
import org.springframework.jms.connection.JmsTransactionManager;
@@ -58,7 +58,7 @@ public class JmsConfiguration implements
public static final String TEMP_QUEUE_PREFIX = "temp:queue:";
public static final String TEMP_TOPIC_PREFIX = "temp:topic:";
- private static final transient Log LOG = LogFactory.getLog(JmsConfiguration.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(JmsConfiguration.class);
private JmsOperations jmsOperations;
private DestinationResolver destinationResolver;
private ConnectionFactory connectionFactory;
Modified: camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsMessage.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsMessage.java?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsMessage.java (original)
+++ camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsMessage.java Tue Feb 1 07:41:02 2011
@@ -27,8 +27,8 @@ import javax.jms.Topic;
import org.apache.camel.RuntimeExchangeException;
import org.apache.camel.impl.DefaultMessage;
import org.apache.camel.util.ExchangeHelper;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Represents a {@link org.apache.camel.Message} for working with JMS
@@ -36,7 +36,7 @@ import org.apache.commons.logging.LogFac
* @version $Revision:520964 $
*/
public class JmsMessage extends DefaultMessage {
- private static final transient Log LOG = LogFactory.getLog(JmsMessage.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(JmsMessage.class);
private Message jmsMessage;
private JmsBinding binding;
Modified: camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsProducer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsProducer.java?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsProducer.java (original)
+++ camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsProducer.java Tue Feb 1 07:41:02 2011
@@ -34,8 +34,8 @@ import org.apache.camel.impl.DefaultAsyn
import org.apache.camel.spi.UuidGenerator;
import org.apache.camel.util.ObjectHelper;
import org.apache.camel.util.ValueHolder;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.jms.core.JmsOperations;
import org.springframework.jms.core.MessageCreator;
@@ -45,7 +45,7 @@ import static org.apache.camel.component
* @version $Revision$
*/
public class JmsProducer extends DefaultAsyncProducer {
- private static final transient Log LOG = LogFactory.getLog(JmsProducer.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(JmsProducer.class);
private final JmsEndpoint endpoint;
private final AtomicBoolean started = new AtomicBoolean(false);
private JmsOperations inOnlyTemplate;
Modified: camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsQueueEndpoint.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsQueueEndpoint.java?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsQueueEndpoint.java (original)
+++ camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsQueueEndpoint.java Tue Feb 1 07:41:02 2011
@@ -23,8 +23,8 @@ import javax.jms.Queue;
import org.apache.camel.Exchange;
import org.apache.camel.spi.BrowsableEndpoint;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.jms.core.JmsOperations;
import org.springframework.jmx.export.annotation.ManagedAttribute;
import org.springframework.jmx.export.annotation.ManagedOperation;
@@ -37,7 +37,7 @@ import org.springframework.jmx.export.an
*/
@ManagedResource(description = "Managed JMS Queue Endpoint")
public class JmsQueueEndpoint extends JmsEndpoint implements BrowsableEndpoint {
- private static final transient Log LOG = LogFactory.getLog(JmsQueueEndpoint.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(JmsQueueEndpoint.class);
private int maximumBrowseSize = -1;
private final QueueBrowseStrategy queueBrowseStrategy;
Modified: camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/ReplyManagerSupport.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/ReplyManagerSupport.java?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/ReplyManagerSupport.java (original)
+++ camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/ReplyManagerSupport.java Tue Feb 1 07:41:02 2011
@@ -32,8 +32,8 @@ import org.apache.camel.component.jms.Jm
import org.apache.camel.impl.ServiceSupport;
import org.apache.camel.util.ObjectHelper;
import org.apache.camel.util.ServiceHelper;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.jms.listener.AbstractMessageListenerContainer;
/**
@@ -43,7 +43,7 @@ import org.springframework.jms.listener.
*/
public abstract class ReplyManagerSupport extends ServiceSupport implements ReplyManager {
- protected final Log log = LogFactory.getLog(getClass());
+ protected final Logger log = LoggerFactory.getLogger(getClass());
protected ScheduledExecutorService executorService;
protected JmsEndpoint endpoint;
protected Destination replyTo;
Modified: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/AggregratedJmsRouteTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/AggregratedJmsRouteTest.java?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/AggregratedJmsRouteTest.java (original)
+++ camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/AggregratedJmsRouteTest.java Tue Feb 1 07:41:02 2011
@@ -27,14 +27,14 @@ import org.apache.camel.component.mock.M
import org.apache.camel.processor.aggregate.AggregationStrategy;
import org.apache.camel.processor.aggregate.UseLatestAggregationStrategy;
import org.apache.camel.test.junit4.CamelTestSupport;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.junit.Test;
import static org.apache.camel.component.jms.JmsComponent.jmsComponentAutoAcknowledge;
public class AggregratedJmsRouteTest extends CamelTestSupport {
- private static final transient Log LOG = LogFactory.getLog(AggregratedJmsRouteTest.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(AggregratedJmsRouteTest.class);
private String timeOutEndpointUri = "jms:queue:test.a";
private String multicastEndpointUri = "jms:queue:multicast";
Modified: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/BrowsableQueueTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/BrowsableQueueTest.java?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/BrowsableQueueTest.java (original)
+++ camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/BrowsableQueueTest.java Tue Feb 1 07:41:02 2011
@@ -25,8 +25,8 @@ import org.apache.camel.CamelContext;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.test.junit4.CamelTestSupport;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.junit.Test;
import static org.apache.camel.component.jms.JmsComponent.jmsComponentAutoAcknowledge;
@@ -35,7 +35,7 @@ import static org.apache.camel.component
* @version $Revision$
*/
public class BrowsableQueueTest extends CamelTestSupport {
- private static final transient Log LOG = LogFactory.getLog(BrowsableQueueTest.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(BrowsableQueueTest.class);
protected String componentName = "activemq";
protected String startEndpointUri;
@@ -94,4 +94,4 @@ public class BrowsableQueueTest extends
}
};
}
-}
\ No newline at end of file
+}
Modified: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsSimpleRequestCustomReplyToTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsSimpleRequestCustomReplyToTest.java?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsSimpleRequestCustomReplyToTest.java (original)
+++ camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsSimpleRequestCustomReplyToTest.java Tue Feb 1 07:41:02 2011
@@ -28,8 +28,8 @@ import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.junit4.CamelTestSupport;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.junit.Test;
import static org.apache.camel.component.jms.JmsComponent.jmsComponentAutoAcknowledge;
@@ -39,7 +39,7 @@ import static org.apache.camel.component
*/
public class JmsSimpleRequestCustomReplyToTest extends CamelTestSupport {
- private static final Log LOG = LogFactory.getLog(JmsSimpleRequestCustomReplyToTest.class);
+ private static final Logger LOG = LoggerFactory.getLogger(JmsSimpleRequestCustomReplyToTest.class);
private static String myReplyTo;
protected String componentName = "activemq";
private CountDownLatch latch = new CountDownLatch(1);
@@ -135,4 +135,4 @@ public class JmsSimpleRequestCustomReply
}
};
}
-}
\ No newline at end of file
+}
Modified: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsSimpleRequestLateReplyTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsSimpleRequestLateReplyTest.java?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsSimpleRequestLateReplyTest.java (original)
+++ camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsSimpleRequestLateReplyTest.java Tue Feb 1 07:41:02 2011
@@ -29,8 +29,8 @@ import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.junit4.CamelTestSupport;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.junit.Before;
import org.junit.Test;
@@ -41,7 +41,7 @@ import static org.apache.camel.component
*/
public class JmsSimpleRequestLateReplyTest extends CamelTestSupport {
- private static final Log LOG = LogFactory.getLog(JmsSimpleRequestLateReplyTest.class);
+ private static final Logger LOG = LoggerFactory.getLogger(JmsSimpleRequestLateReplyTest.class);
private static Destination replyDestination;
private static String cid;
private static int count;
Modified: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/discovery/MyRegistry.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/discovery/MyRegistry.java?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/discovery/MyRegistry.java (original)
+++ camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/discovery/MyRegistry.java Tue Feb 1 07:41:02 2011
@@ -19,8 +19,8 @@ package org.apache.camel.component.jms.d
import java.util.HashMap;
import java.util.Map;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* A simple POJO showing how to create a simple registry
@@ -28,7 +28,7 @@ import org.apache.commons.logging.LogFac
* @version $Revision$
*/
public class MyRegistry {
- private static final transient Log LOG = LogFactory.getLog(MyRegistry.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(MyRegistry.class);
private Map<String, Map> services = new HashMap<String, Map>();
Modified: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsHammerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsHammerTest.java?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsHammerTest.java (original)
+++ camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsHammerTest.java Tue Feb 1 07:41:02 2011
@@ -21,8 +21,8 @@ import org.apache.camel.CamelContext;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.junit4.CamelTestSupport;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.junit.Ignore;
import org.junit.Test;
import static org.apache.activemq.camel.component.ActiveMQComponent.activeMQComponent;
@@ -35,7 +35,7 @@ import static org.apache.activemq.camel.
@Ignore
public class JmsHammerTest extends CamelTestSupport {
- private static final Log LOG = LogFactory.getLog(JmsHammerTest.class);
+ private static final Logger LOG = LoggerFactory.getLogger(JmsHammerTest.class);
private String message;
// TODO: AMQ reaches a limit when sending #169.
Modified: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsSendToAlotOfDestinationWithSameEndpointTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsSendToAlotOfDestinationWithSameEndpointTest.java?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsSendToAlotOfDestinationWithSameEndpointTest.java (original)
+++ camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsSendToAlotOfDestinationWithSameEndpointTest.java Tue Feb 1 07:41:02 2011
@@ -19,8 +19,8 @@ package org.apache.camel.component.jms.i
import org.apache.camel.ExchangePattern;
import org.apache.camel.component.jms.JmsConstants;
import org.apache.camel.test.junit4.CamelSpringTestSupport;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
import org.junit.Test;
import org.springframework.context.support.AbstractXmlApplicationContext;
@@ -30,7 +30,7 @@ import org.springframework.context.suppo
*/
public class JmsSendToAlotOfDestinationWithSameEndpointTest extends CamelSpringTestSupport {
- private static final transient Log LOG = LogFactory.getLog(JmsSendToAlotOfDestinationWithSameEndpointTest.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(JmsSendToAlotOfDestinationWithSameEndpointTest.class);
private static final String URI = "activemq:queue:foo?autoStartup=false";
public int getExpectedRouteCount() {
Modified: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/LarsIssueTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/LarsIssueTest.java?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/LarsIssueTest.java (original)
+++ camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/LarsIssueTest.java Tue Feb 1 07:41:02 2011
@@ -25,8 +25,8 @@ import org.apache.camel.builder.RouteBui
import org.apache.camel.component.jms.CamelJmsTestHelper;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.junit4.CamelTestSupport;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.junit.Test;
import static org.apache.camel.component.jms.JmsComponent.jmsComponentAutoAcknowledge;
@@ -38,7 +38,7 @@ import static org.apache.camel.component
* @version $Revision$
*/
public class LarsIssueTest extends CamelTestSupport {
- private static final transient Log LOG = LogFactory.getLog(LarsIssueTest.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(LarsIssueTest.class);
@Test
public void testSendSomeMessages() throws Exception {
@@ -79,4 +79,4 @@ public class LarsIssueTest extends Came
}
};
}
-}
\ No newline at end of file
+}
Modified: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/temp/TemporaryQueueRouteTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/temp/TemporaryQueueRouteTest.java?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/temp/TemporaryQueueRouteTest.java (original)
+++ camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/temp/TemporaryQueueRouteTest.java Tue Feb 1 07:41:02 2011
@@ -25,8 +25,8 @@ import org.apache.camel.builder.RouteBui
import org.apache.camel.component.jms.CamelJmsTestHelper;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.junit4.CamelTestSupport;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.junit.Test;
import static org.apache.camel.component.jms.JmsComponent.jmsComponentAutoAcknowledge;
@@ -35,7 +35,7 @@ import static org.apache.camel.component
* @version $Revision$
*/
public class TemporaryQueueRouteTest extends CamelTestSupport {
- private static final transient Log LOG = LogFactory.getLog(TemporaryQueueRouteTest.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(TemporaryQueueRouteTest.class);
protected String endpointUri = "activemq:temp:queue:cheese";
protected Object expectedBody = "<hello>world!</hello>";
@@ -97,4 +97,4 @@ public class TemporaryQueueRouteTest ext
return message;
}
}
-}
\ No newline at end of file
+}
Modified: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/temp/TemporaryTopicRouteTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/temp/TemporaryTopicRouteTest.java?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/temp/TemporaryTopicRouteTest.java (original)
+++ camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/temp/TemporaryTopicRouteTest.java Tue Feb 1 07:41:02 2011
@@ -17,15 +17,15 @@
package org.apache.camel.component.jms.temp;
import org.apache.activemq.command.ActiveMQTempTopic;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.junit.Before;
/**
* @version $Revision$
*/
public class TemporaryTopicRouteTest extends TemporaryQueueRouteTest {
- private static final transient Log LOG = LogFactory.getLog(TemporaryQueueRouteTest.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(TemporaryQueueRouteTest.class);
@Override
@Before
Modified: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/ConditionalExceptionProcessor.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/ConditionalExceptionProcessor.java?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/ConditionalExceptionProcessor.java (original)
+++ camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/ConditionalExceptionProcessor.java Tue Feb 1 07:41:02 2011
@@ -18,15 +18,15 @@ package org.apache.camel.component.jms.t
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Conditionally throws exception causing a rollback
*/
public class ConditionalExceptionProcessor implements Processor {
- private static final transient Log LOG = LogFactory.getLog(ConditionalExceptionProcessor.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(ConditionalExceptionProcessor.class);
private int count;
private int maxCalls;
private String errorMsg;
Modified: camel/trunk/components/camel-josql/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-josql/pom.xml?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-josql/pom.xml (original)
+++ camel/trunk/components/camel-josql/pom.xml Tue Feb 1 07:41:02 2011
@@ -57,15 +57,30 @@
</dependency>
<dependency>
+ <groupId>net.sf.josql</groupId>
+ <artifactId>josql</artifactId>
+ <version>1.5</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.josql</groupId>
+ <artifactId>gentlyweb-utils</artifactId>
+ <version>1.5</version>
+ </dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-test</artifactId>
<optional>true</optional>
<scope>test</scope>
</dependency>
-
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -74,16 +89,6 @@
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>net.sf.josql</groupId>
- <artifactId>josql</artifactId>
- <version>1.5</version>
- </dependency>
- <dependency>
- <groupId>net.sf.josql</groupId>
- <artifactId>gentlyweb-utils</artifactId>
- <version>1.5</version>
- </dependency>
<!-- to allow Spring annotations (jmx) to be tested -->
<dependency>
@@ -99,11 +104,6 @@
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
</project>
Modified: camel/trunk/components/camel-jpa/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jpa/pom.xml?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-jpa/pom.xml (original)
+++ camel/trunk/components/camel-jpa/pom.xml Tue Feb 1 07:41:02 2011
@@ -69,10 +69,6 @@
<groupId>org.springframework</groupId>
<artifactId>spring-orm</artifactId>
</dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging-api</artifactId>
- </dependency>
<!-- testing -->
<dependency>
@@ -96,8 +92,13 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Modified: camel/trunk/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaComponent.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaComponent.java?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaComponent.java (original)
+++ camel/trunk/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaComponent.java Tue Feb 1 07:41:02 2011
@@ -21,8 +21,8 @@ import javax.persistence.EntityManagerFa
import org.apache.camel.Endpoint;
import org.apache.camel.impl.DefaultComponent;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.transaction.PlatformTransactionManager;
import org.springframework.transaction.support.TransactionTemplate;
@@ -32,7 +32,7 @@ import org.springframework.transaction.s
* @version $Revision$
*/
public class JpaComponent extends DefaultComponent {
- private static final Log LOG = LogFactory.getLog(JpaComponent.class);
+ private static final Logger LOG = LoggerFactory.getLogger(JpaComponent.class);
private EntityManagerFactory entityManagerFactory;
private PlatformTransactionManager transactionManager;
Modified: camel/trunk/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaConsumer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaConsumer.java?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaConsumer.java (original)
+++ camel/trunk/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaConsumer.java Tue Feb 1 07:41:02 2011
@@ -35,8 +35,8 @@ import org.apache.camel.impl.ScheduledPo
import org.apache.camel.spi.ShutdownAware;
import org.apache.camel.util.CastUtils;
import org.apache.camel.util.ObjectHelper;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.orm.jpa.JpaCallback;
/**
@@ -44,7 +44,7 @@ import org.springframework.orm.jpa.JpaCa
*/
public class JpaConsumer extends ScheduledPollConsumer implements BatchConsumer, ShutdownAware {
- private static final transient Log LOG = LogFactory.getLog(JpaConsumer.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(JpaConsumer.class);
private final JpaEndpoint endpoint;
private final TransactionStrategy template;
private QueryFactory queryFactory;
Modified: camel/trunk/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaTest.java?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaTest.java (original)
+++ camel/trunk/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaTest.java Tue Feb 1 07:41:02 2011
@@ -31,8 +31,8 @@ import org.apache.camel.Processor;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.examples.SendEmail;
import org.apache.camel.impl.DefaultCamelContext;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
@@ -46,7 +46,7 @@ import static org.apache.camel.util.Serv
* @version $Revision$
*/
public class JpaTest extends Assert {
- private static final transient Log LOG = LogFactory.getLog(JpaTest.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(JpaTest.class);
protected CamelContext camelContext = new DefaultCamelContext();
protected ProducerTemplate template;
protected JpaEndpoint endpoint;
Modified: camel/trunk/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaWithNamedQueryTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaWithNamedQueryTest.java?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaWithNamedQueryTest.java (original)
+++ camel/trunk/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaWithNamedQueryTest.java Tue Feb 1 07:41:02 2011
@@ -32,8 +32,8 @@ import org.apache.camel.ProducerTemplate
import org.apache.camel.examples.MultiSteps;
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.util.ServiceHelper;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
@@ -46,7 +46,7 @@ import org.springframework.orm.jpa.JpaTe
*/
public class JpaWithNamedQueryTest extends Assert {
- protected static final transient Log LOG = LogFactory.getLog(JpaWithNamedQueryTest.class);
+ protected static final transient Logger LOG = LoggerFactory.getLogger(JpaWithNamedQueryTest.class);
protected CamelContext camelContext = new DefaultCamelContext();
protected ProducerTemplate template;
Modified: camel/trunk/components/camel-jpa/src/test/java/org/apache/camel/examples/MultiSteps.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jpa/src/test/java/org/apache/camel/examples/MultiSteps.java?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-jpa/src/test/java/org/apache/camel/examples/MultiSteps.java (original)
+++ camel/trunk/components/camel-jpa/src/test/java/org/apache/camel/examples/MultiSteps.java Tue Feb 1 07:41:02 2011
@@ -22,8 +22,8 @@ import javax.persistence.Id;
import javax.persistence.NamedQuery;
import org.apache.camel.component.jpa.Consumed;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Represents a task which has multiple steps so that it can move from stage to stage
@@ -35,7 +35,7 @@ import org.apache.commons.logging.LogFac
@Entity
@NamedQuery(name = "step1", query = "select x from MultiSteps x where x.step = 1")
public class MultiSteps {
- private static final transient Log LOG = LogFactory.getLog(MultiSteps.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(MultiSteps.class);
private Long id;
private String address;
private int step;
Modified: camel/trunk/components/camel-juel/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-juel/pom.xml?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-juel/pom.xml (original)
+++ camel/trunk/components/camel-juel/pom.xml Tue Feb 1 07:41:02 2011
@@ -60,8 +60,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -89,19 +89,4 @@
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <childDelegation>false</childDelegation>
- <useFile>true</useFile>
- <excludes>
- <exclude>**/FooTest.*</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
</project>
Modified: camel/trunk/components/camel-juel/src/main/java/org/apache/camel/language/juel/JuelExpression.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-juel/src/main/java/org/apache/camel/language/juel/JuelExpression.java?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-juel/src/main/java/org/apache/camel/language/juel/JuelExpression.java (original)
+++ camel/trunk/components/camel-juel/src/main/java/org/apache/camel/language/juel/JuelExpression.java Tue Feb 1 07:41:02 2011
@@ -36,8 +36,8 @@ import org.apache.camel.Exchange;
import org.apache.camel.Message;
import org.apache.camel.impl.ExpressionSupport;
import org.apache.camel.spi.FactoryFinder;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* The <a href="http://camel.apache.org/el.html">EL Language from JSP and JSF</a>
@@ -47,7 +47,7 @@ import org.apache.commons.logging.LogFac
*/
public class JuelExpression extends ExpressionSupport {
public static final String DEFAULT_EXPRESSION_FACTORY_IMPL_CLASS = "de.odysseus.el.ExpressionFactoryImpl";
- private static final Log LOG = LogFactory.getLog(JuelExpression.class);
+ private static final Logger LOG = LoggerFactory.getLogger(JuelExpression.class);
private final String expression;
private final Class<?> type;
Modified: camel/trunk/components/camel-juel/src/test/resources/log4j.properties
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-juel/src/test/resources/log4j.properties?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-juel/src/test/resources/log4j.properties (original)
+++ camel/trunk/components/camel-juel/src/test/resources/log4j.properties Tue Feb 1 07:41:02 2011
@@ -33,6 +33,6 @@ log4j.appender.stdout.layout.ConversionP
log4j.appender.out=org.apache.log4j.FileAppender
log4j.appender.out.layout=org.apache.log4j.PatternLayout
log4j.appender.out.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n
-log4j.appender.out.file=target/camel-test.log
+log4j.appender.out.file=target/camel-juel-test.log
log4j.appender.out.append=true
Modified: camel/trunk/components/camel-jxpath/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jxpath/pom.xml?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-jxpath/pom.xml (original)
+++ camel/trunk/components/camel-jxpath/pom.xml Tue Feb 1 07:41:02 2011
@@ -65,8 +65,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Modified: camel/trunk/components/camel-jxpath/src/test/java/org/apache/camel/language/jxpath/BeanWithJXPathInjectionTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jxpath/src/test/java/org/apache/camel/language/jxpath/BeanWithJXPathInjectionTest.java?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-jxpath/src/test/java/org/apache/camel/language/jxpath/BeanWithJXPathInjectionTest.java (original)
+++ camel/trunk/components/camel-jxpath/src/test/java/org/apache/camel/language/jxpath/BeanWithJXPathInjectionTest.java Tue Feb 1 07:41:02 2011
@@ -22,14 +22,14 @@ import javax.naming.Context;
import org.apache.camel.ContextTestSupport;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.util.jndi.JndiContext;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* @version $Revision$
*/
public class BeanWithJXPathInjectionTest extends ContextTestSupport {
- private static final transient Log LOG = LogFactory.getLog(BeanWithJXPathInjectionTest.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(BeanWithJXPathInjectionTest.class);
protected MyBean myBean = new MyBean();
public void testSendMessage() throws Exception {
Modified: camel/trunk/components/camel-jxpath/src/test/resources/log4j.properties
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jxpath/src/test/resources/log4j.properties?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-jxpath/src/test/resources/log4j.properties (original)
+++ camel/trunk/components/camel-jxpath/src/test/resources/log4j.properties Tue Feb 1 07:41:02 2011
@@ -20,15 +20,17 @@
#
log4j.rootLogger=INFO, out
-log4j.logger.org.apache.camel=WARN
-#log4j.logger.org.apache.camel.component.test=DEBUG
-
-
-log4j.logger.org.springframework=WARN
#log4j.logger.org.apache.camel=DEBUG
# CONSOLE appender not used by default
-log4j.appender.out=org.apache.log4j.ConsoleAppender
-log4j.appender.out.layout=org.apache.log4j.PatternLayout
-log4j.appender.out.layout.ConversionPattern=[%30.30t] %-30.30c{1} %-5p %m%n
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern=[%30.30t] %-30.30c{1} %-5p %m%n
#log4j.appender.out.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n
+
+# File appender
+log4j.appender.out=org.apache.log4j.FileAppender
+log4j.appender.out.layout=org.apache.log4j.PatternLayout
+log4j.appender.out.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n
+log4j.appender.out.file=target/camel-jxpath-test.log
+log4j.appender.out.append=true
Modified: camel/trunk/components/camel-kestrel/src/main/java/org/apache/camel/component/kestrel/KestrelComponent.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-kestrel/src/main/java/org/apache/camel/component/kestrel/KestrelComponent.java?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-kestrel/src/main/java/org/apache/camel/component/kestrel/KestrelComponent.java (original)
+++ camel/trunk/components/camel-kestrel/src/main/java/org/apache/camel/component/kestrel/KestrelComponent.java Tue Feb 1 07:41:02 2011
@@ -28,15 +28,15 @@ import org.apache.camel.CamelContext;
import org.apache.camel.RuntimeCamelException;
import org.apache.camel.impl.DefaultComponent;
import org.apache.camel.util.ServiceHelper;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Camel component which offers queueing over the Memcached protocol
* as supported by Kestrel.
*/
public class KestrelComponent extends DefaultComponent {
- private static final transient Log LOG = LogFactory.getLog(KestrelComponent.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(KestrelComponent.class);
private KestrelConfiguration configuration;
private ConnectionFactory memcachedConnectionFactory;
Modified: camel/trunk/components/camel-kestrel/src/main/java/org/apache/camel/component/kestrel/KestrelConsumer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-kestrel/src/main/java/org/apache/camel/component/kestrel/KestrelConsumer.java?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-kestrel/src/main/java/org/apache/camel/component/kestrel/KestrelConsumer.java (original)
+++ camel/trunk/components/camel-kestrel/src/main/java/org/apache/camel/component/kestrel/KestrelConsumer.java Tue Feb 1 07:41:02 2011
@@ -29,8 +29,8 @@ import org.apache.camel.Processor;
import org.apache.camel.ShutdownRunningTask;
import org.apache.camel.impl.DefaultConsumer;
import org.apache.camel.spi.ShutdownAware;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* A Camel consumer that polls a kestrel queue.
Modified: camel/trunk/components/camel-kestrel/src/main/java/org/apache/camel/component/kestrel/KestrelProducer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-kestrel/src/main/java/org/apache/camel/component/kestrel/KestrelProducer.java?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-kestrel/src/main/java/org/apache/camel/component/kestrel/KestrelProducer.java (original)
+++ camel/trunk/components/camel-kestrel/src/main/java/org/apache/camel/component/kestrel/KestrelProducer.java Tue Feb 1 07:41:02 2011
@@ -20,8 +20,8 @@ import net.spy.memcached.MemcachedClient
import org.apache.camel.CamelExchangeException;
import org.apache.camel.Exchange;
import org.apache.camel.impl.DefaultProducer;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Camel producer for communication with a kestrel based queue.
Modified: camel/trunk/components/camel-lucene/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-lucene/pom.xml?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-lucene/pom.xml (original)
+++ camel/trunk/components/camel-lucene/pom.xml Tue Feb 1 07:41:02 2011
@@ -65,11 +65,6 @@
<!-- logging -->
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<scope>test</scope>
</dependency>
Modified: camel/trunk/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneIndexer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneIndexer.java?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneIndexer.java (original)
+++ camel/trunk/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneIndexer.java Tue Feb 1 07:41:02 2011
@@ -23,8 +23,8 @@ import java.util.Map;
import org.apache.camel.Exchange;
import org.apache.camel.converter.IOConverter;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
@@ -32,7 +32,7 @@ import org.apache.lucene.index.IndexWrit
import org.apache.lucene.store.NIOFSDirectory;
public class LuceneIndexer {
- private static final transient Log LOG = LogFactory.getLog(LuceneIndexer.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(LuceneIndexer.class);
private File sourceDirectory;
private Analyzer analyzer;
private NIOFSDirectory niofsDirectory;
@@ -140,7 +140,7 @@ public class LuceneIndexer {
}
}
} else {
- LOG.warn("Directory/File " + file.getAbsolutePath() + "could not be read."
+ LOG.warn("Directory/File " + file.getAbsolutePath() + " could not be read."
+ " This directory will not be indexed. Please check permissions and rebuild indexes.");
}
}
@@ -160,4 +160,4 @@ public class LuceneIndexer {
indexWriter.close();
}
-}
\ No newline at end of file
+}
Modified: camel/trunk/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneSearcher.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneSearcher.java?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneSearcher.java (original)
+++ camel/trunk/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneSearcher.java Tue Feb 1 07:41:02 2011
@@ -21,8 +21,8 @@ import java.io.IOException;
import org.apache.camel.processor.lucene.support.Hit;
import org.apache.camel.processor.lucene.support.Hits;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.document.Document;
import org.apache.lucene.queryParser.ParseException;
@@ -35,7 +35,7 @@ import org.apache.lucene.store.NIOFSDire
import org.apache.lucene.util.Version;
public class LuceneSearcher {
- private static final transient Log LOG = LogFactory.getLog(LuceneSearcher.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(LuceneSearcher.class);
private Analyzer analyzer;
private IndexSearcher indexSearcher;
private ScoreDoc[] hits;
Modified: camel/trunk/components/camel-lucene/src/test/java/org/apache/camel/component/lucene/LuceneIndexAndQueryProducerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-lucene/src/test/java/org/apache/camel/component/lucene/LuceneIndexAndQueryProducerTest.java?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-lucene/src/test/java/org/apache/camel/component/lucene/LuceneIndexAndQueryProducerTest.java (original)
+++ camel/trunk/components/camel-lucene/src/test/java/org/apache/camel/component/lucene/LuceneIndexAndQueryProducerTest.java Tue Feb 1 07:41:02 2011
@@ -27,8 +27,8 @@ import org.apache.camel.component.mock.M
import org.apache.camel.impl.JndiRegistry;
import org.apache.camel.processor.lucene.support.Hits;
import org.apache.camel.test.CamelTestSupport;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.lucene.analysis.SimpleAnalyzer;
import org.apache.lucene.analysis.WhitespaceAnalyzer;
import org.apache.lucene.analysis.standard.StandardAnalyzer;
@@ -36,7 +36,7 @@ import org.apache.lucene.util.Version;
import org.junit.Test;
public class LuceneIndexAndQueryProducerTest extends CamelTestSupport {
- private static final transient Log LOG = LogFactory.getLog(LuceneIndexAndQueryProducerTest.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(LuceneIndexAndQueryProducerTest.class);
private String[] humorousQuotes = {
"I think, therefore I am. I think - George Carlin",
"I have as much authority as the Pope. I just donÕt have as many people who believe it. - George Carlin",
Modified: camel/trunk/components/camel-lucene/src/test/java/org/apache/camel/processor/lucene/LuceneQueryProcessorTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-lucene/src/test/java/org/apache/camel/processor/lucene/LuceneQueryProcessorTest.java?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-lucene/src/test/java/org/apache/camel/processor/lucene/LuceneQueryProcessorTest.java (original)
+++ camel/trunk/components/camel-lucene/src/test/java/org/apache/camel/processor/lucene/LuceneQueryProcessorTest.java Tue Feb 1 07:41:02 2011
@@ -24,15 +24,15 @@ import org.apache.camel.builder.RouteBui
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.processor.lucene.support.Hits;
import org.apache.camel.test.CamelTestSupport;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.lucene.analysis.SimpleAnalyzer;
import org.apache.lucene.analysis.standard.StandardAnalyzer;
import org.apache.lucene.util.Version;
import org.junit.Test;
public class LuceneQueryProcessorTest extends CamelTestSupport {
- private static final transient Log LOG = LogFactory.getLog(LuceneQueryProcessorTest.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(LuceneQueryProcessorTest.class);
@Override
public boolean isUseRouteBuilder() {