Author: davsclaus
Date: Wed Aug 24 07:36:37 2011
New Revision: 1160992
URL: http://svn.apache.org/viewvc?rev=1160992&view=rev
Log:
CAMEL-4358: Fixed failing test in camel-ftp. Migrating components to use
support.ServiceSupport.
Modified:
camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/processor/ActivityMonitorEngine.java
camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/processor/JpaBamProcessor.java
camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/rules/ActivityRules.java
camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/rules/ProcessRules.java
camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/rules/TemporalRule.java
camel/trunk/components/camel-cache/src/main/java/org/apache/camel/component/cache/CacheManagerFactory.java
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerThrowExceptionOnLoginFailedTest.java
camel/trunk/components/camel-hawtdb/src/main/java/org/apache/camel/component/hawtdb/HawtDBAggregationRepository.java
camel/trunk/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/JaxbDataFormat.java
camel/trunk/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzEndpoint.java
camel/trunk/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjComponentTest.java
camel/trunk/components/camel-sql/src/main/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregationRepository.java
camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/CamelContextResource.java
Modified:
camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/processor/ActivityMonitorEngine.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/processor/ActivityMonitorEngine.java?rev=1160992&r1=1160991&r2=1160992&view=diff
==============================================================================
---
camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/processor/ActivityMonitorEngine.java
(original)
+++
camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/processor/ActivityMonitorEngine.java
Wed Aug 24 07:36:37 2011
@@ -27,7 +27,7 @@ import javax.persistence.PersistenceExce
import org.apache.camel.bam.QueryUtils;
import org.apache.camel.bam.model.ActivityState;
import org.apache.camel.bam.rules.ProcessRules;
-import org.apache.camel.impl.ServiceSupport;
+import org.apache.camel.support.ServiceSupport;
import org.apache.camel.util.CastUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -36,7 +36,6 @@ import org.springframework.orm.jpa.JpaTe
import org.springframework.transaction.TransactionStatus;
import
org.springframework.transaction.support.TransactionCallbackWithoutResult;
import org.springframework.transaction.support.TransactionTemplate;
-import org.springframework.util.ClassUtils;
/**
* A timer engine to monitor for expired activities and perform whatever
actions
Modified:
camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/processor/JpaBamProcessor.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/processor/JpaBamProcessor.java?rev=1160992&r1=1160991&r2=1160992&view=diff
==============================================================================
---
camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/processor/JpaBamProcessor.java
(original)
+++
camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/processor/JpaBamProcessor.java
Wed Aug 24 07:36:37 2011
@@ -27,7 +27,7 @@ import org.springframework.orm.jpa.JpaTe
import org.springframework.transaction.support.TransactionTemplate;
/**
- * A concrete {@link Processor} for working on <a
+ * A concrete {@link org.apache.camel.Processor} for working on <a
* href="http://camel.apache.org/bam.html";>BAM</a> which uses JPA as
* the persistence and uses the {@link ProcessInstance} entity to store the
* process information.
Modified:
camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/rules/ActivityRules.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/rules/ActivityRules.java?rev=1160992&r1=1160991&r2=1160992&view=diff
==============================================================================
---
camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/rules/ActivityRules.java
(original)
+++
camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/rules/ActivityRules.java
Wed Aug 24 07:36:37 2011
@@ -24,7 +24,7 @@ import org.apache.camel.bam.ProcessBuild
import org.apache.camel.bam.model.ActivityDefinition;
import org.apache.camel.bam.model.ActivityState;
import org.apache.camel.bam.model.ProcessInstance;
-import org.apache.camel.impl.ServiceSupport;
+import org.apache.camel.support.ServiceSupport;
import org.apache.camel.util.ServiceHelper;
/**
Modified:
camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/rules/ProcessRules.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/rules/ProcessRules.java?rev=1160992&r1=1160991&r2=1160992&view=diff
==============================================================================
---
camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/rules/ProcessRules.java
(original)
+++
camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/rules/ProcessRules.java
Wed Aug 24 07:36:37 2011
@@ -23,7 +23,7 @@ import org.apache.camel.Exchange;
import org.apache.camel.bam.model.ActivityState;
import org.apache.camel.bam.model.ProcessDefinition;
import org.apache.camel.bam.model.ProcessInstance;
-import org.apache.camel.impl.ServiceSupport;
+import org.apache.camel.support.ServiceSupport;
import org.apache.camel.util.ServiceHelper;
/**
Modified:
camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/rules/TemporalRule.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/rules/TemporalRule.java?rev=1160992&r1=1160991&r2=1160992&view=diff
==============================================================================
---
camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/rules/TemporalRule.java
(original)
+++
camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/rules/TemporalRule.java
Wed Aug 24 07:36:37 2011
@@ -27,11 +27,10 @@ import org.apache.camel.bam.model.Activi
import org.apache.camel.bam.model.ProcessInstance;
import org.apache.camel.impl.DefaultExchange;
import org.apache.camel.impl.DefaultRouteContext;
-import org.apache.camel.impl.ServiceSupport;
import org.apache.camel.model.OutputDefinition;
-import org.apache.camel.model.ProcessorDefinition;
import org.apache.camel.model.RouteDefinition;
import org.apache.camel.spi.RouteContext;
+import org.apache.camel.support.ServiceSupport;
import org.apache.camel.util.Time;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified:
camel/trunk/components/camel-cache/src/main/java/org/apache/camel/component/cache/CacheManagerFactory.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cache/src/main/java/org/apache/camel/component/cache/CacheManagerFactory.java?rev=1160992&r1=1160991&r2=1160992&view=diff
==============================================================================
---
camel/trunk/components/camel-cache/src/main/java/org/apache/camel/component/cache/CacheManagerFactory.java
(original)
+++
camel/trunk/components/camel-cache/src/main/java/org/apache/camel/component/cache/CacheManagerFactory.java
Wed Aug 24 07:36:37 2011
@@ -17,7 +17,7 @@
package org.apache.camel.component.cache;
import net.sf.ehcache.CacheManager;
-import org.apache.camel.impl.ServiceSupport;
+import org.apache.camel.support.ServiceSupport;
public abstract class CacheManagerFactory extends ServiceSupport {
private CacheManager cacheManager;
Modified:
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerThrowExceptionOnLoginFailedTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerThrowExceptionOnLoginFailedTest.java?rev=1160992&r1=1160991&r2=1160992&view=diff
==============================================================================
---
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerThrowExceptionOnLoginFailedTest.java
(original)
+++
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerThrowExceptionOnLoginFailedTest.java
Wed Aug 24 07:36:37 2011
@@ -24,8 +24,8 @@ import org.apache.camel.Endpoint;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.file.GenericFileOperationFailedException;
import org.apache.camel.impl.JndiRegistry;
-import org.apache.camel.impl.ServiceSupport;
import org.apache.camel.spi.PollingConsumerPollStrategy;
+import org.apache.camel.support.ServiceSupport;
import org.junit.Test;
/**
Modified:
camel/trunk/components/camel-hawtdb/src/main/java/org/apache/camel/component/hawtdb/HawtDBAggregationRepository.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-hawtdb/src/main/java/org/apache/camel/component/hawtdb/HawtDBAggregationRepository.java?rev=1160992&r1=1160991&r2=1160992&view=diff
==============================================================================
---
camel/trunk/components/camel-hawtdb/src/main/java/org/apache/camel/component/hawtdb/HawtDBAggregationRepository.java
(original)
+++
camel/trunk/components/camel-hawtdb/src/main/java/org/apache/camel/component/hawtdb/HawtDBAggregationRepository.java
Wed Aug 24 07:36:37 2011
@@ -27,8 +27,8 @@ import java.util.concurrent.TimeUnit;
import org.apache.camel.CamelContext;
import org.apache.camel.Exchange;
-import org.apache.camel.impl.ServiceSupport;
import org.apache.camel.spi.RecoverableAggregationRepository;
+import org.apache.camel.support.ServiceSupport;
import org.apache.camel.util.ObjectHelper;
import org.apache.camel.util.ServiceHelper;
import org.fusesource.hawtbuf.Buffer;
Modified:
camel/trunk/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/JaxbDataFormat.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/JaxbDataFormat.java?rev=1160992&r1=1160991&r2=1160992&view=diff
==============================================================================
---
camel/trunk/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/JaxbDataFormat.java
(original)
+++
camel/trunk/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/JaxbDataFormat.java
Wed Aug 24 07:36:37 2011
@@ -38,9 +38,8 @@ import org.apache.camel.CamelContext;
import org.apache.camel.CamelContextAware;
import org.apache.camel.Exchange;
import org.apache.camel.converter.IOConverter;
-import org.apache.camel.impl.ServiceSupport;
import org.apache.camel.spi.DataFormat;
-import org.apache.camel.util.IOHelper;
+import org.apache.camel.support.ServiceSupport;
import org.apache.camel.util.ObjectHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
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=1160992&r1=1160991&r2=1160992&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
Wed Aug 24 07:36:37 2011
@@ -23,9 +23,9 @@ import org.apache.camel.Processor;
import org.apache.camel.Producer;
import org.apache.camel.ShutdownableService;
import org.apache.camel.impl.DefaultEndpoint;
-import org.apache.camel.impl.ServiceSupport;
import org.apache.camel.processor.loadbalancer.LoadBalancer;
import org.apache.camel.processor.loadbalancer.RoundRobinLoadBalancer;
+import org.apache.camel.support.ServiceSupport;
import org.apache.camel.util.ExchangeHelper;
import org.apache.camel.util.ObjectHelper;
import org.apache.camel.util.ServiceHelper;
Modified:
camel/trunk/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjComponentTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjComponentTest.java?rev=1160992&r1=1160991&r2=1160992&view=diff
==============================================================================
---
camel/trunk/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjComponentTest.java
(original)
+++
camel/trunk/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjComponentTest.java
Wed Aug 24 07:36:37 2011
@@ -35,8 +35,8 @@ import org.apache.camel.Processor;
import org.apache.camel.Producer;
import org.apache.camel.component.quickfixj.converter.QuickfixjConverters;
import org.apache.camel.impl.DefaultCamelContext;
-import org.apache.camel.impl.ServiceSupport;
import org.apache.camel.impl.converter.StaticMethodTypeConverter;
+import org.apache.camel.support.ServiceSupport;
import org.apache.camel.util.ServiceHelper;
import org.apache.mina.common.TransportType;
import org.junit.After;
Modified:
camel/trunk/components/camel-sql/src/main/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregationRepository.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-sql/src/main/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregationRepository.java?rev=1160992&r1=1160991&r2=1160992&view=diff
==============================================================================
---
camel/trunk/components/camel-sql/src/main/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregationRepository.java
(original)
+++
camel/trunk/components/camel-sql/src/main/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregationRepository.java
Wed Aug 24 07:36:37 2011
@@ -29,8 +29,8 @@ import javax.sql.DataSource;
import org.apache.camel.CamelContext;
import org.apache.camel.Exchange;
-import org.apache.camel.impl.ServiceSupport;
import org.apache.camel.spi.RecoverableAggregationRepository;
+import org.apache.camel.support.ServiceSupport;
import org.apache.camel.util.ObjectHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified:
camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/CamelContextResource.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/CamelContextResource.java?rev=1160992&r1=1160991&r2=1160992&view=diff
==============================================================================
---
camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/CamelContextResource.java
(original)
+++
camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/CamelContextResource.java
Wed Aug 24 07:36:37 2011
@@ -29,7 +29,7 @@ import com.sun.jersey.api.view.ImplicitP
import com.sun.jersey.spi.resource.Singleton;
import org.apache.camel.CamelContext;
import org.apache.camel.ProducerTemplate;
-import org.apache.camel.impl.ServiceSupport;
+import org.apache.camel.support.ServiceSupport;
import org.apache.camel.web.model.Camel;
/**
