camel git commit: fixed CS error

2017-03-26 Thread cmueller
Repository: camel
Updated Branches:
  refs/heads/master fce2a5ab5 -> d0dafc6f9


fixed CS error


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d0dafc6f
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d0dafc6f
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d0dafc6f

Branch: refs/heads/master
Commit: d0dafc6f973a77077bab69d0474c5216574ce647
Parents: fce2a5a
Author: Christian Mueller 
Authored: Sun Mar 26 16:40:17 2017 +0200
Committer: Christian Mueller 
Committed: Sun Mar 26 16:40:17 2017 +0200

--
 .../KinesisComponentIntegrationTest.java| 60 ++--
 1 file changed, 29 insertions(+), 31 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/d0dafc6f/components/camel-aws/src/test/java/org/apache/camel/component/aws/kinesis/integration/KinesisComponentIntegrationTest.java
--
diff --git 
a/components/camel-aws/src/test/java/org/apache/camel/component/aws/kinesis/integration/KinesisComponentIntegrationTest.java
 
b/components/camel-aws/src/test/java/org/apache/camel/component/aws/kinesis/integration/KinesisComponentIntegrationTest.java
index 5764c59..3970fcf 100644
--- 
a/components/camel-aws/src/test/java/org/apache/camel/component/aws/kinesis/integration/KinesisComponentIntegrationTest.java
+++ 
b/components/camel-aws/src/test/java/org/apache/camel/component/aws/kinesis/integration/KinesisComponentIntegrationTest.java
@@ -16,6 +16,11 @@
  */
 package org.apache.camel.component.aws.kinesis.integration;
 
+import com.amazonaws.regions.Regions;
+import com.amazonaws.services.kinesis.AmazonKinesis;
+import com.amazonaws.services.kinesis.AmazonKinesisClientBuilder;
+import com.amazonaws.services.kinesis.model.Record;
+
 import org.apache.camel.EndpointInject;
 import org.apache.camel.Exchange;
 import org.apache.camel.ExchangePattern;
@@ -29,44 +34,39 @@ import org.apache.camel.test.junit4.CamelTestSupport;
 import org.junit.Ignore;
 import org.junit.Test;
 
-import com.amazonaws.regions.Regions;
-import com.amazonaws.services.kinesis.AmazonKinesis;
-import com.amazonaws.services.kinesis.AmazonKinesisClientBuilder;
-import com.amazonaws.services.kinesis.model.Record;
-
 @Ignore("Must be manually tested.")
 public class KinesisComponentIntegrationTest extends CamelTestSupport {
-
+
 @EndpointInject(uri = "direct:start")
 private ProducerTemplate template;
-
+
 @EndpointInject(uri = "mock:result")
 private MockEndpoint result;
-
+
 @Test
 public void send() throws Exception {
 result.expectedMessageCount(2);
-
+
 template.send("direct:start", ExchangePattern.InOnly, new Processor() {
 public void process(Exchange exchange) throws Exception {
 exchange.getIn().setHeader(KinesisConstants.PARTITION_KEY, 
"partition-1");
 exchange.getIn().setBody("Kinesis Event 1.");
 }
 });
-
+
 template.send("direct:start", ExchangePattern.InOut, new Processor() {
 public void process(Exchange exchange) throws Exception {
 exchange.getIn().setHeader(KinesisConstants.PARTITION_KEY, 
"partition-1");
 exchange.getIn().setBody("Kinesis Event 2.");
 }
 });
-
+
 assertMockEndpointsSatisfied();
-
+
 assertResultExchange(result.getExchanges().get(0), "Kinesis Event 1.", 
"partition-1");
 assertResultExchange(result.getExchanges().get(1), "Kinesis Event 2.", 
"partition-1");
 }
-
+
 private void assertResultExchange(Exchange resultExchange, String data, 
String partition) {
 assertIsInstanceOf(Record.class, resultExchange.getIn().getBody());
 Record record = resultExchange.getIn().getBody(Record.class);
@@ -75,29 +75,27 @@ public class KinesisComponentIntegrationTest extends 
CamelTestSupport {
 
assertNotNull(resultExchange.getIn().getHeader(KinesisConstants.APPROX_ARRIVAL_TIME));
 
assertNotNull(resultExchange.getIn().getHeader(KinesisConstants.SEQUENCE_NUMBER));
 }
-
+
 @Override
-   protected JndiRegistry createRegistry() throws Exception {
-JndiRegistry registry = super.createRegistry();
-
-AmazonKinesis client = 
AmazonKinesisClientBuilder.standard().withRegion(Regions.EU_CENTRAL_1).build();
-registry.bind("amazonKinesisClient", client);
-
-return registry;
-   }
-
-   protected RouteBuilder createRouteBuilder() throws Exception {
+protected JndiRegistry createRegistry() throws Exception {
+JndiRegistry registry = super.createRegistry();
+
+

camel git commit: fixed CS error

2016-01-09 Thread cmueller
Repository: camel
Updated Branches:
  refs/heads/camel-2.16.x 395675341 -> f8c8bdcd9


fixed CS error


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f8c8bdcd
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f8c8bdcd
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f8c8bdcd

Branch: refs/heads/camel-2.16.x
Commit: f8c8bdcd9b6f2478b4edc4c9bb8e7ede6b73d954
Parents: 3956753
Author: Christian Mueller 
Authored: Sat Jan 9 19:41:30 2016 +0100
Committer: Christian Mueller 
Committed: Sat Jan 9 19:41:30 2016 +0100

--
 .../test/java/org/apache/camel/component/jdbc/JdbcFix9491Test.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/f8c8bdcd/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcFix9491Test.java
--
diff --git 
a/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcFix9491Test.java
 
b/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcFix9491Test.java
index dc80d42..41eafbb 100644
--- 
a/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcFix9491Test.java
+++ 
b/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcFix9491Test.java
@@ -45,7 +45,7 @@ public class JdbcFix9491Test extends AbstractJdbcTestSupport {
 direct.sendBody("select * from customer");
 
 assertMockEndpointsSatisfied();
-
Assert.assertEquals(2,mock.getReceivedExchanges().get(1).getIn().getBody(List.class).size());
+Assert.assertEquals(2, 
mock.getReceivedExchanges().get(1).getIn().getBody(List.class).size());
 
 }
 



camel git commit: fixed CS error

2016-01-09 Thread cmueller
Repository: camel
Updated Branches:
  refs/heads/camel-2.15.x 00d37f6ff -> b7aeb46a9


fixed CS error


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/b7aeb46a
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/b7aeb46a
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/b7aeb46a

Branch: refs/heads/camel-2.15.x
Commit: b7aeb46a9cfa575135a89bcbf737ffa1308f31ca
Parents: 00d37f6
Author: Christian Mueller 
Authored: Sat Jan 9 19:42:50 2016 +0100
Committer: Christian Mueller 
Committed: Sat Jan 9 19:42:50 2016 +0100

--
 .../test/java/org/apache/camel/component/jdbc/JdbcFix9491Test.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/b7aeb46a/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcFix9491Test.java
--
diff --git 
a/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcFix9491Test.java
 
b/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcFix9491Test.java
index dc80d42..41eafbb 100644
--- 
a/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcFix9491Test.java
+++ 
b/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcFix9491Test.java
@@ -45,7 +45,7 @@ public class JdbcFix9491Test extends AbstractJdbcTestSupport {
 direct.sendBody("select * from customer");
 
 assertMockEndpointsSatisfied();
-
Assert.assertEquals(2,mock.getReceivedExchanges().get(1).getIn().getBody(List.class).size());
+Assert.assertEquals(2, 
mock.getReceivedExchanges().get(1).getIn().getBody(List.class).size());
 
 }
 



camel git commit: fixed CS error

2016-01-09 Thread cmueller
Repository: camel
Updated Branches:
  refs/heads/master c8833ddf9 -> ac4fff949


fixed CS error


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/ac4fff94
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ac4fff94
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ac4fff94

Branch: refs/heads/master
Commit: ac4fff949b1d67f1be3f2fa9a577015a43db420a
Parents: c8833dd
Author: Christian Mueller 
Authored: Sat Jan 9 19:34:12 2016 +0100
Committer: Christian Mueller 
Committed: Sat Jan 9 19:34:12 2016 +0100

--
 .../test/java/org/apache/camel/component/jdbc/JdbcFix9491Test.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/ac4fff94/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcFix9491Test.java
--
diff --git 
a/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcFix9491Test.java
 
b/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcFix9491Test.java
index dc80d42..41eafbb 100644
--- 
a/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcFix9491Test.java
+++ 
b/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcFix9491Test.java
@@ -45,7 +45,7 @@ public class JdbcFix9491Test extends AbstractJdbcTestSupport {
 direct.sendBody("select * from customer");
 
 assertMockEndpointsSatisfied();
-
Assert.assertEquals(2,mock.getReceivedExchanges().get(1).getIn().getBody(List.class).size());
+Assert.assertEquals(2, 
mock.getReceivedExchanges().get(1).getIn().getBody(List.class).size());
 
 }
 



camel git commit: Fixed CS error of camel-spring

2015-04-28 Thread ningjiang
Repository: camel
Updated Branches:
  refs/heads/camel-2.15.x 3cb822056 - 360c6c26a


Fixed CS error of camel-spring


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/360c6c26
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/360c6c26
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/360c6c26

Branch: refs/heads/camel-2.15.x
Commit: 360c6c26ad04a9a48c2c8b517e3726881e63dfb4
Parents: 3cb8220
Author: Willem Jiang willem.ji...@gmail.com
Authored: Tue Apr 28 13:50:12 2015 +
Committer: Willem Jiang willem.ji...@gmail.com
Committed: Tue Apr 28 13:50:12 2015 +

--
 .../org/apache/camel/spring/CamelContextFactoryBeanTest.java| 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/360c6c26/components/camel-spring/src/test/java/org/apache/camel/spring/CamelContextFactoryBeanTest.java
--
diff --git 
a/components/camel-spring/src/test/java/org/apache/camel/spring/CamelContextFactoryBeanTest.java
 
b/components/camel-spring/src/test/java/org/apache/camel/spring/CamelContextFactoryBeanTest.java
index d356cc8..ec963f3 100644
--- 
a/components/camel-spring/src/test/java/org/apache/camel/spring/CamelContextFactoryBeanTest.java
+++ 
b/components/camel-spring/src/test/java/org/apache/camel/spring/CamelContextFactoryBeanTest.java
@@ -109,5 +109,6 @@ public class CamelContextFactoryBeanTest extends TestCase {
 assertTrue(modelJAXBContextFactory instanceof 
CustomModelJAXBContextFactory);
 }
 
-private static class CustomModelJAXBContextFactory extends 
DefaultModelJAXBContextFactory {}
-}
\ No newline at end of file
+private static class CustomModelJAXBContextFactory extends 
DefaultModelJAXBContextFactory {
+}
+}



[1/2] camel git commit: fixed CS error

2015-04-23 Thread cmueller
Repository: camel
Updated Branches:
  refs/heads/master ae7b52acb - 6c2467222


fixed CS error


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/8bcd609b
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/8bcd609b
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/8bcd609b

Branch: refs/heads/master
Commit: 8bcd609b58c2f64764b3d77319ee5ebc7adb9068
Parents: ae7b52a
Author: Christian Mueller cmuel...@apache.org
Authored: Thu Apr 23 21:39:22 2015 +0200
Committer: Christian Mueller cmuel...@apache.org
Committed: Thu Apr 23 21:39:22 2015 +0200

--
 camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/8bcd609b/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java
--
diff --git a/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java 
b/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java
index 4290a88..7367d1e 100644
--- a/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java
+++ b/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java
@@ -1709,7 +1709,7 @@ public final class ObjectHelper {
 }
 
 //check the suppressed exception first
-for (Throwable throwable: exception.getSuppressed()) {
+for (Throwable throwable : exception.getSuppressed()) {
 if (type.isInstance(throwable)) {
 return type.cast(throwable);
 }



[2/2] camel git commit: Fixed CS error of camel-test

2015-04-22 Thread ningjiang
Fixed CS error of camel-test


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/bff1ec76
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/bff1ec76
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/bff1ec76

Branch: refs/heads/master
Commit: bff1ec76807607b95b63ce2f8fc73b64af0887f9
Parents: ea6d2fc
Author: Willem Jiang willem.ji...@gmail.com
Authored: Wed Apr 22 20:54:59 2015 +0800
Committer: Willem Jiang willem.ji...@gmail.com
Committed: Wed Apr 22 22:10:55 2015 +0800

--
 .../main/java/org/apache/camel/test/junit4/CamelTestSupport.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/bff1ec76/components/camel-test/src/main/java/org/apache/camel/test/junit4/CamelTestSupport.java
--
diff --git 
a/components/camel-test/src/main/java/org/apache/camel/test/junit4/CamelTestSupport.java
 
b/components/camel-test/src/main/java/org/apache/camel/test/junit4/CamelTestSupport.java
index b6931de..e716da6 100644
--- 
a/components/camel-test/src/main/java/org/apache/camel/test/junit4/CamelTestSupport.java
+++ 
b/components/camel-test/src/main/java/org/apache/camel/test/junit4/CamelTestSupport.java
@@ -82,11 +82,12 @@ public abstract class CamelTestSupport extends TestSupport {
 protected volatile ProducerTemplate template;
 protected volatile ConsumerTemplate consumer;
 protected volatile Service camelContextService;
+protected boolean dumpRouteStats;
 private boolean useRouteBuilder = true;
 private final DebugBreakpoint breakpoint = new DebugBreakpoint();
 private final StopWatch watch = new StopWatch();
 private final MapString, String fromEndpoints = new HashMapString, 
String();
-protected boolean dumpRouteStats;
+
 
 /**
  * Use the RouteBuilder or not



camel git commit: fixed CS error

2015-03-01 Thread cmueller
Repository: camel
Updated Branches:
  refs/heads/master df4a9413e - 2cbd2a4eb


fixed CS error


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/2cbd2a4e
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/2cbd2a4e
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/2cbd2a4e

Branch: refs/heads/master
Commit: 2cbd2a4ebae7867313107734d86c3c37b93c9a8c
Parents: df4a941
Author: Christian Mueller cmuel...@apache.org
Authored: Sun Mar 1 13:47:11 2015 +0100
Committer: Christian Mueller cmuel...@apache.org
Committed: Sun Mar 1 13:47:11 2015 +0100

--
 .../src/main/java/org/apache/camel/impl/DefaultCamelContext.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/2cbd2a4e/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java 
b/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
index 143b58c..9ac71b6 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
@@ -730,7 +730,8 @@ public class DefaultCamelContext extends ServiceSupport 
implements ModelCamelCon
 public Void call() throws Exception {
 builder.addRoutesToCamelContext(DefaultCamelContext.this);
 return null;
-}});
+}
+});
 }
 
 public synchronized RoutesDefinition loadRoutesDefinition(InputStream is) 
throws Exception {



camel git commit: fixed CS error

2015-03-01 Thread cmueller
Repository: camel
Updated Branches:
  refs/heads/master 2cbd2a4eb - 1bb97cc69


fixed CS error


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/1bb97cc6
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/1bb97cc6
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/1bb97cc6

Branch: refs/heads/master
Commit: 1bb97cc6909231b777e8d0a300cb74f2dc2a1d9f
Parents: 2cbd2a4
Author: Christian Mueller cmuel...@apache.org
Authored: Sun Mar 1 14:16:52 2015 +0100
Committer: Christian Mueller cmuel...@apache.org
Committed: Sun Mar 1 14:16:52 2015 +0100

--
 .../camel/maven/EipDocumentationEnricherMojo.java | 18 +-
 1 file changed, 13 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/1bb97cc6/tooling/maven/camel-eip-documentation-enricher-maven-plugin/src/main/java/org/apache/camel/maven/EipDocumentationEnricherMojo.java
--
diff --git 
a/tooling/maven/camel-eip-documentation-enricher-maven-plugin/src/main/java/org/apache/camel/maven/EipDocumentationEnricherMojo.java
 
b/tooling/maven/camel-eip-documentation-enricher-maven-plugin/src/main/java/org/apache/camel/maven/EipDocumentationEnricherMojo.java
index 15ac9be..aebd0b1 100644
--- 
a/tooling/maven/camel-eip-documentation-enricher-maven-plugin/src/main/java/org/apache/camel/maven/EipDocumentationEnricherMojo.java
+++ 
b/tooling/maven/camel-eip-documentation-enricher-maven-plugin/src/main/java/org/apache/camel/maven/EipDocumentationEnricherMojo.java
@@ -79,7 +79,7 @@ public class EipDocumentationEnricherMojo extends 
AbstractMojo {
 
 @Override
 public void execute() throws MojoExecutionException, MojoFailureException {
-SetString injectedTypes = new HashSet();
+SetString injectedTypes = new HashSetString();
 File rootDir = new File(camelCoreDir, Constants.PATH_TO_MODEL_DIR);
 DomFinder domFinder = new DomFinder();
 DocumentationEnricher documentationEnricher = new 
DocumentationEnricher();
@@ -104,7 +104,9 @@ public class EipDocumentationEnricherMojo extends 
AbstractMojo {
 }
 }
 saveToFile(document, outputCamelSchemaFile, buildTransformer());
-} catch (XPathExpressionException | IOException e) {
+} catch (XPathExpressionException e) {
+throw new MojoExecutionException(Error during documentation 
enrichment, e);
+} catch (IOException e) {
 throw new MojoExecutionException(Error during documentation 
enrichment, e);
 }
 }
@@ -134,7 +136,7 @@ public class EipDocumentationEnricherMojo extends 
AbstractMojo {
 }
 
 private MapString, String buildTypeToNameMap(NodeList elementsAndTypes) {
-MapString, String typeToNameMap = new HashMap();
+MapString, String typeToNameMap = new HashMapString, String();
 for (int i = 0; i  elementsAndTypes.getLength(); i++) {
 Element item = (Element) elementsAndTypes.item(i);
 String name = item.getAttribute(Constants.NAME_ATTRIBUTE_NAME);
@@ -180,7 +182,11 @@ public class EipDocumentationEnricherMojo extends 
AbstractMojo {
 try {
 builder = factory.newDocumentBuilder();
 result =  builder.parse(xml);
-} catch (SAXException | ParserConfigurationException | IOException  e) 
{
+} catch (SAXException e) {
+throw new MojoExecutionException(Error during building a 
document, e);
+} catch (ParserConfigurationException e) {
+throw new MojoExecutionException(Error during building a 
document, e);
+} catch (IOException  e) {
 throw new MojoExecutionException(Error during building a 
document, e);
 }
 return result;
@@ -191,7 +197,9 @@ public class EipDocumentationEnricherMojo extends 
AbstractMojo {
 StreamResult result = new StreamResult(new 
FileOutputStream(outputFile));
 DOMSource source = new DOMSource(document);
 transformer.transform(source, result);
-} catch (FileNotFoundException | TransformerException e) {
+} catch (TransformerException e) {
+throw new MojoExecutionException(Error during saving to file, e);
+} catch (FileNotFoundException e) {
 throw new MojoExecutionException(Error during saving to file, e);
 }
 }



[4/4] camel git commit: Fixed CS error of camel-package-maven-plugin

2015-02-24 Thread ningjiang
Fixed CS error of camel-package-maven-plugin


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/48d7f606
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/48d7f606
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/48d7f606

Branch: refs/heads/master
Commit: 48d7f606f07e5d2ce66801654caaa033463ea070
Parents: 7517eb8
Author: Willem Jiang willem.ji...@gmail.com
Authored: Wed Feb 25 14:31:04 2015 +0800
Committer: Willem Jiang willem.ji...@gmail.com
Committed: Wed Feb 25 14:31:04 2015 +0800

--
 .../java/org/apache/camel/maven/packaging/StringHelper.java | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/48d7f606/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/StringHelper.java
--
diff --git 
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/StringHelper.java
 
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/StringHelper.java
index 9af9ec9..ac6a133 100644
--- 
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/StringHelper.java
+++ 
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/StringHelper.java
@@ -16,7 +16,10 @@
  */
 package org.apache.camel.maven.packaging;
 
-public class StringHelper {
+public final class StringHelper {
+private StringHelper() {
+// Utils Class
+}
 
 public static String after(String text, String after) {
 if (!text.contains(after)) {



camel git commit: fixed CS error

2015-01-01 Thread cmueller
Repository: camel
Updated Branches:
  refs/heads/master 85778bc43 - 1d5ba0570


fixed CS error


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/1d5ba057
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/1d5ba057
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/1d5ba057

Branch: refs/heads/master
Commit: 1d5ba05703f97eec7aa6894454b14ddce4278710
Parents: 85778bc
Author: Christian Mueller cmuel...@apache.org
Authored: Fri Jan 2 08:00:34 2015 +0100
Committer: Christian Mueller cmuel...@apache.org
Committed: Fri Jan 2 08:01:16 2015 +0100

--
 .../camel/component/jira/mocks/MockSearchRestClient.java | 8 
 .../apache/camel/component/jira/mocks/MockSearchResult.java  | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/1d5ba057/components/camel-jira/src/test/java/org/apache/camel/component/jira/mocks/MockSearchRestClient.java
--
diff --git 
a/components/camel-jira/src/test/java/org/apache/camel/component/jira/mocks/MockSearchRestClient.java
 
b/components/camel-jira/src/test/java/org/apache/camel/component/jira/mocks/MockSearchRestClient.java
index 8eb5463..44d38cb 100644
--- 
a/components/camel-jira/src/test/java/org/apache/camel/component/jira/mocks/MockSearchRestClient.java
+++ 
b/components/camel-jira/src/test/java/org/apache/camel/component/jira/mocks/MockSearchRestClient.java
@@ -33,11 +33,11 @@ import org.joda.time.DateTime;
 
 
 public class MockSearchRestClient implements SearchRestClient {
+
 private static final String KEY_BASE = CAMELJIRA-;
-private final ListBasicIssue issues = new ArrayList();
-private final MapLong, ListComment comments = new HashMap();
+private final ListBasicIssue issues = new ArrayListBasicIssue();
+private final MapLong, ListComment comments = new HashMapLong, 
ListComment();
 private AtomicLong basicIssueId = new AtomicLong(0);
-
 
 @Override
 public SearchResult searchJql(String s, ProgressMonitor progressMonitor) {
@@ -51,7 +51,7 @@ public class MockSearchRestClient implements SearchRestClient 
{
 
 @Override
 public SearchResult searchJqlWithFullIssues(String jql, int maxPerQuery, 
int start, ProgressMonitor progressMonitor) {
-ListBasicIssue result = new ArrayList();
+ListBasicIssue result = new ArrayListBasicIssue();
 for (BasicIssue issue : issues) {
 if (issue.getId() = start) {
 result.add(issue);

http://git-wip-us.apache.org/repos/asf/camel/blob/1d5ba057/components/camel-jira/src/test/java/org/apache/camel/component/jira/mocks/MockSearchResult.java
--
diff --git 
a/components/camel-jira/src/test/java/org/apache/camel/component/jira/mocks/MockSearchResult.java
 
b/components/camel-jira/src/test/java/org/apache/camel/component/jira/mocks/MockSearchResult.java
index f8ef7ee..1945465 100644
--- 
a/components/camel-jira/src/test/java/org/apache/camel/component/jira/mocks/MockSearchResult.java
+++ 
b/components/camel-jira/src/test/java/org/apache/camel/component/jira/mocks/MockSearchResult.java
@@ -43,7 +43,7 @@ public class MockSearchResult extends SearchResult {
 @Override
 public Iterable? extends BasicIssue getIssues() {
 Collections.sort(issues, basicIssueComparator);
-ArrayList? extends BasicIssue copy = new ArrayList(issues);
+ArrayList? extends BasicIssue copy = new 
ArrayListBasicIssue(issues);
 if (!issues.isEmpty()) {
 issues.remove(0);
 }



[2/5] camel git commit: Fixed CS error of camel-spark

2014-11-26 Thread ningjiang
Fixed CS error of camel-spark


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/74b6c5cd
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/74b6c5cd
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/74b6c5cd

Branch: refs/heads/master
Commit: 74b6c5cd0a1888a6d8bb0e6364b2998c258c27ed
Parents: 85e1239
Author: Willem Jiang willem.ji...@gmail.com
Authored: Thu Nov 27 15:12:59 2014 +0800
Committer: Willem Jiang willem.ji...@gmail.com
Committed: Thu Nov 27 15:16:17 2014 +0800

--
 .../org/apache/camel/component/sparkrest/SparkEndpoint.java | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/74b6c5cd/components/camel-spark-rest/src/main/java/org/apache/camel/component/sparkrest/SparkEndpoint.java
--
diff --git 
a/components/camel-spark-rest/src/main/java/org/apache/camel/component/sparkrest/SparkEndpoint.java
 
b/components/camel-spark-rest/src/main/java/org/apache/camel/component/sparkrest/SparkEndpoint.java
index f655abf..56bc14c 100644
--- 
a/components/camel-spark-rest/src/main/java/org/apache/camel/component/sparkrest/SparkEndpoint.java
+++ 
b/components/camel-spark-rest/src/main/java/org/apache/camel/component/sparkrest/SparkEndpoint.java
@@ -29,14 +29,13 @@ import spark.route.HttpMethod;
 
 @UriEndpoint(scheme = spark-rest, consumerClass =  SparkConsumer.class, 
label = rest)
 public class SparkEndpoint extends DefaultEndpoint {
-
+@UriParam
+SparkConfiguration sparkConfiguration;
 @UriPath
 private String verb;
 @UriPath
 private String path;
 @UriParam
-SparkConfiguration sparkConfiguration;
-@UriParam
 private SparkBinding sparkBinding;
 @UriParam
 private String accept;



git commit: fixed CS error

2014-02-15 Thread cmueller
Repository: camel
Updated Branches:
  refs/heads/master b894f7637 - df8d92075


fixed CS error


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/df8d9207
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/df8d9207
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/df8d9207

Branch: refs/heads/master
Commit: df8d92075336dcc479034c097f9a49ee77073d26
Parents: b894f76
Author: cmueller cmuel...@apache.org
Authored: Sat Feb 15 14:22:54 2014 +0100
Committer: cmueller cmuel...@apache.org
Committed: Sat Feb 15 14:23:10 2014 +0100

--
 .../java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/df8d9207/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java
--
diff --git 
a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java
 
b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java
index 9cb0b1d..242c027 100644
--- 
a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java
+++ 
b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java
@@ -198,7 +198,7 @@ public class CxfRsEndpoint extends DefaultEndpoint 
implements HeaderFilterStrate
 }
 // setup the features
 if (!getFeatures().isEmpty()) {
-for (Feature feature: getFeatures()) {
+for (Feature feature : getFeatures()) {
 sfb.getFeatures().add(feature);
 }
 }



git commit: fixed CS error

2013-10-25 Thread bvahdat
Updated Branches:
  refs/heads/camel-2.12.x 1c17f496a - 5e7c6adbd


fixed CS error


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/5e7c6adb
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/5e7c6adb
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/5e7c6adb

Branch: refs/heads/camel-2.12.x
Commit: 5e7c6adbd00dc7acf01af297c10e47dc783cc8f9
Parents: 1c17f49
Author: cmueller cmuel...@apache.org
Authored: Thu Oct 24 21:19:25 2013 +0200
Committer: Babak Vahdat bvah...@apache.org
Committed: Fri Oct 25 08:10:35 2013 +0200

--
 .../java/org/apache/camel/example/etl/CustomerTransformer.java  | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/5e7c6adb/examples/camel-example-etl/src/main/java/org/apache/camel/example/etl/CustomerTransformer.java
--
diff --git 
a/examples/camel-example-etl/src/main/java/org/apache/camel/example/etl/CustomerTransformer.java
 
b/examples/camel-example-etl/src/main/java/org/apache/camel/example/etl/CustomerTransformer.java
index 06b9c0e76..5f2daff 100644
--- 
a/examples/camel-example-etl/src/main/java/org/apache/camel/example/etl/CustomerTransformer.java
+++ 
b/examples/camel-example-etl/src/main/java/org/apache/camel/example/etl/CustomerTransformer.java
@@ -38,10 +38,13 @@ import 
org.springframework.transaction.support.TransactionTemplate;
  */
 // START SNIPPET: example
 @Converter
-public class CustomerTransformer {
+public final class CustomerTransformer {
 
 private static final Logger LOG = 
LoggerFactory.getLogger(CustomerTransformer.class);
 
+private CustomerTransformer() {
+}
+
 /**
  * A transformation method to convert a person document into a customer
  * entity



git commit: fixed CS error

2013-10-24 Thread cmueller
Updated Branches:
  refs/heads/master efbf31368 - 8b7896322


fixed CS error


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/8b789632
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/8b789632
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/8b789632

Branch: refs/heads/master
Commit: 8b7896322869dceb023f97d770238e2618d6c3d1
Parents: efbf313
Author: cmueller cmuel...@apache.org
Authored: Thu Oct 24 21:19:25 2013 +0200
Committer: cmueller cmuel...@apache.org
Committed: Thu Oct 24 21:19:28 2013 +0200

--
 .../java/org/apache/camel/example/etl/CustomerTransformer.java  | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/8b789632/examples/camel-example-etl/src/main/java/org/apache/camel/example/etl/CustomerTransformer.java
--
diff --git 
a/examples/camel-example-etl/src/main/java/org/apache/camel/example/etl/CustomerTransformer.java
 
b/examples/camel-example-etl/src/main/java/org/apache/camel/example/etl/CustomerTransformer.java
index 06b9c0e76..5f2daff 100644
--- 
a/examples/camel-example-etl/src/main/java/org/apache/camel/example/etl/CustomerTransformer.java
+++ 
b/examples/camel-example-etl/src/main/java/org/apache/camel/example/etl/CustomerTransformer.java
@@ -38,10 +38,13 @@ import 
org.springframework.transaction.support.TransactionTemplate;
  */
 // START SNIPPET: example
 @Converter
-public class CustomerTransformer {
+public final class CustomerTransformer {
 
 private static final Logger LOG = 
LoggerFactory.getLogger(CustomerTransformer.class);
 
+private CustomerTransformer() {
+}
+
 /**
  * A transformation method to convert a person document into a customer
  * entity



git commit: fixed CS error

2013-09-30 Thread cmueller
Updated Branches:
  refs/heads/master c08fe00a8 - 281268e9e


fixed CS error


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/281268e9
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/281268e9
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/281268e9

Branch: refs/heads/master
Commit: 281268e9e8c687260f469663372e0c1580848b00
Parents: c08fe00
Author: cmueller cmuel...@apache.org
Authored: Mon Sep 30 20:48:16 2013 +0200
Committer: cmueller cmuel...@apache.org
Committed: Mon Sep 30 20:48:16 2013 +0200

--
 .../component/websocket/WebsocketComponentRouteExampleTest.java| 2 +-
 .../component/websocket/WebsocketProducerRouteExampleTest.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/281268e9/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketComponentRouteExampleTest.java
--
diff --git 
a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketComponentRouteExampleTest.java
 
b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketComponentRouteExampleTest.java
index d4bcabe..3f5e18d0 100644
--- 
a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketComponentRouteExampleTest.java
+++ 
b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketComponentRouteExampleTest.java
@@ -49,7 +49,7 @@ public class WebsocketComponentRouteExampleTest extends 
CamelTestSupport {
 public void testWSHttpCall() throws Exception {
 AsyncHttpClient c = new AsyncHttpClient();
 
-WebSocket websocket = c.prepareGet(ws://localhost: +port + 
/echo).execute(
+WebSocket websocket = c.prepareGet(ws://localhost: + port + 
/echo).execute(
 new WebSocketUpgradeHandler.Builder()
 .addWebSocketListener(new WebSocketTextListener() {
 @Override

http://git-wip-us.apache.org/repos/asf/camel/blob/281268e9/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketProducerRouteExampleTest.java
--
diff --git 
a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketProducerRouteExampleTest.java
 
b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketProducerRouteExampleTest.java
index 5271512..0ef41cb 100644
--- 
a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketProducerRouteExampleTest.java
+++ 
b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketProducerRouteExampleTest.java
@@ -53,7 +53,7 @@ public class WebsocketProducerRouteExampleTest extends 
CamelTestSupport {
 public void testWSHttpCall() throws Exception {
 AsyncHttpClient c = new AsyncHttpClient();
 
-WebSocket websocket = c.prepareGet(ws://127.0.0.1: + port 
+/shop).execute(
+WebSocket websocket = c.prepareGet(ws://127.0.0.1: + port + 
/shop).execute(
 new WebSocketUpgradeHandler.Builder()
 .addWebSocketListener(new WebSocketTextListener() {
 @Override



git commit: fixed CS error

2013-09-30 Thread cmueller
Updated Branches:
  refs/heads/camel-2.12.x 09f592be0 - 1c14a20cf


fixed CS error


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/1c14a20c
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/1c14a20c
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/1c14a20c

Branch: refs/heads/camel-2.12.x
Commit: 1c14a20cf2587e399b39b6678ad2c325a68f9a63
Parents: 09f592b
Author: cmueller cmuel...@apache.org
Authored: Mon Sep 30 20:48:16 2013 +0200
Committer: cmueller cmuel...@apache.org
Committed: Mon Sep 30 21:17:50 2013 +0200

--
 .../component/websocket/WebsocketComponentRouteExampleTest.java| 2 +-
 .../component/websocket/WebsocketProducerRouteExampleTest.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/1c14a20c/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketComponentRouteExampleTest.java
--
diff --git 
a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketComponentRouteExampleTest.java
 
b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketComponentRouteExampleTest.java
index d4bcabe..3f5e18d0 100644
--- 
a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketComponentRouteExampleTest.java
+++ 
b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketComponentRouteExampleTest.java
@@ -49,7 +49,7 @@ public class WebsocketComponentRouteExampleTest extends 
CamelTestSupport {
 public void testWSHttpCall() throws Exception {
 AsyncHttpClient c = new AsyncHttpClient();
 
-WebSocket websocket = c.prepareGet(ws://localhost: +port + 
/echo).execute(
+WebSocket websocket = c.prepareGet(ws://localhost: + port + 
/echo).execute(
 new WebSocketUpgradeHandler.Builder()
 .addWebSocketListener(new WebSocketTextListener() {
 @Override

http://git-wip-us.apache.org/repos/asf/camel/blob/1c14a20c/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketProducerRouteExampleTest.java
--
diff --git 
a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketProducerRouteExampleTest.java
 
b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketProducerRouteExampleTest.java
index 5271512..0ef41cb 100644
--- 
a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketProducerRouteExampleTest.java
+++ 
b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketProducerRouteExampleTest.java
@@ -53,7 +53,7 @@ public class WebsocketProducerRouteExampleTest extends 
CamelTestSupport {
 public void testWSHttpCall() throws Exception {
 AsyncHttpClient c = new AsyncHttpClient();
 
-WebSocket websocket = c.prepareGet(ws://127.0.0.1: + port 
+/shop).execute(
+WebSocket websocket = c.prepareGet(ws://127.0.0.1: + port + 
/shop).execute(
 new WebSocketUpgradeHandler.Builder()
 .addWebSocketListener(new WebSocketTextListener() {
 @Override



git commit: fixed CS error

2013-09-30 Thread cmueller
Updated Branches:
  refs/heads/camel-2.11.x df66110a9 - 83e0e5ca9


fixed CS error


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/83e0e5ca
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/83e0e5ca
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/83e0e5ca

Branch: refs/heads/camel-2.11.x
Commit: 83e0e5ca90dfa0c418c7ed54aa3fb5bc93dbc344
Parents: df66110
Author: cmueller cmuel...@apache.org
Authored: Mon Sep 30 20:48:16 2013 +0200
Committer: cmueller cmuel...@apache.org
Committed: Mon Sep 30 21:41:41 2013 +0200

--
 .../component/websocket/WebsocketComponentRouteExampleTest.java| 2 +-
 .../component/websocket/WebsocketProducerRouteExampleTest.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/83e0e5ca/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketComponentRouteExampleTest.java
--
diff --git 
a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketComponentRouteExampleTest.java
 
b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketComponentRouteExampleTest.java
index d4bcabe..3f5e18d0 100644
--- 
a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketComponentRouteExampleTest.java
+++ 
b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketComponentRouteExampleTest.java
@@ -49,7 +49,7 @@ public class WebsocketComponentRouteExampleTest extends 
CamelTestSupport {
 public void testWSHttpCall() throws Exception {
 AsyncHttpClient c = new AsyncHttpClient();
 
-WebSocket websocket = c.prepareGet(ws://localhost: +port + 
/echo).execute(
+WebSocket websocket = c.prepareGet(ws://localhost: + port + 
/echo).execute(
 new WebSocketUpgradeHandler.Builder()
 .addWebSocketListener(new WebSocketTextListener() {
 @Override

http://git-wip-us.apache.org/repos/asf/camel/blob/83e0e5ca/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketProducerRouteExampleTest.java
--
diff --git 
a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketProducerRouteExampleTest.java
 
b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketProducerRouteExampleTest.java
index 5271512..0ef41cb 100644
--- 
a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketProducerRouteExampleTest.java
+++ 
b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketProducerRouteExampleTest.java
@@ -53,7 +53,7 @@ public class WebsocketProducerRouteExampleTest extends 
CamelTestSupport {
 public void testWSHttpCall() throws Exception {
 AsyncHttpClient c = new AsyncHttpClient();
 
-WebSocket websocket = c.prepareGet(ws://127.0.0.1: + port 
+/shop).execute(
+WebSocket websocket = c.prepareGet(ws://127.0.0.1: + port + 
/shop).execute(
 new WebSocketUpgradeHandler.Builder()
 .addWebSocketListener(new WebSocketTextListener() {
 @Override



git commit: fixed CS error

2013-09-15 Thread cmueller
Updated Branches:
  refs/heads/camel-2.11.x ce19353f1 - 4f5537764


fixed CS error


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/4f553776
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/4f553776
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/4f553776

Branch: refs/heads/camel-2.11.x
Commit: 4f553776480bbffe06a5ede1940e265fac2b39f6
Parents: ce19353
Author: cmueller cmuel...@apache.org
Authored: Sun Sep 15 18:40:21 2013 +0200
Committer: cmueller cmuel...@apache.org
Committed: Sun Sep 15 18:40:21 2013 +0200

--
 .../cxf/interceptors/CxfMessageSoapHeaderOutInterceptor.java  | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/4f553776/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/interceptors/CxfMessageSoapHeaderOutInterceptor.java
--
diff --git 
a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/interceptors/CxfMessageSoapHeaderOutInterceptor.java
 
b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/interceptors/CxfMessageSoapHeaderOutInterceptor.java
index d1b7874..dc45e24 100644
--- 
a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/interceptors/CxfMessageSoapHeaderOutInterceptor.java
+++ 
b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/interceptors/CxfMessageSoapHeaderOutInterceptor.java
@@ -16,6 +16,7 @@
  */
 package org.apache.camel.component.cxf.interceptors;
 
+import javax.xml.soap.SOAPMessage;
 
 import org.apache.cxf.binding.soap.SoapMessage;
 import org.apache.cxf.binding.soap.saaj.SAAJOutInterceptor;
@@ -23,8 +24,6 @@ import org.apache.cxf.phase.AbstractPhaseInterceptor;
 import org.apache.cxf.phase.Phase;
 
 
-import javax.xml.soap.SOAPMessage;
-
 public class CxfMessageSoapHeaderOutInterceptor extends 
AbstractPhaseInterceptorSoapMessage {
 
 public CxfMessageSoapHeaderOutInterceptor() {



git commit: fixed CS error

2013-09-15 Thread cmueller
Updated Branches:
  refs/heads/camel-2.12.x acf05fb0a - a55b67966


fixed CS error


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a55b6796
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a55b6796
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a55b6796

Branch: refs/heads/camel-2.12.x
Commit: a55b67966767a2d3dc07104101aa82b7f548aca3
Parents: acf05fb
Author: cmueller cmuel...@apache.org
Authored: Sun Sep 15 19:00:56 2013 +0200
Committer: cmueller cmuel...@apache.org
Committed: Sun Sep 15 19:00:56 2013 +0200

--
 .../java/org/apache/camel/jaxb/TestXmlStreamWriter.java | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/a55b6796/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/TestXmlStreamWriter.java
--
diff --git 
a/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/TestXmlStreamWriter.java
 
b/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/TestXmlStreamWriter.java
index 2b09ae0..d30e8f7 100644
--- 
a/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/TestXmlStreamWriter.java
+++ 
b/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/TestXmlStreamWriter.java
@@ -16,12 +16,12 @@
  */
 package org.apache.camel.jaxb;
 
-import org.apache.camel.converter.jaxb.JaxbXmlStreamWriterWrapper;
-
 import javax.xml.namespace.NamespaceContext;
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamWriter;
 
+import org.apache.camel.converter.jaxb.JaxbXmlStreamWriterWrapper;
+
 /**
  * @author a href=http://christianposta.com/blog;Christian Posta/a
  */
@@ -31,17 +31,17 @@ public class TestXmlStreamWriter implements 
JaxbXmlStreamWriterWrapper {
 return new XMLStreamWriter() {
 @Override
 public void writeStartElement(String s) throws XMLStreamException {
-writer.writeStartElement(s+-Foo);
+writer.writeStartElement(s + -Foo);
 }
 
 @Override
 public void writeStartElement(String s, String s2) throws 
XMLStreamException {
-writer.writeStartElement(s, s2+-Foo);
+writer.writeStartElement(s, s2 + -Foo);
 }
 
 @Override
 public void writeStartElement(String s, String s2, String s3) 
throws XMLStreamException {
-writer.writeStartElement(s, s2+-Foo, s3);
+writer.writeStartElement(s, s2 + -Foo, s3);
 }
 
 @Override
@@ -161,7 +161,7 @@ public class TestXmlStreamWriter implements 
JaxbXmlStreamWriterWrapper {
 
 @Override
 public String getPrefix(String s) throws XMLStreamException {
-   return writer.getPrefix(s);
+return writer.getPrefix(s);
 }
 
 @Override



git commit: fixed CS error

2013-09-15 Thread cmueller
Updated Branches:
  refs/heads/camel-2.12.x a55b67966 - 32961151a


fixed CS error


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/32961151
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/32961151
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/32961151

Branch: refs/heads/camel-2.12.x
Commit: 32961151aa8e9ae9887ca1e9972ed0fc75f23369
Parents: a55b679
Author: cmueller cmuel...@apache.org
Authored: Sun Sep 15 19:24:35 2013 +0200
Committer: cmueller cmuel...@apache.org
Committed: Sun Sep 15 19:24:35 2013 +0200

--
 .../component/xmlsecurity/api/XmlSignatureHelper.java| 11 ++-
 1 file changed, 6 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/32961151/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/api/XmlSignatureHelper.java
--
diff --git 
a/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/api/XmlSignatureHelper.java
 
b/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/api/XmlSignatureHelper.java
index 851aeb5..8650ce8 100644
--- 
a/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/api/XmlSignatureHelper.java
+++ 
b/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/api/XmlSignatureHelper.java
@@ -52,12 +52,13 @@ import javax.xml.xpath.XPathExpression;
 import javax.xml.xpath.XPathExpressionException;
 import javax.xml.xpath.XPathFactory;
 
-import org.apache.camel.util.IOHelper;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 import org.xml.sax.SAXException;
 
+import org.apache.camel.util.IOHelper;
+
 /**
  * Helps to construct the transformations and the canonicalization methods for
  * the XML Signature generator.
@@ -331,10 +332,10 @@ public final class XmlSignatureHelper {
 if (is == null) {
 throw new IllegalStateException(String.format(XSL file %s not 
found, path));
 }
-try{
-   return getXslTranform(is);
-}finally{
-   IOHelper.close(is);
+try {
+return getXslTranform(is);
+} finally {
+IOHelper.close(is);
 }
 }
 



git commit: fixed CS error

2013-09-15 Thread cmueller
Updated Branches:
  refs/heads/master 77a522e08 - 3f9ea0246


fixed CS error


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/3f9ea024
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/3f9ea024
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/3f9ea024

Branch: refs/heads/master
Commit: 3f9ea0246fc75aad6fae1b4ce27d5d359c50b4c4
Parents: 77a522e
Author: cmueller cmuel...@apache.org
Authored: Sun Sep 15 19:00:56 2013 +0200
Committer: cmueller cmuel...@apache.org
Committed: Sun Sep 15 19:39:17 2013 +0200

--
 .../java/org/apache/camel/jaxb/TestXmlStreamWriter.java | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/3f9ea024/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/TestXmlStreamWriter.java
--
diff --git 
a/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/TestXmlStreamWriter.java
 
b/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/TestXmlStreamWriter.java
index 2b09ae0..d30e8f7 100644
--- 
a/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/TestXmlStreamWriter.java
+++ 
b/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/TestXmlStreamWriter.java
@@ -16,12 +16,12 @@
  */
 package org.apache.camel.jaxb;
 
-import org.apache.camel.converter.jaxb.JaxbXmlStreamWriterWrapper;
-
 import javax.xml.namespace.NamespaceContext;
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamWriter;
 
+import org.apache.camel.converter.jaxb.JaxbXmlStreamWriterWrapper;
+
 /**
  * @author a href=http://christianposta.com/blog;Christian Posta/a
  */
@@ -31,17 +31,17 @@ public class TestXmlStreamWriter implements 
JaxbXmlStreamWriterWrapper {
 return new XMLStreamWriter() {
 @Override
 public void writeStartElement(String s) throws XMLStreamException {
-writer.writeStartElement(s+-Foo);
+writer.writeStartElement(s + -Foo);
 }
 
 @Override
 public void writeStartElement(String s, String s2) throws 
XMLStreamException {
-writer.writeStartElement(s, s2+-Foo);
+writer.writeStartElement(s, s2 + -Foo);
 }
 
 @Override
 public void writeStartElement(String s, String s2, String s3) 
throws XMLStreamException {
-writer.writeStartElement(s, s2+-Foo, s3);
+writer.writeStartElement(s, s2 + -Foo, s3);
 }
 
 @Override
@@ -161,7 +161,7 @@ public class TestXmlStreamWriter implements 
JaxbXmlStreamWriterWrapper {
 
 @Override
 public String getPrefix(String s) throws XMLStreamException {
-   return writer.getPrefix(s);
+return writer.getPrefix(s);
 }
 
 @Override



git commit: fixed CS error

2013-09-15 Thread cmueller
Updated Branches:
  refs/heads/master f6ece1220 - b544ac298


fixed CS error


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/b544ac29
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/b544ac29
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/b544ac29

Branch: refs/heads/master
Commit: b544ac2984efac01e39b138103dc406eb8bc4aab
Parents: f6ece12
Author: cmueller cmuel...@apache.org
Authored: Sun Sep 15 19:24:35 2013 +0200
Committer: cmueller cmuel...@apache.org
Committed: Sun Sep 15 19:55:51 2013 +0200

--
 .../component/xmlsecurity/api/XmlSignatureHelper.java| 11 ++-
 1 file changed, 6 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/b544ac29/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/api/XmlSignatureHelper.java
--
diff --git 
a/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/api/XmlSignatureHelper.java
 
b/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/api/XmlSignatureHelper.java
index 851aeb5..8650ce8 100644
--- 
a/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/api/XmlSignatureHelper.java
+++ 
b/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/api/XmlSignatureHelper.java
@@ -52,12 +52,13 @@ import javax.xml.xpath.XPathExpression;
 import javax.xml.xpath.XPathExpressionException;
 import javax.xml.xpath.XPathFactory;
 
-import org.apache.camel.util.IOHelper;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 import org.xml.sax.SAXException;
 
+import org.apache.camel.util.IOHelper;
+
 /**
  * Helps to construct the transformations and the canonicalization methods for
  * the XML Signature generator.
@@ -331,10 +332,10 @@ public final class XmlSignatureHelper {
 if (is == null) {
 throw new IllegalStateException(String.format(XSL file %s not 
found, path));
 }
-try{
-   return getXslTranform(is);
-}finally{
-   IOHelper.close(is);
+try {
+return getXslTranform(is);
+} finally {
+IOHelper.close(is);
 }
 }
 



[3/4] git commit: Fixed CS error of camel-cxf

2013-09-11 Thread ningjiang
Fixed CS error of camel-cxf


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c04e88e9
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c04e88e9
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c04e88e9

Branch: refs/heads/camel-2.12.x
Commit: c04e88e9805aa79a994567361ef6fd6310ab6773
Parents: 7002c75
Author: Willem Jiang ningji...@apache.org
Authored: Wed Sep 11 10:47:08 2013 +0800
Committer: Willem Jiang ningji...@apache.org
Committed: Wed Sep 11 17:36:45 2013 +0800

--
 .../CxfMessageSoapHeaderOutInterceptor.java |  5 ++--
 .../RawMessageWSDLGetInterceptor.java   | 29 +---
 .../RawMessageWSDLGetOutInterceptor.java| 11 +---
 3 files changed, 34 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/c04e88e9/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/interceptors/CxfMessageSoapHeaderOutInterceptor.java
--
diff --git 
a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/interceptors/CxfMessageSoapHeaderOutInterceptor.java
 
b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/interceptors/CxfMessageSoapHeaderOutInterceptor.java
index d1b7874..b5708e8 100644
--- 
a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/interceptors/CxfMessageSoapHeaderOutInterceptor.java
+++ 
b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/interceptors/CxfMessageSoapHeaderOutInterceptor.java
@@ -17,14 +17,13 @@
 package org.apache.camel.component.cxf.interceptors;
 
 
+import javax.xml.soap.SOAPMessage;
+
 import org.apache.cxf.binding.soap.SoapMessage;
 import org.apache.cxf.binding.soap.saaj.SAAJOutInterceptor;
 import org.apache.cxf.phase.AbstractPhaseInterceptor;
 import org.apache.cxf.phase.Phase;
 
-
-import javax.xml.soap.SOAPMessage;
-
 public class CxfMessageSoapHeaderOutInterceptor extends 
AbstractPhaseInterceptorSoapMessage {
 
 public CxfMessageSoapHeaderOutInterceptor() {

http://git-wip-us.apache.org/repos/asf/camel/blob/c04e88e9/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/interceptors/RawMessageWSDLGetInterceptor.java
--
diff --git 
a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/interceptors/RawMessageWSDLGetInterceptor.java
 
b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/interceptors/RawMessageWSDLGetInterceptor.java
index 5e9ca39..41a30d1 100644
--- 
a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/interceptors/RawMessageWSDLGetInterceptor.java
+++ 
b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/interceptors/RawMessageWSDLGetInterceptor.java
@@ -1,20 +1,41 @@
+/**
+ * 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.cxf.interceptors;
 
+import java.util.Iterator;
+import java.util.Map;
+
+import org.w3c.dom.Document;
+
 import org.apache.cxf.binding.soap.interceptor.EndpointSelectionInterceptor;
 import org.apache.cxf.common.util.StringUtils;
 import org.apache.cxf.common.util.UrlUtils;
 import org.apache.cxf.endpoint.Endpoint;
 import org.apache.cxf.frontend.WSDLGetUtils;
-import org.apache.cxf.interceptor.*;
+import org.apache.cxf.interceptor.Fault;
+import org.apache.cxf.interceptor.Interceptor;
+import org.apache.cxf.interceptor.OutgoingChainInterceptor;
 import org.apache.cxf.message.Message;
 import org.apache.cxf.message.MessageImpl;
 import org.apache.cxf.phase.AbstractPhaseInterceptor;
 import org.apache.cxf.phase.Phase;
 import org.apache.cxf.service.model.EndpointInfo;
-import org.w3c.dom.Document;
 
-import java.util.Iterator;
-import java.util.Map;
 
 /**
  * Just copy the from WSDLGetInterceptor to provide backward compatible 
support for 2.7.x


[1/4] git commit: Fixed CS error of camel-cxf

2013-09-11 Thread ningjiang
Updated Branches:
  refs/heads/camel-2.12.x 7002c750d - 812524a64
  refs/heads/master 33e4d7e47 - ae6a4c081


Fixed CS error of camel-cxf


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/95e17f68
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/95e17f68
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/95e17f68

Branch: refs/heads/master
Commit: 95e17f68b8e6e9fadfae668281cd82173bb165f7
Parents: 33e4d7e
Author: Willem Jiang ningji...@apache.org
Authored: Wed Sep 11 10:47:08 2013 +0800
Committer: Willem Jiang ningji...@apache.org
Committed: Wed Sep 11 10:48:00 2013 +0800

--
 .../CxfMessageSoapHeaderOutInterceptor.java |  5 ++--
 .../RawMessageWSDLGetInterceptor.java   | 29 +---
 .../RawMessageWSDLGetOutInterceptor.java| 11 +---
 3 files changed, 34 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/95e17f68/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/interceptors/CxfMessageSoapHeaderOutInterceptor.java
--
diff --git 
a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/interceptors/CxfMessageSoapHeaderOutInterceptor.java
 
b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/interceptors/CxfMessageSoapHeaderOutInterceptor.java
index d1b7874..b5708e8 100644
--- 
a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/interceptors/CxfMessageSoapHeaderOutInterceptor.java
+++ 
b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/interceptors/CxfMessageSoapHeaderOutInterceptor.java
@@ -17,14 +17,13 @@
 package org.apache.camel.component.cxf.interceptors;
 
 
+import javax.xml.soap.SOAPMessage;
+
 import org.apache.cxf.binding.soap.SoapMessage;
 import org.apache.cxf.binding.soap.saaj.SAAJOutInterceptor;
 import org.apache.cxf.phase.AbstractPhaseInterceptor;
 import org.apache.cxf.phase.Phase;
 
-
-import javax.xml.soap.SOAPMessage;
-
 public class CxfMessageSoapHeaderOutInterceptor extends 
AbstractPhaseInterceptorSoapMessage {
 
 public CxfMessageSoapHeaderOutInterceptor() {

http://git-wip-us.apache.org/repos/asf/camel/blob/95e17f68/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/interceptors/RawMessageWSDLGetInterceptor.java
--
diff --git 
a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/interceptors/RawMessageWSDLGetInterceptor.java
 
b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/interceptors/RawMessageWSDLGetInterceptor.java
index 5e9ca39..41a30d1 100644
--- 
a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/interceptors/RawMessageWSDLGetInterceptor.java
+++ 
b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/interceptors/RawMessageWSDLGetInterceptor.java
@@ -1,20 +1,41 @@
+/**
+ * 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.cxf.interceptors;
 
+import java.util.Iterator;
+import java.util.Map;
+
+import org.w3c.dom.Document;
+
 import org.apache.cxf.binding.soap.interceptor.EndpointSelectionInterceptor;
 import org.apache.cxf.common.util.StringUtils;
 import org.apache.cxf.common.util.UrlUtils;
 import org.apache.cxf.endpoint.Endpoint;
 import org.apache.cxf.frontend.WSDLGetUtils;
-import org.apache.cxf.interceptor.*;
+import org.apache.cxf.interceptor.Fault;
+import org.apache.cxf.interceptor.Interceptor;
+import org.apache.cxf.interceptor.OutgoingChainInterceptor;
 import org.apache.cxf.message.Message;
 import org.apache.cxf.message.MessageImpl;
 import org.apache.cxf.phase.AbstractPhaseInterceptor;
 import org.apache.cxf.phase.Phase;
 import org.apache.cxf.service.model.EndpointInfo;
-import org.w3c.dom.Document;
 
-import java.util.Iterator;
-import java.util.Map;
 
 /**
  * Just copy the from WSDLGetInterceptor to provide backward compatible 
support for 2.7.x


[1/2] git commit: fixed CS error

2013-08-25 Thread cmueller
Updated Branches:
  refs/heads/master 1fc7bd7a7 - 2f0970a67


fixed CS error


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/2f0970a6
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/2f0970a6
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/2f0970a6

Branch: refs/heads/master
Commit: 2f0970a67f4e542a4a885bdc8707341af58cdd1a
Parents: f1bf334
Author: cmueller cmuel...@apache.org
Authored: Sun Aug 25 17:51:10 2013 +0200
Committer: cmueller cmuel...@apache.org
Committed: Sun Aug 25 17:51:36 2013 +0200

--
 .../file/remote/FtpConsumerIdempotentKeyChangedIssueTest.java| 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/2f0970a6/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerIdempotentKeyChangedIssueTest.java
--
diff --git 
a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerIdempotentKeyChangedIssueTest.java
 
b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerIdempotentKeyChangedIssueTest.java
index 58e7f64..f8cf769 100644
--- 
a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerIdempotentKeyChangedIssueTest.java
+++ 
b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerIdempotentKeyChangedIssueTest.java
@@ -26,13 +26,13 @@ import org.junit.Test;
 
 public class FtpConsumerIdempotentKeyChangedIssueTest extends 
FtpServerTestSupport {
 
+private Endpoint endpoint;
+
 private String getFtpUrl() {
 return ftp://admin@localhost:; + getPort() + 
/idempotent?password=adminreadLock=changed
 + 
idempotentKey=${file:onlyname}-${file:size}-${date:file:MMddHHmmss};
 }
 
-private Endpoint endpoint;
-
 @Test
 public void testIdempotent() throws Exception {
 NotifyBuilder oneExchangeDone = new 
NotifyBuilder(context).whenDone(1).create();



[2/2] git commit: fixed CS error

2013-08-25 Thread cmueller
fixed CS error


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f1bf334c
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f1bf334c
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f1bf334c

Branch: refs/heads/master
Commit: f1bf334ccfb4927d53388cf72e00b461c2b14042
Parents: 1fc7bd7
Author: cmueller cmuel...@apache.org
Authored: Sun Aug 25 17:46:40 2013 +0200
Committer: cmueller cmuel...@apache.org
Committed: Sun Aug 25 17:51:36 2013 +0200

--
 .../main/java/org/apache/camel/component/avro/AvroComponent.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/f1bf334c/components/camel-avro/src/main/java/org/apache/camel/component/avro/AvroComponent.java
--
diff --git 
a/components/camel-avro/src/main/java/org/apache/camel/component/avro/AvroComponent.java
 
b/components/camel-avro/src/main/java/org/apache/camel/component/avro/AvroComponent.java
index f1f6fc6..84c90e6 100644
--- 
a/components/camel-avro/src/main/java/org/apache/camel/component/avro/AvroComponent.java
+++ 
b/components/camel-avro/src/main/java/org/apache/camel/component/avro/AvroComponent.java
@@ -113,7 +113,7 @@ public class AvroComponent extends DefaultComponent {
 IterableProtocol.Message messagesToCheck = 
config.getMessageName() == null 
 ? messageMap.values() 
 : 
Collections.singleton(messageMap.get(config.getMessageName()));
-for (Protocol.Message message: messagesToCheck) {
+for (Protocol.Message message : messagesToCheck) {
 if (message.getRequest().getFields().size() != 1) {
 throw new IllegalArgumentException(Single parameter 
option can't be used with message 
 + message.getName() +  because it has  + 
message.getRequest().getFields().size()



git commit: fixed CS error

2013-08-25 Thread cmueller
Updated Branches:
  refs/heads/master 3f8fb8dc9 - e449ccf64


fixed CS error


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/e449ccf6
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/e449ccf6
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/e449ccf6

Branch: refs/heads/master
Commit: e449ccf64b9754ef1e88178146e54c1d825d4e07
Parents: 3f8fb8d
Author: cmueller cmuel...@apache.org
Authored: Sun Aug 25 18:54:33 2013 +0200
Committer: cmueller cmuel...@apache.org
Committed: Sun Aug 25 18:54:33 2013 +0200

--
 .../apache/camel/maven/CamelSalesforceMojo.java | 31 +---
 .../CamelSalesforceMojoIntegrationTest.java | 10 ---
 2 files changed, 27 insertions(+), 14 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/e449ccf6/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/java/org/apache/camel/maven/CamelSalesforceMojo.java
--
diff --git 
a/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/java/org/apache/camel/maven/CamelSalesforceMojo.java
 
b/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/java/org/apache/camel/maven/CamelSalesforceMojo.java
index 2adbf7f..4436d2e 100644
--- 
a/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/java/org/apache/camel/maven/CamelSalesforceMojo.java
+++ 
b/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/java/org/apache/camel/maven/CamelSalesforceMojo.java
@@ -16,10 +16,30 @@
  */
 package org.apache.camel.maven;
 
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.lang.reflect.Field;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+import java.util.regex.Pattern;
+
 import org.apache.camel.component.salesforce.SalesforceEndpointConfig;
 import org.apache.camel.component.salesforce.SalesforceLoginConfig;
 import org.apache.camel.component.salesforce.api.SalesforceException;
-import org.apache.camel.component.salesforce.api.dto.*;
+import org.apache.camel.component.salesforce.api.dto.AbstractSObjectBase;
+import org.apache.camel.component.salesforce.api.dto.GlobalObjects;
+import org.apache.camel.component.salesforce.api.dto.PickListValue;
+import org.apache.camel.component.salesforce.api.dto.SObject;
+import org.apache.camel.component.salesforce.api.dto.SObjectDescription;
+import org.apache.camel.component.salesforce.api.dto.SObjectField;
 import org.apache.camel.component.salesforce.internal.PayloadFormat;
 import org.apache.camel.component.salesforce.internal.SalesforceSession;
 import org.apache.camel.component.salesforce.internal.client.DefaultRestClient;
@@ -41,15 +61,6 @@ import org.codehaus.jackson.map.ObjectMapper;
 import org.eclipse.jetty.client.HttpClient;
 import org.eclipse.jetty.client.RedirectListener;
 
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.lang.reflect.Field;
-import java.util.*;
-import java.util.concurrent.TimeUnit;
-import java.util.regex.Pattern;
-
 /**
  * Goal which generates POJOs for Salesforce SObjects
  */

http://git-wip-us.apache.org/repos/asf/camel/blob/e449ccf6/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/java/org/apache/camel/maven/CamelSalesforceMojoIntegrationTest.java
--
diff --git 
a/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/java/org/apache/camel/maven/CamelSalesforceMojoIntegrationTest.java
 
b/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/java/org/apache/camel/maven/CamelSalesforceMojoIntegrationTest.java
index 917292b..c6df2ac 100644
--- 
a/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/java/org/apache/camel/maven/CamelSalesforceMojoIntegrationTest.java
+++ 
b/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/java/org/apache/camel/maven/CamelSalesforceMojoIntegrationTest.java
@@ -16,13 +16,13 @@
  */
 package org.apache.camel.maven;
 
+import java.io.*;
+import java.util.Properties;
+
 import org.apache.maven.plugin.logging.SystemStreamLog;
 import org.junit.Assert;
 import org.junit.Test;
 
-import java.io.*;
-import java.util.Properties;
-
 public class CamelSalesforceMojoIntegrationTest {
 
 private static final String TEST_LOGIN_PROPERTIES = 
../test-salesforce-login.properties;
@@ -82,7 +82,9 @@ public class CamelSalesforceMojoIntegrationTest {
 if (stream != null) {
 try {
 

git commit: fixed CS error

2013-08-25 Thread cmueller
Updated Branches:
  refs/heads/master e449ccf64 - 1583343fb


fixed CS error


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/1583343f
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/1583343f
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/1583343f

Branch: refs/heads/master
Commit: 1583343fb4a70641f09d2c231bb85e0056aafe35
Parents: e449ccf
Author: cmueller cmuel...@apache.org
Authored: Sun Aug 25 18:58:55 2013 +0200
Committer: cmueller cmuel...@apache.org
Committed: Sun Aug 25 18:58:55 2013 +0200

--
 .../camel/component/yammer/YammerMessagesConsumerOptionTest.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/1583343f/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerMessagesConsumerOptionTest.java
--
diff --git 
a/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerMessagesConsumerOptionTest.java
 
b/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerMessagesConsumerOptionTest.java
index b8476ab..d6c174a 100644
--- 
a/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerMessagesConsumerOptionTest.java
+++ 
b/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerMessagesConsumerOptionTest.java
@@ -21,7 +21,8 @@ import org.junit.Test;
 
 public class YammerMessagesConsumerOptionTest extends 
YammerComponentTestSupport {
 
-private static final String YAMMER_MESSAGES_CONSUMER = 
yammer:messages?consumerKey=aConsumerKeyconsumerSecret=aConsumerSecretKeyaccessToken=aAccessTokenlimit=1threaded=trueolderThan=130newerThan=127;
+private static final String YAMMER_MESSAGES_CONSUMER = 
yammer:messages?consumerKey=aConsumerKeyconsumerSecret=aConsumerSecretKeyaccessToken=aAccessTokenlimit=1threaded=trueolderThan=130
++ newerThan=127;
 
 @Test
 public void testOptions() throws Exception {



git commit: fixed CS error

2013-08-25 Thread cmueller
Updated Branches:
  refs/heads/master 1583343fb - 801ebe952


fixed CS error


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/801ebe95
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/801ebe95
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/801ebe95

Branch: refs/heads/master
Commit: 801ebe952ec3be85cc15ae14e077c64d70498568
Parents: 1583343
Author: cmueller cmuel...@apache.org
Authored: Sun Aug 25 19:03:20 2013 +0200
Committer: cmueller cmuel...@apache.org
Committed: Sun Aug 25 19:03:20 2013 +0200

--
 .../camel/example/jdbc/RecordProcessor.java | 21 ++--
 1 file changed, 11 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/801ebe95/examples/camel-example-jdbc/src/main/java/org/apache/camel/example/jdbc/RecordProcessor.java
--
diff --git 
a/examples/camel-example-jdbc/src/main/java/org/apache/camel/example/jdbc/RecordProcessor.java
 
b/examples/camel-example-jdbc/src/main/java/org/apache/camel/example/jdbc/RecordProcessor.java
index 7a1f83c..702247e 100644
--- 
a/examples/camel-example-jdbc/src/main/java/org/apache/camel/example/jdbc/RecordProcessor.java
+++ 
b/examples/camel-example-jdbc/src/main/java/org/apache/camel/example/jdbc/RecordProcessor.java
@@ -24,16 +24,17 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
- * Just a demo bean to show we are ready to process each record polled from
- * the database.
+ * Just a demo bean to show we are ready to process each record polled from the
+ * database.
  */
 public class RecordProcessor implements Processor {
-   static Logger LOG = LoggerFactory.getLogger(RecordProcessor.class);
-   
-   public void process(Exchange msg) {
-   LOG.trace(Processing msg {}, msg);
-   MapString, Object record = msg.getIn().getBody(Map.class);
-   LOG.info(Processing record {}, record);
-   // Do something useful with this record.
-   }
+
+static Logger LOG = LoggerFactory.getLogger(RecordProcessor.class);
+
+public void process(Exchange msg) {
+LOG.trace(Processing msg {}, msg);
+MapString, Object record = msg.getIn().getBody(Map.class);
+LOG.info(Processing record {}, record);
+// Do something useful with this record.
+}
 }
\ No newline at end of file



git commit: fixed CS error

2013-08-25 Thread cmueller
Updated Branches:
  refs/heads/master 801ebe952 - ea325e32d


fixed CS error


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/ea325e32
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ea325e32
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ea325e32

Branch: refs/heads/master
Commit: ea325e32d41f3e13ef12615bbb6b9fd87fa916d1
Parents: 801ebe9
Author: cmueller cmuel...@apache.org
Authored: Sun Aug 25 19:14:41 2013 +0200
Committer: cmueller cmuel...@apache.org
Committed: Sun Aug 25 19:14:41 2013 +0200

--
 .../java/org/apache/camel/example/jdbc/RecordProcessor.java| 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/ea325e32/examples/camel-example-jdbc/src/main/java/org/apache/camel/example/jdbc/RecordProcessor.java
--
diff --git 
a/examples/camel-example-jdbc/src/main/java/org/apache/camel/example/jdbc/RecordProcessor.java
 
b/examples/camel-example-jdbc/src/main/java/org/apache/camel/example/jdbc/RecordProcessor.java
index 702247e..93c576a 100644
--- 
a/examples/camel-example-jdbc/src/main/java/org/apache/camel/example/jdbc/RecordProcessor.java
+++ 
b/examples/camel-example-jdbc/src/main/java/org/apache/camel/example/jdbc/RecordProcessor.java
@@ -29,12 +29,12 @@ import org.slf4j.LoggerFactory;
  */
 public class RecordProcessor implements Processor {
 
-static Logger LOG = LoggerFactory.getLogger(RecordProcessor.class);
+static Logger log = LoggerFactory.getLogger(RecordProcessor.class);
 
 public void process(Exchange msg) {
-LOG.trace(Processing msg {}, msg);
+log.trace(Processing msg {}, msg);
 MapString, Object record = msg.getIn().getBody(Map.class);
-LOG.info(Processing record {}, record);
+log.info(Processing record {}, record);
 // Do something useful with this record.
 }
 }
\ No newline at end of file



git commit: fixed CS error

2013-08-25 Thread cmueller
Updated Branches:
  refs/heads/camel-2.11.x a9fd76f6c - 7e62658e0


fixed CS error


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/7e62658e
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/7e62658e
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/7e62658e

Branch: refs/heads/camel-2.11.x
Commit: 7e62658e00cb175449a9bb63e856fd54eaeafb5e
Parents: a9fd76f
Author: cmueller cmuel...@apache.org
Authored: Sun Aug 25 19:24:05 2013 +0200
Committer: cmueller cmuel...@apache.org
Committed: Sun Aug 25 19:24:05 2013 +0200

--
 .../main/java/org/apache/camel/converter/jaxb/JaxbDataFormat.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/7e62658e/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/JaxbDataFormat.java
--
diff --git 
a/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/JaxbDataFormat.java
 
b/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/JaxbDataFormat.java
index a64d73d..bf06318 100644
--- 
a/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/JaxbDataFormat.java
+++ 
b/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/JaxbDataFormat.java
@@ -46,6 +46,8 @@ import javax.xml.transform.stream.StreamSource;
 import javax.xml.validation.Schema;
 import javax.xml.validation.SchemaFactory;
 
+import org.xml.sax.SAXException;
+
 import org.apache.camel.CamelContext;
 import org.apache.camel.CamelContextAware;
 import org.apache.camel.Exchange;
@@ -58,7 +60,6 @@ import org.apache.camel.util.ObjectHelper;
 import org.apache.camel.util.ResourceHelper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.xml.sax.SAXException;
 
 
 /**



git commit: fixed CS error

2013-08-25 Thread cmueller
Updated Branches:
  refs/heads/camel-2.11.x 7e62658e0 - 9938a4de4


fixed CS error


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/9938a4de
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/9938a4de
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/9938a4de

Branch: refs/heads/camel-2.11.x
Commit: 9938a4de4da9ede8ce493a140186da19e10da5d7
Parents: 7e62658
Author: cmueller cmuel...@apache.org
Authored: Sun Aug 25 19:44:49 2013 +0200
Committer: cmueller cmuel...@apache.org
Committed: Sun Aug 25 19:44:49 2013 +0200

--
 .../main/java/org/apache/camel/component/jdbc/JdbcProducer.java| 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/9938a4de/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/JdbcProducer.java
--
diff --git 
a/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/JdbcProducer.java
 
b/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/JdbcProducer.java
index 85a70ae..e238075 100755
--- 
a/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/JdbcProducer.java
+++ 
b/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/JdbcProducer.java
@@ -224,7 +224,7 @@ public class JdbcProducer extends DefaultProducer {
 
 exchange.getOut().setHeader(JdbcConstants.JDBC_ROW_COUNT, data.size());
 if (!data.isEmpty()) {
-  exchange.getOut().setHeader(JdbcConstants.JDBC_COLUMN_NAMES, 
data.get(0).keySet());
+exchange.getOut().setHeader(JdbcConstants.JDBC_COLUMN_NAMES, 
data.get(0).keySet());
 }
 exchange.getOut().setBody(data);
 }



git commit: fixed CS error

2013-08-25 Thread cmueller
Updated Branches:
  refs/heads/camel-2.10.x aa37220c5 - 9f34fa65a


fixed CS error


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/9f34fa65
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/9f34fa65
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/9f34fa65

Branch: refs/heads/camel-2.10.x
Commit: 9f34fa65af5521d66923e992ecccb53b64fbffd2
Parents: aa37220
Author: cmueller cmuel...@apache.org
Authored: Sun Aug 25 20:02:40 2013 +0200
Committer: cmueller cmuel...@apache.org
Committed: Sun Aug 25 20:02:40 2013 +0200

--
 .../main/java/org/apache/camel/builder/script/ScriptBuilder.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/9f34fa65/components/camel-script/src/main/java/org/apache/camel/builder/script/ScriptBuilder.java
--
diff --git 
a/components/camel-script/src/main/java/org/apache/camel/builder/script/ScriptBuilder.java
 
b/components/camel-script/src/main/java/org/apache/camel/builder/script/ScriptBuilder.java
index 9feca5e..96adfab 100644
--- 
a/components/camel-script/src/main/java/org/apache/camel/builder/script/ScriptBuilder.java
+++ 
b/components/camel-script/src/main/java/org/apache/camel/builder/script/ScriptBuilder.java
@@ -345,7 +345,7 @@ public class ScriptBuilder implements Expression, 
Predicate, Processor {
 if (LOG.isDebugEnabled()) {
 LOG.debug(Script evaluation failed:  + e.getMessage(), e);
 } 
-if (e.getCause()!= null) {
+if (e.getCause() !=  null) {
 throw createScriptEvaluationException(e.getCause());
 } else {
 throw createScriptEvaluationException(e);



git commit: fixed CS error

2013-06-20 Thread cmueller
Updated Branches:
  refs/heads/camel-2.10.x 36624994c - 5dbfc4a50


fixed CS error


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/5dbfc4a5
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/5dbfc4a5
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/5dbfc4a5

Branch: refs/heads/camel-2.10.x
Commit: 5dbfc4a50d1069384122fc6065fef7ac0066b7dd
Parents: 3662499
Author: cmueller cmuel...@apache.org
Authored: Thu Jun 20 20:59:18 2013 +0200
Committer: cmueller cmuel...@apache.org
Committed: Thu Jun 20 20:59:18 2013 +0200

--
 .../java/org/apache/camel/example/client/CamelClientRemoting.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/5dbfc4a5/examples/camel-example-spring-jms/src/main/java/org/apache/camel/example/client/CamelClientRemoting.java
--
diff --git 
a/examples/camel-example-spring-jms/src/main/java/org/apache/camel/example/client/CamelClientRemoting.java
 
b/examples/camel-example-spring-jms/src/main/java/org/apache/camel/example/client/CamelClientRemoting.java
index e7110e5..ac7f4eb 100644
--- 
a/examples/camel-example-spring-jms/src/main/java/org/apache/camel/example/client/CamelClientRemoting.java
+++ 
b/examples/camel-example-spring-jms/src/main/java/org/apache/camel/example/client/CamelClientRemoting.java
@@ -45,7 +45,7 @@ public final class CamelClientRemoting {
 System.out.println(... the result is:  + response);
 
 // we're done so let's properly close the application context
-   context.close();
+context.close();
 }
 // END SNIPPET: e1
 



git commit: fixed CS error

2013-06-19 Thread cmueller
Updated Branches:
  refs/heads/camel-2.10.x ea3823a58 - 93d0f250f


fixed CS error


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/93d0f250
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/93d0f250
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/93d0f250

Branch: refs/heads/camel-2.10.x
Commit: 93d0f250fa9024f488f7c77e2e5ee35b4b3f233c
Parents: ea3823a
Author: cmueller cmuel...@apache.org
Authored: Wed Jun 19 22:37:16 2013 +0200
Committer: cmueller cmuel...@apache.org
Committed: Wed Jun 19 22:37:16 2013 +0200

--
 .../processor/DeadLetterChannelAlwaysHandledTest.java | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/93d0f250/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelAlwaysHandledTest.java
--
diff --git 
a/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelAlwaysHandledTest.java
 
b/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelAlwaysHandledTest.java
index 324a391..e4f6de3 100644
--- 
a/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelAlwaysHandledTest.java
+++ 
b/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelAlwaysHandledTest.java
@@ -26,7 +26,7 @@ import org.apache.camel.spi.ExceptionHandler;
 
 public class DeadLetterChannelAlwaysHandledTest extends ContextTestSupport {
 
-private static final AtomicBoolean called = new AtomicBoolean();
+private static final AtomicBoolean CALLED = new AtomicBoolean();
 
 public void testDeadLetterChannelAlwaysHandled() throws Exception {
 // need to set exception handler manually to work around an issue 
configuring from uri
@@ -42,7 +42,7 @@ public class DeadLetterChannelAlwaysHandledTest extends 
ContextTestSupport {
 
 assertMockEndpointsSatisfied();
 
-assertFalse(Should not have called, called.get());
+assertFalse(Should not have called, CALLED.get());
 }
 
 @Override
@@ -69,17 +69,17 @@ public class DeadLetterChannelAlwaysHandledTest extends 
ContextTestSupport {
 
 @Override
 public void handleException(Throwable exception) {
-called.set(true);
+CALLED.set(true);
 }
 
 @Override
 public void handleException(String message, Throwable exception) {
-called.set(true);
+CALLED.set(true);
 }
 
 @Override
 public void handleException(String message, Exchange exchange, 
Throwable exception) {
-called.set(true);
+CALLED.set(true);
 }
 }
 }



git commit: fixed CS error

2013-06-19 Thread cmueller
Updated Branches:
  refs/heads/camel-2.10.x 8b0a568e1 - 36624994c


fixed CS error


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/36624994
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/36624994
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/36624994

Branch: refs/heads/camel-2.10.x
Commit: 36624994c0ed1d3c8ba036a33775c995c8434ed0
Parents: 8b0a568
Author: cmueller cmuel...@apache.org
Authored: Wed Jun 19 23:28:48 2013 +0200
Committer: cmueller cmuel...@apache.org
Committed: Wed Jun 19 23:28:48 2013 +0200

--
 .../java/org/apache/camel/component/ical/ICalConverter.java   | 7 +--
 .../java/org/apache/camel/component/ical/ICalDataFormat.java  | 2 +-
 .../org/apache/camel/component/ical/ICalDataFormatTest.java   | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/36624994/components/camel-ical/src/main/java/org/apache/camel/component/ical/ICalConverter.java
--
diff --git 
a/components/camel-ical/src/main/java/org/apache/camel/component/ical/ICalConverter.java
 
b/components/camel-ical/src/main/java/org/apache/camel/component/ical/ICalConverter.java
index 5a3e4d9..765b158 100644
--- 
a/components/camel-ical/src/main/java/org/apache/camel/component/ical/ICalConverter.java
+++ 
b/components/camel-ical/src/main/java/org/apache/camel/component/ical/ICalConverter.java
@@ -1,4 +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.
@@ -31,7 +31,10 @@ import org.apache.camel.util.IOHelper;
  * ICal related converter.
  */
 @Converter
-public class ICalConverter {
+public final class ICalConverter {
+
+private ICalConverter() {
+}
 
 @Converter
 public static Date toDate(DateProperty property) {

http://git-wip-us.apache.org/repos/asf/camel/blob/36624994/components/camel-ical/src/main/java/org/apache/camel/component/ical/ICalDataFormat.java
--
diff --git 
a/components/camel-ical/src/main/java/org/apache/camel/component/ical/ICalDataFormat.java
 
b/components/camel-ical/src/main/java/org/apache/camel/component/ical/ICalDataFormat.java
index 2159b53..0448c74 100644
--- 
a/components/camel-ical/src/main/java/org/apache/camel/component/ical/ICalDataFormat.java
+++ 
b/components/camel-ical/src/main/java/org/apache/camel/component/ical/ICalDataFormat.java
@@ -1,4 +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.

http://git-wip-us.apache.org/repos/asf/camel/blob/36624994/components/camel-ical/src/test/java/org/apache/camel/component/ical/ICalDataFormatTest.java
--
diff --git 
a/components/camel-ical/src/test/java/org/apache/camel/component/ical/ICalDataFormatTest.java
 
b/components/camel-ical/src/test/java/org/apache/camel/component/ical/ICalDataFormatTest.java
index 163a533..f588401 100644
--- 
a/components/camel-ical/src/test/java/org/apache/camel/component/ical/ICalDataFormatTest.java
+++ 
b/components/camel-ical/src/test/java/org/apache/camel/component/ical/ICalDataFormatTest.java
@@ -1,4 +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.