Author: davsclaus Date: Mon Mar 2 08:20:07 2009 New Revision: 749227 URL: http://svn.apache.org/viewvc?rev=749227&view=rev Log: CAMEL-588: LoggingLevel moved from model to root pacakge to improve API package structuring.
Added: camel/trunk/camel-core/src/main/java/org/apache/camel/StreamCache.java (contents, props changed) - copied, changed from r749184, camel/trunk/camel-core/src/main/java/org/apache/camel/converter/stream/StreamCache.java Removed: camel/trunk/camel-core/src/main/java/org/apache/camel/converter/stream/StreamCache.java Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/builder/BuilderSupport.java camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DeadLetterChannelBuilder.java camel/trunk/camel-core/src/main/java/org/apache/camel/builder/LoggingErrorHandlerBuilder.java camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/XPathBuilder.java camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanComponent.java camel/trunk/camel-core/src/main/java/org/apache/camel/component/log/LogFormatter.java camel/trunk/camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java camel/trunk/camel-core/src/main/java/org/apache/camel/converter/stream/StreamCacheConverter.java camel/trunk/camel-core/src/main/java/org/apache/camel/model/ExceptionType.java camel/trunk/camel-core/src/main/java/org/apache/camel/processor/DeadLetterChannel.java camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Logger.java camel/trunk/camel-core/src/main/java/org/apache/camel/processor/LoggingErrorHandler.java camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RedeliveryPolicy.java camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/StreamCachingInterceptor.java camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/Tracer.java camel/trunk/camel-core/src/main/java/org/apache/camel/util/MessageHelper.java camel/trunk/camel-core/src/test/java/org/apache/camel/builder/ExceptionBuilderWithRetryLoggingLevelSetTest.java camel/trunk/camel-core/src/test/java/org/apache/camel/converter/stream/StreamCacheConverterTest.java camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelTest.java camel/trunk/camel-core/src/test/java/org/apache/camel/processor/FaultRetryRouteTest.java camel/trunk/camel-core/src/test/java/org/apache/camel/processor/FaultRouteTest.java camel/trunk/camel-core/src/test/java/org/apache/camel/processor/TracerConfigurationTest.java camel/trunk/camel-core/src/test/java/org/apache/camel/processor/interceptor/StreamCachingInterceptorTest.java camel/trunk/camel-core/src/test/java/org/apache/camel/processor/interceptor/TraceInterceptorDestinationTest.java camel/trunk/camel-core/src/test/java/org/apache/camel/util/MessageHelperTest.java camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/StreamCachingInterceptorTest.java Copied: camel/trunk/camel-core/src/main/java/org/apache/camel/StreamCache.java (from r749184, camel/trunk/camel-core/src/main/java/org/apache/camel/converter/stream/StreamCache.java) URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/StreamCache.java?p2=camel/trunk/camel-core/src/main/java/org/apache/camel/StreamCache.java&p1=camel/trunk/camel-core/src/main/java/org/apache/camel/converter/stream/StreamCache.java&r1=749184&r2=749227&rev=749227&view=diff ============================================================================== --- camel/trunk/camel-core/src/main/java/org/apache/camel/converter/stream/StreamCache.java (original) +++ camel/trunk/camel-core/src/main/java/org/apache/camel/StreamCache.java Mon Mar 2 08:20:07 2009 @@ -14,16 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.camel.converter.stream; - -import org.apache.camel.processor.interceptor.StreamCachingInterceptor; +package org.apache.camel; /** * Tagging interface to indicate that a type is capable of caching the underlying data stream. * <p/> * This is a useful feature for avoid message re-readability issues. - * This interface is mainly used by the {...@link StreamCachingInterceptor} for determining if/how to wrap a - * stream-based message. + * This interface is mainly used by the {...@link org.apache.camel.processor.interceptor.StreamCachingInterceptor} + * for determining if/how to wrap a stream-based message. + * + * @version $Revision$ */ public interface StreamCache { Propchange: camel/trunk/camel-core/src/main/java/org/apache/camel/StreamCache.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: camel/trunk/camel-core/src/main/java/org/apache/camel/StreamCache.java ------------------------------------------------------------------------------ svn:keywords = Rev Date Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/builder/BuilderSupport.java URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/BuilderSupport.java?rev=749227&r1=749226&r2=749227&view=diff ============================================================================== --- camel/trunk/camel-core/src/main/java/org/apache/camel/builder/BuilderSupport.java (original) +++ camel/trunk/camel-core/src/main/java/org/apache/camel/builder/BuilderSupport.java Mon Mar 2 08:20:07 2009 @@ -23,8 +23,8 @@ import org.apache.camel.CamelContext; import org.apache.camel.Endpoint; import org.apache.camel.Expression; -import org.apache.camel.NoSuchEndpointException; import org.apache.camel.LoggingLevel; +import org.apache.camel.NoSuchEndpointException; import org.apache.camel.processor.SendProcessor; import org.apache.camel.util.ObjectHelper; import org.apache.commons.logging.Log; Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DeadLetterChannelBuilder.java URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DeadLetterChannelBuilder.java?rev=749227&r1=749226&r2=749227&view=diff ============================================================================== --- camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DeadLetterChannelBuilder.java (original) +++ camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DeadLetterChannelBuilder.java Mon Mar 2 08:20:07 2009 @@ -17,8 +17,8 @@ package org.apache.camel.builder; import org.apache.camel.Expression; -import org.apache.camel.Processor; import org.apache.camel.LoggingLevel; +import org.apache.camel.Processor; import org.apache.camel.processor.DeadLetterChannel; import org.apache.camel.processor.ErrorHandlerSupport; import org.apache.camel.processor.Logger; Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/builder/LoggingErrorHandlerBuilder.java URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/LoggingErrorHandlerBuilder.java?rev=749227&r1=749226&r2=749227&view=diff ============================================================================== --- camel/trunk/camel-core/src/main/java/org/apache/camel/builder/LoggingErrorHandlerBuilder.java (original) +++ camel/trunk/camel-core/src/main/java/org/apache/camel/builder/LoggingErrorHandlerBuilder.java Mon Mar 2 08:20:07 2009 @@ -16,8 +16,8 @@ */ package org.apache.camel.builder; -import org.apache.camel.Processor; import org.apache.camel.LoggingLevel; +import org.apache.camel.Processor; import org.apache.camel.processor.Logger; import org.apache.camel.processor.LoggingErrorHandler; import org.apache.camel.spi.RouteContext; Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/XPathBuilder.java URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/XPathBuilder.java?rev=749227&r1=749226&r2=749227&view=diff ============================================================================== --- camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/XPathBuilder.java (original) +++ camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/XPathBuilder.java Mon Mar 2 08:20:07 2009 @@ -43,7 +43,6 @@ import org.apache.camel.Message; import org.apache.camel.Predicate; import org.apache.camel.RuntimeExpressionException; -import org.apache.camel.converter.stream.StreamCache; import org.apache.camel.spi.NamespaceAware; import org.apache.camel.util.ExchangeHelper; import org.apache.camel.util.MessageHelper; Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanComponent.java URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanComponent.java?rev=749227&r1=749226&r2=749227&view=diff ============================================================================== --- camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanComponent.java (original) +++ camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanComponent.java Mon Mar 2 08:20:07 2009 @@ -20,11 +20,8 @@ import org.apache.camel.Endpoint; import org.apache.camel.Processor; -import org.apache.camel.converter.ObjectConverter; import org.apache.camel.impl.DefaultComponent; import org.apache.camel.impl.ProcessorEndpoint; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; /** * The <a href="http://activemq.apache.org/bean.html">Bean Component</a> @@ -33,7 +30,6 @@ * @version $Revision$ */ public class BeanComponent extends DefaultComponent { - private static final transient Log LOG = LogFactory.getLog(BeanComponent.class); private ParameterMappingStrategy parameterMappingStrategy; public BeanComponent() { @@ -71,7 +67,8 @@ protected Endpoint createEndpoint(String uri, String remaining, Map parameters) throws Exception { BeanEndpoint endpoint = new BeanEndpoint(uri, this); endpoint.setBeanName(remaining); - endpoint.setCache(ObjectConverter.toBool(parameters.remove("cache"))); + Boolean cache = getAndRemoveParameter(parameters, "cache", Boolean.class, Boolean.FALSE); + endpoint.setCache(cache); Processor processor = endpoint.getProcessor(); setProperties(processor, parameters); return endpoint; Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/component/log/LogFormatter.java URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/log/LogFormatter.java?rev=749227&r1=749226&r2=749227&view=diff ============================================================================== --- camel/trunk/camel-core/src/main/java/org/apache/camel/component/log/LogFormatter.java (original) +++ camel/trunk/camel-core/src/main/java/org/apache/camel/component/log/LogFormatter.java Mon Mar 2 08:20:07 2009 @@ -19,7 +19,7 @@ import org.apache.camel.Exchange; import org.apache.camel.Message; import org.apache.camel.NoTypeConversionAvailableException; -import org.apache.camel.converter.stream.StreamCache; +import org.apache.camel.StreamCache; import org.apache.camel.spi.ExchangeFormatter; import org.apache.camel.util.ObjectHelper; Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java?rev=749227&r1=749226&r2=749227&view=diff ============================================================================== --- camel/trunk/camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java (original) +++ camel/trunk/camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java Mon Mar 2 08:20:07 2009 @@ -19,7 +19,6 @@ import java.beans.PropertyChangeListener; import java.beans.PropertyChangeSupport; import java.io.File; -import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; @@ -41,7 +40,6 @@ import org.apache.camel.Message; import org.apache.camel.Processor; import org.apache.camel.Producer; -import org.apache.camel.converter.IOConverter; import org.apache.camel.impl.DefaultEndpoint; import org.apache.camel.impl.DefaultProducer; import org.apache.camel.spi.BrowsableEndpoint; @@ -434,11 +432,8 @@ assertTrue("The file should exists: " + name, file.exists()); if (content != null) { - try { - assertEquals("Content of file: " + name, content, IOConverter.toString(file)); - } catch (IOException e) { - throw new RuntimeException(e); - } + String body = getCamelContext().getTypeConverter().convertTo(String.class, file); + assertEquals("Content of file: " + name, content, body); } } }); Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/converter/stream/StreamCacheConverter.java URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/converter/stream/StreamCacheConverter.java?rev=749227&r1=749226&r2=749227&view=diff ============================================================================== --- camel/trunk/camel-core/src/main/java/org/apache/camel/converter/stream/StreamCacheConverter.java (original) +++ camel/trunk/camel-core/src/main/java/org/apache/camel/converter/stream/StreamCacheConverter.java Mon Mar 2 08:20:07 2009 @@ -27,6 +27,7 @@ import javax.xml.transform.stream.StreamSource; import org.apache.camel.Converter; +import org.apache.camel.StreamCache; import org.apache.camel.converter.IOConverter; import org.apache.camel.converter.jaxp.BytesSource; import org.apache.camel.converter.jaxp.StringSource; Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/ExceptionType.java URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ExceptionType.java?rev=749227&r1=749226&r2=749227&view=diff ============================================================================== --- camel/trunk/camel-core/src/main/java/org/apache/camel/model/ExceptionType.java (original) +++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/ExceptionType.java Mon Mar 2 08:20:07 2009 @@ -30,10 +30,10 @@ import org.apache.camel.CamelContext; import org.apache.camel.Expression; +import org.apache.camel.LoggingLevel; import org.apache.camel.Predicate; import org.apache.camel.Processor; import org.apache.camel.Route; -import org.apache.camel.LoggingLevel; import org.apache.camel.builder.ErrorHandlerBuilder; import org.apache.camel.builder.ExpressionClause; import org.apache.camel.language.constant.ConstantLanguage; Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/DeadLetterChannel.java URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/DeadLetterChannel.java?rev=749227&r1=749226&r2=749227&view=diff ============================================================================== --- camel/trunk/camel-core/src/main/java/org/apache/camel/processor/DeadLetterChannel.java (original) +++ camel/trunk/camel-core/src/main/java/org/apache/camel/processor/DeadLetterChannel.java Mon Mar 2 08:20:07 2009 @@ -23,12 +23,12 @@ import org.apache.camel.AsyncCallback; import org.apache.camel.AsyncProcessor; import org.apache.camel.Exchange; +import org.apache.camel.LoggingLevel; import org.apache.camel.Message; import org.apache.camel.Predicate; import org.apache.camel.Processor; import org.apache.camel.impl.converter.AsyncProcessorTypeConverter; import org.apache.camel.model.ExceptionType; -import org.apache.camel.LoggingLevel; import org.apache.camel.processor.exceptionpolicy.ExceptionPolicyStrategy; import org.apache.camel.util.AsyncProcessorHelper; import org.apache.camel.util.MessageHelper; Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Logger.java URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Logger.java?rev=749227&r1=749226&r2=749227&view=diff ============================================================================== --- camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Logger.java (original) +++ camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Logger.java Mon Mar 2 08:20:07 2009 @@ -17,8 +17,8 @@ package org.apache.camel.processor; import org.apache.camel.Exchange; -import org.apache.camel.Processor; import org.apache.camel.LoggingLevel; +import org.apache.camel.Processor; import org.apache.camel.impl.DefaultExchangeFormatter; import org.apache.camel.spi.ExchangeFormatter; import org.apache.commons.logging.Log; Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/LoggingErrorHandler.java URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/LoggingErrorHandler.java?rev=749227&r1=749226&r2=749227&view=diff ============================================================================== --- camel/trunk/camel-core/src/main/java/org/apache/camel/processor/LoggingErrorHandler.java (original) +++ camel/trunk/camel-core/src/main/java/org/apache/camel/processor/LoggingErrorHandler.java Mon Mar 2 08:20:07 2009 @@ -17,8 +17,8 @@ package org.apache.camel.processor; import org.apache.camel.Exchange; -import org.apache.camel.Processor; import org.apache.camel.LoggingLevel; +import org.apache.camel.Processor; import org.apache.camel.util.ServiceHelper; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RedeliveryPolicy.java URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RedeliveryPolicy.java?rev=749227&r1=749226&r2=749227&view=diff ============================================================================== --- camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RedeliveryPolicy.java (original) +++ camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RedeliveryPolicy.java Mon Mar 2 08:20:07 2009 @@ -19,8 +19,8 @@ import java.util.Random; import org.apache.camel.Exchange; -import org.apache.camel.Predicate; import org.apache.camel.LoggingLevel; +import org.apache.camel.Predicate; import org.apache.camel.util.ObjectHelper; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/StreamCachingInterceptor.java URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/StreamCachingInterceptor.java?rev=749227&r1=749226&r2=749227&view=diff ============================================================================== --- camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/StreamCachingInterceptor.java (original) +++ camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/StreamCachingInterceptor.java Mon Mar 2 08:20:07 2009 @@ -23,7 +23,7 @@ import org.apache.camel.Exchange; import org.apache.camel.NoTypeConversionAvailableException; import org.apache.camel.Processor; -import org.apache.camel.converter.stream.StreamCache; +import org.apache.camel.StreamCache; import org.apache.camel.model.InterceptorRef; import org.apache.camel.model.InterceptorType; import org.apache.camel.processor.DelegateProcessor; Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/Tracer.java URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/Tracer.java?rev=749227&r1=749226&r2=749227&view=diff ============================================================================== --- camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/Tracer.java (original) +++ camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/Tracer.java Mon Mar 2 08:20:07 2009 @@ -20,9 +20,9 @@ import org.apache.camel.CamelContext; import org.apache.camel.Endpoint; +import org.apache.camel.LoggingLevel; import org.apache.camel.Predicate; import org.apache.camel.Processor; -import org.apache.camel.LoggingLevel; import org.apache.camel.impl.DefaultCamelContext; import org.apache.camel.model.ProcessorType; import org.apache.camel.spi.InterceptStrategy; Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/util/MessageHelper.java URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/util/MessageHelper.java?rev=749227&r1=749226&r2=749227&view=diff ============================================================================== --- camel/trunk/camel-core/src/main/java/org/apache/camel/util/MessageHelper.java (original) +++ camel/trunk/camel-core/src/main/java/org/apache/camel/util/MessageHelper.java Mon Mar 2 08:20:07 2009 @@ -18,7 +18,7 @@ import org.apache.camel.Message; import org.apache.camel.NoTypeConversionAvailableException; -import org.apache.camel.converter.stream.StreamCache; +import org.apache.camel.StreamCache; /** * Some helper methods when working with {...@link org.apache.camel.Message}. Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/builder/ExceptionBuilderWithRetryLoggingLevelSetTest.java URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/builder/ExceptionBuilderWithRetryLoggingLevelSetTest.java?rev=749227&r1=749226&r2=749227&view=diff ============================================================================== --- camel/trunk/camel-core/src/test/java/org/apache/camel/builder/ExceptionBuilderWithRetryLoggingLevelSetTest.java (original) +++ camel/trunk/camel-core/src/test/java/org/apache/camel/builder/ExceptionBuilderWithRetryLoggingLevelSetTest.java Mon Mar 2 08:20:07 2009 @@ -17,12 +17,11 @@ package org.apache.camel.builder; import java.io.IOException; - import javax.naming.Context; import org.apache.camel.ContextTestSupport; -import org.apache.camel.RuntimeCamelException; import org.apache.camel.LoggingLevel; +import org.apache.camel.RuntimeCamelException; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.util.jndi.JndiContext; Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/converter/stream/StreamCacheConverterTest.java URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/converter/stream/StreamCacheConverterTest.java?rev=749227&r1=749226&r2=749227&view=diff ============================================================================== --- camel/trunk/camel-core/src/test/java/org/apache/camel/converter/stream/StreamCacheConverterTest.java (original) +++ camel/trunk/camel-core/src/test/java/org/apache/camel/converter/stream/StreamCacheConverterTest.java Mon Mar 2 08:20:07 2009 @@ -19,13 +19,12 @@ import java.io.FileNotFoundException; import java.io.IOException; import java.io.InputStream; - import javax.xml.transform.Source; import javax.xml.transform.TransformerException; import javax.xml.transform.stream.StreamSource; import junit.framework.TestCase; - +import org.apache.camel.StreamCache; import org.apache.camel.converter.IOConverter; import org.apache.camel.converter.jaxp.XmlConverter; Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelTest.java URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelTest.java?rev=749227&r1=749226&r2=749227&view=diff ============================================================================== --- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelTest.java (original) +++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelTest.java Mon Mar 2 08:20:07 2009 @@ -21,8 +21,8 @@ import org.apache.camel.ContextTestSupport; import org.apache.camel.Endpoint; import org.apache.camel.Exchange; -import org.apache.camel.Processor; import org.apache.camel.LoggingLevel; +import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/FaultRetryRouteTest.java URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/FaultRetryRouteTest.java?rev=749227&r1=749226&r2=749227&view=diff ============================================================================== --- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/FaultRetryRouteTest.java (original) +++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/FaultRetryRouteTest.java Mon Mar 2 08:20:07 2009 @@ -19,11 +19,11 @@ import org.apache.camel.CamelException; import org.apache.camel.ContextTestSupport; import org.apache.camel.Exchange; +import org.apache.camel.LoggingLevel; import org.apache.camel.Message; import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.LoggingLevel; public class FaultRetryRouteTest extends ContextTestSupport { protected MockEndpoint a; Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/FaultRouteTest.java URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/FaultRouteTest.java?rev=749227&r1=749226&r2=749227&view=diff ============================================================================== --- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/FaultRouteTest.java (original) +++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/FaultRouteTest.java Mon Mar 2 08:20:07 2009 @@ -21,12 +21,12 @@ import org.apache.camel.CamelException; import org.apache.camel.ContextTestSupport; import org.apache.camel.Exchange; +import org.apache.camel.LoggingLevel; import org.apache.camel.Message; import org.apache.camel.Processor; import org.apache.camel.RuntimeCamelException; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.LoggingLevel; /** * @version $Revision$ Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/TracerConfigurationTest.java URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/TracerConfigurationTest.java?rev=749227&r1=749226&r2=749227&view=diff ============================================================================== --- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/TracerConfigurationTest.java (original) +++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/TracerConfigurationTest.java Mon Mar 2 08:20:07 2009 @@ -17,9 +17,9 @@ package org.apache.camel.processor; import org.apache.camel.ContextTestSupport; +import org.apache.camel.LoggingLevel; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.LoggingLevel; import org.apache.camel.processor.interceptor.Tracer; /** Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/interceptor/StreamCachingInterceptorTest.java URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/interceptor/StreamCachingInterceptorTest.java?rev=749227&r1=749226&r2=749227&view=diff ============================================================================== --- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/interceptor/StreamCachingInterceptorTest.java (original) +++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/interceptor/StreamCachingInterceptorTest.java Mon Mar 2 08:20:07 2009 @@ -27,12 +27,12 @@ import org.apache.camel.ContextTestSupport; import org.apache.camel.Exchange; +import org.apache.camel.StreamCache; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.converter.jaxp.BytesSource; import org.apache.camel.converter.jaxp.StringSource; import org.apache.camel.converter.jaxp.XmlConverter; -import org.apache.camel.converter.stream.StreamCache; import org.apache.camel.model.InterceptorRef; import org.apache.camel.model.InterceptorType; import org.apache.camel.processor.DelegateProcessor; Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/interceptor/TraceInterceptorDestinationTest.java URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/interceptor/TraceInterceptorDestinationTest.java?rev=749227&r1=749226&r2=749227&view=diff ============================================================================== --- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/interceptor/TraceInterceptorDestinationTest.java (original) +++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/interceptor/TraceInterceptorDestinationTest.java Mon Mar 2 08:20:07 2009 @@ -21,8 +21,8 @@ import org.apache.camel.ContextTestSupport; import org.apache.camel.Exchange; -import org.apache.camel.Processor; import org.apache.camel.LoggingLevel; +import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/util/MessageHelperTest.java URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/util/MessageHelperTest.java?rev=749227&r1=749226&r2=749227&view=diff ============================================================================== --- camel/trunk/camel-core/src/test/java/org/apache/camel/util/MessageHelperTest.java (original) +++ camel/trunk/camel-core/src/test/java/org/apache/camel/util/MessageHelperTest.java Mon Mar 2 08:20:07 2009 @@ -19,7 +19,7 @@ import junit.framework.TestCase; import org.apache.camel.Message; -import org.apache.camel.converter.stream.StreamCache; +import org.apache.camel.StreamCache; import org.apache.camel.impl.DefaultMessage; /** Modified: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/StreamCachingInterceptorTest.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/StreamCachingInterceptorTest.java?rev=749227&r1=749226&r2=749227&view=diff ============================================================================== --- camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/StreamCachingInterceptorTest.java (original) +++ camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/StreamCachingInterceptorTest.java Mon Mar 2 08:20:07 2009 @@ -16,7 +16,6 @@ */ package org.apache.camel.spring.interceptor; - import java.io.StringReader; import javax.xml.transform.stream.StreamSource; @@ -24,8 +23,8 @@ import org.apache.camel.CamelContext; import org.apache.camel.ContextTestSupport; import org.apache.camel.Exchange; +import org.apache.camel.StreamCache; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.converter.stream.StreamCache; import org.apache.camel.hamcrest.Assertions; import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext; @@ -46,7 +45,6 @@ assertMockEndpointsSatisfied(); Exchange exchange = a.getExchanges().get(0); StreamCache streamCache = Assertions.assertInstanceOf(exchange.getIn().getBody(), StreamCache.class); - //assertTrue(a.assertExchangeReceived(0).getIn().getBody() instanceof StreamCache); } protected CamelContext createCamelContext() throws Exception {