camel git commit: fixed a CS error

2016-10-06 Thread cmueller 
Repository: camel
Updated Branches:
  refs/heads/master 03f231e0b -> 841bbf2cc


fixed a CS error


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

Branch: refs/heads/master
Commit: 841bbf2ccc7628879687d448bb9c48ccf2a8c8ff
Parents: 03f231e
Author: Christian Mueller 
Authored: Thu Oct 6 08:11:04 2016 +0200
Committer: Christian Mueller 
Committed: Thu Oct 6 08:11:04 2016 +0200

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


http://git-wip-us.apache.org/repos/asf/camel/blob/841bbf2c/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 d264f86..2c3d00a 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
@@ -79,6 +79,7 @@ import org.slf4j.LoggerFactory;
 public abstract class CamelTestSupport extends TestSupport {
 private static final Logger LOG = 
LoggerFactory.getLogger(CamelTestSupport.class);
 private static final ThreadLocal INIT = new 
ThreadLocal();
+private static final String ROUTE_COVERAGE_LOG_ENTRY = "Route coverage ({} 
out of {} routes used)";
 private static ThreadLocal threadCamelContext = new 
ThreadLocal();
 private static ThreadLocal threadTemplate = new 
ThreadLocal();
 private static ThreadLocal threadFluentTemplate = 
new ThreadLocal();
@@ -96,8 +97,6 @@ public abstract class CamelTestSupport extends TestSupport {
 private final Map fromEndpoints = new HashMap();
 private CamelTestWatcher camelTestWatcher = new CamelTestWatcher();
 
-private static final String ROUTE_COVERAGE_LOG_ENTRY = "Route coverage ({} 
out of {} routes used)";
-
 /**
  * Use the RouteBuilder or not
  * @return true then {@link CamelContext} will be auto started,

[1/2] camel git commit: Fixed the CS error in camel-jetty-common

2015-07-05 Thread ningjiang 
Repository: camel
Updated Branches:
  refs/heads/master a2c1b7126 - cac126393


Fixed the CS error in camel-jetty-common


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

Branch: refs/heads/master
Commit: cac1263936e0077534537f08dfe4674d591aa9be
Parents: 29ca57c
Author: Willem Jiang willem.ji...@gmail.com
Authored: Mon Jul 6 10:17:50 2015 +0800
Committer: Willem Jiang willem.ji...@gmail.com
Committed: Mon Jul 6 10:18:06 2015 +0800

--
 .../java/org/apache/camel/component/jetty/JettyHttpComponent.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/cac12639/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
--
diff --git 
a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
 
b/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
index 95b1185..f98cee5 100644
--- 
a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
+++ 
b/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
@@ -482,7 +482,8 @@ public abstract class JettyHttpComponent extends 
HttpComponent implements RestCo
 /**
  * The key password, which is used to access the certificate's key entry 
in the keystore (this is the same password that is supplied to the keystore 
command's -keypass option).
  */
-@Metadata(description = The key password, which is used to access the 
certificate's key entry in the keystore (this is the same password that is 
supplied to the keystore command's -keypass option).)
+@Metadata(description = The key password, which is used to access the 
certificate's key entry in the keystore 
++ (this is the same password that is supplied to the keystore 
command's -keypass option).)
 public void setSslKeyPassword(String sslKeyPassword) {
 this.sslKeyPassword = sslKeyPassword;
 }

[2/2] camel git commit: Fixed the CS error in camel-cxf

2015-07-05 Thread ningjiang 
Fixed the CS error in camel-cxf


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

Branch: refs/heads/master
Commit: 29ca57c189fced80614786669544e1d20005ed44
Parents: a2c1b71
Author: Willem Jiang willem.ji...@gmail.com
Authored: Mon Jul 6 10:16:57 2015 +0800
Committer: Willem Jiang willem.ji...@gmail.com
Committed: Mon Jul 6 10:18:06 2015 +0800

--
 .../org/apache/camel/component/cxf/CxfEndpoint.java| 13 -
 .../camel/component/cxf/jaxrs/CxfRsEndpoint.java   |  5 +++--
 2 files changed, 11 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/29ca57c1/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
--
diff --git 
a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
 
b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
index 5ea1acd..090e1ca 100644
--- 
a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
+++ 
b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
@@ -37,6 +37,10 @@ import javax.xml.ws.Provider;
 import javax.xml.ws.WebServiceProvider;
 import javax.xml.ws.handler.Handler;
 
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+
 import org.apache.camel.CamelContext;
 import org.apache.camel.CamelException;
 import org.apache.camel.Consumer;
@@ -99,9 +103,7 @@ import org.apache.cxf.staxutils.StaxSource;
 import org.apache.cxf.staxutils.StaxUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
+
 
 
 /**
@@ -114,6 +116,9 @@ import org.w3c.dom.Node;
 public class CxfEndpoint extends DefaultEndpoint implements 
HeaderFilterStrategyAware, Service, Cloneable {
 
 private static final Logger LOG = 
LoggerFactory.getLogger(CxfEndpoint.class);
+
+@UriPath
+protected Bus bus;
 
 private AtomicBoolean getBusHasBeenCalled = new AtomicBoolean(false);
 private volatile boolean createBus;
@@ -135,8 +140,6 @@ public class CxfEndpoint extends DefaultEndpoint implements 
HeaderFilterStrategy
 private String beanId;
 @UriPath
 private String address;
-@UriPath
-protected Bus bus;
 @UriParam
 private String wsdlURL;
 private Class? serviceClass;

http://git-wip-us.apache.org/repos/asf/camel/blob/29ca57c1/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 47e54cf..c3251fa 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
@@ -81,6 +81,9 @@ public class CxfRsEndpoint extends DefaultEndpoint implements 
HeaderFilterStrate
 }
 
 private static final Logger LOG = 
LoggerFactory.getLogger(CxfRsEndpoint.class);
+
+@UriPath
+protected Bus bus;
 
 private final InterceptorHolder interceptorHolder = new 
InterceptorHolder();
 
@@ -97,8 +100,6 @@ public class CxfRsEndpoint extends DefaultEndpoint 
implements HeaderFilterStrate
 private String modelRef;
 @UriParam(defaultValue = Default)
 private BindingStyle bindingStyle = BindingStyle.Default;
-@UriPath
-protected Bus bus;
 @UriParam
 private HeaderFilterStrategy headerFilterStrategy;
 @UriParam

[1/2] camel git commit: Fixed the CS error in camel-ftp

2015-06-10 Thread ningjiang 
Repository: camel
Updated Branches:
  refs/heads/master 0e54bc8e5 - 148333845


Fixed the CS error in camel-ftp


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

Branch: refs/heads/master
Commit: 22d3d0f8e2f07ad8e31bd6ba3acfd7a662dc0e27
Parents: 0e54bc8
Author: Willem Jiang willem.ji...@gmail.com
Authored: Wed Jun 10 16:27:33 2015 +0800
Committer: Willem Jiang willem.ji...@gmail.com
Committed: Wed Jun 10 16:27:33 2015 +0800

--
 .../java/org/apache/camel/component/file/remote/FtpUtils.java| 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/22d3d0f8/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpUtils.java
--
diff --git 
a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpUtils.java
 
b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpUtils.java
index e190243..476099c 100644
--- 
a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpUtils.java
+++ 
b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpUtils.java
@@ -120,8 +120,8 @@ public final class FtpUtils {
 public static void ensureRelativeFtpDirectory(Component ftpComponent, 
RemoteFileConfiguration configuration) {
 if (FileUtil.hasLeadingSeparator(configuration.getDirectoryName())) {
 String relativePath = 
FileUtil.stripLeadingSeparator(configuration.getDirectoryName());
-LOG.warn(String.format(%s doesn't support absolute paths, \%s\ 
will be converted to \%s\.  +
-After Camel 2.16, absolute paths will be 
invalid.,
+LOG.warn(String.format(%s doesn't support absolute paths, \%s\ 
will be converted to \%s\. 
++ After Camel 2.16, absolute paths will be invalid.,
 ftpComponent.getClass().getSimpleName(),
 configuration.getDirectoryName(),
 relativePath));

[2/2] camel git commit: Fixed the CS error of camel-spring-ws

2015-05-26 Thread ningjiang 
Fixed the CS error of camel-spring-ws


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

Branch: refs/heads/master
Commit: ef99689428eb264de51c10179da5354ca6287dc0
Parents: d35bb22
Author: Willem Jiang willem.ji...@gmail.com
Authored: Tue May 26 15:54:34 2015 +0800
Committer: Willem Jiang willem.ji...@gmail.com
Committed: Tue May 26 15:54:34 2015 +0800

--
 .../camel/component/spring/ws/SpringWebserviceEndpoint.java  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/ef996894/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/SpringWebserviceEndpoint.java
--
diff --git 
a/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/SpringWebserviceEndpoint.java
 
b/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/SpringWebserviceEndpoint.java
index 741c1ca..fbec7a4 100644
--- 
a/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/SpringWebserviceEndpoint.java
+++ 
b/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/SpringWebserviceEndpoint.java
@@ -24,7 +24,9 @@ import org.apache.camel.impl.DefaultEndpoint;
 import org.apache.camel.spi.UriEndpoint;
 import org.apache.camel.spi.UriParam;
 
-@UriEndpoint(scheme = spring-ws, title = Spring WebService, syntax = 
spring-ws:type:lookupKey:webServiceEndpointUri, consumerClass = 
SpringWebserviceConsumer.class, label = http,soap,webservice)
+@UriEndpoint(scheme = spring-ws, title = Spring WebService,
+syntax = spring-ws:type:lookupKey:webServiceEndpointUri, 
+consumerClass = SpringWebserviceConsumer.class, label = http,soap,webservice)
 public class SpringWebserviceEndpoint extends DefaultEndpoint {
 
 @UriParam

[1/2] camel git commit: Fixed the CS error in camel-core

2015-05-17 Thread ningjiang 
Repository: camel
Updated Branches:
  refs/heads/master b01150d60 - 71ea1f3dc


Fixed the CS error in camel-core


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

Branch: refs/heads/master
Commit: 2f32bd0313edbcb156f567c8d17eccce4aa112d6
Parents: b01150d
Author: Willem Jiang willem.ji...@gmail.com
Authored: Mon May 18 13:22:28 2015 +0800
Committer: Willem Jiang willem.ji...@gmail.com
Committed: Mon May 18 13:22:28 2015 +0800

--
 .../java/org/apache/camel/model/rest/RestParamDefinition.java| 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/2f32bd03/camel-core/src/main/java/org/apache/camel/model/rest/RestParamDefinition.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/model/rest/RestParamDefinition.java 
b/camel-core/src/main/java/org/apache/camel/model/rest/RestParamDefinition.java
index edc90dd..c9078d6 100644
--- 
a/camel-core/src/main/java/org/apache/camel/model/rest/RestParamDefinition.java
+++ 
b/camel-core/src/main/java/org/apache/camel/model/rest/RestParamDefinition.java
@@ -18,10 +18,10 @@ package org.apache.camel.model.rest;
 
 import java.util.List;
 
-import org.apache.camel.model.OptionalIdentifiedDefinition;
-
 import javax.xml.bind.annotation.XmlTransient;
 
+import org.apache.camel.model.OptionalIdentifiedDefinition;
+
 // TODO: Should not be a Definition as its a builder for Java DSL instead.
 // instead the builder methods should be on RestOperationParam

[3/5] camel git commit: Fixed the CS error of camel-lucene

2015-05-08 Thread ningjiang 
Fixed the CS error of camel-lucene


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

Branch: refs/heads/master
Commit: f55b0a06b2f9bd939240b31c2e7b295783260199
Parents: ea61e86
Author: Willem Jiang willem.ji...@gmail.com
Authored: Fri May 8 19:28:56 2015 +0800
Committer: Willem Jiang willem.ji...@gmail.com
Committed: Fri May 8 19:43:25 2015 +0800

--
 .../java/org/apache/camel/component/lucene/LuceneOperation.java| 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/f55b0a06/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneOperation.java
--
diff --git 
a/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneOperation.java
 
b/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneOperation.java
index fda54f8..d840d25 100644
--- 
a/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneOperation.java
+++ 
b/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneOperation.java
@@ -18,6 +18,6 @@ package org.apache.camel.component.lucene;
 
 public enum LuceneOperation {
 
-insert,query
+insert, query
 
 }

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

2015-05-08 Thread ningjiang 
Fixed the CS error of camel-ftp


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

Branch: refs/heads/master
Commit: ef1df28fec1c9c1322c52b3040b7a6411410c535
Parents: 4da7883
Author: Willem Jiang willem.ji...@gmail.com
Authored: Fri May 8 19:29:59 2015 +0800
Committer: Willem Jiang willem.ji...@gmail.com
Committed: Fri May 8 19:43:25 2015 +0800

--
 .../remote/FtpBadLoginConnectionLeakTest.java   | 12 ++-
 ...FtpBadLoginInProducerConnectionLeakTest.java | 14 +++--
 .../FtpBadLoginMockNoopConnectionLeakTest.java  | 21 ++--
 3 files changed, 26 insertions(+), 21 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/ef1df28f/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpBadLoginConnectionLeakTest.java
--
diff --git 
a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpBadLoginConnectionLeakTest.java
 
b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpBadLoginConnectionLeakTest.java
index ff430ee..8cbd434 100644
--- 
a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpBadLoginConnectionLeakTest.java
+++ 
b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpBadLoginConnectionLeakTest.java
@@ -37,8 +37,8 @@ public class FtpBadLoginConnectionLeakTest extends 
FtpServerTestSupport {
 private MapInteger, boolean[] socketAudits = new HashMap();
 
 private String getFtpUrl() {
-return ftp://dummy@localhost:; + getPort() + 
/badlogin?password=cantremeber +
-
throwExceptionOnConnectFailed=falseftpClient.socketFactory=#sf;
+return ftp://dummy@localhost:; + getPort() + 
/badlogin?password=cantremeber 
++ 
throwExceptionOnConnectFailed=falseftpClient.socketFactory=#sf;
 }
 
 @Override
@@ -101,7 +101,7 @@ public class FtpBadLoginConnectionLeakTest extends 
FtpServerTestSupport {
 @Override
 public Socket createSocket() throws IOException {
 AuditingSocket socket = new AuditingSocket();
-socketAudits.put(System.identityHashCode(socket), new boolean[] { 
false, false });
+socketAudits.put(System.identityHashCode(socket), new boolean[] 
{false, false});
 return socket;
 }
 
@@ -119,13 +119,15 @@ public class FtpBadLoginConnectionLeakTest extends 
FtpServerTestSupport {
 @Override
 public void connect(SocketAddress endpoint, int timeout) throws 
IOException {
 super.connect(endpoint, timeout);
-socketAudits.get(System.identityHashCode(this))[0] = true;
+boolean[] value = socketAudits.get(System.identityHashCode(this));
+value[0] = true;
 }
 
 @Override
 public synchronized void close() throws IOException {
 super.close();
-socketAudits.get(System.identityHashCode(this))[1] = true;
+boolean[] value = socketAudits.get(System.identityHashCode(this));
+value[1] = true;
 }
 }
 

http://git-wip-us.apache.org/repos/asf/camel/blob/ef1df28f/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpBadLoginInProducerConnectionLeakTest.java
--
diff --git 
a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpBadLoginInProducerConnectionLeakTest.java
 
b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpBadLoginInProducerConnectionLeakTest.java
index e3314d0..db0ef36 100644
--- 
a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpBadLoginInProducerConnectionLeakTest.java
+++ 
b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpBadLoginInProducerConnectionLeakTest.java
@@ -36,8 +36,8 @@ public class FtpBadLoginInProducerConnectionLeakTest extends 
FtpServerTestSuppor
 private MapInteger, boolean[] socketAudits = new HashMap();
 
 private String getFtpUrl() {
-return ftp://dummy@localhost:; + getPort() + 
/badlogin?password=cantremebermaximumReconnectAttempts=3 +
-
throwExceptionOnConnectFailed=falseftpClient.socketFactory=#sf;
+return ftp://dummy@localhost:; + getPort() + 
/badlogin?password=cantremebermaximumReconnectAttempts=3
++ 
throwExceptionOnConnectFailed=falseftpClient.socketFactory=#sf;
 }
 
 @Override
@@ -51,7 +51,7 @@ public class FtpBadLoginInProducerConnectionLeakTest extends 
FtpServerTestSuppor
 
 @Test

[4/5] camel git commit: Fixed the CS error of camel-quartz

2015-05-08 Thread ningjiang 
Fixed the CS error of camel-quartz


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

Branch: refs/heads/master
Commit: 4da78831cfce6dbbc92b10ad1b5f388ad4008ad7
Parents: f55b0a0
Author: Willem Jiang willem.ji...@gmail.com
Authored: Fri May 8 19:29:30 2015 +0800
Committer: Willem Jiang willem.ji...@gmail.com
Committed: Fri May 8 19:43:25 2015 +0800

--
 .../java/org/apache/camel/component/quartz/QuartzComponent.java| 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/4da78831/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzComponent.java
--
diff --git 
a/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzComponent.java
 
b/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzComponent.java
index 53a81e5..d3e6bd0 100644
--- 
a/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzComponent.java
+++ 
b/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzComponent.java
@@ -53,7 +53,7 @@ import org.slf4j.LoggerFactory;
 public class QuartzComponent extends UriEndpointComponent implements 
StartupListener {
 private static final Logger LOG = 
LoggerFactory.getLogger(QuartzComponent.class);
 private Scheduler scheduler;
-private transient final ListJobToAdd jobsToAdd = new 
ArrayListJobToAdd();
+private final transient ListJobToAdd jobsToAdd = new 
ArrayListJobToAdd();
 private SchedulerFactory factory;
 private Properties properties;
 private String propertiesFile;

[1/2] camel git commit: Fixed the CS error of camel-gson and camel-xstream

2015-04-02 Thread ningjiang 
Repository: camel
Updated Branches:
  refs/heads/master c67392fe1 - c91c41d1a


Fixed the CS error of camel-gson and camel-xstream


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

Branch: refs/heads/master
Commit: c91c41d1af2f05ae9827cc5960129e422860d480
Parents: 3c3b0ed
Author: Willem Jiang willem.ji...@gmail.com
Authored: Fri Apr 3 09:20:00 2015 +0800
Committer: Willem Jiang willem.ji...@gmail.com
Committed: Fri Apr 3 09:20:31 2015 +0800

--
 .../component/gson/SpringGsonJsonDataFormatTest.java  |  6 +++---
 .../dataformat/xstream/MarshalDomainObjectJSONTest.java   | 10 +-
 2 files changed, 8 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/c91c41d1/components/camel-gson/src/test/java/org/apache/camel/component/gson/SpringGsonJsonDataFormatTest.java
--
diff --git 
a/components/camel-gson/src/test/java/org/apache/camel/component/gson/SpringGsonJsonDataFormatTest.java
 
b/components/camel-gson/src/test/java/org/apache/camel/component/gson/SpringGsonJsonDataFormatTest.java
index cece6fd..751f99b 100644
--- 
a/components/camel-gson/src/test/java/org/apache/camel/component/gson/SpringGsonJsonDataFormatTest.java
+++ 
b/components/camel-gson/src/test/java/org/apache/camel/component/gson/SpringGsonJsonDataFormatTest.java
@@ -58,9 +58,9 @@ public class SpringGsonJsonDataFormatTest extends 
CamelSpringTestSupport {
 
 Object marshalled = template.requestBody(direct:inPretty, in);
 String marshalledAsString = 
context.getTypeConverter().convertTo(String.class, marshalled);
-String expected = {\n + 
-\name\: \Camel\ +
-  \n};
+String expected = {\n 
+ +   \name\: \Camel\
+ + \n};
 assertEquals(expected, marshalledAsString);
 
 template.sendBody(direct:backPretty, marshalled);

http://git-wip-us.apache.org/repos/asf/camel/blob/c91c41d1/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/MarshalDomainObjectJSONTest.java
--
diff --git 
a/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/MarshalDomainObjectJSONTest.java
 
b/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/MarshalDomainObjectJSONTest.java
index 6c3cdac..55fbdf0 100644
--- 
a/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/MarshalDomainObjectJSONTest.java
+++ 
b/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/MarshalDomainObjectJSONTest.java
@@ -37,11 +37,11 @@ public class MarshalDomainObjectJSONTest extends 
MarshalDomainObjectTest {
 Object marshalled = template.requestBody(direct:inPretty, order);
 String marshalledAsString = 
context.getTypeConverter().convertTo(String.class, marshalled);
 // the line-separator used by JsonWriter is \n, even on windows
-String expected = 
{\org.apache.camel.dataformat.xstream.PurchaseOrder\: {\n +
-\name\: \pretty printed Camel\,\n+
-\price\: 7.91,\n +
-\amount\: 1.0\n +
-  }};
+String expected = 
{\org.apache.camel.dataformat.xstream.PurchaseOrder\: {\n
+  +   \name\: \pretty printed Camel\,\n 
+  +   \price\: 7.91,\n
+  +   \amount\: 1.0\n 
+  + }};
 assertEquals(expected, marshalledAsString);
 
 template.sendBody(direct:backPretty, marshalled);

[3/3] camel git commit: Fixed the CS error of camel-core

2015-03-18 Thread ningjiang 
Fixed the CS error of camel-core


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

Branch: refs/heads/master
Commit: 50954111924562c0bcf291008bdf3d1aad1e8e88
Parents: b3afcac
Author: Willem Jiang willem.ji...@gmail.com
Authored: Wed Mar 18 19:26:59 2015 +0800
Committer: Willem Jiang willem.ji...@gmail.com
Committed: Wed Mar 18 19:30:36 2015 +0800

--
 .../apache/camel/impl/PojoProduceProxyInterceptEndpointTest.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/50954111/camel-core/src/test/java/org/apache/camel/impl/PojoProduceProxyInterceptEndpointTest.java
--
diff --git 
a/camel-core/src/test/java/org/apache/camel/impl/PojoProduceProxyInterceptEndpointTest.java
 
b/camel-core/src/test/java/org/apache/camel/impl/PojoProduceProxyInterceptEndpointTest.java
index f03ec9d..b9f24be 100644
--- 
a/camel-core/src/test/java/org/apache/camel/impl/PojoProduceProxyInterceptEndpointTest.java
+++ 
b/camel-core/src/test/java/org/apache/camel/impl/PojoProduceProxyInterceptEndpointTest.java
@@ -89,8 +89,8 @@ public class PojoProduceProxyInterceptEndpointTest extends 
TestCase {
 context.stop();
 }
 
-public static interface EchoService {
-public String echo(String word);
+public interface EchoService {
+String echo(String word);
 }
 
 public static class MyBean {

[3/3] camel git commit: Fixed the CS error of camel-sjms

2015-03-17 Thread ningjiang 
Fixed the CS error of camel-sjms


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

Branch: refs/heads/master
Commit: e7fde3731fef4c840d2659210e292d3b365bc7a6
Parents: 3bcc9d4
Author: Willem Jiang willem.ji...@gmail.com
Authored: Wed Mar 18 09:49:57 2015 +0800
Committer: Willem Jiang willem.ji...@gmail.com
Committed: Wed Mar 18 09:53:00 2015 +0800

--
 .../java/org/apache/camel/component/sjms/jms/JmsMessageHelper.java  | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/e7fde373/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/jms/JmsMessageHelper.java
--
diff --git 
a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/jms/JmsMessageHelper.java
 
b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/jms/JmsMessageHelper.java
index f065bbe..dcccd9b 100644
--- 
a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/jms/JmsMessageHelper.java
+++ 
b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/jms/JmsMessageHelper.java
@@ -204,6 +204,7 @@ public final class JmsMessageHelper implements JmsConstants 
{
 } else {
 throw new JMSException(Null body is not allowed);
 }
+break;
 default:
 break;
 }

camel git commit: Fixed the CS error of camel-hdfs and camel-hdfs2

2015-03-06 Thread ningjiang 
Repository: camel
Updated Branches:
  refs/heads/master 5831060cd - e9d0cf4dc


Fixed the CS error of camel-hdfs and camel-hdfs2


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

Branch: refs/heads/master
Commit: e9d0cf4dc830a5bb94bbd670dd50d8f071d90ab4
Parents: 5831060
Author: Willem Jiang willem.ji...@gmail.com
Authored: Fri Mar 6 16:30:15 2015 +0800
Committer: Willem Jiang willem.ji...@gmail.com
Committed: Fri Mar 6 16:30:38 2015 +0800

--
 .../camel/component/hdfs/HdfsConsumerTest.java   |  3 +--
 .../camel/component/hdfs2/HdfsConsumerTest.java  |  3 +--
 .../component/hdfs2/integration/HdfsAppendTest.java  |  2 +-
 .../HdfsProducerConsumerIntegrationTest.java | 15 ---
 4 files changed, 7 insertions(+), 16 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/e9d0cf4d/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/HdfsConsumerTest.java
--
diff --git 
a/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/HdfsConsumerTest.java
 
b/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/HdfsConsumerTest.java
index 25d1073..9488afb 100644
--- 
a/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/HdfsConsumerTest.java
+++ 
b/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/HdfsConsumerTest.java
@@ -59,6 +59,7 @@ import static org.apache.hadoop.io.SequenceFile.createWriter;
 import static org.hamcrest.CoreMatchers.equalTo;
 
 public class HdfsConsumerTest extends HdfsTestSupport {
+private static final int ITERATIONS = 200;
 
 @Override
 public boolean isUseRouteBuilder() {
@@ -117,8 +118,6 @@ public class HdfsConsumerTest extends HdfsTestSupport {
 return;
 }
 
-int ITERATIONS = 200;
-
 final File dir = new File(target/test/multiple-consumers);
 dir.mkdirs();
 for (int i = 1; i = ITERATIONS; i++) {

http://git-wip-us.apache.org/repos/asf/camel/blob/e9d0cf4d/components/camel-hdfs2/src/test/java/org/apache/camel/component/hdfs2/HdfsConsumerTest.java
--
diff --git 
a/components/camel-hdfs2/src/test/java/org/apache/camel/component/hdfs2/HdfsConsumerTest.java
 
b/components/camel-hdfs2/src/test/java/org/apache/camel/component/hdfs2/HdfsConsumerTest.java
index 06115f1..fdbfd73 100644
--- 
a/components/camel-hdfs2/src/test/java/org/apache/camel/component/hdfs2/HdfsConsumerTest.java
+++ 
b/components/camel-hdfs2/src/test/java/org/apache/camel/component/hdfs2/HdfsConsumerTest.java
@@ -60,6 +60,7 @@ import static 
org.apache.hadoop.io.SequenceFile.CompressionType;
 import static org.hamcrest.CoreMatchers.equalTo;
 
 public class HdfsConsumerTest extends HdfsTestSupport {
+private static final int ITERATIONS = 200;
 
 @Override
 public boolean isUseRouteBuilder() {
@@ -118,8 +119,6 @@ public class HdfsConsumerTest extends HdfsTestSupport {
 return;
 }
 
-int ITERATIONS = 200;
-
 final File dir = new File(target/test/multiple-consumers);
 dir.mkdirs();
 for (int i = 1; i = ITERATIONS; i++) {

http://git-wip-us.apache.org/repos/asf/camel/blob/e9d0cf4d/components/camel-hdfs2/src/test/java/org/apache/camel/component/hdfs2/integration/HdfsAppendTest.java
--
diff --git 
a/components/camel-hdfs2/src/test/java/org/apache/camel/component/hdfs2/integration/HdfsAppendTest.java
 
b/components/camel-hdfs2/src/test/java/org/apache/camel/component/hdfs2/integration/HdfsAppendTest.java
index 5c3f7f8..0018446 100644
--- 
a/components/camel-hdfs2/src/test/java/org/apache/camel/component/hdfs2/integration/HdfsAppendTest.java
+++ 
b/components/camel-hdfs2/src/test/java/org/apache/camel/component/hdfs2/integration/HdfsAppendTest.java
@@ -29,6 +29,7 @@ import org.junit.Test;
 
 @Ignore(Must run manual)
 public class HdfsAppendTest extends CamelTestSupport {
+private static final int ITERATIONS = 10;
 
 @Override
 public boolean isUseRouteBuilder() {
@@ -84,7 +85,6 @@ public class HdfsAppendTest extends CamelTestSupport {
 
 @Test
 public void testAppendWithDynamicFileName() throws Exception {
-int ITERATIONS = 10;
 
 context.addRoutes(new RouteBuilder() {
 @Override

http://git-wip-us.apache.org/repos/asf/camel/blob/e9d0cf4d/components/camel-hdfs2/src/test/java/org/apache/camel/component/hdfs2/integration/HdfsProducerConsumerIntegrationTest.java

camel git commit: Fixed the CS error

2015-03-03 Thread ningjiang 
Repository: camel
Updated Branches:
  refs/heads/camel-2.14.x 7e6168a49 - 87c6ec54a


Fixed the CS error


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

Branch: refs/heads/camel-2.14.x
Commit: 87c6ec54a73f7c2462fb3cc85c5d08e180eabecc
Parents: 7e6168a
Author: Willem Jiang willem.ji...@gmail.com
Authored: Tue Mar 3 09:01:03 2015 +
Committer: Willem Jiang willem.ji...@gmail.com
Committed: Tue Mar 3 09:01:03 2015 +

--
 .../main/java/org/apache/camel/jsonpath/JsonPathEngine.java| 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/87c6ec54/components/camel-jsonpath/src/main/java/org/apache/camel/jsonpath/JsonPathEngine.java
--
diff --git 
a/components/camel-jsonpath/src/main/java/org/apache/camel/jsonpath/JsonPathEngine.java
 
b/components/camel-jsonpath/src/main/java/org/apache/camel/jsonpath/JsonPathEngine.java
index c0fb720..6d52226 100644
--- 
a/components/camel-jsonpath/src/main/java/org/apache/camel/jsonpath/JsonPathEngine.java
+++ 
b/components/camel-jsonpath/src/main/java/org/apache/camel/jsonpath/JsonPathEngine.java
@@ -22,6 +22,9 @@ import java.io.InputStream;
 import java.net.URL;
 import java.nio.charset.Charset;
 
+import com.jayway.jsonpath.Configuration;
+import com.jayway.jsonpath.JsonPath;
+
 import org.apache.camel.Exchange;
 import org.apache.camel.InvalidPayloadException;
 import org.apache.camel.NoTypeConversionAvailableException;
@@ -29,9 +32,6 @@ import org.apache.camel.WrappedFile;
 import org.apache.camel.component.file.GenericFile;
 import org.apache.camel.component.file.GenericFileConverter;
 
-import com.jayway.jsonpath.Configuration;
-import com.jayway.jsonpath.JsonPath;
-
 public class JsonPathEngine {
 
 private final JsonPath path;

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

2015-02-24 Thread ningjiang 
Fixed the 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/7517eb88
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/7517eb88
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/7517eb88

Branch: refs/heads/master
Commit: 7517eb8812cb8d0a22ca95537b176ab827013b06
Parents: 6c58bd0
Author: Willem Jiang willem.ji...@gmail.com
Authored: Wed Feb 25 14:30:41 2015 +0800
Committer: Willem Jiang willem.ji...@gmail.com
Committed: Wed Feb 25 14:30:41 2015 +0800

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


http://git-wip-us.apache.org/repos/asf/camel/blob/7517eb88/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsConsumerTest.java
--
diff --git 
a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsConsumerTest.java
 
b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsConsumerTest.java
index cd6d683..d5153dd 100644
--- 
a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsConsumerTest.java
+++ 
b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsConsumerTest.java
@@ -179,7 +179,7 @@ public class CxfRsConsumerTest extends CamelTestSupport {
 }
 }
  
-private static abstract class AbstractTestProcessor implements Processor {
+private abstract static class AbstractTestProcessor implements Processor {
 public void processGetCustomer(Exchange exchange) throws Exception {
 Message inMessage = exchange.getIn();
 String httpMethod = inMessage.getHeader(Exchange.HTTP_METHOD, 
String.class);

[4/5] camel git commit: Fixed the CS error of camel-ganglia

2015-02-24 Thread ningjiang 
Fixed the CS error of camel-ganglia


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

Branch: refs/heads/master
Commit: 245e68c7fc034afc3c0d88a0d7a204c20d5ff184
Parents: e9e686e
Author: Willem Jiang willem.ji...@gmail.com
Authored: Wed Feb 25 13:32:16 2015 +0800
Committer: Willem Jiang willem.ji...@gmail.com
Committed: Wed Feb 25 13:32:16 2015 +0800

--
 .../org/apache/camel/component/ganglia/GangliaConfiguration.java | 2 +-
 .../java/org/apache/camel/component/ganglia/GangliaProducer.java | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/245e68c7/components/camel-ganglia/src/main/java/org/apache/camel/component/ganglia/GangliaConfiguration.java
--
diff --git 
a/components/camel-ganglia/src/main/java/org/apache/camel/component/ganglia/GangliaConfiguration.java
 
b/components/camel-ganglia/src/main/java/org/apache/camel/component/ganglia/GangliaConfiguration.java
index 3a3613e..1133894 100644
--- 
a/components/camel-ganglia/src/main/java/org/apache/camel/component/ganglia/GangliaConfiguration.java
+++ 
b/components/camel-ganglia/src/main/java/org/apache/camel/component/ganglia/GangliaConfiguration.java
@@ -65,7 +65,7 @@ public class GangliaConfiguration implements Cloneable {
 private String groupName = DEFAULT_GROUP_NAME;
 
 @UriParam
-private String prefix = null;
+private String prefix;
 
 @UriParam(defaultValue = metric)
 private String metricName = DEFAULT_METRIC_NAME;

http://git-wip-us.apache.org/repos/asf/camel/blob/245e68c7/components/camel-ganglia/src/main/java/org/apache/camel/component/ganglia/GangliaProducer.java
--
diff --git 
a/components/camel-ganglia/src/main/java/org/apache/camel/component/ganglia/GangliaProducer.java
 
b/components/camel-ganglia/src/main/java/org/apache/camel/component/ganglia/GangliaProducer.java
index 101e8e9..8f8ca5c 100644
--- 
a/components/camel-ganglia/src/main/java/org/apache/camel/component/ganglia/GangliaProducer.java
+++ 
b/components/camel-ganglia/src/main/java/org/apache/camel/component/ganglia/GangliaProducer.java
@@ -79,8 +79,8 @@ public class GangliaProducer extends DefaultProducer {
 }
 
 String value = message.getBody(String.class);
-if ((value == null || value.length() == 0) 
-(type == GMetricType.FLOAT || type == GMetricType.DOUBLE)) {
+if ((value == null || value.length() == 0)
+ (type == GMetricType.FLOAT || type == GMetricType.DOUBLE)) {
 log.debug(Metric {} string value was null, using NaN, 
metricName);
 value = NaN;
 }

camel git commit: Fixed the CS error of camel-core

2015-02-12 Thread ningjiang 
Repository: camel
Updated Branches:
  refs/heads/master 43dde0e41 - a6c39ce4a


Fixed the CS error of camel-core


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

Branch: refs/heads/master
Commit: a6c39ce4ac106711ca25196269f085247dd2e36c
Parents: 43dde0e
Author: Willem Jiang willem.ji...@gmail.com
Authored: Fri Feb 13 11:09:55 2015 +0800
Committer: Willem Jiang willem.ji...@gmail.com
Committed: Fri Feb 13 14:03:25 2015 +0800

--
 .../org/apache/camel/management/ManagedCamelContextTest.java  | 7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/a6c39ce4/camel-core/src/test/java/org/apache/camel/management/ManagedCamelContextTest.java
--
diff --git 
a/camel-core/src/test/java/org/apache/camel/management/ManagedCamelContextTest.java
 
b/camel-core/src/test/java/org/apache/camel/management/ManagedCamelContextTest.java
index bcf1535..c6e4f1e 100644
--- 
a/camel-core/src/test/java/org/apache/camel/management/ManagedCamelContextTest.java
+++ 
b/camel-core/src/test/java/org/apache/camel/management/ManagedCamelContextTest.java
@@ -17,18 +17,16 @@
 package org.apache.camel.management;
 
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 import java.util.Properties;
+
 import javax.management.MBeanServer;
 import javax.management.ObjectName;
-import javax.management.openmbean.TabularData;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.util.StringHelper;
-import org.junit.Ignore;
 
 /**
  * @version 
@@ -367,7 +365,8 @@ public class ManagedCamelContextTest extends 
ManagementTestSupport {
 
 assertTrue(json.contains(\description\: \The SEDA Component is for 
asynchronous SEDA exchanges on a BlockingQueue within a CamelContext\));
 assertTrue(json.contains(\label\: \core,endpoint\));
-assertTrue(json.contains(\defaultQueueFactory\: { \kind\: 
\property\, \type\: \object\, \javaType\: 
\org.apache.camel.component.seda.BlockingQueueFactoryorg.apache.camel.Exchange\,));
+assertTrue(json.contains(\defaultQueueFactory\: { \kind\: 
\property\, \type\: \object\, \javaType\:
++  
\org.apache.camel.component.seda.BlockingQueueFactoryorg.apache.camel.Exchange\,));
 assertTrue(json.contains(\queueSize\: { \kind\: \property\, 
\type\: \integer\, \javaType\: \int\, \deprecated\: \false\, 
\value\: \0\));
 }

[1/2] camel git commit: Fixed the CS error of camel-jms

2015-02-11 Thread ningjiang 
Repository: camel
Updated Branches:
  refs/heads/master 0e50f2c70 - d1b1db91f


Fixed the CS error of camel-jms


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

Branch: refs/heads/master
Commit: d1b1db91f7414c4e6dc2b4469a38301781cec570
Parents: 057e95f
Author: Willem Jiang willem.ji...@gmail.com
Authored: Wed Feb 11 17:47:31 2015 +0800
Committer: Willem Jiang willem.ji...@gmail.com
Committed: Wed Feb 11 17:48:11 2015 +0800

--
 .../camel/component/jms/reply/TemporaryQueueReplyManager.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/d1b1db91/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/TemporaryQueueReplyManager.java
--
diff --git 
a/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/TemporaryQueueReplyManager.java
 
b/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/TemporaryQueueReplyManager.java
index fc0a4e7..123b9cd 100644
--- 
a/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/TemporaryQueueReplyManager.java
+++ 
b/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/TemporaryQueueReplyManager.java
@@ -140,7 +140,8 @@ public class TemporaryQueueReplyManager extends 
ReplyManagerSupport {
 if (endpoint.getErrorHandler() != null) {
 answer.setErrorHandler(endpoint.getErrorHandler());
 } else {
-answer.setErrorHandler(new 
DefaultSpringErrorHandler(endpoint.getCamelContext(), 
TemporaryQueueReplyManager.class, endpoint.getErrorHandlerLoggingLevel(), 
endpoint.isErrorHandlerLogStackTrace()));
+answer.setErrorHandler(new 
DefaultSpringErrorHandler(endpoint.getCamelContext(), 
TemporaryQueueReplyManager.class, 
+ 
endpoint.getErrorHandlerLoggingLevel(), 
endpoint.isErrorHandlerLogStackTrace()));
 }
 if (endpoint.getReceiveTimeout() = 0) {
 answer.setReceiveTimeout(endpoint.getReceiveTimeout());

[1/2] camel git commit: Fixed the CS error of camel-rabbitmq

2015-02-04 Thread ningjiang 
Repository: camel
Updated Branches:
  refs/heads/master 99804d8fe - 8494f7b5a


Fixed the CS error of camel-rabbitmq


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

Branch: refs/heads/master
Commit: de2fe75563710a6907f6bbab9214b8047d79b99b
Parents: 99804d8
Author: Willem Jiang willem.ji...@gmail.com
Authored: Wed Feb 4 14:42:35 2015 +0800
Committer: Willem Jiang willem.ji...@gmail.com
Committed: Wed Feb 4 16:18:04 2015 +0800

--
 .../java/org/apache/camel/component/rabbitmq/RabbitMQProducer.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/de2fe755/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQProducer.java
--
diff --git 
a/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQProducer.java
 
b/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQProducer.java
index 96bd516..6652544 100644
--- 
a/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQProducer.java
+++ 
b/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQProducer.java
@@ -52,7 +52,7 @@ public class RabbitMQProducer extends DefaultProducer {
 /**
  * Channel callback (similar to Spring JDBC ConnectionCallback)
  */
-private static interface ChannelCallbackT {
+private interface ChannelCallbackT {
 T doWithChannel(Channel channel) throws Exception;
 }

[1/5] camel git commit: Fixed the CS error of apt

2015-02-01 Thread ningjiang 
Repository: camel
Updated Branches:
  refs/heads/master 9dcd714b9 - 1175b2752


Fixed the CS error of apt


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

Branch: refs/heads/master
Commit: 3058e326ccbc6470b8850bfb6d2412bb700794dd
Parents: 3ca7f7b
Author: Willem Jiang willem.ji...@gmail.com
Authored: Mon Feb 2 11:01:02 2015 +0800
Committer: Willem Jiang willem.ji...@gmail.com
Committed: Mon Feb 2 11:02:40 2015 +0800

--
 .../org/apache/camel/tools/apt/EipAnnotationProcessor.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/3058e326/tooling/apt/src/main/java/org/apache/camel/tools/apt/EipAnnotationProcessor.java
--
diff --git 
a/tooling/apt/src/main/java/org/apache/camel/tools/apt/EipAnnotationProcessor.java
 
b/tooling/apt/src/main/java/org/apache/camel/tools/apt/EipAnnotationProcessor.java
index 892ed8c..d3bda3b 100644
--- 
a/tooling/apt/src/main/java/org/apache/camel/tools/apt/EipAnnotationProcessor.java
+++ 
b/tooling/apt/src/main/java/org/apache/camel/tools/apt/EipAnnotationProcessor.java
@@ -61,8 +61,8 @@ public class EipAnnotationProcessor extends 
AbstractAnnotationProcessor {
 private static final String ONE_OF_LANGUAGES = 
org.apache.camel.model.language.ExpressionDefinition;
 // special for inputs (these classes have sub classes, so we use this to 
find all classes)
 private static final String[] ONE_OF_INPUTS = new String[]{
-org.apache.camel.model.ProcessorDefinition,
-org.apache.camel.model.VerbDefinition
+org.apache.camel.model.ProcessorDefinition,
+org.apache.camel.model.VerbDefinition
 };
 // special for outputs (these classes have sub classes, so we use this to 
find all classes)
 private static final String[] ONE_OF_OUTPUTS = new String[]{
@@ -933,7 +933,7 @@ public class EipAnnotationProcessor extends 
AbstractAnnotationProcessor {
 }
 }
 
-private static class EipOptionComparator implements ComparatorEipOption {
+private static final class EipOptionComparator implements 
ComparatorEipOption {
 
 private final EipModel model;

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

2015-02-01 Thread ningjiang 
Fixed the CS error of camel-core


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

Branch: refs/heads/master
Commit: 3ca7f7b82f142c8dd4ff8eca227c51cfc698cc94
Parents: 06c9b2c
Author: Willem Jiang willem.ji...@gmail.com
Authored: Mon Feb 2 11:00:19 2015 +0800
Committer: Willem Jiang willem.ji...@gmail.com
Committed: Mon Feb 2 11:02:40 2015 +0800

--
 .../apache/camel/processor/RecipientListExchangePropertyTest.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/3ca7f7b8/camel-core/src/test/java/org/apache/camel/processor/RecipientListExchangePropertyTest.java
--
diff --git 
a/camel-core/src/test/java/org/apache/camel/processor/RecipientListExchangePropertyTest.java
 
b/camel-core/src/test/java/org/apache/camel/processor/RecipientListExchangePropertyTest.java
index 784c5ed..04f83b8 100644
--- 
a/camel-core/src/test/java/org/apache/camel/processor/RecipientListExchangePropertyTest.java
+++ 
b/camel-core/src/test/java/org/apache/camel/processor/RecipientListExchangePropertyTest.java
@@ -55,7 +55,7 @@ public class RecipientListExchangePropertyTest extends 
ContextTestSupport {
 
 }
 
-private static class MyStuff {
+private static final class MyStuff {
 
 private String name;

[1/2] camel git commit: Fixed the CS error of camel-flatpack

2015-01-09 Thread ningjiang 
Repository: camel
Updated Branches:
  refs/heads/master 22d596737 - 21f69939d


Fixed the CS error of camel-flatpack


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

Branch: refs/heads/master
Commit: 21f69939ddb463b18fa603e36510f0011aba2a2c
Parents: 68a0d0f
Author: Willem Jiang willem.ji...@gmail.com
Authored: Fri Jan 9 21:51:30 2015 +0800
Committer: Willem Jiang willem.ji...@gmail.com
Committed: Fri Jan 9 21:51:52 2015 +0800

--
 .../org/apache/camel/component/flatpack/FlatpackEndpoint.java  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/21f69939/components/camel-flatpack/src/main/java/org/apache/camel/component/flatpack/FlatpackEndpoint.java
--
diff --git 
a/components/camel-flatpack/src/main/java/org/apache/camel/component/flatpack/FlatpackEndpoint.java
 
b/components/camel-flatpack/src/main/java/org/apache/camel/component/flatpack/FlatpackEndpoint.java
index a8789cc..3d24363 100644
--- 
a/components/camel-flatpack/src/main/java/org/apache/camel/component/flatpack/FlatpackEndpoint.java
+++ 
b/components/camel-flatpack/src/main/java/org/apache/camel/component/flatpack/FlatpackEndpoint.java
@@ -49,14 +49,14 @@ import org.apache.camel.util.ResourceHelper;
  */
 @UriEndpoint(scheme = flatpack, consumerClass = FlatpackConsumer.class, 
label = transformation)
 public class FlatpackEndpoint extends DefaultPollingEndpoint {
+@UriPath
+protected String resourceUri;
 
 private LoadBalancer loadBalancer = new RoundRobinLoadBalancer();
 private ParserFactory parserFactory = DefaultParserFactory.getInstance();
-
+   
 @UriPath
 private FlatpackType type;
-@UriPath
-protected String resourceUri;
 
 @UriParam(defaultValue = true)
 private boolean splitRows = true;

[3/3] camel git commit: Fixed the CS error of camel component

2014-12-17 Thread ningjiang 
Fixed the CS error of camel component


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

Branch: refs/heads/master
Commit: ccab027f48df20e04c21e48ab0ce34056facffc5
Parents: 5bd61ab
Author: Willem Jiang willem.ji...@gmail.com
Authored: Thu Dec 18 11:23:29 2014 +0800
Committer: Willem Jiang willem.ji...@gmail.com
Committed: Thu Dec 18 14:20:49 2014 +0800

--
 .../camel/component/jetty/DefaultJettyHttpBinding.java|  2 +-
 .../java/org/apache/camel/test/junit4/TestSupport.java| 10 +-
 2 files changed, 6 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/ccab027f/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/DefaultJettyHttpBinding.java
--
diff --git 
a/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/DefaultJettyHttpBinding.java
 
b/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/DefaultJettyHttpBinding.java
index 5137d15..92b6c21 100644
--- 
a/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/DefaultJettyHttpBinding.java
+++ 
b/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/DefaultJettyHttpBinding.java
@@ -192,7 +192,7 @@ public class DefaultJettyHttpBinding implements 
JettyHttpBinding {
 }
 
 MapString, String getSimpleMap(MapString, CollectionString headers) {
-MapString, String result = new HashMapString ,String();
+MapString, String result = new HashMapString , String();
 for (String key : headers.keySet()) {
 CollectionString valueCol = headers.get(key);
 String value = (valueCol == null) ? null : 
valueCol.iterator().next();

http://git-wip-us.apache.org/repos/asf/camel/blob/ccab027f/components/camel-test/src/main/java/org/apache/camel/test/junit4/TestSupport.java
--
diff --git 
a/components/camel-test/src/main/java/org/apache/camel/test/junit4/TestSupport.java
 
b/components/camel-test/src/main/java/org/apache/camel/test/junit4/TestSupport.java
index f086c82..0df328a 100644
--- 
a/components/camel-test/src/main/java/org/apache/camel/test/junit4/TestSupport.java
+++ 
b/components/camel-test/src/main/java/org/apache/camel/test/junit4/TestSupport.java
@@ -149,11 +149,11 @@ public abstract class TestSupport extends Assert {
 }
 
 public static T extends Throwable T assertThrowable(ClassT 
expectedType, Throwable t) {
-   assertNotNull(Expected an exinstance of type:  + 
expectedType.getName() +  but was null, t);
-   if (!expectedType.isInstance(t)) {
-   throw new AssertionError(Unexpected throwable, t);
-   }
-   return expectedType.cast(t);
+assertNotNull(Expected an exinstance of type:  + 
expectedType.getName() +  but was null, t);
+if (!expectedType.isInstance(t)) {
+throw new AssertionError(Unexpected throwable, t);
+}
+return expectedType.cast(t);
 }
 
 public static void assertEndpointUri(Endpoint endpoint, String uri) {

[3/3] camel git commit: Fixed the CS error of camel-velocity

2014-12-02 Thread ningjiang 
Fixed the CS error of camel-velocity


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

Branch: refs/heads/master
Commit: 897805a2bd2ccc20880da6c9b9fc85457fea9844
Parents: d33319f
Author: Willem Jiang willem.ji...@gmail.com
Authored: Tue Dec 2 20:34:52 2014 +0800
Committer: Willem Jiang willem.ji...@gmail.com
Committed: Tue Dec 2 20:44:15 2014 +0800

--
 .../apache/camel/component/velocity/VelocityComponent.java   | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/897805a2/components/camel-velocity/src/main/java/org/apache/camel/component/velocity/VelocityComponent.java
--
diff --git 
a/components/camel-velocity/src/main/java/org/apache/camel/component/velocity/VelocityComponent.java
 
b/components/camel-velocity/src/main/java/org/apache/camel/component/velocity/VelocityComponent.java
index e9421da..97f3244 100644
--- 
a/components/camel-velocity/src/main/java/org/apache/camel/component/velocity/VelocityComponent.java
+++ 
b/components/camel-velocity/src/main/java/org/apache/camel/component/velocity/VelocityComponent.java
@@ -28,6 +28,10 @@ import org.apache.velocity.app.VelocityEngine;
  */
 public class VelocityComponent extends UriEndpointComponent {
 private VelocityEngine velocityEngine;
+
+public VelocityComponent() {
+super(VelocityEndpoint.class);
+}
 
 public VelocityEngine getVelocityEngine() {
 return velocityEngine;
@@ -37,10 +41,6 @@ public class VelocityComponent extends UriEndpointComponent {
 this.velocityEngine = velocityEngine;
 }
 
-public VelocityComponent() {
-super(VelocityEndpoint.class);
-}
-
 protected Endpoint createEndpoint(String uri, String remaining, 
MapString, Object parameters) throws Exception {
 boolean cache = getAndRemoveParameter(parameters, contentCache, 
Boolean.class, Boolean.TRUE);

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

2014-11-16 Thread ningjiang 
Fixed the CS error of camel-metrics


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

Branch: refs/heads/master
Commit: dc24362ce436294d9e104aee66c796dc802c39a3
Parents: affeb0e
Author: Willem Jiang willem.ji...@gmail.com
Authored: Mon Nov 17 15:38:41 2014 +0800
Committer: Willem Jiang willem.ji...@gmail.com
Committed: Mon Nov 17 15:38:41 2014 +0800

--
 .../java/org/apache/camel/component/metrics/CounterProducer.java   | 2 --
 1 file changed, 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/dc24362c/components/camel-metrics/src/main/java/org/apache/camel/component/metrics/CounterProducer.java
--
diff --git 
a/components/camel-metrics/src/main/java/org/apache/camel/component/metrics/CounterProducer.java
 
b/components/camel-metrics/src/main/java/org/apache/camel/component/metrics/CounterProducer.java
index afb9a7b..008299c 100644
--- 
a/components/camel-metrics/src/main/java/org/apache/camel/component/metrics/CounterProducer.java
+++ 
b/components/camel-metrics/src/main/java/org/apache/camel/component/metrics/CounterProducer.java
@@ -20,8 +20,6 @@ import com.codahale.metrics.Counter;
 import com.codahale.metrics.MetricRegistry;
 import org.apache.camel.Exchange;
 import org.apache.camel.Message;
-import org.apache.camel.component.metrics.AbstractMetricsProducer;
-import org.apache.camel.component.metrics.MetricsEndpoint;
 
 import static 
org.apache.camel.component.metrics.MetricsConstants.HEADER_COUNTER_DECREMENT;
 import static 
org.apache.camel.component.metrics.MetricsConstants.HEADER_COUNTER_INCREMENT;

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

2014-11-13 Thread ningjiang 
Fixed an CS error of camel-core


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

Branch: refs/heads/master
Commit: 552f99ac18067b9c53536193c9a1c349529444a5
Parents: 6bd3ad9
Author: Willem Jiang willem.ji...@gmail.com
Authored: Thu Nov 13 21:33:45 2014 +0800
Committer: Willem Jiang willem.ji...@gmail.com
Committed: Thu Nov 13 21:47:13 2014 +0800

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


http://git-wip-us.apache.org/repos/asf/camel/blob/552f99ac/camel-core/src/main/java/org/apache/camel/util/JsonSchemaHelper.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/util/JsonSchemaHelper.java 
b/camel-core/src/main/java/org/apache/camel/util/JsonSchemaHelper.java
index 76f27be..3ab566b 100644
--- a/camel-core/src/main/java/org/apache/camel/util/JsonSchemaHelper.java
+++ b/camel-core/src/main/java/org/apache/camel/util/JsonSchemaHelper.java
@@ -46,7 +46,8 @@ public final class JsonSchemaHelper {
 return enum;
 } else if (type.isArray()) {
 return array;
-} if (type.isAssignableFrom(URI.class) || 
type.isAssignableFrom(URL.class)) {
+} 
+if (type.isAssignableFrom(URI.class) || 
type.isAssignableFrom(URL.class)) {
 return sting;
 }

[1/5] camel git commit: Fixed a CS error of camel-apt

2014-11-12 Thread ningjiang 
Repository: camel
Updated Branches:
  refs/heads/master f3b10c550 - 9378d293e


Fixed a CS error of camel-apt


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

Branch: refs/heads/master
Commit: 4c363a1bee919e1cee47ffc2fc24cf47cec51d5b
Parents: f3b10c5
Author: Willem Jiang willem.ji...@gmail.com
Authored: Wed Nov 12 16:12:13 2014 +0800
Committer: Willem Jiang willem.ji...@gmail.com
Committed: Wed Nov 12 17:14:37 2014 +0800

--
 tooling/apt/src/main/java/org/apache/camel/tools/apt/IOHelper.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/4c363a1b/tooling/apt/src/main/java/org/apache/camel/tools/apt/IOHelper.java
--
diff --git a/tooling/apt/src/main/java/org/apache/camel/tools/apt/IOHelper.java 
b/tooling/apt/src/main/java/org/apache/camel/tools/apt/IOHelper.java
index e6c764a..d4c1717 100644
--- a/tooling/apt/src/main/java/org/apache/camel/tools/apt/IOHelper.java
+++ b/tooling/apt/src/main/java/org/apache/camel/tools/apt/IOHelper.java
@@ -22,7 +22,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 
-class IOHelper {
+final class IOHelper {
 
 private IOHelper() {
 }

[2/5] camel git commit: Fixed the CS error of camel-karaf-component

2014-11-12 Thread ningjiang 
Fixed the CS error of camel-karaf-component


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

Branch: refs/heads/master
Commit: 49ab630dd0ca1ce51475038d3bb6d857bebef833
Parents: 4c5ae14
Author: Willem Jiang willem.ji...@gmail.com
Authored: Wed Nov 12 16:13:05 2014 +0800
Committer: Willem Jiang willem.ji...@gmail.com
Committed: Wed Nov 12 17:14:38 2014 +0800

--
 .../main/java/org/apache/camel/karaf/commands/ComponentList.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/49ab630d/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/ComponentList.java
--
diff --git 
a/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/ComponentList.java
 
b/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/ComponentList.java
index 1c196a3..43d1a69 100644
--- 
a/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/ComponentList.java
+++ 
b/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/ComponentList.java
@@ -51,7 +51,7 @@ public class ComponentList extends CamelCommandSupport {
 
 @Option(name = --verbose, aliases = -v, description = Verbose output 
which shows more information,
 required = false, multiValued = false, valueToShowInHelp = false)
-boolean verbose = false;
+boolean verbose;
 
 protected Object doExecute() throws Exception {
 ListMapString, String components = 
camelController.listComponents(name);

[3/6] camel git commit: Fixed the CS error of camel-sql

2014-11-10 Thread ningjiang 
Fixed the CS error of camel-sql


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

Branch: refs/heads/master
Commit: 9ac4e742c64540896c87d367556ad6e7fbf529e5
Parents: 07eb9a4
Author: Willem Jiang willem.ji...@gmail.com
Authored: Mon Nov 10 15:47:02 2014 +0800
Committer: Willem Jiang willem.ji...@gmail.com
Committed: Mon Nov 10 21:11:41 2014 +0800

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


http://git-wip-us.apache.org/repos/asf/camel/blob/9ac4e742/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlEndpoint.java
--
diff --git 
a/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlEndpoint.java
 
b/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlEndpoint.java
index 9e0df84..8f47b24 100644
--- 
a/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlEndpoint.java
+++ 
b/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlEndpoint.java
@@ -251,7 +251,8 @@ public class SqlEndpoint extends DefaultPollingEndpoint {
  * Make the output of consumer or producer to SelectList as List of Map, 
or SelectOne as single Java object in the following way:
  * a) If the query has only single column, then that JDBC Column object is 
returned. (such as SELECT COUNT( * ) FROM PROJECT will return a Long object.
  * b) If the query has more than one column, then it will return a Map of 
that result.
- * c) If the outputClass is set, then it will convert the query result 
into an Java bean object by calling all the setters that match the column 
names. It will assume your class has a default constructor to create instance 
with.
+ * c) If the outputClass is set, then it will convert the query result 
into an Java bean object by calling all the setters that match the column 
names. 
+ * It will assume your class has a default constructor to create instance 
with.
  * d) If the query resulted in more than one rows, it throws an non-unique 
result exception.
  */
 public void setOutputType(SqlOutputType outputType) {

[5/5] camel git commit: Fixed the CS error of camel-solr

2014-11-06 Thread ningjiang 
Fixed the CS error of camel-solr


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

Branch: refs/heads/master
Commit: 4fa9ef24e1cc6ff99b7c088ad210847cfa05ca31
Parents: e402b87
Author: Willem Jiang willem.ji...@gmail.com
Authored: Fri Nov 7 10:38:42 2014 +0800
Committer: Willem Jiang willem.ji...@gmail.com
Committed: Fri Nov 7 10:38:42 2014 +0800

--
 .../java/org/apache/camel/component/solr/SolrAddBeansTest.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/4fa9ef24/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrAddBeansTest.java
--
diff --git 
a/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrAddBeansTest.java
 
b/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrAddBeansTest.java
index ea46094..8c73129 100644
--- 
a/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrAddBeansTest.java
+++ 
b/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrAddBeansTest.java
@@ -25,10 +25,10 @@ import org.junit.Test;
 public class SolrAddBeansTest extends SolrComponentTestSupport {
 
 public SolrAddBeansTest(SolrFixtures.TestServerType serverToTest) {
-   super(serverToTest);
-   }
+super(serverToTest);
+}
 
-   @Test
+@Test
 public void testAddBeans() throws Exception {
 
 ListItem beans = new ArrayListItem();

[4/5] camel git commit: Fixed the CS error of camel-jira

2014-11-06 Thread ningjiang 
Fixed the CS error of camel-jira


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

Branch: refs/heads/master
Commit: e402b878de79c6599ea59935df4ab8425cd9eba6
Parents: aa4bc98
Author: Willem Jiang willem.ji...@gmail.com
Authored: Fri Nov 7 10:37:56 2014 +0800
Committer: Willem Jiang willem.ji...@gmail.com
Committed: Fri Nov 7 10:37:56 2014 +0800

--
 .../component/jira/mocks/MockIssueClient.java   | 39 
 .../mocks/MockJerseyJiraRestClientFactory.java  |  3 +-
 .../component/jira/mocks/MockSearchResult.java  |  6 +--
 3 files changed, 37 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/e402b878/components/camel-jira/src/test/java/org/apache/camel/component/jira/mocks/MockIssueClient.java
--
diff --git 
a/components/camel-jira/src/test/java/org/apache/camel/component/jira/mocks/MockIssueClient.java
 
b/components/camel-jira/src/test/java/org/apache/camel/component/jira/mocks/MockIssueClient.java
index 31e1f54..f926563 100644
--- 
a/components/camel-jira/src/test/java/org/apache/camel/component/jira/mocks/MockIssueClient.java
+++ 
b/components/camel-jira/src/test/java/org/apache/camel/component/jira/mocks/MockIssueClient.java
@@ -16,25 +16,50 @@
  */
 package org.apache.camel.component.jira.mocks;
 
+import java.io.File;
+import java.io.InputStream;
+import java.net.URI;
+import java.util.Collection;
+import java.util.Set;
+
 import com.atlassian.jira.rest.client.GetCreateIssueMetadataOptions;
 import com.atlassian.jira.rest.client.IssueRestClient;
 import com.atlassian.jira.rest.client.ProgressMonitor;
-import com.atlassian.jira.rest.client.domain.*;
+import com.atlassian.jira.rest.client.domain.Attachment;
+import com.atlassian.jira.rest.client.domain.BasicComponent;
+import com.atlassian.jira.rest.client.domain.BasicIssue;
+import com.atlassian.jira.rest.client.domain.BasicIssueType;
+import com.atlassian.jira.rest.client.domain.BasicPriority;
+import com.atlassian.jira.rest.client.domain.BasicProject;
+import com.atlassian.jira.rest.client.domain.BasicResolution;
+import com.atlassian.jira.rest.client.domain.BasicStatus;
+import com.atlassian.jira.rest.client.domain.BasicUser;
+import com.atlassian.jira.rest.client.domain.BasicVotes;
+import com.atlassian.jira.rest.client.domain.BasicWatchers;
+import com.atlassian.jira.rest.client.domain.ChangelogGroup;
+import com.atlassian.jira.rest.client.domain.CimProject;
+import com.atlassian.jira.rest.client.domain.Comment;
+import com.atlassian.jira.rest.client.domain.Field;
+import com.atlassian.jira.rest.client.domain.Issue;
+import com.atlassian.jira.rest.client.domain.IssueLink;
+import com.atlassian.jira.rest.client.domain.Subtask;
+import com.atlassian.jira.rest.client.domain.TimeTracking;
+import com.atlassian.jira.rest.client.domain.Transition;
+import com.atlassian.jira.rest.client.domain.Version;
+import com.atlassian.jira.rest.client.domain.Votes;
+import com.atlassian.jira.rest.client.domain.Watchers;
+import com.atlassian.jira.rest.client.domain.Worklog;
 import com.atlassian.jira.rest.client.domain.input.AttachmentInput;
 import com.atlassian.jira.rest.client.domain.input.FieldInput;
 import com.atlassian.jira.rest.client.domain.input.IssueInput;
 import com.atlassian.jira.rest.client.domain.input.LinkIssuesInput;
 import com.atlassian.jira.rest.client.domain.input.TransitionInput;
 import com.atlassian.jira.rest.client.domain.input.WorklogInput;
+
+
 import org.codehaus.jettison.json.JSONObject;
 import org.joda.time.DateTime;
 
-import java.io.File;
-import java.io.InputStream;
-import java.net.URI;
-import java.util.Collection;
-import java.util.Set;
-
 public class MockIssueClient implements IssueRestClient {
 private MockSearchRestClient mockSearchRestClient;
 

http://git-wip-us.apache.org/repos/asf/camel/blob/e402b878/components/camel-jira/src/test/java/org/apache/camel/component/jira/mocks/MockJerseyJiraRestClientFactory.java
--
diff --git 
a/components/camel-jira/src/test/java/org/apache/camel/component/jira/mocks/MockJerseyJiraRestClientFactory.java
 
b/components/camel-jira/src/test/java/org/apache/camel/component/jira/mocks/MockJerseyJiraRestClientFactory.java
index 6f51184..3cd93a8 100644
--- 
a/components/camel-jira/src/test/java/org/apache/camel/component/jira/mocks/MockJerseyJiraRestClientFactory.java
+++ 
b/components/camel-jira/src/test/java/org/apache/camel/component/jira/mocks/MockJerseyJiraRestClientFactory.java
@@ -16,10 +16,11 @@
  */
 package org.apache.camel.component.jira.mocks;
 
+import