Return-Path: Delivered-To: apmail-activemq-camel-commits-archive@locus.apache.org Received: (qmail 84584 invoked from network); 8 Dec 2008 09:04:52 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 8 Dec 2008 09:04:52 -0000 Received: (qmail 50777 invoked by uid 500); 8 Dec 2008 09:05:05 -0000 Delivered-To: apmail-activemq-camel-commits-archive@activemq.apache.org Received: (qmail 50759 invoked by uid 500); 8 Dec 2008 09:05:05 -0000 Mailing-List: contact camel-commits-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: camel-dev@activemq.apache.org Delivered-To: mailing list camel-commits@activemq.apache.org Received: (qmail 50748 invoked by uid 99); 8 Dec 2008 09:05:05 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 08 Dec 2008 01:05:05 -0800 X-ASF-Spam-Status: No, hits=2.4 required=10.0 tests=NORMAL_HTTP_TO_IP,URIBL_RHS_DOB,WEIRD_PORT X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 08 Dec 2008 09:04:47 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 6ADF2238889B; Mon, 8 Dec 2008 01:04:25 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r724293 [1/2] - in /activemq/camel/branches/camel-1.x: camel-core/src/main/java/org/apache/camel/impl/ camel-core/src/main/java/org/apache/camel/model/ camel-core/src/test/java/org/apache/camel/builder/ camel-core/src/test/java/org/apache/c... Date: Mon, 08 Dec 2008 09:04:23 -0000 To: camel-commits@activemq.apache.org From: ningjiang@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20081208090425.6ADF2238889B@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: ningjiang Date: Mon Dec 8 01:04:21 2008 New Revision: 724293 URL: http://svn.apache.org/viewvc?rev=724293&view=rev Log: Applied the svn properties Modified: activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/impl/CamelPostProcessorHelper.java (contents, props changed) activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/impl/ProducerTemplateProcessor.java (contents, props changed) activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/impl/ProxyInstantiationException.java (contents, props changed) activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/model/ExpressionSubElementType.java (props changed) activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/model/LoggingLevel.java (contents, props changed) activemq/camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/builder/CustomLog.java (props changed) activemq/camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/builder/ExceptionBuilderWithRetryLoggingLevelSetTest.java (props changed) activemq/camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/builder/MyExceptionThrowingProcessor.java (props changed) activemq/camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelExceptionCausePropagatedTest.java (props changed) activemq/camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/processor/MyNormalizer.java (props changed) activemq/camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/processor/NormalizerTest.java (props changed) activemq/camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/processor/SplitterWithCustomThreadPoolExecutorTest.java (props changed) activemq/camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/processor/TraceInterceptorWithOutBodyTraceTest.java (props changed) activemq/camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/processor/aggregator/MyReverseAggregationCollection.java (props changed) activemq/camel/branches/camel-1.x/components/camel-guice/src/main/java/org/apache/camel/guice/impl/ConsumerInjection.java (contents, props changed) activemq/camel/branches/camel-1.x/components/camel-guice/src/main/java/org/apache/camel/guice/impl/EndpointInjector.java (contents, props changed) activemq/camel/branches/camel-1.x/components/camel-guice/src/main/java/org/apache/camel/guice/impl/ProduceInjector.java (contents, props changed) activemq/camel/branches/camel-1.x/components/camel-guice/src/test/java/org/apache/camel/guice/EndpointInjectionTest.java (contents, props changed) activemq/camel/branches/camel-1.x/components/camel-guice/src/test/java/org/apache/camel/guice/consume/ConsumeTest.java (contents, props changed) activemq/camel/branches/camel-1.x/components/camel-guice/src/test/java/org/apache/camel/guice/produce/MyListener.java (contents, props changed) activemq/camel/branches/camel-1.x/components/camel-guice/src/test/java/org/apache/camel/guice/produce/MyListenerService.java (contents, props changed) activemq/camel/branches/camel-1.x/components/camel-guice/src/test/java/org/apache/camel/guice/produce/ProduceTest.java (contents, props changed) activemq/camel/branches/camel-1.x/components/camel-http/src/main/java/org/apache/camel/component/http/HttpBinding.java (contents, props changed) activemq/camel/branches/camel-1.x/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/InterfacesTest.java (contents, props changed) activemq/camel/branches/camel-1.x/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyContentTypeTest.java (contents, props changed) activemq/camel/branches/camel-1.x/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyHttpBindingRefTest.java (contents, props changed) activemq/camel/branches/camel-1.x/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyHttpClientOptionsTest.java (contents, props changed) activemq/camel/branches/camel-1.x/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyImageFileTest.java (contents, props changed) activemq/camel/branches/camel-1.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/CamelMessageListener.java (contents, props changed) activemq/camel/branches/camel-1.x/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringAggregatorWithCustomCollectionTest.java (contents, props changed) activemq/camel/branches/camel-1.x/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringNormalizerTest.java (props changed) activemq/camel/branches/camel-1.x/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringSplitterWithCustomThreadPoolExecutorTest.java (props changed) activemq/camel/branches/camel-1.x/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringTraceInterceptorWithOutBodyTraceTest.java (props changed) activemq/camel/branches/camel-1.x/components/camel-spring/src/test/java/org/apache/camel/spring/processor/onexception/SpringExceptionBuilderWithRetryLoggingLevelSetTest.java (props changed) activemq/camel/branches/camel-1.x/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/aggregator-custom-collection.xml (props changed) activemq/camel/branches/camel-1.x/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/normalizer.xml (props changed) activemq/camel/branches/camel-1.x/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/onexception/exceptionBuilderWithRetryLoggingLevelSet.xml (props changed) activemq/camel/branches/camel-1.x/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/splitterWithCustomThreadPoolExecutor.xml (props changed) activemq/camel/branches/camel-1.x/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/traceInterceptorWithOutBodyTrace.xml (props changed) activemq/camel/branches/camel-1.x/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlDataSourceRefTest.java (contents, props changed) activemq/camel/branches/camel-1.x/tooling/maven/guice-maven-plugin/pom.xml (props changed) activemq/camel/branches/camel-1.x/tooling/maven/guice-maven-plugin/src/main/java/org/apache/camel/guice/maven/DotMojo.java (contents, props changed) activemq/camel/branches/camel-1.x/tooling/maven/guice-maven-plugin/src/main/java/org/apache/camel/guice/maven/EmbeddedMojo.java (props changed) activemq/camel/branches/camel-1.x/tooling/maven/guice-maven-plugin/src/main/java/org/apache/camel/guice/maven/RunMojo.java (props changed) activemq/camel/branches/camel-1.x/tooling/maven/guice-maven-plugin/src/main/resources/META-INF/LICENSE.txt (props changed) activemq/camel/branches/camel-1.x/tooling/maven/guice-maven-plugin/src/main/resources/META-INF/NOTICE.txt (props changed) activemq/camel/branches/camel-1.x/tooling/maven/guice-maven-plugin/src/main/resources/guice-maven-plugin.properties (props changed) Modified: activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/impl/CamelPostProcessorHelper.java URL: http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/impl/CamelPostProcessorHelper.java?rev=724293&r1=724292&r2=724293&view=diff ============================================================================== --- activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/impl/CamelPostProcessorHelper.java (original) +++ activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/impl/CamelPostProcessorHelper.java Mon Dec 8 01:04:21 2008 @@ -42,7 +42,7 @@ * both the Spring * and Guice support. * - * @version $Revision: 1.1 $ + * @version $Revision$ */ public class CamelPostProcessorHelper implements CamelContextAware { private static final transient Log LOG = LogFactory.getLog(CamelPostProcessorHelper.class); Propchange: activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/impl/CamelPostProcessorHelper.java ------------------------------------------------------------------------------ svn:keywords = Rev Date Modified: activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/impl/ProducerTemplateProcessor.java URL: http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/impl/ProducerTemplateProcessor.java?rev=724293&r1=724292&r2=724293&view=diff ============================================================================== --- activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/impl/ProducerTemplateProcessor.java (original) +++ activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/impl/ProducerTemplateProcessor.java Mon Dec 8 01:04:21 2008 @@ -24,7 +24,7 @@ /** * A simple processor which just sends the message exchange to the default endpoint of the {@link ProducerTemplate} * - * @version $Revision: 1.1 $ + * @version $Revision$ */ public class ProducerTemplateProcessor implements Processor { private final ProducerTemplate producerTemplate; Propchange: activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/impl/ProducerTemplateProcessor.java ------------------------------------------------------------------------------ svn:keywords = Rev Date Modified: activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/impl/ProxyInstantiationException.java URL: http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/impl/ProxyInstantiationException.java?rev=724293&r1=724292&r2=724293&view=diff ============================================================================== --- activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/impl/ProxyInstantiationException.java (original) +++ activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/impl/ProxyInstantiationException.java Mon Dec 8 01:04:21 2008 @@ -21,7 +21,7 @@ /** * A proxy creation failed trying to create a proxy of a given type and on an given endpoint * - * @version $Revision: 1.1 $ + * @version $Revision$ */ public class ProxyInstantiationException extends RuntimeException { private final Class type; Propchange: activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/impl/ProxyInstantiationException.java ------------------------------------------------------------------------------ svn:keywords = Rev Date Propchange: activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/model/ExpressionSubElementType.java ------------------------------------------------------------------------------ svn:keywords = Rev Date Modified: activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/model/LoggingLevel.java URL: http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/model/LoggingLevel.java?rev=724293&r1=724292&r2=724293&view=diff ============================================================================== --- activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/model/LoggingLevel.java (original) +++ activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/model/LoggingLevel.java Mon Dec 8 01:04:21 2008 @@ -21,7 +21,7 @@ /** * Used to configure the logging levels * - * @version $Revision: 703680 $ + * @version $Revision$ */ @XmlEnum public enum LoggingLevel { Propchange: activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/model/LoggingLevel.java ------------------------------------------------------------------------------ svn:keywords = Rev Date Propchange: activemq/camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/builder/CustomLog.java ------------------------------------------------------------------------------ svn:keywords = Rev Date Propchange: activemq/camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/builder/ExceptionBuilderWithRetryLoggingLevelSetTest.java ------------------------------------------------------------------------------ svn:keywords = Rev Date Propchange: activemq/camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/builder/MyExceptionThrowingProcessor.java ------------------------------------------------------------------------------ svn:keywords = Rev Date Propchange: activemq/camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelExceptionCausePropagatedTest.java ------------------------------------------------------------------------------ svn:keywords = Rev Date Propchange: activemq/camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/processor/MyNormalizer.java ------------------------------------------------------------------------------ svn:keywords = Rev Date Propchange: activemq/camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/processor/NormalizerTest.java ------------------------------------------------------------------------------ svn:keywords = Rev Date Propchange: activemq/camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/processor/SplitterWithCustomThreadPoolExecutorTest.java ------------------------------------------------------------------------------ svn:keywords = Rev Date Propchange: activemq/camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/processor/TraceInterceptorWithOutBodyTraceTest.java ------------------------------------------------------------------------------ svn:keywords = Rev Date Propchange: activemq/camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/processor/aggregator/MyReverseAggregationCollection.java ------------------------------------------------------------------------------ svn:keywords = Rev Date Modified: activemq/camel/branches/camel-1.x/components/camel-guice/src/main/java/org/apache/camel/guice/impl/ConsumerInjection.java URL: http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/components/camel-guice/src/main/java/org/apache/camel/guice/impl/ConsumerInjection.java?rev=724293&r1=724292&r2=724293&view=diff ============================================================================== --- activemq/camel/branches/camel-1.x/components/camel-guice/src/main/java/org/apache/camel/guice/impl/ConsumerInjection.java (original) +++ activemq/camel/branches/camel-1.x/components/camel-guice/src/main/java/org/apache/camel/guice/impl/ConsumerInjection.java Mon Dec 8 01:04:21 2008 @@ -27,7 +27,7 @@ import org.apache.camel.impl.CamelPostProcessorHelper; /** - * @version $Revision: 1.1 $ + * @version $Revision$ */ public class ConsumerInjection extends CamelPostProcessorHelper implements ConstructorInterceptor { public Object construct(ConstructorInvocation invocation) throws Throwable { Propchange: activemq/camel/branches/camel-1.x/components/camel-guice/src/main/java/org/apache/camel/guice/impl/ConsumerInjection.java ------------------------------------------------------------------------------ svn:keywords = Rev Date Modified: activemq/camel/branches/camel-1.x/components/camel-guice/src/main/java/org/apache/camel/guice/impl/EndpointInjector.java URL: http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/components/camel-guice/src/main/java/org/apache/camel/guice/impl/EndpointInjector.java?rev=724293&r1=724292&r2=724293&view=diff ============================================================================== --- activemq/camel/branches/camel-1.x/components/camel-guice/src/main/java/org/apache/camel/guice/impl/EndpointInjector.java (original) +++ activemq/camel/branches/camel-1.x/components/camel-guice/src/main/java/org/apache/camel/guice/impl/EndpointInjector.java Mon Dec 8 01:04:21 2008 @@ -34,7 +34,7 @@ /** * Injects values into the {@link EndpointInject} injection point * - * @version $Revision: 1.1 $ + * @version $Revision$ */ @InjectionAnnotation(EndpointInject.class) public class EndpointInjector extends CamelPostProcessorHelper implements AnnotationProviderFactory { Propchange: activemq/camel/branches/camel-1.x/components/camel-guice/src/main/java/org/apache/camel/guice/impl/EndpointInjector.java ------------------------------------------------------------------------------ svn:keywords = Rev Date Modified: activemq/camel/branches/camel-1.x/components/camel-guice/src/main/java/org/apache/camel/guice/impl/ProduceInjector.java URL: http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/components/camel-guice/src/main/java/org/apache/camel/guice/impl/ProduceInjector.java?rev=724293&r1=724292&r2=724293&view=diff ============================================================================== --- activemq/camel/branches/camel-1.x/components/camel-guice/src/main/java/org/apache/camel/guice/impl/ProduceInjector.java (original) +++ activemq/camel/branches/camel-1.x/components/camel-guice/src/main/java/org/apache/camel/guice/impl/ProduceInjector.java Mon Dec 8 01:04:21 2008 @@ -34,7 +34,7 @@ /** * Injects values into the {@link Produce} injection point * - * @version $Revision: 1.1 $ + * @version $Revision$ */ @InjectionAnnotation(Produce.class) public class ProduceInjector extends CamelPostProcessorHelper implements AnnotationProviderFactory { Propchange: activemq/camel/branches/camel-1.x/components/camel-guice/src/main/java/org/apache/camel/guice/impl/ProduceInjector.java ------------------------------------------------------------------------------ svn:keywords = Rev Date Modified: activemq/camel/branches/camel-1.x/components/camel-guice/src/test/java/org/apache/camel/guice/EndpointInjectionTest.java URL: http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/components/camel-guice/src/test/java/org/apache/camel/guice/EndpointInjectionTest.java?rev=724293&r1=724292&r2=724293&view=diff ============================================================================== --- activemq/camel/branches/camel-1.x/components/camel-guice/src/test/java/org/apache/camel/guice/EndpointInjectionTest.java (original) +++ activemq/camel/branches/camel-1.x/components/camel-guice/src/test/java/org/apache/camel/guice/EndpointInjectionTest.java Mon Dec 8 01:04:21 2008 @@ -35,7 +35,7 @@ /** * Create a collection of routes via a provider method * - * @version $Revision: 705742 $ + * @version $Revision$ */ public class EndpointInjectionTest extends TestCase { Propchange: activemq/camel/branches/camel-1.x/components/camel-guice/src/test/java/org/apache/camel/guice/EndpointInjectionTest.java ------------------------------------------------------------------------------ svn:keywords = Rev Date Modified: activemq/camel/branches/camel-1.x/components/camel-guice/src/test/java/org/apache/camel/guice/consume/ConsumeTest.java URL: http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/components/camel-guice/src/test/java/org/apache/camel/guice/consume/ConsumeTest.java?rev=724293&r1=724292&r2=724293&view=diff ============================================================================== --- activemq/camel/branches/camel-1.x/components/camel-guice/src/test/java/org/apache/camel/guice/consume/ConsumeTest.java (original) +++ activemq/camel/branches/camel-1.x/components/camel-guice/src/test/java/org/apache/camel/guice/consume/ConsumeTest.java Mon Dec 8 01:04:21 2008 @@ -24,7 +24,7 @@ import org.guiceyfruit.testing.junit3.GuiceyTestCase; /** - * @version $Revision: 697494 $ + * @version $Revision$ */ public class ConsumeTest extends GuiceyTestCase { Propchange: activemq/camel/branches/camel-1.x/components/camel-guice/src/test/java/org/apache/camel/guice/consume/ConsumeTest.java ------------------------------------------------------------------------------ svn:keywords = Rev Date Modified: activemq/camel/branches/camel-1.x/components/camel-guice/src/test/java/org/apache/camel/guice/produce/MyListener.java URL: http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/components/camel-guice/src/test/java/org/apache/camel/guice/produce/MyListener.java?rev=724293&r1=724292&r2=724293&view=diff ============================================================================== --- activemq/camel/branches/camel-1.x/components/camel-guice/src/test/java/org/apache/camel/guice/produce/MyListener.java (original) +++ activemq/camel/branches/camel-1.x/components/camel-guice/src/test/java/org/apache/camel/guice/produce/MyListener.java Mon Dec 8 01:04:21 2008 @@ -17,7 +17,7 @@ package org.apache.camel.guice.produce; /** - * @version $Revision: 697494 $ + * @version $Revision$ */ public interface MyListener { Propchange: activemq/camel/branches/camel-1.x/components/camel-guice/src/test/java/org/apache/camel/guice/produce/MyListener.java ------------------------------------------------------------------------------ svn:keywords = Rev Date Modified: activemq/camel/branches/camel-1.x/components/camel-guice/src/test/java/org/apache/camel/guice/produce/MyListenerService.java URL: http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/components/camel-guice/src/test/java/org/apache/camel/guice/produce/MyListenerService.java?rev=724293&r1=724292&r2=724293&view=diff ============================================================================== --- activemq/camel/branches/camel-1.x/components/camel-guice/src/test/java/org/apache/camel/guice/produce/MyListenerService.java (original) +++ activemq/camel/branches/camel-1.x/components/camel-guice/src/test/java/org/apache/camel/guice/produce/MyListenerService.java Mon Dec 8 01:04:21 2008 @@ -21,7 +21,7 @@ import org.apache.commons.logging.LogFactory; /** - * @version $Revision: 697494 $ + * @version $Revision$ */ public class MyListenerService implements MyListener { Propchange: activemq/camel/branches/camel-1.x/components/camel-guice/src/test/java/org/apache/camel/guice/produce/MyListenerService.java ------------------------------------------------------------------------------ svn:keywords = Rev Date Modified: activemq/camel/branches/camel-1.x/components/camel-guice/src/test/java/org/apache/camel/guice/produce/ProduceTest.java URL: http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/components/camel-guice/src/test/java/org/apache/camel/guice/produce/ProduceTest.java?rev=724293&r1=724292&r2=724293&view=diff ============================================================================== --- activemq/camel/branches/camel-1.x/components/camel-guice/src/test/java/org/apache/camel/guice/produce/ProduceTest.java (original) +++ activemq/camel/branches/camel-1.x/components/camel-guice/src/test/java/org/apache/camel/guice/produce/ProduceTest.java Mon Dec 8 01:04:21 2008 @@ -22,7 +22,7 @@ import org.guiceyfruit.testing.junit3.GuiceyTestCase; /** - * @version $Revision: 697494 $ + * @version $Revision$ */ public class ProduceTest extends GuiceyTestCase { Propchange: activemq/camel/branches/camel-1.x/components/camel-guice/src/test/java/org/apache/camel/guice/produce/ProduceTest.java ------------------------------------------------------------------------------ svn:keywords = Rev Date Modified: activemq/camel/branches/camel-1.x/components/camel-http/src/main/java/org/apache/camel/component/http/HttpBinding.java URL: http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/components/camel-http/src/main/java/org/apache/camel/component/http/HttpBinding.java?rev=724293&r1=724292&r2=724293&view=diff ============================================================================== --- activemq/camel/branches/camel-1.x/components/camel-http/src/main/java/org/apache/camel/component/http/HttpBinding.java (original) +++ activemq/camel/branches/camel-1.x/components/camel-http/src/main/java/org/apache/camel/component/http/HttpBinding.java Mon Dec 8 01:04:21 2008 @@ -1,113 +1,113 @@ -/** - * 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. - */ -package org.apache.camel.component.http; - -import java.io.IOException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.apache.camel.Message; -import org.apache.camel.spi.HeaderFilterStrategy; - -/** - * A plugable strategy for configuring the http binding so reading request and writing response - * can be customized using the Java Servlet API. - *

- * This is used by the camel-jetty. - * - * @version $Revision$ - */ -public interface HttpBinding { - - /** - * Startegy to read the given request and bindings it to the given message. - * - * @param request the request - * @param message the message to populate with data from request - */ - void readRequest(HttpServletRequest request, HttpMessage message); - - /** - * Parses the body from a {@link org.apache.camel.component.http.HttpMessage} - * - * @return the parsed body returned as either a {@link java.io.InputStream} or a {@link java.io.Reader} - * depending on the {@link #setUseReaderForPayload(boolean)} property. - * @throws java.io.IOException can be thrown - */ - Object parseBody(HttpMessage httpMessage) throws IOException; - - /** - * Writes the exchange to the servlet response. - *

- * Default implementation will delegate to the following methods depending on the status of the exchange - *

    - *
  • doWriteResponse - processing returns a OUT message
    • - *
  • doWriteFaultResponse - processing returns a fault message
    • - *
  • doWriteResponse - processing returns an exception and status code 500
    • - *
- * - * @param exchange the exchange - * @param response the http response - * @throws java.io.IOException can be thrown from http response - */ - void writeResponse(HttpExchange exchange, HttpServletResponse response) throws IOException; - - /** - * Strategy method that writes the response to the http response stream when an exception occuerd - * - * @param exception the exception occured - * @param response the http response - * @throws java.io.IOException can be thrown from http response - */ - void doWriteExceptionResponse(Throwable exception, HttpServletResponse response) throws IOException; - - /** - * Strategy method that writes the response to the http response stream for a fault message - * - * @param message the fault message - * @param response the http response - * @throws java.io.IOException can be thrown from http response - */ - void doWriteFaultResponse(Message message, HttpServletResponse response) throws IOException; - - /** - * Strategy method that writes the response to the http response stream for an OUT message - * - * @param message the OUT message - * @param response the http response - * @throws java.io.IOException can be thrown from http response - */ - void doWriteResponse(Message message, HttpServletResponse response) throws IOException; - - boolean isUseReaderForPayload(); - - /** - * Should the {@link javax.servlet.http.HttpServletRequest#getReader()} be exposed as the payload of input messages in the Camel - * {@link org.apache.camel.Message#getBody()} or not. If false then the {@link javax.servlet.http.HttpServletRequest#getInputStream()} will be exposed. - */ - void setUseReaderForPayload(boolean useReaderForPayload); - - HeaderFilterStrategy getHeaderFilterStrategy(); - - /** - * Sets the header filter stratety to use. - *

- * Will default use {@link org.apache.camel.component.http.HttpHeaderFilterStrategy} - */ - void setHeaderFilterStrategy(HeaderFilterStrategy headerFilterStrategy); - -} +/** + * 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. + */ +package org.apache.camel.component.http; + +import java.io.IOException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.apache.camel.Message; +import org.apache.camel.spi.HeaderFilterStrategy; + +/** + * A plugable strategy for configuring the http binding so reading request and writing response + * can be customized using the Java Servlet API. + *

+ * This is used by the camel-jetty. + * + * @version $Revision$ + */ +public interface HttpBinding { + + /** + * Startegy to read the given request and bindings it to the given message. + * + * @param request the request + * @param message the message to populate with data from request + */ + void readRequest(HttpServletRequest request, HttpMessage message); + + /** + * Parses the body from a {@link org.apache.camel.component.http.HttpMessage} + * + * @return the parsed body returned as either a {@link java.io.InputStream} or a {@link java.io.Reader} + * depending on the {@link #setUseReaderForPayload(boolean)} property. + * @throws java.io.IOException can be thrown + */ + Object parseBody(HttpMessage httpMessage) throws IOException; + + /** + * Writes the exchange to the servlet response. + *

+ * Default implementation will delegate to the following methods depending on the status of the exchange + *

    + *
  • doWriteResponse - processing returns a OUT message
    • + *
  • doWriteFaultResponse - processing returns a fault message
    • + *
  • doWriteResponse - processing returns an exception and status code 500
    • + *
+ * + * @param exchange the exchange + * @param response the http response + * @throws java.io.IOException can be thrown from http response + */ + void writeResponse(HttpExchange exchange, HttpServletResponse response) throws IOException; + + /** + * Strategy method that writes the response to the http response stream when an exception occuerd + * + * @param exception the exception occured + * @param response the http response + * @throws java.io.IOException can be thrown from http response + */ + void doWriteExceptionResponse(Throwable exception, HttpServletResponse response) throws IOException; + + /** + * Strategy method that writes the response to the http response stream for a fault message + * + * @param message the fault message + * @param response the http response + * @throws java.io.IOException can be thrown from http response + */ + void doWriteFaultResponse(Message message, HttpServletResponse response) throws IOException; + + /** + * Strategy method that writes the response to the http response stream for an OUT message + * + * @param message the OUT message + * @param response the http response + * @throws java.io.IOException can be thrown from http response + */ + void doWriteResponse(Message message, HttpServletResponse response) throws IOException; + + boolean isUseReaderForPayload(); + + /** + * Should the {@link javax.servlet.http.HttpServletRequest#getReader()} be exposed as the payload of input messages in the Camel + * {@link org.apache.camel.Message#getBody()} or not. If false then the {@link javax.servlet.http.HttpServletRequest#getInputStream()} will be exposed. + */ + void setUseReaderForPayload(boolean useReaderForPayload); + + HeaderFilterStrategy getHeaderFilterStrategy(); + + /** + * Sets the header filter stratety to use. + *

+ * Will default use {@link org.apache.camel.component.http.HttpHeaderFilterStrategy} + */ + void setHeaderFilterStrategy(HeaderFilterStrategy headerFilterStrategy); + +} Propchange: activemq/camel/branches/camel-1.x/components/camel-http/src/main/java/org/apache/camel/component/http/HttpBinding.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: activemq/camel/branches/camel-1.x/components/camel-http/src/main/java/org/apache/camel/component/http/HttpBinding.java ------------------------------------------------------------------------------ svn:keywords = Rev Date Modified: activemq/camel/branches/camel-1.x/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/InterfacesTest.java URL: http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/InterfacesTest.java?rev=724293&r1=724292&r2=724293&view=diff ============================================================================== --- activemq/camel/branches/camel-1.x/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/InterfacesTest.java (original) +++ activemq/camel/branches/camel-1.x/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/InterfacesTest.java Mon Dec 8 01:04:21 2008 @@ -1,123 +1,123 @@ -/** - * 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. - */ -package org.apache.camel.component.jetty; - -import java.io.IOException; -import java.net.Inet6Address; -import java.net.InetAddress; -import java.net.NetworkInterface; -import java.net.URL; -import java.util.Enumeration; - -import org.apache.camel.ContextTestSupport; -import org.apache.camel.builder.RouteBuilder; -import org.apache.commons.io.IOUtils; - -public class InterfacesTest extends ContextTestSupport { - - private String remoteInterfaceAddress; - - - public InterfacesTest() throws IOException { - // Retrieve an address of some remote network interface - Enumeration interfaces = NetworkInterface.getNetworkInterfaces(); - - while (remoteInterfaceAddress == null && interfaces.hasMoreElements()) { - NetworkInterface interfaze = interfaces.nextElement(); - Enumeration addresses = interfaze.getInetAddresses(); - if (addresses.hasMoreElements()) { - InetAddress nextAddress = addresses.nextElement(); - if (nextAddress.isLoopbackAddress() || !nextAddress.isReachable(2000)) { - continue; - } - if (nextAddress instanceof Inet6Address) { - continue; - } else { - remoteInterfaceAddress = nextAddress.getHostAddress(); - } - } - } - } - - public void testLocalInterfaceHandled() throws IOException, InterruptedException { - int expectedMessages = (remoteInterfaceAddress != null) ? 3 : 2; - getMockEndpoint("mock:endpoint").expectedMessageCount(expectedMessages); - - URL localUrl = new URL("http://localhost:4567/testRoute"); - String localResponse = IOUtils.toString(localUrl.openStream()); - assertEquals("local", localResponse); - - // 127.0.0.1 is an alias of localhost so should work - localUrl = new URL("http://127.0.0.1:4568/testRoute"); - localResponse = IOUtils.toString(localUrl.openStream()); - assertEquals("local-differentPort", localResponse); - - if (remoteInterfaceAddress != null) { - URL url = new URL("http://" + remoteInterfaceAddress + ":4567/testRoute"); - String remoteResponse = IOUtils.toString(url.openStream()); - assertEquals("remote", remoteResponse); - } - - assertMockEndpointsSatisfied(); - } - - - public void testAllInterfaces() throws Exception { - int expectedMessages = (remoteInterfaceAddress != null) ? 2 : 1; - getMockEndpoint("mock:endpoint").expectedMessageCount(expectedMessages); - - URL localUrl = new URL("http://localhost:4569/allInterfaces"); - String localResponse = IOUtils.toString(localUrl.openStream()); - assertEquals("allInterfaces", localResponse); - - if (remoteInterfaceAddress != null) { - URL url = new URL("http://" + remoteInterfaceAddress + ":4569/allInterfaces"); - String remoteResponse = IOUtils.toString(url.openStream()); - assertEquals("allInterfaces", remoteResponse); - } - - assertMockEndpointsSatisfied(); - } - - @Override - protected RouteBuilder createRouteBuilder() throws Exception { - return new RouteBuilder() { - - @Override - public void configure() throws Exception { - from("jetty:http://localhost:4567/testRoute") - .setBody().constant("local") - .to("mock:endpoint"); - - from("jetty:http://localhost:4568/testRoute") - .setBody().constant("local-differentPort") - .to("mock:endpoint"); - - if (remoteInterfaceAddress != null) { - from("jetty:http://" + remoteInterfaceAddress + ":4567/testRoute") - .setBody().constant("remote") - .to("mock:endpoint"); - } - - from("jetty:http://0.0.0.0:4569/allInterfaces") - .setBody().constant("allInterfaces") - .to("mock:endpoint"); - - } - }; - } -} +/** + * 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. + */ +package org.apache.camel.component.jetty; + +import java.io.IOException; +import java.net.Inet6Address; +import java.net.InetAddress; +import java.net.NetworkInterface; +import java.net.URL; +import java.util.Enumeration; + +import org.apache.camel.ContextTestSupport; +import org.apache.camel.builder.RouteBuilder; +import org.apache.commons.io.IOUtils; + +public class InterfacesTest extends ContextTestSupport { + + private String remoteInterfaceAddress; + + + public InterfacesTest() throws IOException { + // Retrieve an address of some remote network interface + Enumeration interfaces = NetworkInterface.getNetworkInterfaces(); + + while (remoteInterfaceAddress == null && interfaces.hasMoreElements()) { + NetworkInterface interfaze = interfaces.nextElement(); + Enumeration addresses = interfaze.getInetAddresses(); + if (addresses.hasMoreElements()) { + InetAddress nextAddress = addresses.nextElement(); + if (nextAddress.isLoopbackAddress() || !nextAddress.isReachable(2000)) { + continue; + } + if (nextAddress instanceof Inet6Address) { + continue; + } else { + remoteInterfaceAddress = nextAddress.getHostAddress(); + } + } + } + } + + public void testLocalInterfaceHandled() throws IOException, InterruptedException { + int expectedMessages = (remoteInterfaceAddress != null) ? 3 : 2; + getMockEndpoint("mock:endpoint").expectedMessageCount(expectedMessages); + + URL localUrl = new URL("http://localhost:4567/testRoute"); + String localResponse = IOUtils.toString(localUrl.openStream()); + assertEquals("local", localResponse); + + // 127.0.0.1 is an alias of localhost so should work + localUrl = new URL("http://127.0.0.1:4568/testRoute"); + localResponse = IOUtils.toString(localUrl.openStream()); + assertEquals("local-differentPort", localResponse); + + if (remoteInterfaceAddress != null) { + URL url = new URL("http://" + remoteInterfaceAddress + ":4567/testRoute"); + String remoteResponse = IOUtils.toString(url.openStream()); + assertEquals("remote", remoteResponse); + } + + assertMockEndpointsSatisfied(); + } + + + public void testAllInterfaces() throws Exception { + int expectedMessages = (remoteInterfaceAddress != null) ? 2 : 1; + getMockEndpoint("mock:endpoint").expectedMessageCount(expectedMessages); + + URL localUrl = new URL("http://localhost:4569/allInterfaces"); + String localResponse = IOUtils.toString(localUrl.openStream()); + assertEquals("allInterfaces", localResponse); + + if (remoteInterfaceAddress != null) { + URL url = new URL("http://" + remoteInterfaceAddress + ":4569/allInterfaces"); + String remoteResponse = IOUtils.toString(url.openStream()); + assertEquals("allInterfaces", remoteResponse); + } + + assertMockEndpointsSatisfied(); + } + + @Override + protected RouteBuilder createRouteBuilder() throws Exception { + return new RouteBuilder() { + + @Override + public void configure() throws Exception { + from("jetty:http://localhost:4567/testRoute") + .setBody().constant("local") + .to("mock:endpoint"); + + from("jetty:http://localhost:4568/testRoute") + .setBody().constant("local-differentPort") + .to("mock:endpoint"); + + if (remoteInterfaceAddress != null) { + from("jetty:http://" + remoteInterfaceAddress + ":4567/testRoute") + .setBody().constant("remote") + .to("mock:endpoint"); + } + + from("jetty:http://0.0.0.0:4569/allInterfaces") + .setBody().constant("allInterfaces") + .to("mock:endpoint"); + + } + }; + } +} Propchange: activemq/camel/branches/camel-1.x/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/InterfacesTest.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: activemq/camel/branches/camel-1.x/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/InterfacesTest.java ------------------------------------------------------------------------------ svn:keywords = Rev Date Modified: activemq/camel/branches/camel-1.x/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyContentTypeTest.java URL: http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyContentTypeTest.java?rev=724293&r1=724292&r2=724293&view=diff ============================================================================== --- activemq/camel/branches/camel-1.x/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyContentTypeTest.java (original) +++ activemq/camel/branches/camel-1.x/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyContentTypeTest.java Mon Dec 8 01:04:21 2008 @@ -1,75 +1,75 @@ -/** - * 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. - */ -package org.apache.camel.component.jetty; - -import org.apache.camel.ContextTestSupport; -import org.apache.camel.Endpoint; -import org.apache.camel.Exchange; -import org.apache.camel.Processor; -import org.apache.camel.builder.RouteBuilder; - -/** - * Unit test for content-type - */ -public class JettyContentTypeTest extends ContextTestSupport { - - public void testSameContentType() throws Exception { - Endpoint endpoint = context.getEndpoint("http://localhost:8080/myapp/myservice"); - Exchange exchange = endpoint.createExchange(); - exchange.getIn().setBody("123"); - exchange.getIn().setHeader("user", "Claus"); - exchange.getIn().setHeader("content-type", "text/xml"); - template.send(endpoint, exchange); - - String body = exchange.getOut().getBody(String.class); - assertEquals("OK", body); - assertOutMessageHeader(exchange, "content-type", "text/xml"); - } - - public void testMixedContentType() throws Exception { - Endpoint endpoint = context.getEndpoint("http://localhost:8080/myapp/myservice"); - Exchange exchange = endpoint.createExchange(); - exchange.getIn().setBody("123"); - exchange.getIn().setHeader("Content-Type", "text/xml"); - template.send(endpoint, exchange); - - String body = exchange.getOut().getBody(String.class); - assertEquals("FAIL", body); - assertOutMessageHeader(exchange, "Content-Type", "text/plain"); - } - - @Override - protected RouteBuilder createRouteBuilder() throws Exception { - return new RouteBuilder() { - public void configure() throws Exception { - from("jetty:http://localhost:8080/myapp/myservice").process(new MyBookService()); - } - }; - } - - public class MyBookService implements Processor { - public void process(Exchange exchange) throws Exception { - if (exchange.getIn().getHeader("user") != null) { - exchange.getOut().setBody("OK"); - } else { - exchange.getOut().setBody("FAIL"); - exchange.getOut().setHeader("Content-Type", "text/plain"); - } - } - } - +/** + * 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. + */ +package org.apache.camel.component.jetty; + +import org.apache.camel.ContextTestSupport; +import org.apache.camel.Endpoint; +import org.apache.camel.Exchange; +import org.apache.camel.Processor; +import org.apache.camel.builder.RouteBuilder; + +/** + * Unit test for content-type + */ +public class JettyContentTypeTest extends ContextTestSupport { + + public void testSameContentType() throws Exception { + Endpoint endpoint = context.getEndpoint("http://localhost:8080/myapp/myservice"); + Exchange exchange = endpoint.createExchange(); + exchange.getIn().setBody("123"); + exchange.getIn().setHeader("user", "Claus"); + exchange.getIn().setHeader("content-type", "text/xml"); + template.send(endpoint, exchange); + + String body = exchange.getOut().getBody(String.class); + assertEquals("OK", body); + assertOutMessageHeader(exchange, "content-type", "text/xml"); + } + + public void testMixedContentType() throws Exception { + Endpoint endpoint = context.getEndpoint("http://localhost:8080/myapp/myservice"); + Exchange exchange = endpoint.createExchange(); + exchange.getIn().setBody("123"); + exchange.getIn().setHeader("Content-Type", "text/xml"); + template.send(endpoint, exchange); + + String body = exchange.getOut().getBody(String.class); + assertEquals("FAIL", body); + assertOutMessageHeader(exchange, "Content-Type", "text/plain"); + } + + @Override + protected RouteBuilder createRouteBuilder() throws Exception { + return new RouteBuilder() { + public void configure() throws Exception { + from("jetty:http://localhost:8080/myapp/myservice").process(new MyBookService()); + } + }; + } + + public class MyBookService implements Processor { + public void process(Exchange exchange) throws Exception { + if (exchange.getIn().getHeader("user") != null) { + exchange.getOut().setBody("OK"); + } else { + exchange.getOut().setBody("FAIL"); + exchange.getOut().setHeader("Content-Type", "text/plain"); + } + } + } + } \ No newline at end of file Propchange: activemq/camel/branches/camel-1.x/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyContentTypeTest.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: activemq/camel/branches/camel-1.x/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyContentTypeTest.java ------------------------------------------------------------------------------ svn:keywords = Rev Date Modified: activemq/camel/branches/camel-1.x/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyHttpBindingRefTest.java URL: http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyHttpBindingRefTest.java?rev=724293&r1=724292&r2=724293&view=diff ============================================================================== --- activemq/camel/branches/camel-1.x/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyHttpBindingRefTest.java (original) +++ activemq/camel/branches/camel-1.x/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyHttpBindingRefTest.java Mon Dec 8 01:04:21 2008 @@ -1,87 +1,87 @@ -/** - * 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. - */ -package org.apache.camel.component.jetty; - -import java.io.IOException; -import javax.servlet.http.HttpServletResponse; - -import org.apache.camel.ContextTestSupport; -import org.apache.camel.Exchange; -import org.apache.camel.Processor; -import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.component.http.DefaultHttpBinding; -import org.apache.camel.impl.JndiRegistry; - -/** - * Unit test for http binding ref option. - */ -public class JettyHttpBindingRefTest extends ContextTestSupport { - - public void testDefaultHttpBinding() throws Exception { - Object out = template.requestBody("http://localhost:8080/myapp/myservice", "Hello World"); - assertEquals("Bye World", context.getTypeConverter().convertTo(String.class, out)); - } - - public void testCustomHttpBinding() throws Exception { - Object out = template.requestBody("http://localhost:8081/myapp/myotherservice", "Hello World"); - assertEquals("Something went wrong but we dont care", context.getTypeConverter().convertTo(String.class, out)); - } - - @Override - protected JndiRegistry createRegistry() throws Exception { - JndiRegistry jndi = super.createRegistry(); - jndi.bind("default", new DefaultHttpBinding()); - jndi.bind("myownbinder", new MyHttpBinding()); - return jndi; - } - - @Override - protected RouteBuilder createRouteBuilder() throws Exception { - return new RouteBuilder() { - @Override - public void configure() throws Exception { - errorHandler(noErrorHandler()); - - from("jetty:http://localhost:8080/myapp/myservice?httpBindingRef=default").transform().constant("Bye World"); - - from("jetty:http://localhost:8081/myapp/myotherservice?httpBindingRef=myownbinder").process(new Processor() { - public void process(Exchange exchange) throws Exception { - throw new IllegalStateException("Not implemented"); - } - }); - } - }; - } - - // START SNIPPET: e1 - public class MyHttpBinding extends DefaultHttpBinding { - - @Override - public void doWriteExceptionResponse(Throwable exception, HttpServletResponse response) throws IOException { - // we override the doWriteExceptionResponse as we only want to alter the binding how exceptions is - // written back to the client. - - // we just return HTTP 200 so the client thinks its okay - response.setStatus(200); - // and we return this fixed text - response.getWriter().write("Something went wrong but we dont care"); - } - } - // END SNIPPET: e1 - -} - +/** + * 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. + */ +package org.apache.camel.component.jetty; + +import java.io.IOException; +import javax.servlet.http.HttpServletResponse; + +import org.apache.camel.ContextTestSupport; +import org.apache.camel.Exchange; +import org.apache.camel.Processor; +import org.apache.camel.builder.RouteBuilder; +import org.apache.camel.component.http.DefaultHttpBinding; +import org.apache.camel.impl.JndiRegistry; + +/** + * Unit test for http binding ref option. + */ +public class JettyHttpBindingRefTest extends ContextTestSupport { + + public void testDefaultHttpBinding() throws Exception { + Object out = template.requestBody("http://localhost:8080/myapp/myservice", "Hello World"); + assertEquals("Bye World", context.getTypeConverter().convertTo(String.class, out)); + } + + public void testCustomHttpBinding() throws Exception { + Object out = template.requestBody("http://localhost:8081/myapp/myotherservice", "Hello World"); + assertEquals("Something went wrong but we dont care", context.getTypeConverter().convertTo(String.class, out)); + } + + @Override + protected JndiRegistry createRegistry() throws Exception { + JndiRegistry jndi = super.createRegistry(); + jndi.bind("default", new DefaultHttpBinding()); + jndi.bind("myownbinder", new MyHttpBinding()); + return jndi; + } + + @Override + protected RouteBuilder createRouteBuilder() throws Exception { + return new RouteBuilder() { + @Override + public void configure() throws Exception { + errorHandler(noErrorHandler()); + + from("jetty:http://localhost:8080/myapp/myservice?httpBindingRef=default").transform().constant("Bye World"); + + from("jetty:http://localhost:8081/myapp/myotherservice?httpBindingRef=myownbinder").process(new Processor() { + public void process(Exchange exchange) throws Exception { + throw new IllegalStateException("Not implemented"); + } + }); + } + }; + } + + // START SNIPPET: e1 + public class MyHttpBinding extends DefaultHttpBinding { + + @Override + public void doWriteExceptionResponse(Throwable exception, HttpServletResponse response) throws IOException { + // we override the doWriteExceptionResponse as we only want to alter the binding how exceptions is + // written back to the client. + + // we just return HTTP 200 so the client thinks its okay + response.setStatus(200); + // and we return this fixed text + response.getWriter().write("Something went wrong but we dont care"); + } + } + // END SNIPPET: e1 + +} + Propchange: activemq/camel/branches/camel-1.x/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyHttpBindingRefTest.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: activemq/camel/branches/camel-1.x/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyHttpBindingRefTest.java ------------------------------------------------------------------------------ svn:keywords = Rev Date Modified: activemq/camel/branches/camel-1.x/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyHttpClientOptionsTest.java URL: http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyHttpClientOptionsTest.java?rev=724293&r1=724292&r2=724293&view=diff ============================================================================== --- activemq/camel/branches/camel-1.x/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyHttpClientOptionsTest.java (original) +++ activemq/camel/branches/camel-1.x/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyHttpClientOptionsTest.java Mon Dec 8 01:04:21 2008 @@ -1,48 +1,48 @@ -/** - * 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. - */ -package org.apache.camel.component.jetty; - -import org.apache.camel.ContextTestSupport; -import org.apache.camel.builder.RouteBuilder; - -/** - * Unit test for http client options. - */ -public class JettyHttpClientOptionsTest extends ContextTestSupport { - - public void testCustomHttpBinding() throws Exception { - // assert jetty was configured with our timeout - JettyHttpComponent jetty = context.getComponent("jetty", JettyHttpComponent.class); - assertNotNull(jetty); - assertEquals(5555, jetty.getHttpClient().getIdleTimeout()); - - // send and receive - Object out = template.requestBody("http://localhost:8080/myapp/myservice", "Hello World"); - assertEquals("Bye World", context.getTypeConverter().convertTo(String.class, out)); - } - - @Override - protected RouteBuilder createRouteBuilder() throws Exception { - return new RouteBuilder() { - @Override - public void configure() throws Exception { - from("jetty:http://localhost:8080/myapp/myservice?httpClient.idleTimeout=5555").transform().constant("Bye World"); - } - }; - } - +/** + * 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. + */ +package org.apache.camel.component.jetty; + +import org.apache.camel.ContextTestSupport; +import org.apache.camel.builder.RouteBuilder; + +/** + * Unit test for http client options. + */ +public class JettyHttpClientOptionsTest extends ContextTestSupport { + + public void testCustomHttpBinding() throws Exception { + // assert jetty was configured with our timeout + JettyHttpComponent jetty = context.getComponent("jetty", JettyHttpComponent.class); + assertNotNull(jetty); + assertEquals(5555, jetty.getHttpClient().getIdleTimeout()); + + // send and receive + Object out = template.requestBody("http://localhost:8080/myapp/myservice", "Hello World"); + assertEquals("Bye World", context.getTypeConverter().convertTo(String.class, out)); + } + + @Override + protected RouteBuilder createRouteBuilder() throws Exception { + return new RouteBuilder() { + @Override + public void configure() throws Exception { + from("jetty:http://localhost:8080/myapp/myservice?httpClient.idleTimeout=5555").transform().constant("Bye World"); + } + }; + } + } \ No newline at end of file Propchange: activemq/camel/branches/camel-1.x/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyHttpClientOptionsTest.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: activemq/camel/branches/camel-1.x/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyHttpClientOptionsTest.java ------------------------------------------------------------------------------ svn:keywords = Rev Date Modified: activemq/camel/branches/camel-1.x/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyImageFileTest.java URL: http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyImageFileTest.java?rev=724293&r1=724292&r2=724293&view=diff ============================================================================== --- activemq/camel/branches/camel-1.x/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyImageFileTest.java (original) +++ activemq/camel/branches/camel-1.x/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyImageFileTest.java Mon Dec 8 01:04:21 2008 @@ -1,57 +1,57 @@ -/** - * 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. - */ -package org.apache.camel.component.jetty; - -import java.io.File; - -import org.apache.camel.ContextTestSupport; -import org.apache.camel.Endpoint; -import org.apache.camel.Exchange; -import org.apache.camel.Processor; -import org.apache.camel.builder.RouteBuilder; - -/** - * Unit test for exposing a http server that returns images - */ -public class JettyImageFileTest extends ContextTestSupport { - - public void testImageContentType() throws Exception { - Endpoint endpoint = context.getEndpoint("http://localhost:8080/myapp/myservice"); - Exchange exchange = endpoint.createExchange(); - template.send(endpoint, exchange); - - assertNotNull(exchange.getOut().getBody()); - assertOutMessageHeader(exchange, "Content-Type", "image/jpeg"); - } - - @Override - protected RouteBuilder createRouteBuilder() throws Exception { - return new RouteBuilder() { - public void configure() throws Exception { - from("jetty:http://localhost:8080/myapp/myservice").process(new MyImageService()); - } - }; - } - - public class MyImageService implements Processor { - public void process(Exchange exchange) throws Exception { - exchange.getOut().setBody(new File("src/test/data/logo.jpeg")); - exchange.getOut().setHeader("Content-Type", "image/jpeg"); - } - } - +/** + * 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. + */ +package org.apache.camel.component.jetty; + +import java.io.File; + +import org.apache.camel.ContextTestSupport; +import org.apache.camel.Endpoint; +import org.apache.camel.Exchange; +import org.apache.camel.Processor; +import org.apache.camel.builder.RouteBuilder; + +/** + * Unit test for exposing a http server that returns images + */ +public class JettyImageFileTest extends ContextTestSupport { + + public void testImageContentType() throws Exception { + Endpoint endpoint = context.getEndpoint("http://localhost:8080/myapp/myservice"); + Exchange exchange = endpoint.createExchange(); + template.send(endpoint, exchange); + + assertNotNull(exchange.getOut().getBody()); + assertOutMessageHeader(exchange, "Content-Type", "image/jpeg"); + } + + @Override + protected RouteBuilder createRouteBuilder() throws Exception { + return new RouteBuilder() { + public void configure() throws Exception { + from("jetty:http://localhost:8080/myapp/myservice").process(new MyImageService()); + } + }; + } + + public class MyImageService implements Processor { + public void process(Exchange exchange) throws Exception { + exchange.getOut().setBody(new File("src/test/data/logo.jpeg")); + exchange.getOut().setHeader("Content-Type", "image/jpeg"); + } + } + } \ No newline at end of file Propchange: activemq/camel/branches/camel-1.x/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyImageFileTest.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: activemq/camel/branches/camel-1.x/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyImageFileTest.java ------------------------------------------------------------------------------ svn:keywords = Rev Date Modified: activemq/camel/branches/camel-1.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/CamelMessageListener.java URL: http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/CamelMessageListener.java?rev=724293&r1=724292&r2=724293&view=diff ============================================================================== --- activemq/camel/branches/camel-1.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/CamelMessageListener.java (original) +++ activemq/camel/branches/camel-1.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/CamelMessageListener.java Mon Dec 8 01:04:21 2008 @@ -37,7 +37,7 @@ * {@link #newInstance(org.apache.camel.CamelContext, org.apache.camel.ProducerTemplate)} * you can send the message exchange into a Camel endpoint for processing. * - * @version $Revision: 1.1 $ + * @version $Revision$ */ public class CamelMessageListener implements MessageListener, Processor { private final CamelContext camelContext; Propchange: activemq/camel/branches/camel-1.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/CamelMessageListener.java ------------------------------------------------------------------------------ svn:keywords = Rev Date Modified: activemq/camel/branches/camel-1.x/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringAggregatorWithCustomCollectionTest.java URL: http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringAggregatorWithCustomCollectionTest.java?rev=724293&r1=724292&r2=724293&view=diff ============================================================================== --- activemq/camel/branches/camel-1.x/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringAggregatorWithCustomCollectionTest.java (original) +++ activemq/camel/branches/camel-1.x/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringAggregatorWithCustomCollectionTest.java Mon Dec 8 01:04:21 2008 @@ -21,7 +21,7 @@ import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext; /** - * @version $Revision: 630591 $ + * @version $Revision$ */ public class SpringAggregatorWithCustomCollectionTest extends CustomAggregationCollectionTest { protected CamelContext createCamelContext() throws Exception { Propchange: activemq/camel/branches/camel-1.x/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringAggregatorWithCustomCollectionTest.java ------------------------------------------------------------------------------ svn:keywords = Rev Date Propchange: activemq/camel/branches/camel-1.x/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringNormalizerTest.java ------------------------------------------------------------------------------ svn:keywords = Rev Date Propchange: activemq/camel/branches/camel-1.x/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringSplitterWithCustomThreadPoolExecutorTest.java ------------------------------------------------------------------------------ svn:keywords = Rev Date Propchange: activemq/camel/branches/camel-1.x/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringTraceInterceptorWithOutBodyTraceTest.java ------------------------------------------------------------------------------ svn:keywords = Rev Date Propchange: activemq/camel/branches/camel-1.x/components/camel-spring/src/test/java/org/apache/camel/spring/processor/onexception/SpringExceptionBuilderWithRetryLoggingLevelSetTest.java ------------------------------------------------------------------------------ svn:keywords = Rev Date Propchange: activemq/camel/branches/camel-1.x/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/aggregator-custom-collection.xml ------------------------------------------------------------------------------ svn:keywords = Rev Date Propchange: activemq/camel/branches/camel-1.x/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/aggregator-custom-collection.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml Propchange: activemq/camel/branches/camel-1.x/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/normalizer.xml ------------------------------------------------------------------------------ svn:keywords = Rev Date Propchange: activemq/camel/branches/camel-1.x/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/normalizer.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml Propchange: activemq/camel/branches/camel-1.x/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/onexception/exceptionBuilderWithRetryLoggingLevelSet.xml ------------------------------------------------------------------------------ svn:keywords = Rev Date Propchange: activemq/camel/branches/camel-1.x/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/onexception/exceptionBuilderWithRetryLoggingLevelSet.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml Propchange: activemq/camel/branches/camel-1.x/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/splitterWithCustomThreadPoolExecutor.xml ------------------------------------------------------------------------------ svn:keywords = Rev Date Propchange: activemq/camel/branches/camel-1.x/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/splitterWithCustomThreadPoolExecutor.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml Propchange: activemq/camel/branches/camel-1.x/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/traceInterceptorWithOutBodyTrace.xml ------------------------------------------------------------------------------ svn:keywords = Rev Date Propchange: activemq/camel/branches/camel-1.x/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/traceInterceptorWithOutBodyTrace.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml Modified: activemq/camel/branches/camel-1.x/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlDataSourceRefTest.java URL: http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlDataSourceRefTest.java?rev=724293&r1=724292&r2=724293&view=diff ============================================================================== --- activemq/camel/branches/camel-1.x/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlDataSourceRefTest.java (original) +++ activemq/camel/branches/camel-1.x/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlDataSourceRefTest.java Mon Dec 8 01:04:21 2008 @@ -1,110 +1,110 @@ -/** - * 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. - */ -package org.apache.camel.component.sql; - -import java.util.List; -import java.util.Map; - -import javax.sql.DataSource; - -import org.apache.camel.ContextTestSupport; -import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.impl.JndiRegistry; -import org.springframework.jdbc.core.JdbcTemplate; -import org.springframework.jdbc.datasource.SingleConnectionDataSource; - -/** - * @version $Revision:$ - */ -public class SqlDataSourceRefTest extends ContextTestSupport { - protected String driverClass = "org.hsqldb.jdbcDriver"; - protected String url = "jdbc:hsqldb:mem:camel_jdbc"; - protected String user = "sa"; - protected String password = ""; - private JdbcTemplate jdbcTemplate; - - @Override - protected JndiRegistry createRegistry() throws Exception { - JndiRegistry jndi = super.createRegistry(); - jndi.bind("jdbc/myDataSource", createDataSource()); - return jndi; - } - - public void testSimpleBody() throws Exception { - // START SNIPPET: e3 - MockEndpoint mock = getMockEndpoint("mock:result"); - mock.expectedMessageCount(1); - - // send the query to direct that will route it to the sql where we will execute the query - // and bind the parameters with the data from the body. The body only contains one value - // in this case (GPL) but if we should use multi values then the body will be iterated - // so we could supply a List instead containing each binding value. - template.sendBody("direct:simple", "GPL"); - - mock.assertIsSatisfied(); - - // the result is a List - List received = assertIsInstanceOf(List.class, mock.getReceivedExchanges().get(0).getIn().getBody()); - - // and each row in the list is a Map - Map row = assertIsInstanceOf(Map.class, received.get(0)); - - // and we should be able the get the project from the map that should be Linux - assertEquals("Linux", row.get("PROJECT")); - // END SNIPPET: e3 - } - - protected void setUp() throws Exception { - Class.forName(driverClass); - super.setUp(); - - jdbcTemplate = new JdbcTemplate(createDataSource()); - // START SNIPPET: e2 - // this is the database we create with some initial data for our unit test - jdbcTemplate.execute("create table projects (id integer primary key," - + "project varchar(10), license varchar(5))"); - jdbcTemplate.execute("insert into projects values (1, 'Camel', 'ASF')"); - jdbcTemplate.execute("insert into projects values (2, 'AMQ', 'ASF')"); - jdbcTemplate.execute("insert into projects values (3, 'Linux', 'GPL')"); - // END SNIPPET: e2 - } - - protected void tearDown() throws Exception { - super.tearDown(); - JdbcTemplate jdbcTemplate = new JdbcTemplate(createDataSource()); - jdbcTemplate.execute("drop table projects"); - } - - private DataSource createDataSource() { - return new SingleConnectionDataSource(url, user, password, true); - } - - @Override - protected RouteBuilder createRouteBuilder() throws Exception { - return new RouteBuilder() { - public void configure() { - // START SNIPPET: e1 - from("direct:simple") - .to("sql:select * from projects where license = # order by id?dataSourceRef=jdbc/myDataSource") - .to("mock:result"); - // END SNIPPET: e1 - } - }; - } - +/** + * 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. + */ +package org.apache.camel.component.sql; + +import java.util.List; +import java.util.Map; + +import javax.sql.DataSource; + +import org.apache.camel.ContextTestSupport; +import org.apache.camel.builder.RouteBuilder; +import org.apache.camel.component.mock.MockEndpoint; +import org.apache.camel.impl.JndiRegistry; +import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.jdbc.datasource.SingleConnectionDataSource; + +/** + * @version $Revision$ + */ +public class SqlDataSourceRefTest extends ContextTestSupport { + protected String driverClass = "org.hsqldb.jdbcDriver"; + protected String url = "jdbc:hsqldb:mem:camel_jdbc"; + protected String user = "sa"; + protected String password = ""; + private JdbcTemplate jdbcTemplate; + + @Override + protected JndiRegistry createRegistry() throws Exception { + JndiRegistry jndi = super.createRegistry(); + jndi.bind("jdbc/myDataSource", createDataSource()); + return jndi; + } + + public void testSimpleBody() throws Exception { + // START SNIPPET: e3 + MockEndpoint mock = getMockEndpoint("mock:result"); + mock.expectedMessageCount(1); + + // send the query to direct that will route it to the sql where we will execute the query + // and bind the parameters with the data from the body. The body only contains one value + // in this case (GPL) but if we should use multi values then the body will be iterated + // so we could supply a List instead containing each binding value. + template.sendBody("direct:simple", "GPL"); + + mock.assertIsSatisfied(); + + // the result is a List + List received = assertIsInstanceOf(List.class, mock.getReceivedExchanges().get(0).getIn().getBody()); + + // and each row in the list is a Map + Map row = assertIsInstanceOf(Map.class, received.get(0)); + + // and we should be able the get the project from the map that should be Linux + assertEquals("Linux", row.get("PROJECT")); + // END SNIPPET: e3 + } + + protected void setUp() throws Exception { + Class.forName(driverClass); + super.setUp(); + + jdbcTemplate = new JdbcTemplate(createDataSource()); + // START SNIPPET: e2 + // this is the database we create with some initial data for our unit test + jdbcTemplate.execute("create table projects (id integer primary key," + + "project varchar(10), license varchar(5))"); + jdbcTemplate.execute("insert into projects values (1, 'Camel', 'ASF')"); + jdbcTemplate.execute("insert into projects values (2, 'AMQ', 'ASF')"); + jdbcTemplate.execute("insert into projects values (3, 'Linux', 'GPL')"); + // END SNIPPET: e2 + } + + protected void tearDown() throws Exception { + super.tearDown(); + JdbcTemplate jdbcTemplate = new JdbcTemplate(createDataSource()); + jdbcTemplate.execute("drop table projects"); + } + + private DataSource createDataSource() { + return new SingleConnectionDataSource(url, user, password, true); + } + + @Override + protected RouteBuilder createRouteBuilder() throws Exception { + return new RouteBuilder() { + public void configure() { + // START SNIPPET: e1 + from("direct:simple") + .to("sql:select * from projects where license = # order by id?dataSourceRef=jdbc/myDataSource") + .to("mock:result"); + // END SNIPPET: e1 + } + }; + } + } \ No newline at end of file Propchange: activemq/camel/branches/camel-1.x/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlDataSourceRefTest.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: activemq/camel/branches/camel-1.x/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlDataSourceRefTest.java ------------------------------------------------------------------------------ svn:keywords = Rev Date