Author: ningjiang Date: Sun Apr 6 20:40:11 2008 New Revision: 645359 URL: http://svn.apache.org/viewvc?rev=645359&view=rev Log: Fixed the CS errors Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DeadLetterChannelBuilder.java activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetConsumer.java activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetEndpoint.java activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/log/LogComponent.java activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/mock/MockComponent.java activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorType.java activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ConvertBodyProcessor.java activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/DeadLetterChannel.java activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ErrorHandlerSupport.java activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Splitter.java activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ThroughputLogger.java activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/exceptionpolicy/ExceptionPolicyStrategy.java activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/builder/ExceptionBuilderTest.java activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterTest.java activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ValidationWithErrorInHandleAndFinallyBlockTest.java activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/exceptionpolicy/CustomExceptionPolicyStrategyTest.java activemq/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpServerTestSupport.java activemq/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpConverter.java Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DeadLetterChannelBuilder.java URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DeadLetterChannelBuilder.java?rev=645359&r1=645358&r2=645359&view=diff ============================================================================== --- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DeadLetterChannelBuilder.java (original) +++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DeadLetterChannelBuilder.java Sun Apr 6 20:40:11 2008 @@ -19,11 +19,11 @@ import org.apache.camel.Expression; import org.apache.camel.Processor; import org.apache.camel.processor.DeadLetterChannel; +import org.apache.camel.processor.ErrorHandlerSupport; import org.apache.camel.processor.Logger; import org.apache.camel.processor.LoggingLevel; import org.apache.camel.processor.RecipientList; import org.apache.camel.processor.RedeliveryPolicy; -import org.apache.camel.processor.ErrorHandlerSupport; import org.apache.camel.processor.exceptionpolicy.ExceptionPolicyStrategy; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -32,7 +32,7 @@ * A builder of a Dead Letter * Channel - * + * * @version $Revision$ */ public class DeadLetterChannelBuilder extends ErrorHandlerBuilderSupport { @@ -216,7 +216,7 @@ * Sets the default dead letter endpoint URI used if no factory is provided * via {@link #setDeadLetterFactory(ProcessorFactory)} and no expression is * provided via {@link #setDefaultDeadLetterEndpointExpression(Expression)} - * + * * @param defaultDeadLetterEndpointUri the default URI if no deadletter * factory or expression is provided */ Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetConsumer.java URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetConsumer.java?rev=645359&r1=645358&r2=645359&view=diff ============================================================================== --- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetConsumer.java (original) +++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetConsumer.java Sun Apr 6 20:40:11 2008 @@ -18,8 +18,8 @@ import org.apache.camel.Exchange; import org.apache.camel.Processor; -import org.apache.camel.processor.ThroughputLogger; import org.apache.camel.impl.DefaultConsumer; +import org.apache.camel.processor.ThroughputLogger; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetEndpoint.java URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetEndpoint.java?rev=645359&r1=645358&r2=645359&view=diff ============================================================================== --- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetEndpoint.java (original) +++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetEndpoint.java Sun Apr 6 20:40:11 2008 @@ -42,7 +42,7 @@ private long produceDelay = -1; private long consumeDelay = -1; private long startTime; - private long preloadSize = 0; + private long preloadSize; public DataSetEndpoint(String endpointUri, Component component, DataSet dataSet) { super(endpointUri, component); Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/log/LogComponent.java URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/log/LogComponent.java?rev=645359&r1=645358&r2=645359&view=diff ============================================================================== --- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/log/LogComponent.java (original) +++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/log/LogComponent.java Sun Apr 6 20:40:11 2008 @@ -42,8 +42,7 @@ Logger logger; if (value != null) { logger = new ThroughputLogger(remaining, level, ObjectConverter.toInteger(value)); - } - else { + } else { logger = new Logger(remaining, level); } Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/mock/MockComponent.java URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/mock/MockComponent.java?rev=645359&r1=645358&r2=645359&view=diff ============================================================================== --- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/mock/MockComponent.java (original) +++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/mock/MockComponent.java Sun Apr 6 20:40:11 2008 @@ -21,9 +21,9 @@ import org.apache.camel.Endpoint; import org.apache.camel.Exchange; import org.apache.camel.Processor; -import org.apache.camel.processor.ThroughputLogger; import org.apache.camel.converter.ObjectConverter; import org.apache.camel.impl.DefaultComponent; +import org.apache.camel.processor.ThroughputLogger; /** * A factory of {@link MockEndpoint} instances Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorType.java URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorType.java?rev=645359&r1=645358&r2=645359&view=diff ============================================================================== --- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorType.java (original) +++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorType.java Sun Apr 6 20:40:11 2008 @@ -34,8 +34,6 @@ import org.apache.camel.Processor; import org.apache.camel.Route; import org.apache.camel.RuntimeCamelException; -import org.apache.camel.Message; -import org.apache.camel.builder.Builder; import org.apache.camel.builder.DataFormatClause; import org.apache.camel.builder.DeadLetterChannelBuilder; import org.apache.camel.builder.ErrorHandlerBuilder; @@ -47,11 +45,11 @@ import org.apache.camel.model.dataformat.DataFormatType; import org.apache.camel.model.language.ExpressionType; import org.apache.camel.model.language.LanguageExpression; +import org.apache.camel.processor.ConvertBodyProcessor; import org.apache.camel.processor.DelegateProcessor; import org.apache.camel.processor.MulticastProcessor; import org.apache.camel.processor.Pipeline; import org.apache.camel.processor.RecipientList; -import org.apache.camel.processor.ConvertBodyProcessor; import org.apache.camel.processor.aggregate.AggregationCollection; import org.apache.camel.processor.aggregate.AggregationStrategy; import org.apache.camel.processor.idempotent.IdempotentConsumer; @@ -402,8 +400,8 @@ RoutingSlipType answer = new RoutingSlipType(header, uriDelimiter); addOutput(answer); return (Type) this; - } - + } + /** * Creates a Routing @@ -411,27 +409,27 @@ * * @param header is the header that the {@link org.apache.camel.processor.RoutingSlip RoutingSlip} * class will look in for the list of URIs to route the message to. The list of URIs - * will be split based on the default delimiter + * will be split based on the default delimiter * {@link RoutingSlipType#DEFAULT_DELIMITER}. */ public Type routingSlip(String header) { RoutingSlipType answer = new RoutingSlipType(header); addOutput(answer); return (Type) this; - } + } /** * Creates a Routing * Slip pattern with the default header {@link RoutingSlipType#ROUTING_SLIP_HEADER}. - * The list of URIs in the header will be split based on the default delimiter + * The list of URIs in the header will be split based on the default delimiter * {@link RoutingSlipType#DEFAULT_DELIMITER}. */ public Type routingSlip() { RoutingSlipType answer = new RoutingSlipType(); addOutput(answer); return (Type) this; - } + } /** * Creates the Resequencer Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ConvertBodyProcessor.java URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ConvertBodyProcessor.java?rev=645359&r1=645358&r2=645359&view=diff ============================================================================== --- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ConvertBodyProcessor.java (original) +++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ConvertBodyProcessor.java Sun Apr 6 20:40:11 2008 @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/DeadLetterChannel.java URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/DeadLetterChannel.java?rev=645359&r1=645358&r2=645359&view=diff ============================================================================== --- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/DeadLetterChannel.java (original) +++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/DeadLetterChannel.java Sun Apr 6 20:40:11 2008 @@ -23,9 +23,9 @@ import org.apache.camel.Exchange; import org.apache.camel.Message; import org.apache.camel.Processor; -import org.apache.camel.processor.exceptionpolicy.ExceptionPolicyStrategy; import org.apache.camel.impl.converter.AsyncProcessorTypeConverter; import org.apache.camel.model.ExceptionType; +import org.apache.camel.processor.exceptionpolicy.ExceptionPolicyStrategy; import org.apache.camel.util.AsyncProcessorHelper; import org.apache.camel.util.ServiceHelper; import org.apache.commons.logging.Log; Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ErrorHandlerSupport.java URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ErrorHandlerSupport.java?rev=645359&r1=645358&r2=645359&view=diff ============================================================================== --- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ErrorHandlerSupport.java (original) +++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ErrorHandlerSupport.java Sun Apr 6 20:40:11 2008 @@ -24,8 +24,8 @@ import org.apache.camel.Processor; import org.apache.camel.impl.ServiceSupport; import org.apache.camel.model.ExceptionType; -import org.apache.camel.processor.exceptionpolicy.ExceptionPolicyStrategy; import org.apache.camel.processor.exceptionpolicy.DefaultExceptionPolicyStrategy; +import org.apache.camel.processor.exceptionpolicy.ExceptionPolicyStrategy; /** * Support class for {@link ErrorHandler} implementations. Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Splitter.java URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Splitter.java?rev=645359&r1=645358&r2=645359&view=diff ============================================================================== --- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Splitter.java (original) +++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Splitter.java Sun Apr 6 20:40:11 2008 @@ -16,9 +16,6 @@ */ package org.apache.camel.processor; - -import static org.apache.camel.util.ObjectHelper.notNull; - import java.util.ArrayList; import java.util.Collections; import java.util.Iterator; @@ -33,6 +30,7 @@ import org.apache.camel.processor.aggregate.AggregationStrategy; import org.apache.camel.util.CollectionHelper; +import static org.apache.camel.util.ObjectHelper.notNull; /** * Implements a dynamic Splitter pattern @@ -55,7 +53,7 @@ AggregationStrategy aggregationStrategy, boolean parallelProcessing, ThreadPoolExecutor threadPoolExecutor) { super(Collections.singleton(destination), aggregationStrategy, parallelProcessing, threadPoolExecutor); - + this.expression = expression; notNull(expression, "expression"); notNull(destination, "destination"); @@ -77,7 +75,8 @@ } else { result = new ArrayList(); } - for (Iterator iter = ObjectConverter.iterator(value); iter.hasNext(); ) { + Iterator iter = ObjectConverter.iterator(value); + while (iter.hasNext()) { Object part = iter.next(); Exchange newExchange = exchange.copy(); Message in = newExchange.getIn(); Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ThroughputLogger.java URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ThroughputLogger.java?rev=645359&r1=645358&r2=645359&view=diff ============================================================================== --- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ThroughputLogger.java (original) +++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ThroughputLogger.java Sun Apr 6 20:40:11 2008 @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/exceptionpolicy/ExceptionPolicyStrategy.java URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/exceptionpolicy/ExceptionPolicyStrategy.java?rev=645359&r1=645358&r2=645359&view=diff ============================================================================== --- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/exceptionpolicy/ExceptionPolicyStrategy.java (original) +++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/exceptionpolicy/ExceptionPolicyStrategy.java Sun Apr 6 20:40:11 2008 @@ -37,7 +37,7 @@ * @param exception the exception that was thrown * @return the resolved exception type to handle this exception, null if none found. */ - public ExceptionType getExceptionPolicy(Map exceptionPolicices, Exchange exchange, + ExceptionType getExceptionPolicy(Map exceptionPolicices, Exchange exchange, Throwable exception); } Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/builder/ExceptionBuilderTest.java URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/builder/ExceptionBuilderTest.java?rev=645359&r1=645358&r2=645359&view=diff ============================================================================== --- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/builder/ExceptionBuilderTest.java (original) +++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/builder/ExceptionBuilderTest.java Sun Apr 6 20:40:11 2008 @@ -34,12 +34,12 @@ public class ExceptionBuilderTest extends ContextTestSupport { private static final String MESSAGE_INFO = "messageInfo"; - private static final String errorQueue = "mock:error"; - private static final String businessErrorQueue = "mock:badBusiness"; - private static final String securityErrorQueue = "mock:securitError"; + private static final String ERROR_QUEUE = "mock:error"; + private static final String BUSINESS_ERROR_QUEUE = "mock:badBusiness"; + private static final String SECURITY_ERROR_QUEUE = "mock:securityError"; public void testNPE() throws Exception { - MockEndpoint mock = getMockEndpoint(errorQueue); + MockEndpoint mock = getMockEndpoint(ERROR_QUEUE); mock.expectedMessageCount(1); mock.expectedHeaderReceived(MESSAGE_INFO, "Damm a NPE"); @@ -49,7 +49,7 @@ } public void testIOException() throws Exception { - MockEndpoint mock = getMockEndpoint(errorQueue); + MockEndpoint mock = getMockEndpoint(ERROR_QUEUE); mock.expectedMessageCount(1); mock.expectedHeaderReceived(MESSAGE_INFO, "Damm somekind of IO exception"); @@ -59,7 +59,7 @@ } public void testException() throws Exception { - MockEndpoint mock = getMockEndpoint(errorQueue); + MockEndpoint mock = getMockEndpoint(ERROR_QUEUE); mock.expectedMessageCount(1); mock.expectedHeaderReceived(MESSAGE_INFO, "Damm just exception"); @@ -69,7 +69,7 @@ } public void testMyBusinessException() throws Exception { - MockEndpoint mock = getMockEndpoint(businessErrorQueue); + MockEndpoint mock = getMockEndpoint(BUSINESS_ERROR_QUEUE); mock.expectedMessageCount(1); mock.expectedHeaderReceived(MESSAGE_INFO, "Damm my business is not going to well"); @@ -80,7 +80,7 @@ public void testSecurityConfiguredWithTwoExceptions() throws Exception { // test that we also handles a configuration with 2 or more exceptions - MockEndpoint mock = getMockEndpoint(securityErrorQueue); + MockEndpoint mock = getMockEndpoint(SECURITY_ERROR_QUEUE); mock.expectedMessageCount(1); mock.expectedHeaderReceived(MESSAGE_INFO, "Damm some security error"); @@ -102,7 +102,7 @@ exception(NullPointerException.class) .maximumRedeliveries(1) .setHeader(MESSAGE_INFO, "Damm a NPE") - .to(errorQueue); + .to(ERROR_QUEUE); exception(IOException.class) .initialRedeliveryDelay(5000L) @@ -110,25 +110,25 @@ .backOffMultiplier(1.0) .useExponentialBackOff() .setHeader(MESSAGE_INFO, "Damm somekind of IO exception") - .to(errorQueue); + .to(ERROR_QUEUE); exception(Exception.class) .initialRedeliveryDelay(1000L) .maximumRedeliveries(2) .setHeader(MESSAGE_INFO, "Damm just exception") - .to(errorQueue); + .to(ERROR_QUEUE); // END SNIPPET: exceptionBuilder1 exception(MyBaseBusinessException.class) .initialRedeliveryDelay(1000L) .maximumRedeliveries(3) .setHeader(MESSAGE_INFO, "Damm my business is not going to well") - .to(businessErrorQueue); + .to(BUSINESS_ERROR_QUEUE); exception(GeneralSecurityException.class).exception(KeyException.class) .maximumRedeliveries(1) .setHeader(MESSAGE_INFO, "Damm some security error") - .to(securityErrorQueue); + .to(SECURITY_ERROR_QUEUE); from("direct:a").process(new Processor() { Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterTest.java URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterTest.java?rev=645359&r1=645358&r2=645359&view=diff ============================================================================== --- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterTest.java (original) +++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterTest.java Sun Apr 6 20:40:11 2008 @@ -74,23 +74,23 @@ assertMessageHeader(out, "foo", "bar"); assertMessageHeader(out, Splitter.SPLIT_COUNTER, 4); } - + public void testEmptyBody() { Exchange result = template.send("direct:seqential", new Processor() { public void process(Exchange exchange) throws Exception { exchange.getIn().setHeader("foo", "bar"); } }); - + assertNull(result.getOut(false)); } - + public void testSendingAMessageUsingMulticastReceivesItsOwnExchangeParallel() throws Exception { MockEndpoint resultEndpoint = getMockEndpoint("mock:result"); - + resultEndpoint.expectsNoDuplicates(body()); resultEndpoint.expectedMessageCount(4); - + template.send("direct:parallel", new Processor() { public void process(Exchange exchange) { Message in = exchange.getIn(); @@ -102,20 +102,20 @@ assertMockEndpointsSatisifed(); List list = resultEndpoint.getReceivedExchanges(); - + Set numbersFound = new TreeSet(); - - final String[] NAMES = {"James", "Guillaume", "Hiram", "Rob"}; - + + final String[] names = {"James", "Guillaume", "Hiram", "Rob"}; + for (int i = 0; i < 4; i++) { Exchange exchange = list.get(i); Message in = exchange.getIn(); Integer splitCounter = in.getHeader(Splitter.SPLIT_COUNTER, Integer.class); numbersFound.add(splitCounter); - assertEquals(NAMES[splitCounter], in.getBody()); + assertEquals(names[splitCounter], in.getBody()); assertMessageHeader(in, Splitter.SPLIT_SIZE, 4); } - + assertEquals(4, numbersFound.size()); } @@ -137,7 +137,7 @@ assertMessageHeader(out, "foo", "bar"); assertEquals((Integer)5, result.getProperty("aggregated", Integer.class)); } - + protected RouteBuilder createRouteBuilder() { return new RouteBuilder() { public void configure() { Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ValidationWithErrorInHandleAndFinallyBlockTest.java URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ValidationWithErrorInHandleAndFinallyBlockTest.java?rev=645359&r1=645358&r2=645359&view=diff ============================================================================== --- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ValidationWithErrorInHandleAndFinallyBlockTest.java (original) +++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ValidationWithErrorInHandleAndFinallyBlockTest.java Sun Apr 6 20:40:11 2008 @@ -24,17 +24,17 @@ return new RouteBuilder() { public void configure() { from("direct:start") - .errorHandler(noErrorHandler()) + .errorHandler(noErrorHandler()) .tryBlock() .process(validator) .handle(ValidationException.class) .process(validator) .finallyBlock() - .choice() - .when(header("foo").isEqualTo("bar")) - .to("mock:valid") - .otherwise() - .to("mock:invalid"); + .choice() + .when(header("foo").isEqualTo("bar")) + .to("mock:valid") + .otherwise() + .to("mock:invalid"); } }; } Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/exceptionpolicy/CustomExceptionPolicyStrategyTest.java URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/exceptionpolicy/CustomExceptionPolicyStrategyTest.java?rev=645359&r1=645358&r2=645359&view=diff ============================================================================== --- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/exceptionpolicy/CustomExceptionPolicyStrategyTest.java (original) +++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/exceptionpolicy/CustomExceptionPolicyStrategyTest.java Sun Apr 6 20:40:11 2008 @@ -33,7 +33,7 @@ public class CustomExceptionPolicyStrategyTest extends ContextTestSupport { private static final String MESSAGE_INFO = "messageInfo"; - private static final String errorQueue = "mock:error"; + private static final String ERROR_QUEUE = "mock:error"; public static class MyPolicyException extends Exception { } @@ -52,7 +52,7 @@ // END SNIPPET e2 public void testCustomPolicy() throws Exception { - MockEndpoint mock = getMockEndpoint(errorQueue); + MockEndpoint mock = getMockEndpoint(ERROR_QUEUE); mock.expectedMessageCount(1); mock.expectedHeaderReceived(MESSAGE_INFO, "Damm my policy exception"); @@ -71,12 +71,12 @@ exception(MyPolicyException.class) .maximumRedeliveries(1) .setHeader(MESSAGE_INFO, "Damm my policy exception") - .to(errorQueue); + .to(ERROR_QUEUE); exception(CamelException.class) .maximumRedeliveries(3) .setHeader(MESSAGE_INFO, "Damm a Camel exception") - .to(errorQueue); + .to(ERROR_QUEUE); // END SNIPPET e1 from("direct:a").process(new Processor() { Modified: activemq/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpServerTestSupport.java URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpServerTestSupport.java?rev=645359&r1=645358&r2=645359&view=diff ============================================================================== --- activemq/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpServerTestSupport.java (original) +++ activemq/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpServerTestSupport.java Sun Apr 6 20:40:11 2008 @@ -19,11 +19,11 @@ import java.util.Properties; import org.apache.camel.ContextTestSupport; -import org.apache.ftpserver.FtpServer; import org.apache.ftpserver.ConfigurableFtpServerContext; -import org.apache.ftpserver.interfaces.FtpServerContext; +import org.apache.ftpserver.FtpServer; import org.apache.ftpserver.config.PropertiesConfiguration; import org.apache.ftpserver.ftplet.Configuration; +import org.apache.ftpserver.interfaces.FtpServerContext; /** * Base class for unit testing using a FTPServer Modified: activemq/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpConverter.java URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpConverter.java?rev=645359&r1=645358&r2=645359&view=diff ============================================================================== --- activemq/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpConverter.java (original) +++ activemq/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpConverter.java Sun Apr 6 20:40:11 2008 @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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,