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 [4/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-mail/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mail/pom.xml?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-mail/pom.xml (original)
+++ camel/trunk/components/camel-mail/pom.xml Tue Feb 1 07:41:02 2011
@@ -90,13 +90,13 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
Modified: camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailBinding.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailBinding.java?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailBinding.java (original)
+++ camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailBinding.java Tue Feb 1 07:41:02 2011
@@ -48,8 +48,8 @@ import org.apache.camel.impl.DefaultHead
import org.apache.camel.spi.HeaderFilterStrategy;
import org.apache.camel.util.CollectionHelper;
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;
/**
* A Strategy used to convert between a Camel {@link Exchange} and {@link Message} to and
@@ -59,7 +59,7 @@ import org.apache.commons.logging.LogFac
*/
public class MailBinding {
- private static final transient Log LOG = LogFactory.getLog(MailBinding.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(MailBinding.class);
private HeaderFilterStrategy headerFilterStrategy;
private ContentTypeResolver contentTypeResolver;
Modified: camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConsumer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConsumer.java?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConsumer.java (original)
+++ camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConsumer.java Tue Feb 1 07:41:02 2011
@@ -36,8 +36,8 @@ import org.apache.camel.spi.ShutdownAwar
import org.apache.camel.spi.Synchronization;
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.mail.javamail.JavaMailSenderImpl;
/**
@@ -48,7 +48,7 @@ import org.springframework.mail.javamail
*/
public class MailConsumer extends ScheduledPollConsumer implements BatchConsumer, ShutdownAware {
public static final long DEFAULT_CONSUMER_DELAY = 60 * 1000L;
- private static final transient Log LOG = LogFactory.getLog(MailConsumer.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(MailConsumer.class);
private final JavaMailSenderImpl sender;
private Folder folder;
@@ -340,4 +340,4 @@ public class MailConsumer extends Schedu
public MailEndpoint getEndpoint() {
return (MailEndpoint) super.getEndpoint();
}
-}
\ No newline at end of file
+}
Modified: camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailProducer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailProducer.java?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailProducer.java (original)
+++ camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailProducer.java Tue Feb 1 07:41:02 2011
@@ -20,8 +20,8 @@ import javax.mail.internet.MimeMessage;
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;
import org.springframework.mail.javamail.JavaMailSender;
import org.springframework.mail.javamail.MimeMessagePreparator;
@@ -32,7 +32,7 @@ import org.springframework.mail.javamail
* @version $Revision$
*/
public class MailProducer extends DefaultProducer {
- private static final transient Log LOG = LogFactory.getLog(MailProducer.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(MailProducer.class);
private final JavaMailSender sender;
public MailProducer(MailEndpoint endpoint, JavaMailSender sender) {
@@ -55,4 +55,4 @@ public class MailProducer extends Defaul
public MailEndpoint getEndpoint() {
return (MailEndpoint) super.getEndpoint();
}
-}
\ No newline at end of file
+}
Modified: camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/security/DummySSLSocketFactory.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/security/DummySSLSocketFactory.java?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/security/DummySSLSocketFactory.java (original)
+++ camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/security/DummySSLSocketFactory.java Tue Feb 1 07:41:02 2011
@@ -25,8 +25,8 @@ import javax.net.ssl.SSLSocketFactory;
import javax.net.ssl.TrustManager;
import org.apache.camel.RuntimeCamelException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* DummySSLSocketFactory for testing with SSL - <b>NOT SECURE</b>.
@@ -35,7 +35,7 @@ import org.apache.commons.logging.LogFac
*/
public class DummySSLSocketFactory extends SSLSocketFactory {
- private static final transient Log LOG = LogFactory.getLog(DummySSLSocketFactory.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(DummySSLSocketFactory.class);
private SSLSocketFactory factory;
public DummySSLSocketFactory() {
Modified: camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/security/DummyTrustManager.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/security/DummyTrustManager.java?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/security/DummyTrustManager.java (original)
+++ camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/security/DummyTrustManager.java Tue Feb 1 07:41:02 2011
@@ -21,15 +21,15 @@ import java.security.cert.X509Certificat
import javax.net.ssl.X509TrustManager;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* DummyTrustManager that accepts any given certificate - <b>NOT SECURE</b>.
*/
public class DummyTrustManager implements X509TrustManager {
- private static final transient Log LOG = LogFactory.getLog(DummyTrustManager.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(DummyTrustManager.class);
public void checkClientTrusted(X509Certificate[] chain, String authType) throws CertificateException {
// everything is trusted
Propchange: camel/trunk/components/camel-mvel/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Feb 1 07:41:02 2011
@@ -1,7 +1,8 @@
-.project
+target
.pmd
.checkstyle
.classpath
-target
-.settings
+.project
eclipse-classes
+.settings
+*.i??
Modified: camel/trunk/components/camel-mvel/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mvel/pom.xml?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-mvel/pom.xml (original)
+++ camel/trunk/components/camel-mvel/pom.xml Tue Feb 1 07:41:02 2011
@@ -61,8 +61,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-ognl/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ognl/pom.xml?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-ognl/pom.xml (original)
+++ camel/trunk/components/camel-ognl/pom.xml Tue Feb 1 07:41:02 2011
@@ -70,8 +70,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-printer/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-printer/pom.xml?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-printer/pom.xml (original)
+++ camel/trunk/components/camel-printer/pom.xml Tue Feb 1 07:41:02 2011
@@ -57,11 +57,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-printer/src/main/java/org/apache/camel/component/printer/PrinterConfiguration.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-printer/src/main/java/org/apache/camel/component/printer/PrinterConfiguration.java?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-printer/src/main/java/org/apache/camel/component/printer/PrinterConfiguration.java (original)
+++ camel/trunk/components/camel-printer/src/main/java/org/apache/camel/component/printer/PrinterConfiguration.java Tue Feb 1 07:41:02 2011
@@ -24,11 +24,11 @@ import javax.print.attribute.standard.Me
import javax.print.attribute.standard.Sides;
import org.apache.camel.util.URISupport;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class PrinterConfiguration {
- private static final transient Log LOG = LogFactory.getLog(PrinterConfiguration.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(PrinterConfiguration.class);
private URI uri;
private String hostname;
private int port;
Modified: camel/trunk/components/camel-printer/src/main/java/org/apache/camel/component/printer/PrinterOperations.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-printer/src/main/java/org/apache/camel/component/printer/PrinterOperations.java?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-printer/src/main/java/org/apache/camel/component/printer/PrinterOperations.java (original)
+++ camel/trunk/components/camel-printer/src/main/java/org/apache/camel/component/printer/PrinterOperations.java Tue Feb 1 07:41:02 2011
@@ -33,11 +33,11 @@ import javax.print.attribute.standard.Me
import javax.print.attribute.standard.Sides;
import org.apache.camel.util.IOHelper;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class PrinterOperations implements PrinterOperationsInterface {
- private static final transient Log LOG = LogFactory.getLog(PrinterOperations.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(PrinterOperations.class);
private PrintService printService;
private DocPrintJob job;
private DocFlavor flavor;
Modified: camel/trunk/components/camel-printer/src/main/java/org/apache/camel/component/printer/PrinterProducer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-printer/src/main/java/org/apache/camel/component/printer/PrinterProducer.java?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-printer/src/main/java/org/apache/camel/component/printer/PrinterProducer.java (original)
+++ camel/trunk/components/camel-printer/src/main/java/org/apache/camel/component/printer/PrinterProducer.java Tue Feb 1 07:41:02 2011
@@ -31,11 +31,11 @@ import org.apache.camel.Endpoint;
import org.apache.camel.Exchange;
import org.apache.camel.impl.DefaultProducer;
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;
public class PrinterProducer extends DefaultProducer {
- private static final transient Log LOG = LogFactory.getLog(PrinterProducer.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(PrinterProducer.class);
private final PrinterConfiguration config;
private PrinterOperations printerOperations;
private PrintService printService;
Modified: camel/trunk/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzComponent.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzComponent.java?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzComponent.java (original)
+++ camel/trunk/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzComponent.java Tue Feb 1 07:41:02 2011
@@ -32,8 +32,8 @@ import org.apache.camel.StartupListener;
import org.apache.camel.impl.DefaultComponent;
import org.apache.camel.util.IntrospectionSupport;
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.quartz.CronTrigger;
import org.quartz.JobDetail;
import org.quartz.Scheduler;
@@ -52,7 +52,7 @@ import org.quartz.impl.StdSchedulerFacto
* @version $Revision:520964 $
*/
public class QuartzComponent extends DefaultComponent implements StartupListener {
- private static final transient Log LOG = LogFactory.getLog(QuartzComponent.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(QuartzComponent.class);
private static final AtomicInteger JOBS = new AtomicInteger();
private static Scheduler scheduler;
private final List<JobToAdd> jobsToAdd = new ArrayList<JobToAdd>();
Modified: camel/trunk/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzEndpoint.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzEndpoint.java?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzEndpoint.java (original)
+++ camel/trunk/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzEndpoint.java Tue Feb 1 07:41:02 2011
@@ -29,8 +29,8 @@ import org.apache.camel.processor.loadba
import org.apache.camel.util.ExchangeHelper;
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.quartz.JobDetail;
import org.quartz.JobExecutionContext;
import org.quartz.JobExecutionException;
@@ -43,7 +43,7 @@ import org.quartz.Trigger;
* @version $Revision:520964 $
*/
public class QuartzEndpoint extends DefaultEndpoint implements ShutdownableService {
- private static final transient Log LOG = LogFactory.getLog(QuartzEndpoint.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(QuartzEndpoint.class);
private LoadBalancer loadBalancer;
private Trigger trigger;
Modified: camel/trunk/components/camel-quartz/src/main/java/org/apache/camel/routepolicy/quartz/CronScheduledRoutePolicy.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-quartz/src/main/java/org/apache/camel/routepolicy/quartz/CronScheduledRoutePolicy.java?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-quartz/src/main/java/org/apache/camel/routepolicy/quartz/CronScheduledRoutePolicy.java (original)
+++ camel/trunk/components/camel-quartz/src/main/java/org/apache/camel/routepolicy/quartz/CronScheduledRoutePolicy.java Tue Feb 1 07:41:02 2011
@@ -20,13 +20,13 @@ import java.util.concurrent.TimeUnit;
import org.apache.camel.Route;
import org.apache.camel.component.quartz.QuartzComponent;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.quartz.CronTrigger;
import org.quartz.Trigger;
public class CronScheduledRoutePolicy extends ScheduledRoutePolicy implements ScheduledRoutePolicyConstants {
- private static final transient Log LOG = LogFactory.getLog(CronScheduledRoutePolicy.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(CronScheduledRoutePolicy.class);
private String routeStartTime;
private String routeStopTime;
private String routeSuspendTime;
Modified: camel/trunk/components/camel-quartz/src/main/java/org/apache/camel/routepolicy/quartz/ScheduledRoutePolicy.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-quartz/src/main/java/org/apache/camel/routepolicy/quartz/ScheduledRoutePolicy.java?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-quartz/src/main/java/org/apache/camel/routepolicy/quartz/ScheduledRoutePolicy.java (original)
+++ camel/trunk/components/camel-quartz/src/main/java/org/apache/camel/routepolicy/quartz/ScheduledRoutePolicy.java Tue Feb 1 07:41:02 2011
@@ -21,15 +21,15 @@ import java.util.concurrent.TimeUnit;
import org.apache.camel.Route;
import org.apache.camel.ServiceStatus;
import org.apache.camel.impl.RoutePolicySupport;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.quartz.JobDetail;
import org.quartz.Scheduler;
import org.quartz.SchedulerException;
import org.quartz.Trigger;
public abstract class ScheduledRoutePolicy extends RoutePolicySupport implements ScheduledRoutePolicyConstants {
- private static final transient Log LOG = LogFactory.getLog(ScheduledRoutePolicy.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(ScheduledRoutePolicy.class);
protected ScheduledRouteDetails scheduledRouteDetails;
private Scheduler scheduler;
private int routeStopGracePeriod;
Modified: camel/trunk/components/camel-quartz/src/main/java/org/apache/camel/routepolicy/quartz/SimpleScheduledRoutePolicy.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-quartz/src/main/java/org/apache/camel/routepolicy/quartz/SimpleScheduledRoutePolicy.java?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-quartz/src/main/java/org/apache/camel/routepolicy/quartz/SimpleScheduledRoutePolicy.java (original)
+++ camel/trunk/components/camel-quartz/src/main/java/org/apache/camel/routepolicy/quartz/SimpleScheduledRoutePolicy.java Tue Feb 1 07:41:02 2011
@@ -21,13 +21,13 @@ import java.util.concurrent.TimeUnit;
import org.apache.camel.Route;
import org.apache.camel.component.quartz.QuartzComponent;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.quartz.SimpleTrigger;
import org.quartz.Trigger;
public class SimpleScheduledRoutePolicy extends ScheduledRoutePolicy {
- private static final transient Log LOG = LogFactory.getLog(CronScheduledRoutePolicy.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(CronScheduledRoutePolicy.class);
private Date routeStartDate;
private int routeStartRepeatCount;
private long routeStartRepeatInterval;
Modified: camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/CronScheduledRoutePolicyTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/CronScheduledRoutePolicyTest.java?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/CronScheduledRoutePolicyTest.java (original)
+++ camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/CronScheduledRoutePolicyTest.java Tue Feb 1 07:41:02 2011
@@ -25,15 +25,15 @@ import org.apache.camel.component.mock.M
import org.apache.camel.component.quartz.QuartzComponent;
import org.apache.camel.test.junit4.CamelTestSupport;
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.Test;
/**
* @version $Revision: 882486 $
*/
public class CronScheduledRoutePolicyTest extends CamelTestSupport {
- private static final transient Log LOG = LogFactory.getLog(CronScheduledRoutePolicyTest.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(CronScheduledRoutePolicyTest.class);
/* (non-Javadoc)
* @see org.apache.camel.test.junit4.CamelTestSupport#s;etUp()
Modified: camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/MultiplePoliciesOnRouteTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/MultiplePoliciesOnRouteTest.java?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/MultiplePoliciesOnRouteTest.java (original)
+++ camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/MultiplePoliciesOnRouteTest.java Tue Feb 1 07:41:02 2011
@@ -29,15 +29,15 @@ import org.apache.camel.impl.ThrottlingI
import org.apache.camel.spi.RoutePolicy;
import org.apache.camel.test.junit4.CamelTestSupport;
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.Test;
/**
* @version $Revision: 882486 $
*/
public class MultiplePoliciesOnRouteTest extends CamelTestSupport {
- private static final transient Log LOG = LogFactory.getLog(MultiplePoliciesOnRouteTest.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(MultiplePoliciesOnRouteTest.class);
private String url = "seda:foo?concurrentConsumers=20";
private int size = 100;
Modified: camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SimpleScheduledCombinedRoutePolicyTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SimpleScheduledCombinedRoutePolicyTest.java?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SimpleScheduledCombinedRoutePolicyTest.java (original)
+++ camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SimpleScheduledCombinedRoutePolicyTest.java Tue Feb 1 07:41:02 2011
@@ -23,15 +23,15 @@ import org.apache.camel.builder.RouteBui
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.quartz.QuartzComponent;
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;
/**
* @version $Revision: 882486 $
*/
public class SimpleScheduledCombinedRoutePolicyTest extends CamelTestSupport {
- private static final transient Log LOG = LogFactory.getLog(SimpleScheduledCombinedRoutePolicyTest.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(SimpleScheduledCombinedRoutePolicyTest.class);
/* (non-Javadoc)
* @see org.apache.camel.test.junit4.CamelTestSupport#s;etUp()
Modified: camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SimpleScheduledRoutePolicyTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SimpleScheduledRoutePolicyTest.java?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SimpleScheduledRoutePolicyTest.java (original)
+++ camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SimpleScheduledRoutePolicyTest.java Tue Feb 1 07:41:02 2011
@@ -26,15 +26,15 @@ import org.apache.camel.component.mock.M
import org.apache.camel.component.quartz.QuartzComponent;
import org.apache.camel.test.junit4.CamelTestSupport;
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.Test;
/**
* @version $Revision: 882486 $
*/
public class SimpleScheduledRoutePolicyTest extends CamelTestSupport {
- private static final transient Log LOG = LogFactory.getLog(SimpleScheduledRoutePolicyTest.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(SimpleScheduledRoutePolicyTest.class);
/* (non-Javadoc)
* @see org.apache.camel.test.junit4.CamelTestSupport#s;etUp()
Modified: camel/trunk/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/examples/DynamicRoutingExample.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/examples/DynamicRoutingExample.java?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/examples/DynamicRoutingExample.java (original)
+++ camel/trunk/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/examples/DynamicRoutingExample.java Tue Feb 1 07:41:02 2011
@@ -66,7 +66,7 @@ public class DynamicRoutingExample {
filter(header(QuickfixjEndpoint.EVENT_CATEGORY_KEY).isEqualTo(QuickfixjEventCategory.AppMessageReceived)).
recipientList(bean(new FixMessageRouter("quickfix:examples/gateway.cfg")));
- // Log app messages as JSON
+ // Logger app messages as JSON
from("quickfix:examples/gateway.cfg").
filter(PredicateBuilder.or(
header(QuickfixjEndpoint.EVENT_CATEGORY_KEY).isEqualTo(QuickfixjEventCategory.AppMessageReceived),
Modified: camel/trunk/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/examples/trading/TradeExecutorExample.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/examples/trading/TradeExecutorExample.java?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/examples/trading/TradeExecutorExample.java (original)
+++ camel/trunk/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/examples/trading/TradeExecutorExample.java Tue Feb 1 07:41:02 2011
@@ -74,7 +74,7 @@ public class TradeExecutorExample {
from("trade-executor:market").to("quickfix:examples/inprocess.cfg");
- // Log app messages as JSON
+ // Logger app messages as JSON
from("quickfix:examples/inprocess.cfg").
filter(PredicateBuilder.or(
header(QuickfixjEndpoint.EVENT_CATEGORY_KEY).isEqualTo(QuickfixjEventCategory.AppMessageReceived),
Modified: camel/trunk/components/camel-restlet/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-restlet/pom.xml?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-restlet/pom.xml (original)
+++ camel/trunk/components/camel-restlet/pom.xml Tue Feb 1 07:41:02 2011
@@ -83,8 +83,8 @@
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
<scope>test</scope>
</dependency>
Modified: camel/trunk/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/DefaultRestletBinding.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/DefaultRestletBinding.java?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/DefaultRestletBinding.java (original)
+++ camel/trunk/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/DefaultRestletBinding.java Tue Feb 1 07:41:02 2011
@@ -28,8 +28,8 @@ import org.apache.camel.RuntimeCamelExce
import org.apache.camel.converter.jaxp.StringSource;
import org.apache.camel.spi.HeaderFilterStrategy;
import org.apache.camel.spi.HeaderFilterStrategyAware;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.restlet.data.ChallengeResponse;
import org.restlet.data.ChallengeScheme;
import org.restlet.data.CharacterSet;
@@ -47,7 +47,7 @@ import org.restlet.data.Status;
* @version $Revision$
*/
public class DefaultRestletBinding implements RestletBinding, HeaderFilterStrategyAware {
- private static final Log LOG = LogFactory.getLog(DefaultRestletBinding.class);
+ private static final Logger LOG = LoggerFactory.getLogger(DefaultRestletBinding.class);
private HeaderFilterStrategy headerFilterStrategy;
public void populateExchangeFromRestletRequest(Request request, Exchange exchange) throws Exception {
Modified: camel/trunk/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/MethodBasedRouter.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/MethodBasedRouter.java?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/MethodBasedRouter.java (original)
+++ camel/trunk/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/MethodBasedRouter.java Tue Feb 1 07:41:02 2011
@@ -20,8 +20,8 @@ import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicBoolean;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.restlet.Restlet;
import org.restlet.data.Method;
import org.restlet.data.Request;
@@ -34,7 +34,7 @@ import org.restlet.data.Status;
* @version $Revision$
*/
class MethodBasedRouter extends Restlet {
- private static final Log LOG = LogFactory.getLog(MethodBasedRouter.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodBasedRouter.class);
private String uriPattern;
private Map<Method, Restlet> routes = new ConcurrentHashMap<Method, Restlet>();
Modified: camel/trunk/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletComponent.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletComponent.java?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletComponent.java (original)
+++ camel/trunk/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletComponent.java Tue Feb 1 07:41:02 2011
@@ -26,8 +26,8 @@ import org.apache.camel.Endpoint;
import org.apache.camel.impl.HeaderFilterStrategyComponent;
import org.apache.camel.util.URISupport;
import org.apache.camel.util.UnsafeUriCharactersEncoder;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.restlet.Component;
import org.restlet.Guard;
import org.restlet.Restlet;
@@ -42,7 +42,7 @@ import org.restlet.data.Protocol;
* @version $Revision$
*/
public class RestletComponent extends HeaderFilterStrategyComponent {
- private static final Log LOG = LogFactory.getLog(RestletComponent.class);
+ private static final Logger LOG = LoggerFactory.getLogger(RestletComponent.class);
private final Map<String, Server> servers = new HashMap<String, Server>();
private final Map<String, MethodBasedRouter> routers = new HashMap<String, MethodBasedRouter>();
Modified: camel/trunk/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletConsumer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletConsumer.java?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletConsumer.java (original)
+++ camel/trunk/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletConsumer.java Tue Feb 1 07:41:02 2011
@@ -21,8 +21,8 @@ import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.RuntimeCamelException;
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.restlet.Restlet;
import org.restlet.data.Request;
import org.restlet.data.Response;
@@ -33,7 +33,7 @@ import org.restlet.data.Response;
* @version $Revision$
*/
public class RestletConsumer extends DefaultConsumer {
- private static final Log LOG = LogFactory.getLog(RestletConsumer.class);
+ private static final Logger LOG = LoggerFactory.getLogger(RestletConsumer.class);
private Restlet restlet;
public RestletConsumer(Endpoint endpoint, Processor processor)
Modified: camel/trunk/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletProducer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletProducer.java?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletProducer.java (original)
+++ camel/trunk/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletProducer.java Tue Feb 1 07:41:02 2011
@@ -24,8 +24,8 @@ import java.util.regex.Pattern;
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;
import org.restlet.Client;
import org.restlet.Context;
import org.restlet.data.Request;
@@ -37,7 +37,7 @@ import org.restlet.data.Response;
* @version $Revision$
*/
public class RestletProducer extends DefaultProducer {
- private static final Log LOG = LogFactory.getLog(RestletProducer.class);
+ private static final Logger LOG = LoggerFactory.getLogger(RestletProducer.class);
private static final Pattern PATTERN = Pattern.compile("\\{([\\w\\.]*)\\}");
private Client client;
private boolean throwException;
@@ -76,7 +76,7 @@ public class RestletProducer extends Def
Response response = client.handle(request);
if (throwException) {
- if (response instanceof Response) {
+ if (response != null) {
Integer respCode = response.getStatus().getCode();
if (respCode > 207) {
throw populateRestletProducerException(exchange, response, respCode);
@@ -124,7 +124,6 @@ public class RestletProducer extends Def
String statusText = response.getStatus().getDescription();
Map<String, String> headers = parseResponseHeaders(response, exchange);
String copy = response.toString();
- LOG.warn(headers);
if (responseCode >= 300 && responseCode < 400) {
String redirectLocation;
if (response.getStatus().isRedirection()) {
@@ -151,7 +150,6 @@ public class RestletProducer extends Def
if (LOG.isTraceEnabled()) {
LOG.trace("Parse external header " + entry.getKey() + "=" + entry.getValue());
}
- LOG.info("Parse external header " + entry.getKey() + "=" + entry.getValue());
answer.put(entry.getKey(), entry.getValue().toString());
}
}
Modified: camel/trunk/components/camel-rss/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-rss/pom.xml?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-rss/pom.xml (original)
+++ camel/trunk/components/camel-rss/pom.xml Tue Feb 1 07:41:02 2011
@@ -72,8 +72,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-rss/src/main/java/org/apache/camel/component/rss/AggregateRssFeedStrategy.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-rss/src/main/java/org/apache/camel/component/rss/AggregateRssFeedStrategy.java?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-rss/src/main/java/org/apache/camel/component/rss/AggregateRssFeedStrategy.java (original)
+++ camel/trunk/components/camel-rss/src/main/java/org/apache/camel/component/rss/AggregateRssFeedStrategy.java Tue Feb 1 07:41:02 2011
@@ -25,11 +25,11 @@ import com.sun.syndication.feed.synd.Syn
import org.apache.camel.Exchange;
import org.apache.camel.processor.aggregate.AggregationStrategy;
import org.apache.camel.util.CastUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class AggregateRssFeedStrategy implements AggregationStrategy {
- protected final transient Log log = LogFactory.getLog(AggregateRssFeedStrategy.class);
+ protected final transient Logger log = LoggerFactory.getLogger(AggregateRssFeedStrategy.class);
public Exchange aggregate(Exchange oldExchange, Exchange newExchange) {
if (oldExchange == null) {
@@ -49,4 +49,4 @@ public class AggregateRssFeedStrategy im
}
return oldExchange;
}
-}
\ No newline at end of file
+}
Modified: camel/trunk/components/camel-rss/src/main/java/org/apache/camel/component/rss/RssEndpoint.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-rss/src/main/java/org/apache/camel/component/rss/RssEndpoint.java?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-rss/src/main/java/org/apache/camel/component/rss/RssEndpoint.java (original)
+++ camel/trunk/components/camel-rss/src/main/java/org/apache/camel/component/rss/RssEndpoint.java Tue Feb 1 07:41:02 2011
@@ -25,14 +25,14 @@ import org.apache.camel.Processor;
import org.apache.camel.component.feed.FeedComponent;
import org.apache.camel.component.feed.FeedEndpoint;
import org.apache.camel.component.feed.FeedPollingConsumer;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* An <a href="http://camel.apache.org/rss.html">RSS Endpoint</a>.
*/
public class RssEndpoint extends FeedEndpoint {
- protected static final transient Log LOG = LogFactory.getLog(RssEndpoint.class);
+ protected static final transient Logger LOG = LoggerFactory.getLogger(RssEndpoint.class);
public RssEndpoint() {
}
Modified: camel/trunk/components/camel-rss/src/main/java/org/apache/camel/component/rss/UpdatedDateFilter.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-rss/src/main/java/org/apache/camel/component/rss/UpdatedDateFilter.java?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-rss/src/main/java/org/apache/camel/component/rss/UpdatedDateFilter.java (original)
+++ camel/trunk/components/camel-rss/src/main/java/org/apache/camel/component/rss/UpdatedDateFilter.java Tue Feb 1 07:41:02 2011
@@ -22,8 +22,8 @@ import com.sun.syndication.feed.synd.Syn
import org.apache.camel.component.feed.EntryFilter;
import org.apache.camel.component.feed.FeedEndpoint;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Filters out all entries which occur before the last time of the entry we saw (assuming
@@ -33,7 +33,7 @@ import org.apache.commons.logging.LogFac
*/
public class UpdatedDateFilter implements EntryFilter {
- private static final transient Log LOG = LogFactory.getLog(UpdatedDateFilter.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(UpdatedDateFilter.class);
private Date lastUpdate;
public UpdatedDateFilter(Date lastUpdate) {
Modified: camel/trunk/components/camel-rss/src/main/java/org/apache/camel/dataformat/rss/RssDataFormat.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-rss/src/main/java/org/apache/camel/dataformat/rss/RssDataFormat.java?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-rss/src/main/java/org/apache/camel/dataformat/rss/RssDataFormat.java (original)
+++ camel/trunk/components/camel-rss/src/main/java/org/apache/camel/dataformat/rss/RssDataFormat.java Tue Feb 1 07:41:02 2011
@@ -23,8 +23,8 @@ import com.sun.syndication.feed.synd.Syn
import org.apache.camel.Exchange;
import org.apache.camel.spi.DataFormat;
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;
/**
* RSS DataFormat
@@ -39,7 +39,7 @@ import org.apache.commons.logging.LogFac
* <p/>
*/
public class RssDataFormat implements DataFormat {
- protected static final transient Log LOG = LogFactory.getLog(RssDataFormat.class);
+ protected static final transient Logger LOG = LoggerFactory.getLogger(RssDataFormat.class);
public void marshal(Exchange exchange, Object body, OutputStream out) throws Exception {
SyndFeed feed = ExchangeHelper.convertToMandatoryType(exchange, SyndFeed.class, body);
Modified: camel/trunk/components/camel-ruby/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ruby/pom.xml?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-ruby/pom.xml (original)
+++ camel/trunk/components/camel-ruby/pom.xml Tue Feb 1 07:41:02 2011
@@ -58,8 +58,8 @@
</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-ruby/src/main/java/org/apache/camel/ruby/ScriptRouteBuilder.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ruby/src/main/java/org/apache/camel/ruby/ScriptRouteBuilder.java?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-ruby/src/main/java/org/apache/camel/ruby/ScriptRouteBuilder.java (original)
+++ camel/trunk/components/camel-ruby/src/main/java/org/apache/camel/ruby/ScriptRouteBuilder.java Tue Feb 1 07:41:02 2011
@@ -21,8 +21,8 @@ import org.apache.camel.Endpoint;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.model.ProcessorDefinition;
import org.apache.camel.model.RouteDefinition;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Provide some helper methods for building routes from scripting languages
@@ -31,7 +31,7 @@ import org.apache.commons.logging.LogFac
* @version $Revision$
*/
public abstract class ScriptRouteBuilder extends RouteBuilder {
- private static final transient Log LOG = LogFactory.getLog(ScriptRouteBuilder.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(ScriptRouteBuilder.class);
protected ProcessorDefinition node;
public ScriptRouteBuilder() {
Modified: camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryBuilder.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryBuilder.java?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryBuilder.java (original)
+++ camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryBuilder.java Tue Feb 1 07:41:02 2011
@@ -61,8 +61,8 @@ import org.apache.camel.converter.jaxp.X
import org.apache.camel.spi.NamespaceAware;
import org.apache.camel.util.MessageHelper;
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;
/**
* Creates an XQuery builder
@@ -70,7 +70,7 @@ import org.apache.commons.logging.LogFac
* @version $Revision$
*/
public abstract class XQueryBuilder implements Expression, Predicate, NamespaceAware, Processor {
- private static final transient Log LOG = LogFactory.getLog(XQueryBuilder.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(XQueryBuilder.class);
private Configuration configuration;
private XQueryExpression expression;
private StaticQueryContext staticQueryContext;
Modified: camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/BeanWithXQueryInjectionTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/BeanWithXQueryInjectionTest.java?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/BeanWithXQueryInjectionTest.java (original)
+++ camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/BeanWithXQueryInjectionTest.java Tue Feb 1 07:41:02 2011
@@ -22,15 +22,15 @@ import org.apache.camel.builder.RouteBui
import org.apache.camel.component.xquery.XQuery;
import org.apache.camel.test.junit4.CamelTestSupport;
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;
import org.junit.Test;
/**
* @version $Revision$
*/
public class BeanWithXQueryInjectionTest extends CamelTestSupport {
- private static final transient Log LOG = LogFactory.getLog(BeanWithXQueryInjectionTest.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(BeanWithXQueryInjectionTest.class);
protected MyBean myBean = new MyBean();
@Test
@@ -73,4 +73,4 @@ public class BeanWithXQueryInjectionTest
LOG.info("read() method called on " + this);
}
}
-}
\ No newline at end of file
+}
Modified: camel/trunk/components/camel-script/src/main/java/org/apache/camel/builder/script/ScriptBuilder.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-script/src/main/java/org/apache/camel/builder/script/ScriptBuilder.java?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-script/src/main/java/org/apache/camel/builder/script/ScriptBuilder.java (original)
+++ camel/trunk/components/camel-script/src/main/java/org/apache/camel/builder/script/ScriptBuilder.java Tue Feb 1 07:41:02 2011
@@ -33,8 +33,8 @@ import org.apache.camel.Expression;
import org.apache.camel.Predicate;
import org.apache.camel.Processor;
import org.apache.camel.converter.ObjectConverter;
-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.FileSystemResource;
import org.springframework.core.io.Resource;
import org.springframework.core.io.UrlResource;
@@ -46,7 +46,7 @@ import org.springframework.core.io.UrlRe
* @version $Revision$
*/
public class ScriptBuilder implements Expression, Predicate, Processor {
- private static final transient Log LOG = LogFactory.getLog(ScriptBuilder.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(ScriptBuilder.class);
private String scriptEngineName;
private Resource scriptResource;
Modified: camel/trunk/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/CamelHttpTransportServlet.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/CamelHttpTransportServlet.java?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/CamelHttpTransportServlet.java (original)
+++ camel/trunk/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/CamelHttpTransportServlet.java Tue Feb 1 07:41:02 2011
@@ -24,13 +24,13 @@ import javax.servlet.ServletConfig;
import javax.servlet.ServletException;
import org.apache.camel.component.http.CamelServlet;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.context.support.AbstractApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
public class CamelHttpTransportServlet extends CamelServlet implements CamelServletService {
- private static final transient Log LOG = LogFactory.getLog(CamelHttpTransportServlet.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(CamelHttpTransportServlet.class);
private static final Map<String, CamelServlet> CAMEL_SERVLET_MAP = new ConcurrentHashMap<String, CamelServlet>();
private String servletName;
private AbstractApplicationContext applicationContext;
Modified: camel/trunk/components/camel-shiro/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-shiro/pom.xml?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-shiro/pom.xml (original)
+++ camel/trunk/components/camel-shiro/pom.xml Tue Feb 1 07:41:02 2011
@@ -1,4 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ 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.
+
+-->
<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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -40,11 +58,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-shiro/src/main/java/org/apache/camel/component/shiro/security/ShiroSecurityPolicy.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-shiro/src/main/java/org/apache/camel/component/shiro/security/ShiroSecurityPolicy.java?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-shiro/src/main/java/org/apache/camel/component/shiro/security/ShiroSecurityPolicy.java (original)
+++ camel/trunk/components/camel-shiro/src/main/java/org/apache/camel/component/shiro/security/ShiroSecurityPolicy.java Tue Feb 1 07:41:02 2011
@@ -31,8 +31,8 @@ import org.apache.camel.model.ProcessorD
import org.apache.camel.spi.AuthorizationPolicy;
import org.apache.camel.spi.RouteContext;
import org.apache.camel.util.AsyncProcessorHelper;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.shiro.SecurityUtils;
import org.apache.shiro.authc.AuthenticationException;
import org.apache.shiro.authc.IncorrectCredentialsException;
@@ -50,7 +50,7 @@ import org.apache.shiro.util.ByteSource;
import org.apache.shiro.util.Factory;
public class ShiroSecurityPolicy implements AuthorizationPolicy {
- private static final transient Log LOG = LogFactory.getLog(ShiroSecurityPolicy.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(ShiroSecurityPolicy.class);
private final byte[] bits128 = {
(byte) 0x08, (byte) 0x09, (byte) 0x0A, (byte) 0x0B,
(byte) 0x0C, (byte) 0x0D, (byte) 0x0E, (byte) 0x0F,
Modified: camel/trunk/components/camel-shiro/src/test/java/org/apache/camel/component/shiro/security/ShiroAuthenticationTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-shiro/src/test/java/org/apache/camel/component/shiro/security/ShiroAuthenticationTest.java?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-shiro/src/test/java/org/apache/camel/component/shiro/security/ShiroAuthenticationTest.java (original)
+++ camel/trunk/components/camel-shiro/src/test/java/org/apache/camel/component/shiro/security/ShiroAuthenticationTest.java Tue Feb 1 07:41:02 2011
@@ -23,8 +23,8 @@ import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
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.shiro.authc.IncorrectCredentialsException;
import org.apache.shiro.authc.LockedAccountException;
import org.apache.shiro.authc.UnknownAccountException;
Modified: camel/trunk/components/camel-sip/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-sip/pom.xml?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-sip/pom.xml (original)
+++ camel/trunk/components/camel-sip/pom.xml Tue Feb 1 07:41:02 2011
@@ -69,11 +69,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>
@@ -84,18 +79,4 @@
</dependency>
</dependencies>
- <build>
- <defaultGoal>install</defaultGoal>
-
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- </plugins>
- </build>
</project>
Modified: camel/trunk/components/camel-sip/src/main/java/org/apache/camel/component/sip/SipConfiguration.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-sip/src/main/java/org/apache/camel/component/sip/SipConfiguration.java?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-sip/src/main/java/org/apache/camel/component/sip/SipConfiguration.java (original)
+++ camel/trunk/components/camel-sip/src/main/java/org/apache/camel/component/sip/SipConfiguration.java Tue Feb 1 07:41:02 2011
@@ -48,12 +48,12 @@ import javax.sip.message.Request;
import org.apache.camel.util.ObjectHelper;
import org.apache.camel.util.URISupport;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
@SuppressWarnings("unchecked")
public class SipConfiguration {
- private static final transient Log LOG = LogFactory.getLog(SipConfiguration.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(SipConfiguration.class);
private static final String IMPLEMENTATION = "gov.nist";
private URI uri;
private Map<String, Object> parameters;
Modified: camel/trunk/components/camel-sip/src/main/java/org/apache/camel/component/sip/listener/SipPresenceAgentListener.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-sip/src/main/java/org/apache/camel/component/sip/listener/SipPresenceAgentListener.java?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-sip/src/main/java/org/apache/camel/component/sip/listener/SipPresenceAgentListener.java (original)
+++ camel/trunk/components/camel-sip/src/main/java/org/apache/camel/component/sip/listener/SipPresenceAgentListener.java Tue Feb 1 07:41:02 2011
@@ -38,11 +38,11 @@ import javax.sip.message.Request;
import javax.sip.message.Response;
import org.apache.camel.component.sip.SipPresenceAgent;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class SipPresenceAgentListener implements SipListener, SipMessageCodes {
- private static final transient Log LOG = LogFactory.getLog(SipPresenceAgentListener.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(SipPresenceAgentListener.class);
protected Dialog dialog;
protected int notifyCount;
private SipPresenceAgent sipPresenceAgent;
Modified: camel/trunk/components/camel-sip/src/main/java/org/apache/camel/component/sip/listener/SipPublishListener.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-sip/src/main/java/org/apache/camel/component/sip/listener/SipPublishListener.java?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-sip/src/main/java/org/apache/camel/component/sip/listener/SipPublishListener.java (original)
+++ camel/trunk/components/camel-sip/src/main/java/org/apache/camel/component/sip/listener/SipPublishListener.java Tue Feb 1 07:41:02 2011
@@ -24,11 +24,11 @@ import javax.sip.SipListener;
import javax.sip.TransactionTerminatedEvent;
import org.apache.camel.component.sip.SipPublisher;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class SipPublishListener implements SipListener {
- private static final transient Log LOG = LogFactory.getLog(SipPublishListener.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(SipPublishListener.class);
private SipPublisher sipPublisher;
public SipPublishListener(SipPublisher sipPublisher) {
Modified: camel/trunk/components/camel-sip/src/main/java/org/apache/camel/component/sip/listener/SipSubscriptionListener.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-sip/src/main/java/org/apache/camel/component/sip/listener/SipSubscriptionListener.java?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-sip/src/main/java/org/apache/camel/component/sip/listener/SipSubscriptionListener.java (original)
+++ camel/trunk/components/camel-sip/src/main/java/org/apache/camel/component/sip/listener/SipSubscriptionListener.java Tue Feb 1 07:41:02 2011
@@ -35,11 +35,11 @@ import org.apache.camel.CamelException;
import org.apache.camel.Exchange;
import org.apache.camel.ExchangePattern;
import org.apache.camel.component.sip.SipSubscriber;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class SipSubscriptionListener implements SipListener {
- private static final transient Log LOG = LogFactory.getLog(SipSubscriptionListener.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(SipSubscriptionListener.class);
private SipSubscriber sipSubscriber;
private Dialog subscriberDialog;
private Dialog forkedDialog;
Modified: camel/trunk/components/camel-sip/src/test/java/org/apache/camel/component/sip/PublishSubscribeTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-sip/src/test/java/org/apache/camel/component/sip/PublishSubscribeTest.java?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-sip/src/test/java/org/apache/camel/component/sip/PublishSubscribeTest.java (original)
+++ camel/trunk/components/camel-sip/src/test/java/org/apache/camel/component/sip/PublishSubscribeTest.java Tue Feb 1 07:41:02 2011
@@ -24,12 +24,12 @@ import org.apache.camel.ProducerTemplate
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;
public class PublishSubscribeTest extends CamelTestSupport {
- private static final transient Log LOG = LogFactory.getLog(PublishSubscribeTest.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(PublishSubscribeTest.class);
@EndpointInject(uri = "mock:neverland")
protected MockEndpoint unreachableEndpoint;
Modified: camel/trunk/components/camel-smpp/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-smpp/pom.xml?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-smpp/pom.xml (original)
+++ camel/trunk/components/camel-smpp/pom.xml Tue Feb 1 07:41:02 2011
@@ -1,89 +1,89 @@
<?xml version="1.0" encoding="UTF-8"?>
- <!--
- 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.
- -->
-<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>
-
- <parent>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-parent</artifactId>
- <version>2.7-SNAPSHOT</version>
- <relativePath>../../parent</relativePath>
- </parent>
-
- <artifactId>camel-smpp</artifactId>
- <packaging>bundle</packaging>
- <name>Camel :: SMPP</name>
- <description>Camel SMPP support</description>
-
- <properties>
- <camel.osgi.export.pkg>org.apache.camel.component.smpp.*</camel.osgi.export.pkg>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.jsmpp</artifactId>
- <version>${smpp-version}</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- </dependency>
-
- <!-- testing -->
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
+<!--
+ 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.
+-->
+<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>
+
+ <parent>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-spring</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-test</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.easymock</groupId>
- <artifactId>easymockclassextension</artifactId>
- <version>${easymock-version}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
+ <artifactId>camel-parent</artifactId>
+ <version>2.7-SNAPSHOT</version>
+ <relativePath>../../parent</relativePath>
+ </parent>
+
+ <artifactId>camel-smpp</artifactId>
+ <packaging>bundle</packaging>
+ <name>Camel :: SMPP</name>
+ <description>Camel SMPP support</description>
+
+ <properties>
+ <camel.osgi.export.pkg>org.apache.camel.component.smpp.*</camel.osgi.export.pkg>
+ </properties>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.jsmpp</artifactId>
+ <version>${smpp-version}</version>
+ </dependency>
+
+ <!-- testing -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-test</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-spring</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-test</artifactId>
+ <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>
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymockclassextension</artifactId>
+ <version>${easymock-version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ </dependencies>
</project>
Modified: camel/trunk/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppConsumer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppConsumer.java?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppConsumer.java (original)
+++ camel/trunk/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppConsumer.java Tue Feb 1 07:41:02 2011
@@ -21,8 +21,8 @@ import java.io.IOException;
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.jsmpp.DefaultPDUReader;
import org.jsmpp.DefaultPDUSender;
import org.jsmpp.SynchronizedPDUSender;
@@ -53,7 +53,7 @@ import org.jsmpp.util.RandomMessageIDGen
*/
public class SmppConsumer extends DefaultConsumer {
- private static final transient Log LOG = LogFactory.getLog(SmppConsumer.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(SmppConsumer.class);
private SmppConfiguration configuration;
private SMPPSession session;
@@ -244,4 +244,4 @@ public class SmppConsumer extends Defaul
public SmppConfiguration getConfiguration() {
return configuration;
}
-}
\ No newline at end of file
+}
Modified: camel/trunk/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppProducer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppProducer.java?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppProducer.java (original)
+++ camel/trunk/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppProducer.java Tue Feb 1 07:41:02 2011
@@ -20,8 +20,8 @@ import java.io.IOException;
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;
import org.jsmpp.DefaultPDUReader;
import org.jsmpp.DefaultPDUSender;
import org.jsmpp.SynchronizedPDUSender;
@@ -48,7 +48,7 @@ import org.jsmpp.util.DefaultComposer;
*/
public class SmppProducer extends DefaultProducer {
- private static final transient Log LOG = LogFactory.getLog(SmppProducer.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(SmppProducer.class);
private SmppConfiguration configuration;
private SMPPSession session;
@@ -231,4 +231,4 @@ public class SmppProducer extends Defaul
public String toString() {
return "SmppProducer[" + getEndpoint().getConnectionString() + "]";
}
-}
\ No newline at end of file
+}
Modified: camel/trunk/components/camel-snmp/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-snmp/pom.xml?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-snmp/pom.xml (original)
+++ camel/trunk/components/camel-snmp/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>
@@ -49,7 +50,7 @@
<!-- testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
+ <artifactId>camel-test</artifactId>
<optional>true</optional>
<scope>test</scope>
</dependency>
@@ -64,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>
</dependencies>
Modified: camel/trunk/components/camel-snmp/src/main/java/org/apache/camel/component/snmp/SnmpEndpoint.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-snmp/src/main/java/org/apache/camel/component/snmp/SnmpEndpoint.java?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-snmp/src/main/java/org/apache/camel/component/snmp/SnmpEndpoint.java (original)
+++ camel/trunk/components/camel-snmp/src/main/java/org/apache/camel/component/snmp/SnmpEndpoint.java Tue Feb 1 07:41:02 2011
@@ -24,8 +24,8 @@ import org.apache.camel.Processor;
import org.apache.camel.Producer;
import org.apache.camel.impl.DefaultExchange;
import org.apache.camel.impl.DefaultPollingEndpoint;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.snmp4j.PDU;
import org.snmp4j.mp.SnmpConstants;
@@ -36,7 +36,7 @@ public class SnmpEndpoint extends Defaul
public static final int DEFAULT_SNMP_RETRIES = 2;
public static final int DEFAULT_SNMP_TIMEOUT = 1500;
- private static final Log LOG = LogFactory.getLog(SnmpEndpoint.class);
+ private static final Logger LOG = LoggerFactory.getLogger(SnmpEndpoint.class);
private OIDList oids = new OIDList();
private String address;
Modified: camel/trunk/components/camel-snmp/src/main/java/org/apache/camel/component/snmp/SnmpOIDPoller.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-snmp/src/main/java/org/apache/camel/component/snmp/SnmpOIDPoller.java?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-snmp/src/main/java/org/apache/camel/component/snmp/SnmpOIDPoller.java (original)
+++ camel/trunk/components/camel-snmp/src/main/java/org/apache/camel/component/snmp/SnmpOIDPoller.java Tue Feb 1 07:41:02 2011
@@ -19,8 +19,8 @@ package org.apache.camel.component.snmp;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.impl.ScheduledPollConsumer;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.snmp4j.CommunityTarget;
import org.snmp4j.PDU;
import org.snmp4j.Snmp;
@@ -41,7 +41,7 @@ import org.snmp4j.transport.DefaultUdpTr
public class SnmpOIDPoller extends ScheduledPollConsumer implements ResponseListener {
- private static final transient Log LOG = LogFactory.getLog(SnmpOIDPoller.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(SnmpOIDPoller.class);
private Address targetAddress;
private TransportMapping transport;
Modified: camel/trunk/components/camel-snmp/src/main/java/org/apache/camel/component/snmp/SnmpTrapConsumer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-snmp/src/main/java/org/apache/camel/component/snmp/SnmpTrapConsumer.java?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-snmp/src/main/java/org/apache/camel/component/snmp/SnmpTrapConsumer.java (original)
+++ camel/trunk/components/camel-snmp/src/main/java/org/apache/camel/component/snmp/SnmpTrapConsumer.java Tue Feb 1 07:41:02 2011
@@ -19,8 +19,8 @@ package org.apache.camel.component.snmp;
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.snmp4j.CommandResponder;
import org.snmp4j.CommandResponderEvent;
import org.snmp4j.PDU;
@@ -35,7 +35,7 @@ import org.snmp4j.transport.DefaultUdpTr
public class SnmpTrapConsumer extends DefaultConsumer implements CommandResponder {
- private static final Log LOG = LogFactory.getLog(SnmpTrapConsumer.class);
+ private static final Logger LOG = LoggerFactory.getLogger(SnmpTrapConsumer.class);
private SnmpEndpoint endpoint;
private Address listenGenericAddress;
Modified: camel/trunk/components/camel-snmp/src/test/java/org/apache/camel/component/snmp/PollOIDTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-snmp/src/test/java/org/apache/camel/component/snmp/PollOIDTest.java?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-snmp/src/test/java/org/apache/camel/component/snmp/PollOIDTest.java (original)
+++ camel/trunk/components/camel-snmp/src/test/java/org/apache/camel/component/snmp/PollOIDTest.java Tue Feb 1 07:41:02 2011
@@ -22,13 +22,13 @@ import org.apache.camel.Exchange;
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;
public class PollOIDTest extends CamelTestSupport {
- private static final transient Log LOG = LogFactory.getLog(PollOIDTest.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(PollOIDTest.class);
// a disabled test... before enabling you must fill in a working IP, Port
// and maybe oids in the route below
Modified: camel/trunk/components/camel-snmp/src/test/java/org/apache/camel/component/snmp/TrapReceiveTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-snmp/src/test/java/org/apache/camel/component/snmp/TrapReceiveTest.java?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-snmp/src/test/java/org/apache/camel/component/snmp/TrapReceiveTest.java (original)
+++ camel/trunk/components/camel-snmp/src/test/java/org/apache/camel/component/snmp/TrapReceiveTest.java Tue Feb 1 07:41:02 2011
@@ -22,13 +22,13 @@ import org.apache.camel.Exchange;
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;
public class TrapReceiveTest extends CamelTestSupport {
- private static final transient Log LOG = LogFactory.getLog(TrapReceiveTest.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(TrapReceiveTest.class);
// a disabled test... before enabling you must fill in a working IP, Port
// and maybe oids in the route below
Modified: camel/trunk/components/camel-snmp/src/test/resources/log4j.properties
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-snmp/src/test/resources/log4j.properties?rev=1065931&r1=1065930&r2=1065931&view=diff
==============================================================================
--- camel/trunk/components/camel-snmp/src/test/resources/log4j.properties (original)
+++ camel/trunk/components/camel-snmp/src/test/resources/log4j.properties Tue Feb 1 07:41:02 2011
@@ -20,8 +20,8 @@
#
log4j.rootLogger=INFO, file
-log4j.logger.org.apache.camel.component.snmp=DEBUG
-log4j.logger.org.snmp4j=DEBUG
+#log4j.logger.org.apache.camel.component.snmp=DEBUG
+#log4j.logger.org.snmp4j=DEBUG
#log4j.logger.org.apache.camel=DEBUG
# CONSOLE appender not used by default
Propchange: camel/trunk/components/camel-soap/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Feb 1 07:41:02 2011
@@ -1,7 +1,8 @@
-.project
-.checkstyle
+target
.pmd
+.checkstyle
.classpath
-target
-.settings
+.project
eclipse-classes
+.settings
+*.i??