git commit: [bean-validator] Refactoring.

[hekonsek]

Repository: camel
Updated Branches:
  refs/heads/master ae4192246 - 91e707837


[bean-validator] Refactoring.


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

Branch: refs/heads/master
Commit: 91e707837a09da94f6bf997043dc17df166484da
Parents: ae41922
Author: Henryk Konsek hekon...@gmail.com
Authored: Mon Feb 24 12:05:36 2014 +0100
Committer: Henryk Konsek hekon...@gmail.com
Committed: Mon Feb 24 12:05:36 2014 +0100

--
 .../bean/validator/BeanValidatorComponent.java  | 61 +++--
 .../bean/validator/ValidatorFactories.java  | 91 
 2 files changed, 101 insertions(+), 51 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/91e70783/components/camel-bean-validator/src/main/java/org/apache/camel/component/bean/validator/BeanValidatorComponent.java
--
diff --git 
a/components/camel-bean-validator/src/main/java/org/apache/camel/component/bean/validator/BeanValidatorComponent.java
 
b/components/camel-bean-validator/src/main/java/org/apache/camel/component/bean/validator/BeanValidatorComponent.java
index c50d3b4..a70ab2e 100644
--- 
a/components/camel-bean-validator/src/main/java/org/apache/camel/component/bean/validator/BeanValidatorComponent.java
+++ 
b/components/camel-bean-validator/src/main/java/org/apache/camel/component/bean/validator/BeanValidatorComponent.java
@@ -18,20 +18,19 @@ package org.apache.camel.component.bean.validator;
 
 import java.util.Map;
 
-import javax.validation.Configuration;
 import javax.validation.ConstraintValidatorFactory;
 import javax.validation.MessageInterpolator;
 import javax.validation.TraversableResolver;
-import javax.validation.Validation;
 import javax.validation.ValidationProviderResolver;
 import javax.validation.ValidatorFactory;
-import javax.validation.bootstrap.GenericBootstrap;
 
 import org.apache.camel.Endpoint;
 import org.apache.camel.impl.DefaultComponent;
 import org.apache.camel.impl.ProcessorEndpoint;
 import org.apache.camel.util.PlatformHelper;
 
+import static 
org.apache.camel.component.bean.validator.ValidatorFactories.buildValidatorFactory;
+
 /**
  * Bean Validator Component for validating Java beans against reference 
implementation of JSR 303 Validator (Hibernate
  * Validator).
@@ -42,33 +41,15 @@ public class BeanValidatorComponent extends 
DefaultComponent {
 protected Endpoint createEndpoint(String uri, String remaining, 
MapString, Object parameters) throws Exception {
 BeanValidator beanValidator = new BeanValidator();
 
-ValidationProviderResolver validationProviderResolver = 
resolveValidationProviderResolver(parameters);
-MessageInterpolator messageInterpolator = 
resolveAndRemoveReferenceParameter(parameters, messageInterpolator, 
MessageInterpolator.class);
-TraversableResolver traversableResolver = 
resolveAndRemoveReferenceParameter(parameters, traversableResolver, 
TraversableResolver.class);
-ConstraintValidatorFactory constraintValidatorFactory = 
resolveAndRemoveReferenceParameter(parameters, constraintValidatorFactory, 
ConstraintValidatorFactory.class);
-String group = getAndRemoveParameter(parameters, group, 
String.class);
-
-GenericBootstrap bootstrap = Validation.byDefaultProvider();
-if (validationProviderResolver != null) {
-bootstrap.providerResolver(validationProviderResolver);
-}
-Configuration? configuration = bootstrap.configure();
-
-if (messageInterpolator != null) {
-configuration.messageInterpolator(messageInterpolator);
-}
-
-if (traversableResolver != null) {
-configuration.traversableResolver(traversableResolver);
-}
-
-if (constraintValidatorFactory != null) {
-
configuration.constraintValidatorFactory(constraintValidatorFactory);   
 
-}
-
-ValidatorFactory validatorFactory = 
configuration.buildValidatorFactory();
+ValidatorFactory validatorFactory = buildValidatorFactory(
+isOsgiContext(),
+resolveAndRemoveReferenceParameter(parameters, 
validationProviderResolver, ValidationProviderResolver.class),
+resolveAndRemoveReferenceParameter(parameters, 
messageInterpolator, MessageInterpolator.class),
+resolveAndRemoveReferenceParameter(parameters, 
traversableResolver, TraversableResolver.class),
+resolveAndRemoveReferenceParameter(parameters, 
constraintValidatorFactory, ConstraintValidatorFactory.class));
 

git commit: [itest-osgi] Enabled running tests in CI environment.

[hekonsek]

Repository: camel
Updated Branches:
  refs/heads/master 91e707837 - 5621bd3d8


[itest-osgi] Enabled running tests in CI environment.


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

Branch: refs/heads/master
Commit: 5621bd3d860cbfa08bcc9585607695920ebaf0d2
Parents: 91e7078
Author: Henryk Konsek hekon...@gmail.com
Authored: Mon Feb 24 12:08:56 2014 +0100
Committer: Henryk Konsek hekon...@gmail.com
Committed: Mon Feb 24 12:08:56 2014 +0100

--
 tests/camel-itest-osgi/pom.xml | 2 --
 1 file changed, 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/5621bd3d/tests/camel-itest-osgi/pom.xml
--
diff --git a/tests/camel-itest-osgi/pom.xml b/tests/camel-itest-osgi/pom.xml
index d2c10cd..e6ac1b0 100644
--- a/tests/camel-itest-osgi/pom.xml
+++ b/tests/camel-itest-osgi/pom.xml
@@ -527,8 +527,6 @@
 include**/*Test.*/include
 /includes
 excludes
-   !-- TODO: temporary disable unit test to 
let TC not hang --
-   exclude**/*Test.*/exclude
 !--There are some conflicts of the JAXB OSGi 
bundle and Hudson System jar
 so I comment out these JAXB related tests --
 exclude**/OSGiIntegrationSpringTest.*/exclude

[04/18] git commit: Fixed test on slower CI boxes

[davsclaus]

Fixed test on slower CI boxes


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

Branch: refs/heads/master
Commit: da08bda04b2aee0c259624f4f6bdd806af1b68d7
Parents: 493b5dc
Author: Claus Ibsen davscl...@apache.org
Authored: Mon Feb 24 15:43:28 2014 +0100
Committer: Claus Ibsen davscl...@apache.org
Committed: Mon Feb 24 17:05:28 2014 +0100

--
 .../camel/processor/ResequenceStreamRejectOldExchangesTest.java| 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/da08bda0/camel-core/src/test/java/org/apache/camel/processor/ResequenceStreamRejectOldExchangesTest.java
--
diff --git 
a/camel-core/src/test/java/org/apache/camel/processor/ResequenceStreamRejectOldExchangesTest.java
 
b/camel-core/src/test/java/org/apache/camel/processor/ResequenceStreamRejectOldExchangesTest.java
index 1f2067d..e0a4d21 100644
--- 
a/camel-core/src/test/java/org/apache/camel/processor/ResequenceStreamRejectOldExchangesTest.java
+++ 
b/camel-core/src/test/java/org/apache/camel/processor/ResequenceStreamRejectOldExchangesTest.java
@@ -70,6 +70,8 @@ public class ResequenceStreamRejectOldExchangesTest extends 
ContextTestSupport {
 template.sendBodyAndHeader(direct:start, D, seqno, 4);
 template.sendBodyAndHeader(direct:start, A, seqno, 1);
 
+Thread.sleep(500);
+
 template.sendBodyAndHeader(direct:start, B, seqno, 2);
 template.sendBodyAndHeader(direct:start, C, seqno, 3);
 template.sendBodyAndHeader(direct:start, F, seqno, 6);

[06/18] git commit: Made test more resillient on CI boxes

[davsclaus]

Made test more resillient on CI boxes


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

Branch: refs/heads/master
Commit: 570539da9cd0354640ca59d554fc0cb47e6dd85e
Parents: a97dbc2
Author: Claus Ibsen davscl...@apache.org
Authored: Mon Feb 24 15:37:06 2014 +0100
Committer: Claus Ibsen davscl...@apache.org
Committed: Mon Feb 24 17:05:28 2014 +0100

--
 .../camel/component/stomp/StompBaseTest.java| 34 
 .../component/stomp/StompConsumerTest.java  |  7 
 .../component/stomp/StompConsumerUriTest.java   |  7 
 .../component/stomp/StompProducerTest.java  | 10 --
 4 files changed, 49 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/570539da/components/camel-stomp/src/test/java/org/apache/camel/component/stomp/StompBaseTest.java
--
diff --git 
a/components/camel-stomp/src/test/java/org/apache/camel/component/stomp/StompBaseTest.java
 
b/components/camel-stomp/src/test/java/org/apache/camel/component/stomp/StompBaseTest.java
index 643787b..b79325c 100644
--- 
a/components/camel-stomp/src/test/java/org/apache/camel/component/stomp/StompBaseTest.java
+++ 
b/components/camel-stomp/src/test/java/org/apache/camel/component/stomp/StompBaseTest.java
@@ -25,22 +25,42 @@ public abstract class StompBaseTest extends 
CamelTestSupport {
 protected BrokerService brokerService;
 protected int numberOfMessages = 100;
 protected int port;
+private boolean canTest;
 
 protected int getPort() {
 return port;
 }
 
+/**
+ * Whether we can test on this box, as not all boxes can be used for 
reliable CI testing.
+ */
+protected boolean canTest() {
+return canTest;
+}
+
+@Override
+public boolean isUseRouteBuilder() {
+return false;
+}
+
 @Override
 public void setUp() throws Exception {
 port = AvailablePortFinder.getNextAvailable(61613);
 
-brokerService = new BrokerService();
-brokerService.setPersistent(false);
-brokerService.setAdvisorySupport(false);
-brokerService.addConnector(stomp://localhost: + getPort() + 
?trace=true);
-brokerService.start();
-brokerService.waitUntilStarted();
-super.setUp();
+try {
+brokerService = new BrokerService();
+brokerService.setPersistent(false);
+brokerService.setAdvisorySupport(false);
+brokerService.addConnector(stomp://localhost: + getPort() + 
?trace=true);
+brokerService.start();
+brokerService.waitUntilStarted();
+super.setUp();
+canTest = true;
+} catch (Exception e) {
+System.err.println(Cannot test due  + e.getMessage() +  more 
details in the log);
+log.warn(Cannot test due  + e.getMessage(), e);
+canTest = false;
+}
 }
 
 @Override

http://git-wip-us.apache.org/repos/asf/camel/blob/570539da/components/camel-stomp/src/test/java/org/apache/camel/component/stomp/StompConsumerTest.java
--
diff --git 
a/components/camel-stomp/src/test/java/org/apache/camel/component/stomp/StompConsumerTest.java
 
b/components/camel-stomp/src/test/java/org/apache/camel/component/stomp/StompConsumerTest.java
index 894cc4c..22c58c9 100644
--- 
a/components/camel-stomp/src/test/java/org/apache/camel/component/stomp/StompConsumerTest.java
+++ 
b/components/camel-stomp/src/test/java/org/apache/camel/component/stomp/StompConsumerTest.java
@@ -34,6 +34,13 @@ public class StompConsumerTest extends StompBaseTest {
 
 @Test
 public void testConsume() throws Exception {
+if (!canTest()) {
+return;
+}
+
+context.addRoutes(createRouteBuilder());
+context.start();
+
 Stomp stomp = new Stomp(tcp://localhost: + getPort());
 final BlockingConnection producerConnection = stomp.connectBlocking();
 

http://git-wip-us.apache.org/repos/asf/camel/blob/570539da/components/camel-stomp/src/test/java/org/apache/camel/component/stomp/StompConsumerUriTest.java
--
diff --git 
a/components/camel-stomp/src/test/java/org/apache/camel/component/stomp/StompConsumerUriTest.java
 
b/components/camel-stomp/src/test/java/org/apache/camel/component/stomp/StompConsumerUriTest.java
index fa3aa08..629ca2a 100644
--- 
a/components/camel-stomp/src/test/java/org/apache/camel/component/stomp/StompConsumerUriTest.java
+++ 

[13/18] git commit: Made test more resillient on CI boxes

[davsclaus]

Made test more resillient on CI boxes


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

Branch: refs/heads/camel-2.12.x
Commit: 28b51d10164e5afa9850e11e43644c93894fd39b
Parents: 3acf9f8
Author: Claus Ibsen davscl...@apache.org
Authored: Mon Feb 24 15:37:06 2014 +0100
Committer: Claus Ibsen davscl...@apache.org
Committed: Mon Feb 24 17:05:41 2014 +0100

--
 .../camel/component/stomp/StompBaseTest.java| 34 
 .../component/stomp/StompConsumerTest.java  |  7 
 .../component/stomp/StompConsumerUriTest.java   |  7 
 .../component/stomp/StompProducerTest.java  | 10 --
 4 files changed, 49 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/28b51d10/components/camel-stomp/src/test/java/org/apache/camel/component/stomp/StompBaseTest.java
--
diff --git 
a/components/camel-stomp/src/test/java/org/apache/camel/component/stomp/StompBaseTest.java
 
b/components/camel-stomp/src/test/java/org/apache/camel/component/stomp/StompBaseTest.java
index 643787b..b79325c 100644
--- 
a/components/camel-stomp/src/test/java/org/apache/camel/component/stomp/StompBaseTest.java
+++ 
b/components/camel-stomp/src/test/java/org/apache/camel/component/stomp/StompBaseTest.java
@@ -25,22 +25,42 @@ public abstract class StompBaseTest extends 
CamelTestSupport {
 protected BrokerService brokerService;
 protected int numberOfMessages = 100;
 protected int port;
+private boolean canTest;
 
 protected int getPort() {
 return port;
 }
 
+/**
+ * Whether we can test on this box, as not all boxes can be used for 
reliable CI testing.
+ */
+protected boolean canTest() {
+return canTest;
+}
+
+@Override
+public boolean isUseRouteBuilder() {
+return false;
+}
+
 @Override
 public void setUp() throws Exception {
 port = AvailablePortFinder.getNextAvailable(61613);
 
-brokerService = new BrokerService();
-brokerService.setPersistent(false);
-brokerService.setAdvisorySupport(false);
-brokerService.addConnector(stomp://localhost: + getPort() + 
?trace=true);
-brokerService.start();
-brokerService.waitUntilStarted();
-super.setUp();
+try {
+brokerService = new BrokerService();
+brokerService.setPersistent(false);
+brokerService.setAdvisorySupport(false);
+brokerService.addConnector(stomp://localhost: + getPort() + 
?trace=true);
+brokerService.start();
+brokerService.waitUntilStarted();
+super.setUp();
+canTest = true;
+} catch (Exception e) {
+System.err.println(Cannot test due  + e.getMessage() +  more 
details in the log);
+log.warn(Cannot test due  + e.getMessage(), e);
+canTest = false;
+}
 }
 
 @Override

http://git-wip-us.apache.org/repos/asf/camel/blob/28b51d10/components/camel-stomp/src/test/java/org/apache/camel/component/stomp/StompConsumerTest.java
--
diff --git 
a/components/camel-stomp/src/test/java/org/apache/camel/component/stomp/StompConsumerTest.java
 
b/components/camel-stomp/src/test/java/org/apache/camel/component/stomp/StompConsumerTest.java
index 894cc4c..22c58c9 100644
--- 
a/components/camel-stomp/src/test/java/org/apache/camel/component/stomp/StompConsumerTest.java
+++ 
b/components/camel-stomp/src/test/java/org/apache/camel/component/stomp/StompConsumerTest.java
@@ -34,6 +34,13 @@ public class StompConsumerTest extends StompBaseTest {
 
 @Test
 public void testConsume() throws Exception {
+if (!canTest()) {
+return;
+}
+
+context.addRoutes(createRouteBuilder());
+context.start();
+
 Stomp stomp = new Stomp(tcp://localhost: + getPort());
 final BlockingConnection producerConnection = stomp.connectBlocking();
 

http://git-wip-us.apache.org/repos/asf/camel/blob/28b51d10/components/camel-stomp/src/test/java/org/apache/camel/component/stomp/StompConsumerUriTest.java
--
diff --git 
a/components/camel-stomp/src/test/java/org/apache/camel/component/stomp/StompConsumerUriTest.java
 
b/components/camel-stomp/src/test/java/org/apache/camel/component/stomp/StompConsumerUriTest.java
index fa3aa08..629ca2a 100644
--- 
a/components/camel-stomp/src/test/java/org/apache/camel/component/stomp/StompConsumerUriTest.java
+++ 

[08/18] git commit: Fixed test

[davsclaus]

Fixed test


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

Branch: refs/heads/master
Commit: 8ace0ebc09287a9d84f008d546ef87ce4eaa7dc0
Parents: 76bc00f
Author: Claus Ibsen davscl...@apache.org
Authored: Mon Feb 24 16:53:39 2014 +0100
Committer: Claus Ibsen davscl...@apache.org
Committed: Mon Feb 24 17:05:29 2014 +0100

--
 .../camel/processor/StreamResequencerTest.java  | 16 
 1 file changed, 8 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/8ace0ebc/camel-core/src/test/java/org/apache/camel/processor/StreamResequencerTest.java
--
diff --git 
a/camel-core/src/test/java/org/apache/camel/processor/StreamResequencerTest.java
 
b/camel-core/src/test/java/org/apache/camel/processor/StreamResequencerTest.java
index 8498f1b..7e7f73f 100644
--- 
a/camel-core/src/test/java/org/apache/camel/processor/StreamResequencerTest.java
+++ 
b/camel-core/src/test/java/org/apache/camel/processor/StreamResequencerTest.java
@@ -58,14 +58,6 @@ public class StreamResequencerTest extends 
ContextTestSupport {
 public void testMultithreaded() throws Exception {
 int numMessages = 100;
 
-ProducerTemplate producerTemplate = context.createProducerTemplate();
-ProducerTemplate producerTemplate2 = context.createProducerTemplate();
-
-ExecutorService service = 
context.getExecutorServiceManager().newFixedThreadPool(this, getName(), 2);
-
-service.execute(new Sender(producerTemplate, 0, numMessages, 2));
-service.execute(new Sender(producerTemplate2, 1, numMessages, 2));
-
 Object[] bodies = new Object[numMessages];
 for (int i = 0; i  numMessages; i++) {
 bodies[i] = msg + i;
@@ -74,6 +66,14 @@ public class StreamResequencerTest extends 
ContextTestSupport {
 getMockEndpoint(mock:result).expectedBodiesReceived(bodies);
 getMockEndpoint(mock:result).setResultWaitTime(2);
 
+ProducerTemplate producerTemplate = context.createProducerTemplate();
+ProducerTemplate producerTemplate2 = context.createProducerTemplate();
+
+ExecutorService service = 
context.getExecutorServiceManager().newFixedThreadPool(this, getName(), 2);
+
+service.execute(new Sender(producerTemplate, 0, numMessages, 2));
+service.execute(new Sender(producerTemplate2, 1, numMessages, 2));
+
 assertMockEndpointsSatisfied();
 
 ServiceHelper.stopServices(producerTemplate, producerTemplate2);

[10/18] git commit: Removed duplicated tests and problematic on some CI boxes.

[davsclaus]

Removed duplicated tests and problematic on some CI boxes.


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

Branch: refs/heads/camel-2.12.x
Commit: 3eb910c165ea7a15082cebeacb6969d9215c7f69
Parents: c744dc6
Author: Claus Ibsen davscl...@apache.org
Authored: Mon Feb 24 15:22:16 2014 +0100
Committer: Claus Ibsen davscl...@apache.org
Committed: Mon Feb 24 17:05:40 2014 +0100

--
 .../processor/ShutdownDirectEndpointTest.java   | 57 ---
 .../example/SpringRestletGroovyIssueTest.java   | 77 
 .../example/SpringRestletGroovyIssueTest.xml| 40 --
 3 files changed, 174 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/3eb910c1/camel-core/src/test/java/org/apache/camel/processor/ShutdownDirectEndpointTest.java
--
diff --git 
a/camel-core/src/test/java/org/apache/camel/processor/ShutdownDirectEndpointTest.java
 
b/camel-core/src/test/java/org/apache/camel/processor/ShutdownDirectEndpointTest.java
deleted file mode 100644
index d2b622b..000
--- 
a/camel-core/src/test/java/org/apache/camel/processor/ShutdownDirectEndpointTest.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/**
- * 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.processor;
-
-import org.apache.camel.ContextTestSupport;
-import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.mock.MockEndpoint;
-
-/**
- * @version 
- */
-public class ShutdownDirectEndpointTest extends ContextTestSupport {
-
-public void testShutdownDirectEndpoint() throws Exception {
-MockEndpoint bar = getMockEndpoint(mock:bar);
-bar.expectedMessageCount(5);
-
-// send the bodies async so we can continue
-template.asyncSendBody(direct:bar, A);
-template.asyncSendBody(direct:bar, B);
-template.asyncSendBody(direct:bar, C);
-template.asyncSendBody(direct:bar, D);
-template.asyncSendBody(direct:bar, E);
-
-Thread.sleep(10);
-
-context.stop();
-
-assertEquals(Should complete all messages, 5, 
bar.getReceivedCounter());
-}
-
-@Override
-protected RouteBuilder createRouteBuilder() throws Exception {
-return new RouteBuilder() {
-@Override
-public void configure() throws Exception {
-from(direct:bar)
-.delay(25)
-.to(mock:bar);
-}
-};
-}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/camel/blob/3eb910c1/tests/camel-itest/src/test/java/org/apache/camel/itest/restlet/example/SpringRestletGroovyIssueTest.java
--
diff --git 
a/tests/camel-itest/src/test/java/org/apache/camel/itest/restlet/example/SpringRestletGroovyIssueTest.java
 
b/tests/camel-itest/src/test/java/org/apache/camel/itest/restlet/example/SpringRestletGroovyIssueTest.java
deleted file mode 100644
index 1879db8..000
--- 
a/tests/camel-itest/src/test/java/org/apache/camel/itest/restlet/example/SpringRestletGroovyIssueTest.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/**
- * 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 

[12/18] git commit: Fixed test on slower CI box

[davsclaus]

Fixed test on slower CI box


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

Branch: refs/heads/camel-2.12.x
Commit: 3acf9f87bb26efd550894671d30e2e569b931083
Parents: 3eb910c
Author: Claus Ibsen davscl...@apache.org
Authored: Mon Feb 24 15:26:24 2014 +0100
Committer: Claus Ibsen davscl...@apache.org
Committed: Mon Feb 24 17:05:41 2014 +0100

--
 .../apache/camel/support/DefaultTimeoutMapTest.java  | 15 +++
 1 file changed, 15 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/3acf9f87/camel-core/src/test/java/org/apache/camel/support/DefaultTimeoutMapTest.java
--
diff --git 
a/camel-core/src/test/java/org/apache/camel/support/DefaultTimeoutMapTest.java 
b/camel-core/src/test/java/org/apache/camel/support/DefaultTimeoutMapTest.java
index fcf52b8..731c6e7 100644
--- 
a/camel-core/src/test/java/org/apache/camel/support/DefaultTimeoutMapTest.java
+++ 
b/camel-core/src/test/java/org/apache/camel/support/DefaultTimeoutMapTest.java
@@ -23,12 +23,15 @@ import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ScheduledThreadPoolExecutor;
 
 import junit.framework.TestCase;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * @version 
  */
 public class DefaultTimeoutMapTest extends TestCase {
 
+private static final Logger LOG = 
LoggerFactory.getLogger(DefaultTimeoutMapTest.class);
 private ScheduledExecutorService executor = new 
ScheduledThreadPoolExecutor(1);
 
 public void testDefaultTimeoutMap() throws Exception {
@@ -52,6 +55,10 @@ public class DefaultTimeoutMapTest extends TestCase {
 assertEquals(1, map.size());
 
 Thread.sleep(250);
+if (map.size()  0) {
+LOG.warn(Waiting extra due slow CI box);
+Thread.sleep(1000);
+}
 
 assertEquals(0, map.size());
 
@@ -124,6 +131,10 @@ public class DefaultTimeoutMapTest extends TestCase {
 
 Thread.sleep(250);
 
+if (map.size()  0) {
+LOG.warn(Waiting extra due slow CI box);
+Thread.sleep(1000);
+}
 // should have been timed out now
 assertEquals(0, map.size());
 
@@ -239,6 +250,10 @@ public class DefaultTimeoutMapTest extends TestCase {
 
 // start and wait for scheduler to purge
 Thread.sleep(250);
+if (map.size()  0) {
+LOG.warn(Waiting extra due slow CI box);
+Thread.sleep(1000);
+}
 // now it should be gone
 assertEquals(0, map.size());
 

[15/18] git commit: Fixed test on slower CI boxes

[davsclaus]

Fixed test on slower CI boxes


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

Branch: refs/heads/camel-2.12.x
Commit: 82b2ecbd999c544e51585b24019cef9639758892
Parents: ebb8c87
Author: Claus Ibsen davscl...@apache.org
Authored: Mon Feb 24 15:43:28 2014 +0100
Committer: Claus Ibsen davscl...@apache.org
Committed: Mon Feb 24 17:05:41 2014 +0100

--
 .../camel/processor/ResequenceStreamRejectOldExchangesTest.java| 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/82b2ecbd/camel-core/src/test/java/org/apache/camel/processor/ResequenceStreamRejectOldExchangesTest.java
--
diff --git 
a/camel-core/src/test/java/org/apache/camel/processor/ResequenceStreamRejectOldExchangesTest.java
 
b/camel-core/src/test/java/org/apache/camel/processor/ResequenceStreamRejectOldExchangesTest.java
index 1f2067d..e0a4d21 100644
--- 
a/camel-core/src/test/java/org/apache/camel/processor/ResequenceStreamRejectOldExchangesTest.java
+++ 
b/camel-core/src/test/java/org/apache/camel/processor/ResequenceStreamRejectOldExchangesTest.java
@@ -70,6 +70,8 @@ public class ResequenceStreamRejectOldExchangesTest extends 
ContextTestSupport {
 template.sendBodyAndHeader(direct:start, D, seqno, 4);
 template.sendBodyAndHeader(direct:start, A, seqno, 1);
 
+Thread.sleep(500);
+
 template.sendBodyAndHeader(direct:start, B, seqno, 2);
 template.sendBodyAndHeader(direct:start, C, seqno, 3);
 template.sendBodyAndHeader(direct:start, F, seqno, 6);

[14/18] git commit: Fixed test on Windows

[davsclaus]

Fixed test on Windows


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

Branch: refs/heads/camel-2.12.x
Commit: ebb8c879ec326184c6b1446c85f1bc1bbec50c0f
Parents: 28b51d1
Author: Claus Ibsen davscl...@apache.org
Authored: Mon Feb 24 15:39:46 2014 +0100
Committer: Claus Ibsen davscl...@apache.org
Committed: Mon Feb 24 17:05:41 2014 +0100

--
 .../file/FilerConsumerShouldSkipDoneFilePrefixTest.java  | 4 +++-
 .../component/file/FilerConsumerShouldSkipDoneFileTest.java  | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/ebb8c879/camel-core/src/test/java/org/apache/camel/component/file/FilerConsumerShouldSkipDoneFilePrefixTest.java
--
diff --git 
a/camel-core/src/test/java/org/apache/camel/component/file/FilerConsumerShouldSkipDoneFilePrefixTest.java
 
b/camel-core/src/test/java/org/apache/camel/component/file/FilerConsumerShouldSkipDoneFilePrefixTest.java
index 24907ca..d299e57 100644
--- 
a/camel-core/src/test/java/org/apache/camel/component/file/FilerConsumerShouldSkipDoneFilePrefixTest.java
+++ 
b/camel-core/src/test/java/org/apache/camel/component/file/FilerConsumerShouldSkipDoneFilePrefixTest.java
@@ -67,7 +67,9 @@ public class FilerConsumerShouldSkipDoneFilePrefixTest 
extends ContextTestSuppor
 return new RouteBuilder() {
 @Override
 public void configure() throws Exception {
-
from(file:target/done?doneFileName=done-${file:name}initialDelay=0delay=10).to(mock:result);
+
from(file:target/done?doneFileName=done-${file:name}initialDelay=0delay=10)
+.convertBodyTo(String.class)
+.to(mock:result);
 }
 };
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/ebb8c879/camel-core/src/test/java/org/apache/camel/component/file/FilerConsumerShouldSkipDoneFileTest.java
--
diff --git 
a/camel-core/src/test/java/org/apache/camel/component/file/FilerConsumerShouldSkipDoneFileTest.java
 
b/camel-core/src/test/java/org/apache/camel/component/file/FilerConsumerShouldSkipDoneFileTest.java
index 781493b..da3b953 100644
--- 
a/camel-core/src/test/java/org/apache/camel/component/file/FilerConsumerShouldSkipDoneFileTest.java
+++ 
b/camel-core/src/test/java/org/apache/camel/component/file/FilerConsumerShouldSkipDoneFileTest.java
@@ -67,7 +67,9 @@ public class FilerConsumerShouldSkipDoneFileTest extends 
ContextTestSupport {
 return new RouteBuilder() {
 @Override
 public void configure() throws Exception {
-
from(file:target/done?doneFileName=doneinitialDelay=0delay=10).to(mock:result);
+
from(file:target/done?doneFileName=doneinitialDelay=0delay=10)
+.convertBodyTo(String.class)
+.to(mock:result);
 }
 };
 }

[09/18] git commit: Fixed CS

[davsclaus]

Fixed CS


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

Branch: refs/heads/master
Commit: 76bc00f47a6660561d5b96a7467c0a4b4e5d9e65
Parents: 4bc7d6e
Author: Claus Ibsen davscl...@apache.org
Authored: Mon Feb 24 16:49:40 2014 +0100
Committer: Claus Ibsen davscl...@apache.org
Committed: Mon Feb 24 17:05:29 2014 +0100

--
 .../src/main/java/org/apache/camel/util/FileUtil.java| 11 ++-
 1 file changed, 6 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/76bc00f4/camel-core/src/main/java/org/apache/camel/util/FileUtil.java
--
diff --git a/camel-core/src/main/java/org/apache/camel/util/FileUtil.java 
b/camel-core/src/main/java/org/apache/camel/util/FileUtil.java
index 9668cc7..d51330f 100644
--- a/camel-core/src/main/java/org/apache/camel/util/FileUtil.java
+++ b/camel-core/src/main/java/org/apache/camel/util/FileUtil.java
@@ -51,6 +51,12 @@ public final class FileUtil {
 // Utils method
 }
 
+private static boolean initWindowsOs() {
+// initialize once as System.getProperty is not fast
+String osName = System.getProperty(os.name).toLowerCase(Locale.US);
+return osName.contains(windows);
+}
+
 public static File getUserDir() {
 return USER_DIR;
 }
@@ -72,11 +78,6 @@ public final class FileUtil {
 }
 }
 
-private static boolean initWindowsOs() {
-String osName = System.getProperty(os.name).toLowerCase(Locale.US);
-return osName.indexOf(windows)  -1;
-}
-
 /**
  * Returns true, if the OS is windows
  */

[07/18] git commit: Caching of FileUtil.isWindows call, since it gets called quite often. In the profiler It showed up as taking 5-10% cpu on my system.

[davsclaus]

Caching of FileUtil.isWindows call, since it gets called quite often. In the 
profiler It showed up as taking 5-10% cpu on my system.


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

Branch: refs/heads/master
Commit: 4bc7d6e63a3cf7607cd4dbb076c8d511c7dbb084
Parents: da08bda
Author: lldata la...@lldata.dk
Authored: Mon Feb 24 16:32:19 2014 +0100
Committer: Claus Ibsen davscl...@apache.org
Committed: Mon Feb 24 17:05:28 2014 +0100

--
 .../src/main/java/org/apache/camel/util/FileUtil.java   | 12 ++--
 1 file changed, 10 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/4bc7d6e6/camel-core/src/main/java/org/apache/camel/util/FileUtil.java
--
diff --git a/camel-core/src/main/java/org/apache/camel/util/FileUtil.java 
b/camel-core/src/main/java/org/apache/camel/util/FileUtil.java
index b624a21..9668cc7 100644
--- a/camel-core/src/main/java/org/apache/camel/util/FileUtil.java
+++ b/camel-core/src/main/java/org/apache/camel/util/FileUtil.java
@@ -45,6 +45,7 @@ public final class FileUtil {
 private static final File USER_DIR = new 
File(System.getProperty(USER_DIR_KEY));
 private static File defaultTempDir;
 private static Thread shutdownHook;
+private static boolean windowsOs = initWindowsOs();
 
 private FileUtil() {
 // Utils method
@@ -70,12 +71,19 @@ public final class FileUtil {
 return path.replace('\\', '/');
 }
 }
-
-public static boolean isWindows() {
+
+private static boolean initWindowsOs() {
 String osName = System.getProperty(os.name).toLowerCase(Locale.US);
 return osName.indexOf(windows)  -1;
 }
 
+/**
+ * Returns true, if the OS is windows
+ */
+public static boolean isWindows() {
+return windowsOs;
+}
+
 @Deprecated
 public static File createTempFile(String prefix, String suffix) throws 
IOException {
 return createTempFile(prefix, suffix, null);

[01/18] git commit: Fixed test on slower CI box

[davsclaus]

Repository: camel
Updated Branches:
  refs/heads/camel-2.12.x 6de2fba64 - 90685ddb3
  refs/heads/master 5621bd3d8 - 8ace0ebc0


Fixed test on slower CI box


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

Branch: refs/heads/master
Commit: a97dbc25007eed9edfea27be2c6759b2ec7158a8
Parents: cb185c6
Author: Claus Ibsen davscl...@apache.org
Authored: Mon Feb 24 15:26:24 2014 +0100
Committer: Claus Ibsen davscl...@apache.org
Committed: Mon Feb 24 17:05:27 2014 +0100

--
 .../apache/camel/support/DefaultTimeoutMapTest.java  | 15 +++
 1 file changed, 15 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/a97dbc25/camel-core/src/test/java/org/apache/camel/support/DefaultTimeoutMapTest.java
--
diff --git 
a/camel-core/src/test/java/org/apache/camel/support/DefaultTimeoutMapTest.java 
b/camel-core/src/test/java/org/apache/camel/support/DefaultTimeoutMapTest.java
index fcf52b8..731c6e7 100644
--- 
a/camel-core/src/test/java/org/apache/camel/support/DefaultTimeoutMapTest.java
+++ 
b/camel-core/src/test/java/org/apache/camel/support/DefaultTimeoutMapTest.java
@@ -23,12 +23,15 @@ import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ScheduledThreadPoolExecutor;
 
 import junit.framework.TestCase;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * @version 
  */
 public class DefaultTimeoutMapTest extends TestCase {
 
+private static final Logger LOG = 
LoggerFactory.getLogger(DefaultTimeoutMapTest.class);
 private ScheduledExecutorService executor = new 
ScheduledThreadPoolExecutor(1);
 
 public void testDefaultTimeoutMap() throws Exception {
@@ -52,6 +55,10 @@ public class DefaultTimeoutMapTest extends TestCase {
 assertEquals(1, map.size());
 
 Thread.sleep(250);
+if (map.size()  0) {
+LOG.warn(Waiting extra due slow CI box);
+Thread.sleep(1000);
+}
 
 assertEquals(0, map.size());
 
@@ -124,6 +131,10 @@ public class DefaultTimeoutMapTest extends TestCase {
 
 Thread.sleep(250);
 
+if (map.size()  0) {
+LOG.warn(Waiting extra due slow CI box);
+Thread.sleep(1000);
+}
 // should have been timed out now
 assertEquals(0, map.size());
 
@@ -239,6 +250,10 @@ public class DefaultTimeoutMapTest extends TestCase {
 
 // start and wait for scheduler to purge
 Thread.sleep(250);
+if (map.size()  0) {
+LOG.warn(Waiting extra due slow CI box);
+Thread.sleep(1000);
+}
 // now it should be gone
 assertEquals(0, map.size());
 

[16/18] git commit: Fixed CS

[davsclaus]

Fixed CS


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

Branch: refs/heads/camel-2.12.x
Commit: b381e74c411dded61d7ed47a5717b0e7cbd45531
Parents: ed77d1f
Author: Claus Ibsen davscl...@apache.org
Authored: Mon Feb 24 16:49:40 2014 +0100
Committer: Claus Ibsen davscl...@apache.org
Committed: Mon Feb 24 17:05:42 2014 +0100

--
 .../src/main/java/org/apache/camel/util/FileUtil.java| 11 ++-
 1 file changed, 6 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/b381e74c/camel-core/src/main/java/org/apache/camel/util/FileUtil.java
--
diff --git a/camel-core/src/main/java/org/apache/camel/util/FileUtil.java 
b/camel-core/src/main/java/org/apache/camel/util/FileUtil.java
index 9668cc7..d51330f 100644
--- a/camel-core/src/main/java/org/apache/camel/util/FileUtil.java
+++ b/camel-core/src/main/java/org/apache/camel/util/FileUtil.java
@@ -51,6 +51,12 @@ public final class FileUtil {
 // Utils method
 }
 
+private static boolean initWindowsOs() {
+// initialize once as System.getProperty is not fast
+String osName = System.getProperty(os.name).toLowerCase(Locale.US);
+return osName.contains(windows);
+}
+
 public static File getUserDir() {
 return USER_DIR;
 }
@@ -72,11 +78,6 @@ public final class FileUtil {
 }
 }
 
-private static boolean initWindowsOs() {
-String osName = System.getProperty(os.name).toLowerCase(Locale.US);
-return osName.indexOf(windows)  -1;
-}
-
 /**
  * Returns true, if the OS is windows
  */

[17/18] git commit: Caching of FileUtil.isWindows call, since it gets called quite often. In the profiler It showed up as taking 5-10% cpu on my system.

[davsclaus]

Caching of FileUtil.isWindows call, since it gets called quite often. In the 
profiler It showed up as taking 5-10% cpu on my system.


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

Branch: refs/heads/camel-2.12.x
Commit: ed77d1fe362ad8a1836a5cae46709c076b8b13f2
Parents: 82b2ecb
Author: lldata la...@lldata.dk
Authored: Mon Feb 24 16:32:19 2014 +0100
Committer: Claus Ibsen davscl...@apache.org
Committed: Mon Feb 24 17:05:42 2014 +0100

--
 .../src/main/java/org/apache/camel/util/FileUtil.java   | 12 ++--
 1 file changed, 10 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/ed77d1fe/camel-core/src/main/java/org/apache/camel/util/FileUtil.java
--
diff --git a/camel-core/src/main/java/org/apache/camel/util/FileUtil.java 
b/camel-core/src/main/java/org/apache/camel/util/FileUtil.java
index b624a21..9668cc7 100644
--- a/camel-core/src/main/java/org/apache/camel/util/FileUtil.java
+++ b/camel-core/src/main/java/org/apache/camel/util/FileUtil.java
@@ -45,6 +45,7 @@ public final class FileUtil {
 private static final File USER_DIR = new 
File(System.getProperty(USER_DIR_KEY));
 private static File defaultTempDir;
 private static Thread shutdownHook;
+private static boolean windowsOs = initWindowsOs();
 
 private FileUtil() {
 // Utils method
@@ -70,12 +71,19 @@ public final class FileUtil {
 return path.replace('\\', '/');
 }
 }
-
-public static boolean isWindows() {
+
+private static boolean initWindowsOs() {
 String osName = System.getProperty(os.name).toLowerCase(Locale.US);
 return osName.indexOf(windows)  -1;
 }
 
+/**
+ * Returns true, if the OS is windows
+ */
+public static boolean isWindows() {
+return windowsOs;
+}
+
 @Deprecated
 public static File createTempFile(String prefix, String suffix) throws 
IOException {
 return createTempFile(prefix, suffix, null);

[02/18] git commit: Removed duplicated tests and problematic on some CI boxes.

[davsclaus]

Removed duplicated tests and problematic on some CI boxes.


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

Branch: refs/heads/master
Commit: cb185c61ead5bee195c793c0eea7a4b5506a87e0
Parents: bf0147a
Author: Claus Ibsen davscl...@apache.org
Authored: Mon Feb 24 15:22:16 2014 +0100
Committer: Claus Ibsen davscl...@apache.org
Committed: Mon Feb 24 17:05:27 2014 +0100

--
 .../processor/ShutdownDirectEndpointTest.java   | 57 ---
 .../example/SpringRestletGroovyIssueTest.java   | 77 
 .../example/SpringRestletGroovyIssueTest.xml| 40 --
 3 files changed, 174 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/cb185c61/camel-core/src/test/java/org/apache/camel/processor/ShutdownDirectEndpointTest.java
--
diff --git 
a/camel-core/src/test/java/org/apache/camel/processor/ShutdownDirectEndpointTest.java
 
b/camel-core/src/test/java/org/apache/camel/processor/ShutdownDirectEndpointTest.java
deleted file mode 100644
index d2b622b..000
--- 
a/camel-core/src/test/java/org/apache/camel/processor/ShutdownDirectEndpointTest.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/**
- * 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.processor;
-
-import org.apache.camel.ContextTestSupport;
-import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.mock.MockEndpoint;
-
-/**
- * @version 
- */
-public class ShutdownDirectEndpointTest extends ContextTestSupport {
-
-public void testShutdownDirectEndpoint() throws Exception {
-MockEndpoint bar = getMockEndpoint(mock:bar);
-bar.expectedMessageCount(5);
-
-// send the bodies async so we can continue
-template.asyncSendBody(direct:bar, A);
-template.asyncSendBody(direct:bar, B);
-template.asyncSendBody(direct:bar, C);
-template.asyncSendBody(direct:bar, D);
-template.asyncSendBody(direct:bar, E);
-
-Thread.sleep(10);
-
-context.stop();
-
-assertEquals(Should complete all messages, 5, 
bar.getReceivedCounter());
-}
-
-@Override
-protected RouteBuilder createRouteBuilder() throws Exception {
-return new RouteBuilder() {
-@Override
-public void configure() throws Exception {
-from(direct:bar)
-.delay(25)
-.to(mock:bar);
-}
-};
-}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/camel/blob/cb185c61/tests/camel-itest/src/test/java/org/apache/camel/itest/restlet/example/SpringRestletGroovyIssueTest.java
--
diff --git 
a/tests/camel-itest/src/test/java/org/apache/camel/itest/restlet/example/SpringRestletGroovyIssueTest.java
 
b/tests/camel-itest/src/test/java/org/apache/camel/itest/restlet/example/SpringRestletGroovyIssueTest.java
deleted file mode 100644
index 1879db8..000
--- 
a/tests/camel-itest/src/test/java/org/apache/camel/itest/restlet/example/SpringRestletGroovyIssueTest.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/**
- * 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 

[18/18] git commit: Fixed test

[davsclaus]

Fixed test


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

Branch: refs/heads/camel-2.12.x
Commit: 90685ddb32f3826b47965f4f6cc7698acc918dfd
Parents: b381e74
Author: Claus Ibsen davscl...@apache.org
Authored: Mon Feb 24 16:53:39 2014 +0100
Committer: Claus Ibsen davscl...@apache.org
Committed: Mon Feb 24 17:05:42 2014 +0100

--
 .../camel/processor/StreamResequencerTest.java  | 16 
 1 file changed, 8 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/90685ddb/camel-core/src/test/java/org/apache/camel/processor/StreamResequencerTest.java
--
diff --git 
a/camel-core/src/test/java/org/apache/camel/processor/StreamResequencerTest.java
 
b/camel-core/src/test/java/org/apache/camel/processor/StreamResequencerTest.java
index 8498f1b..7e7f73f 100644
--- 
a/camel-core/src/test/java/org/apache/camel/processor/StreamResequencerTest.java
+++ 
b/camel-core/src/test/java/org/apache/camel/processor/StreamResequencerTest.java
@@ -58,14 +58,6 @@ public class StreamResequencerTest extends 
ContextTestSupport {
 public void testMultithreaded() throws Exception {
 int numMessages = 100;
 
-ProducerTemplate producerTemplate = context.createProducerTemplate();
-ProducerTemplate producerTemplate2 = context.createProducerTemplate();
-
-ExecutorService service = 
context.getExecutorServiceManager().newFixedThreadPool(this, getName(), 2);
-
-service.execute(new Sender(producerTemplate, 0, numMessages, 2));
-service.execute(new Sender(producerTemplate2, 1, numMessages, 2));
-
 Object[] bodies = new Object[numMessages];
 for (int i = 0; i  numMessages; i++) {
 bodies[i] = msg + i;
@@ -74,6 +66,14 @@ public class StreamResequencerTest extends 
ContextTestSupport {
 getMockEndpoint(mock:result).expectedBodiesReceived(bodies);
 getMockEndpoint(mock:result).setResultWaitTime(2);
 
+ProducerTemplate producerTemplate = context.createProducerTemplate();
+ProducerTemplate producerTemplate2 = context.createProducerTemplate();
+
+ExecutorService service = 
context.getExecutorServiceManager().newFixedThreadPool(this, getName(), 2);
+
+service.execute(new Sender(producerTemplate, 0, numMessages, 2));
+service.execute(new Sender(producerTemplate2, 1, numMessages, 2));
+
 assertMockEndpointsSatisfied();
 
 ServiceHelper.stopServices(producerTemplate, producerTemplate2);

[03/18] git commit: Fixed test on slower CI boxes

[davsclaus]

Fixed test on slower CI boxes


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

Branch: refs/heads/master
Commit: bf0147af96c7a48511e897e106c1d5885194c1d7
Parents: 5621bd3
Author: Claus Ibsen davscl...@apache.org
Authored: Mon Feb 24 15:12:35 2014 +0100
Committer: Claus Ibsen davscl...@apache.org
Committed: Mon Feb 24 17:05:27 2014 +0100

--
 .../camel/util/toolbox/FlexibleAggregationStrategiesTest.java| 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/bf0147af/camel-core/src/test/java/org/apache/camel/util/toolbox/FlexibleAggregationStrategiesTest.java
--
diff --git 
a/camel-core/src/test/java/org/apache/camel/util/toolbox/FlexibleAggregationStrategiesTest.java
 
b/camel-core/src/test/java/org/apache/camel/util/toolbox/FlexibleAggregationStrategiesTest.java
index bbb2aa9..8d050b4 100644
--- 
a/camel-core/src/test/java/org/apache/camel/util/toolbox/FlexibleAggregationStrategiesTest.java
+++ 
b/camel-core/src/test/java/org/apache/camel/util/toolbox/FlexibleAggregationStrategiesTest.java
@@ -173,12 +173,12 @@ public class FlexibleAggregationStrategiesTest extends 
ContextTestSupport {
 
 template.sendBody(direct:start.timeoutAndCompletionAware, 
AGGREGATE1);
 
-assertTrue(timeoutLatch.await(1200, TimeUnit.MILLISECONDS));
+assertTrue(timeoutLatch.await(2500, TimeUnit.MILLISECONDS));
 
 template.sendBody(direct:start.timeoutAndCompletionAware, 
AGGREGATE2);
 template.sendBody(direct:start.timeoutAndCompletionAware, 
AGGREGATE3);
 
-assertTrue(completionLatch.await(1200, TimeUnit.MILLISECONDS));
+assertTrue(completionLatch.await(2500, TimeUnit.MILLISECONDS));
 
 
getMockEndpoint(mock:result.timeoutAndCompletionAware).getReceivedExchanges();
 assertMockEndpointsSatisfied();

[11/18] git commit: Fixed test on slower CI boxes

[davsclaus]

Fixed test on slower CI boxes


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

Branch: refs/heads/camel-2.12.x
Commit: c744dc63250ff8f10dc4b97ae08294f2d4d9
Parents: 6de2fba
Author: Claus Ibsen davscl...@apache.org
Authored: Mon Feb 24 15:12:35 2014 +0100
Committer: Claus Ibsen davscl...@apache.org
Committed: Mon Feb 24 17:05:40 2014 +0100

--
 .../camel/util/toolbox/FlexibleAggregationStrategiesTest.java| 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/c744dc63/camel-core/src/test/java/org/apache/camel/util/toolbox/FlexibleAggregationStrategiesTest.java
--
diff --git 
a/camel-core/src/test/java/org/apache/camel/util/toolbox/FlexibleAggregationStrategiesTest.java
 
b/camel-core/src/test/java/org/apache/camel/util/toolbox/FlexibleAggregationStrategiesTest.java
index be2dfad..8e45751 100644
--- 
a/camel-core/src/test/java/org/apache/camel/util/toolbox/FlexibleAggregationStrategiesTest.java
+++ 
b/camel-core/src/test/java/org/apache/camel/util/toolbox/FlexibleAggregationStrategiesTest.java
@@ -173,12 +173,12 @@ public class FlexibleAggregationStrategiesTest extends 
ContextTestSupport {
 
 template.sendBody(direct:start.timeoutAndCompletionAware, 
AGGREGATE1);
 
-assertTrue(timeoutLatch.await(1200, TimeUnit.MILLISECONDS));
+assertTrue(timeoutLatch.await(2500, TimeUnit.MILLISECONDS));
 
 template.sendBody(direct:start.timeoutAndCompletionAware, 
AGGREGATE2);
 template.sendBody(direct:start.timeoutAndCompletionAware, 
AGGREGATE3);
 
-assertTrue(completionLatch.await(1200, TimeUnit.MILLISECONDS));
+assertTrue(completionLatch.await(2500, TimeUnit.MILLISECONDS));
 
 
getMockEndpoint(mock:result.timeoutAndCompletionAware).getReceivedExchanges();
 assertMockEndpointsSatisfied();

git commit: CAMEL-7228: Fixed backport not compile.

[davsclaus]

Repository: camel
Updated Branches:
  refs/heads/camel-2.12.x 90685ddb3 - 28d331cb7


CAMEL-7228: Fixed backport not compile.


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

Branch: refs/heads/camel-2.12.x
Commit: 28d331cb7665a777e3147595940631597a8daafd
Parents: 90685dd
Author: Claus Ibsen davscl...@apache.org
Authored: Mon Feb 24 17:28:51 2014 +0100
Committer: Claus Ibsen davscl...@apache.org
Committed: Mon Feb 24 17:28:51 2014 +0100

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


http://git-wip-us.apache.org/repos/asf/camel/blob/28d331cb/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpComponent.java
--
diff --git 
a/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpComponent.java
 
b/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpComponent.java
index 485b1fa..1406968 100644
--- 
a/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpComponent.java
+++ 
b/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpComponent.java
@@ -261,9 +261,6 @@ public class HttpComponent extends 
HeaderFilterStrategyComponent {
 // configure the endpoint
 setProperties(endpoint, parameters);
 
-// determine the portnumber (special case: default portnumber)
-//int port = getPort(uriHttpUriAddress);
-
 // we can not change the port of an URI, we must create a new one with 
an explicit port value
 URI httpUri = URISupport.createRemainingURI(
 new URI(uriHttpUriAddress.getScheme(),
@@ -295,6 +292,9 @@ public class HttpComponent extends 
HeaderFilterStrategyComponent {
 if (endpoint.getCookieStore() == null) {
 endpoint.setCookieStore(getCookieStore());
 }
+
+// determine the portnumber (special case: default portnumber)
+int port = getPort(uriHttpUriAddress);
 // register port on schema registry
 registerPort(secure, x509HostnameVerifier, port, sslContextParameters);
 

[1/2] git commit: Fixed test

[davsclaus]

Repository: camel
Updated Branches:
  refs/heads/camel-2.12.x 28d331cb7 - f491d9c1a
  refs/heads/master 8ace0ebc0 - e42041684


Fixed test


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

Branch: refs/heads/master
Commit: e42041684fb8bca2edbd39baeaff6da3f1dc0b6d
Parents: 8ace0eb
Author: Claus Ibsen davscl...@apache.org
Authored: Mon Feb 24 17:53:10 2014 +0100
Committer: Claus Ibsen davscl...@apache.org
Committed: Mon Feb 24 17:54:59 2014 +0100

--
 components/camel-blueprint/pom.xml|  5 +
 .../org/apache/camel/blueprint/BlueprintJaxbTest.java | 14 +++---
 2 files changed, 12 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/e4204168/components/camel-blueprint/pom.xml
--
diff --git a/components/camel-blueprint/pom.xml 
b/components/camel-blueprint/pom.xml
index decc463..9aeec54 100644
--- a/components/camel-blueprint/pom.xml
+++ b/components/camel-blueprint/pom.xml
@@ -86,6 +86,11 @@
 
 !-- for testing --
 dependency
+groupIdorg.apache.camel/groupId
+artifactIdcamel-test/artifactId
+scopetest/scope
+/dependency
+dependency
 groupIdjunit/groupId
 artifactIdjunit/artifactId
 scopetest/scope

http://git-wip-us.apache.org/repos/asf/camel/blob/e4204168/components/camel-blueprint/src/test/java/org/apache/camel/blueprint/BlueprintJaxbTest.java
--
diff --git 
a/components/camel-blueprint/src/test/java/org/apache/camel/blueprint/BlueprintJaxbTest.java
 
b/components/camel-blueprint/src/test/java/org/apache/camel/blueprint/BlueprintJaxbTest.java
index 9ea5abc..2c49753 100644
--- 
a/components/camel-blueprint/src/test/java/org/apache/camel/blueprint/BlueprintJaxbTest.java
+++ 
b/components/camel-blueprint/src/test/java/org/apache/camel/blueprint/BlueprintJaxbTest.java
@@ -27,18 +27,18 @@ import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 
 import org.apache.camel.blueprint.handler.CamelNamespaceHandler;
-
+import org.apache.camel.test.junit4.TestSupport;
 import org.junit.Test;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-
-public class BlueprintJaxbTest {
+public class BlueprintJaxbTest extends TestSupport {
 
 @Test
 public void test() throws Exception {
+if (isJava16()  isJavaVendor(ibm)) {
+// does not test well on java6 with ibm
+return;
+}
+
 DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
 dbf.setNamespaceAware(true);
 DocumentBuilder db = dbf.newDocumentBuilder();

[2/2] git commit: Fixed test

[davsclaus]

Fixed test


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

Branch: refs/heads/camel-2.12.x
Commit: f491d9c1a18825de303f413e33f6a387eeb5bb13
Parents: 28d331c
Author: Claus Ibsen davscl...@apache.org
Authored: Mon Feb 24 17:53:10 2014 +0100
Committer: Claus Ibsen davscl...@apache.org
Committed: Mon Feb 24 17:55:33 2014 +0100

--
 components/camel-blueprint/pom.xml|  5 +
 .../org/apache/camel/blueprint/BlueprintJaxbTest.java | 14 +++---
 2 files changed, 12 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/f491d9c1/components/camel-blueprint/pom.xml
--
diff --git a/components/camel-blueprint/pom.xml 
b/components/camel-blueprint/pom.xml
index 31b39df..eb5fa0e 100644
--- a/components/camel-blueprint/pom.xml
+++ b/components/camel-blueprint/pom.xml
@@ -86,6 +86,11 @@
 
 !-- for testing --
 dependency
+groupIdorg.apache.camel/groupId
+artifactIdcamel-test/artifactId
+scopetest/scope
+/dependency
+dependency
 groupIdjunit/groupId
 artifactIdjunit/artifactId
 scopetest/scope

http://git-wip-us.apache.org/repos/asf/camel/blob/f491d9c1/components/camel-blueprint/src/test/java/org/apache/camel/blueprint/BlueprintJaxbTest.java
--
diff --git 
a/components/camel-blueprint/src/test/java/org/apache/camel/blueprint/BlueprintJaxbTest.java
 
b/components/camel-blueprint/src/test/java/org/apache/camel/blueprint/BlueprintJaxbTest.java
index 9ea5abc..2c49753 100644
--- 
a/components/camel-blueprint/src/test/java/org/apache/camel/blueprint/BlueprintJaxbTest.java
+++ 
b/components/camel-blueprint/src/test/java/org/apache/camel/blueprint/BlueprintJaxbTest.java
@@ -27,18 +27,18 @@ import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 
 import org.apache.camel.blueprint.handler.CamelNamespaceHandler;
-
+import org.apache.camel.test.junit4.TestSupport;
 import org.junit.Test;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-
-public class BlueprintJaxbTest {
+public class BlueprintJaxbTest extends TestSupport {
 
 @Test
 public void test() throws Exception {
+if (isJava16()  isJavaVendor(ibm)) {
+// does not test well on java6 with ibm
+return;
+}
+
 DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
 dbf.setNamespaceAware(true);
 DocumentBuilder db = dbf.newDocumentBuilder();

git commit: Exclude groovy-eclipse-batch dependency from groovy-eclipse-compiler or it will resolve SNAPSHOTs

[janstey]

Repository: camel
Updated Branches:
  refs/heads/master e42041684 - 44fb0b47c


Exclude groovy-eclipse-batch dependency from groovy-eclipse-compiler or it will 
resolve SNAPSHOTs


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

Branch: refs/heads/master
Commit: 44fb0b47c02e1dcaf38d97af869323ffa30e6a6a
Parents: e420416
Author: Jonathan Anstey jans...@gmail.com
Authored: Mon Feb 24 13:33:08 2014 -0330
Committer: Jonathan Anstey jans...@gmail.com
Committed: Mon Feb 24 13:36:33 2014 -0330

--
 components/camel-groovy/pom.xml | 30 ++
 1 file changed, 18 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/44fb0b47/components/camel-groovy/pom.xml
--
diff --git a/components/camel-groovy/pom.xml b/components/camel-groovy/pom.xml
index 66355dc..f821ca4 100644
--- a/components/camel-groovy/pom.xml
+++ b/components/camel-groovy/pom.xml
@@ -74,18 +74,24 @@
  !-- set verbose to be true if you want lots of uninteresting 
messages --
  !-- verbosetrue/verbose --
/configuration
-   dependencies
- dependency
-   groupIdorg.codehaus.groovy/groupId
-   artifactIdgroovy-eclipse-compiler/artifactId
-   version2.7.0-01/version
- /dependency
-dependency
-  groupIdorg.codehaus.groovy/groupId
-  artifactIdgroovy-eclipse-batch/artifactId
-  version2.1.8-01/version
-/dependency
-   /dependencies
+dependencies
+  dependency
+groupIdorg.codehaus.groovy/groupId
+artifactIdgroovy-eclipse-compiler/artifactId
+version2.7.0-01/version
+exclusions
+  exclusion
+groupIdorg.codehaus.groovy/groupId
+artifactIdgroovy-eclipse-batch/artifactId
+  /exclusion
+/exclusions
+  /dependency
+  dependency
+groupIdorg.codehaus.groovy/groupId
+artifactIdgroovy-eclipse-batch/artifactId
+version2.1.8-01/version
+  /dependency
+/dependencies
  /plugin
   plugin
   groupIdorg.apache.maven.plugins/groupId

git commit: Exclude groovy-eclipse-batch dependency from groovy-eclipse-compiler or it will resolve SNAPSHOTs

[janstey]

Repository: camel
Updated Branches:
  refs/heads/camel-2.12.x f491d9c1a - b24ac9557


Exclude groovy-eclipse-batch dependency from groovy-eclipse-compiler or it will 
resolve SNAPSHOTs


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

Branch: refs/heads/camel-2.12.x
Commit: b24ac9557227857198ee84f458cd9521c3eb122d
Parents: f491d9c
Author: Jonathan Anstey jans...@gmail.com
Authored: Mon Feb 24 13:33:08 2014 -0330
Committer: Jonathan Anstey jans...@gmail.com
Committed: Mon Feb 24 13:37:08 2014 -0330

--
 components/camel-groovy/pom.xml | 30 ++
 1 file changed, 18 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/b24ac955/components/camel-groovy/pom.xml
--
diff --git a/components/camel-groovy/pom.xml b/components/camel-groovy/pom.xml
index 5972dde..97844a9 100644
--- a/components/camel-groovy/pom.xml
+++ b/components/camel-groovy/pom.xml
@@ -74,18 +74,24 @@
  !-- set verbose to be true if you want lots of uninteresting 
messages --
  !-- verbosetrue/verbose --
/configuration
-   dependencies
- dependency
-   groupIdorg.codehaus.groovy/groupId
-   artifactIdgroovy-eclipse-compiler/artifactId
-   version2.7.0-01/version
- /dependency
-dependency
-  groupIdorg.codehaus.groovy/groupId
-  artifactIdgroovy-eclipse-batch/artifactId
-  version2.1.8-01/version
-/dependency
-   /dependencies
+dependencies
+  dependency
+groupIdorg.codehaus.groovy/groupId
+artifactIdgroovy-eclipse-compiler/artifactId
+version2.7.0-01/version
+exclusions
+  exclusion
+groupIdorg.codehaus.groovy/groupId
+artifactIdgroovy-eclipse-batch/artifactId
+  /exclusion
+/exclusions
+  /dependency
+  dependency
+groupIdorg.codehaus.groovy/groupId
+artifactIdgroovy-eclipse-batch/artifactId
+version2.1.8-01/version
+  /dependency
+/dependencies
  /plugin
   plugin
   groupIdorg.apache.maven.plugins/groupId

[2/2] git commit: Avoid potential NPE from testing.

[davsclaus]

Avoid potential NPE from testing.


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

Branch: refs/heads/camel-2.12.x
Commit: 415e51c89aa610c84278020647d36a92017a1349
Parents: b24ac95
Author: Claus Ibsen davscl...@apache.org
Authored: Mon Feb 24 18:28:50 2014 +0100
Committer: Claus Ibsen davscl...@apache.org
Committed: Mon Feb 24 18:42:00 2014 +0100

--
 .../camel/component/solr/SolrComponentTestSupport.java  | 12 
 1 file changed, 8 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/415e51c8/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrComponentTestSupport.java
--
diff --git 
a/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrComponentTestSupport.java
 
b/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrComponentTestSupport.java
index 853b281..a422943 100644
--- 
a/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrComponentTestSupport.java
+++ 
b/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrComponentTestSupport.java
@@ -75,7 +75,9 @@ public class SolrComponentTestSupport extends SolrTestSupport 
{
 
 @AfterClass
 public static void afterClass() throws Exception {
-solrRunner.stop();
+if (solrRunner != null) {
+solrRunner.stop();
+}
 }
 
 @Override
@@ -96,8 +98,10 @@ public class SolrComponentTestSupport extends 
SolrTestSupport {
 
 @Before
 public void clearIndex() throws Exception {
-// Clear the Solr index.
-solrServer.deleteByQuery(*:*);
-solrServer.commit();
+if (solrServer != null) {
+// Clear the Solr index.
+solrServer.deleteByQuery(*:*);
+solrServer.commit();
+}
 }
 }

[1/2] git commit: Avoid potential NPE from testing.

[davsclaus]

Repository: camel
Updated Branches:
  refs/heads/camel-2.12.x b24ac9557 - 415e51c89
  refs/heads/master 44fb0b47c - e052ed175


Avoid potential NPE from testing.


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

Branch: refs/heads/master
Commit: e052ed1759b1a6369996c500d88bbe7aeeef2250
Parents: 44fb0b4
Author: Claus Ibsen davscl...@apache.org
Authored: Mon Feb 24 18:28:50 2014 +0100
Committer: Claus Ibsen davscl...@apache.org
Committed: Mon Feb 24 18:41:51 2014 +0100

--
 .../camel/component/solr/SolrComponentTestSupport.java  | 12 
 1 file changed, 8 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/e052ed17/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrComponentTestSupport.java
--
diff --git 
a/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrComponentTestSupport.java
 
b/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrComponentTestSupport.java
index ff8f59a..c4b5522 100644
--- 
a/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrComponentTestSupport.java
+++ 
b/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrComponentTestSupport.java
@@ -75,7 +75,9 @@ public class SolrComponentTestSupport extends SolrTestSupport 
{
 
 @AfterClass
 public static void afterClass() throws Exception {
-solrRunner.stop();
+if (solrRunner != null) {
+solrRunner.stop();
+}
 }
 
 @Override
@@ -96,8 +98,10 @@ public class SolrComponentTestSupport extends 
SolrTestSupport {
 
 @Before
 public void clearIndex() throws Exception {
-// Clear the Solr index.
-solrServer.deleteByQuery(*:*);
-solrServer.commit();
+if (solrServer != null) {
+// Clear the Solr index.
+solrServer.deleteByQuery(*:*);
+solrServer.commit();
+}
 }
 }

git commit: fix for https://issues.apache.org/jira/browse/CAMEL-7230 SJMS does not respect QoS settings (ttl/persistence) for sending to queues

[ceposta]

Repository: camel
Updated Branches:
  refs/heads/camel-2.12.x 415e51c89 - ce2482002


fix for https://issues.apache.org/jira/browse/CAMEL-7230 SJMS does not respect 
QoS settings (ttl/persistence) for sending to queues


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

Branch: refs/heads/camel-2.12.x
Commit: ce248200223a627fa913446eaf5423b3b8c930a7
Parents: 415e51c
Author: Christian Posta christian.po...@gmail.com
Authored: Thu Feb 20 13:47:08 2014 -0700
Committer: Christian Posta christian.po...@gmail.com
Committed: Mon Feb 24 10:58:21 2014 -0700

--
 components/camel-sjms/pom.xml   |   5 +
 .../component/sjms/producer/InOnlyProducer.java |   8 +-
 .../component/sjms/producer/InOutProducer.java  |   7 +-
 .../sjms/producer/QueueProduerQoSTest.java  | 112 +++
 .../component/sjms/support/JmsTestSupport.java  |  26 -
 5 files changed, 146 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/ce248200/components/camel-sjms/pom.xml
--
diff --git a/components/camel-sjms/pom.xml b/components/camel-sjms/pom.xml
index 2b07ea9..4d583e0 100644
--- a/components/camel-sjms/pom.xml
+++ b/components/camel-sjms/pom.xml
@@ -77,6 +77,11 @@
   artifactIdactivemq-broker/artifactId
   scopetest/scope
 /dependency
+  dependency
+  groupIdorg.apache.activemq/groupId
+  artifactIdactivemq-kahadb-store/artifactId
+  scopetest/scope
+  /dependency
 dependency
   groupIdorg.apache.activemq/groupId
   artifactIdactivemq-pool/artifactId

http://git-wip-us.apache.org/repos/asf/camel/blob/ce248200/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/producer/InOnlyProducer.java
--
diff --git 
a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/producer/InOnlyProducer.java
 
b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/producer/InOnlyProducer.java
index 84eb1f5..e841e6b 100644
--- 
a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/producer/InOnlyProducer.java
+++ 
b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/producer/InOnlyProducer.java
@@ -70,12 +70,8 @@ public class InOnlyProducer extends SjmsProducer {
 session = conn.createSession(false, getAcknowledgeMode());
 }
 
-MessageProducer messageProducer;
-if (isTopic()) {
-messageProducer = 
JmsObjectFactory.createMessageProducer(session, getDestinationName(), 
isTopic(), isPersistent(), getTtl());
-} else {
-messageProducer = 
JmsObjectFactory.createQueueProducer(session, getDestinationName());
-}
+MessageProducer messageProducer = 
JmsObjectFactory.createMessageProducer(session, getDestinationName(), 
isTopic(), isPersistent(), getTtl());
+
 answer = new MessageProducerResources(session, messageProducer, 
commitStrategy);
 } catch (Exception e) {
 log.error(Unable to create the MessageProducer:  + 
e.getLocalizedMessage());

http://git-wip-us.apache.org/repos/asf/camel/blob/ce248200/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/producer/InOutProducer.java
--
diff --git 
a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/producer/InOutProducer.java
 
b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/producer/InOutProducer.java
index 0936ecf..2b93df7 100644
--- 
a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/producer/InOutProducer.java
+++ 
b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/producer/InOutProducer.java
@@ -248,11 +248,8 @@ public class InOutProducer extends SjmsProducer {
 } else {
 session = conn.createSession(false, getAcknowledgeMode());
 }
-if (isTopic()) {
-messageProducer = 
JmsObjectFactory.createMessageProducer(session, getDestinationName(), 
isTopic(), isPersistent(), getTtl());
-} else {
-messageProducer = 
JmsObjectFactory.createQueueProducer(session, getDestinationName());
-}
+
+messageProducer = JmsObjectFactory.createMessageProducer(session, 
getDestinationName(), isTopic(), isPersistent(), getTtl());
 
 if (session == null) {
 throw new CamelException(Message Consumer Creation Exception: 
Session 

svn commit: r4495 - /release/camel/apache-camel/2.12.2/

[ningjiang]

Author: ningjiang
Date: Tue Feb 25 06:26:15 2014
New Revision: 4495

Log:
Removed latest version of camel-2.12.x

Removed:
release/camel/apache-camel/2.12.2/

svn commit: r4496 - /release/camel/apache-camel/2.12.3/

[ningjiang]

Author: ningjiang
Date: Tue Feb 25 06:47:38 2014
New Revision: 4496

Log:
Apache Camel 2.12.3 released artifacts.

Added:
release/camel/apache-camel/2.12.3/
release/camel/apache-camel/2.12.3/apache-camel-2.12.3-src.zip   (with props)
release/camel/apache-camel/2.12.3/apache-camel-2.12.3-src.zip.asc
release/camel/apache-camel/2.12.3/apache-camel-2.12.3-src.zip.md5
release/camel/apache-camel/2.12.3/apache-camel-2.12.3-src.zip.sha1
release/camel/apache-camel/2.12.3/apache-camel-2.12.3.pom
release/camel/apache-camel/2.12.3/apache-camel-2.12.3.pom.asc
release/camel/apache-camel/2.12.3/apache-camel-2.12.3.pom.md5
release/camel/apache-camel/2.12.3/apache-camel-2.12.3.pom.sha1
release/camel/apache-camel/2.12.3/apache-camel-2.12.3.tar.gz   (with props)
release/camel/apache-camel/2.12.3/apache-camel-2.12.3.tar.gz.asc
release/camel/apache-camel/2.12.3/apache-camel-2.12.3.tar.gz.md5
release/camel/apache-camel/2.12.3/apache-camel-2.12.3.tar.gz.sha1
release/camel/apache-camel/2.12.3/apache-camel-2.12.3.zip   (with props)
release/camel/apache-camel/2.12.3/apache-camel-2.12.3.zip.asc
release/camel/apache-camel/2.12.3/apache-camel-2.12.3.zip.md5
release/camel/apache-camel/2.12.3/apache-camel-2.12.3.zip.sha1

Added: release/camel/apache-camel/2.12.3/apache-camel-2.12.3-src.zip
==
Binary file - no diff available.

Propchange: release/camel/apache-camel/2.12.3/apache-camel-2.12.3-src.zip
--
svn:mime-type = application/octet-stream

Added: release/camel/apache-camel/2.12.3/apache-camel-2.12.3-src.zip.asc
==
--- release/camel/apache-camel/2.12.3/apache-camel-2.12.3-src.zip.asc (added)
+++ release/camel/apache-camel/2.12.3/apache-camel-2.12.3-src.zip.asc Tue Feb 
25 06:47:38 2014
@@ -0,0 +1,17 @@
+-BEGIN PGP SIGNATURE-
+Version: GnuPG v1.4.11 (GNU/Linux)
+
+iQIcBAABAgAGBQJTBzqDAAoJEPBYilUU0N7pBOYP/jY39lrjL/WeN2YMZH13hxF0
+gIE42xX0HyTTaAmxCBdMyHBc2iXb9DN9rFzDvTMM64j3alwjMgsxYlimK1ncXUV9
+OR2v8Uo6mDNu9LQldArEMfkLOu6vVvOWz5etBk2dLnLXa8P4jD9cVlArrpL/mMkQ
+sp4jV5xNiyfWtUOfHAVYOF3c0lcWHG7Hljd9yYMD8/tXhJRVqevEU3cDNTbewmhB
+RNRu2p9kSGS3izEB00/hdC+PraYlHiSXjwSPiPrAkuTd2E6qUo3GuvJfpJeABwm3
+wJQf/gND4C5oONNRc8wJpTpEyk7PKQ0W0C/lSaLtCDQD4Ie1Rr3rTjad79E4IV9F
+40W3HSL7exRLr2GrgbOnPndB25HI8eqQoaZzSYtBqg63HZcuHGd69vmG5OQLFZl5
+uXm9SfavNRh52gRB5VR2ESvQbR+mpwSjozqXKV9VTTWRC0oMK4T9J25kWplrzNfC
+09BqAyrmXiT0kDTCPzenF1++2L6dZdqCJe6/dgsfYF3s7x7nMTBuuMV4l3DxJwLc
+pRR2pyiMcqvZlbwwR8Wit2FrR5lTNm+DfimMmh0qFmKj17ccdOiG9AeRBDg4JO7s
+iz+G0NChONFrOteHjqI3pFkU6Ds/+9n+/PUV1YmbQXa24ArGQGc7zV/fD+zQ+9AJ
+CwAJM9H5ycY/3mTf8vuT
+=AMYh
+-END PGP SIGNATURE-

Added: release/camel/apache-camel/2.12.3/apache-camel-2.12.3-src.zip.md5
==
--- release/camel/apache-camel/2.12.3/apache-camel-2.12.3-src.zip.md5 (added)
+++ release/camel/apache-camel/2.12.3/apache-camel-2.12.3-src.zip.md5 Tue Feb 
25 06:47:38 2014
@@ -0,0 +1 @@
+efd8005606d16ca75c44a8d252885aeb
\ No newline at end of file

Added: release/camel/apache-camel/2.12.3/apache-camel-2.12.3-src.zip.sha1
==
--- release/camel/apache-camel/2.12.3/apache-camel-2.12.3-src.zip.sha1 (added)
+++ release/camel/apache-camel/2.12.3/apache-camel-2.12.3-src.zip.sha1 Tue Feb 
25 06:47:38 2014
@@ -0,0 +1 @@
+6ba6826638637c81648879127d183fe542946d76
\ No newline at end of file

Added: release/camel/apache-camel/2.12.3/apache-camel-2.12.3.pom
==
--- release/camel/apache-camel/2.12.3/apache-camel-2.12.3.pom (added)
+++ release/camel/apache-camel/2.12.3/apache-camel-2.12.3.pom Tue Feb 25 
06:47:38 2014
@@ -0,0 +1,825 @@
+?xml version=1.0 encoding=UTF-8?
+!--
+  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.
+--
+project xmlns=http://maven.apache.org/POM/4.0.0; 
xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; 
xsi:schemaLocation=http://maven.apache.org/POM/4.0.0 

[CONF] Apache Camel Camel 2.12.3 Release

[willem jiang (Confluence)]

  


willem jiang created a page:
 


Camel 2.12.3 Release   





Camel 2.12.3 release

  


New and Noteworthy
Welcome to the 2.12.3 release which is mainly a bug fix release with 140 issues resolved..
For more details see theJIRA tickets 
Known Issues

SeeCamel 2.12.0 Release 

Important changes to consider when upgrading

SeeCamel 2.12.0 Release 

Notice

SeeCamel 2.12.0 Release 

Getting the Distributions
Binary Distributions




 Description 
 Download Link 
 PGP Signature file of download 


 Windows Distribution 
  apache-camel-2.12.3.zip  
  apache-camel-2.12.3.zip.asc  


 Unix/Linux/Cygwin Distribution 
  apache-camel-2.12.3.tar.gz  
  apache-camel-2.12.3.tar.gz.asc  





The above URLs use redirection
Icon

The above URLs use the Apache Mirror system to redirect you to a suitable mirror for your download. Some users have experienced issues with some versions of browsers (e.g. some Safari browsers). If the download doesn't seem to work for you from the above URL then try using FireFox 


Source Distributions




 

git commit: Update the release-distro.sh to use https download the artifacts

[ningjiang]

Repository: camel
Updated Branches:
  refs/heads/master e052ed175 - c39570c91


Update the release-distro.sh to use https download the artifacts


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

Branch: refs/heads/master
Commit: c39570c91a4b6133d5ac668e2c7e93e349ba94f2
Parents: e052ed1
Author: Willem Jiang willem.ji...@gmail.com
Authored: Tue Feb 25 15:22:38 2014 +0800
Committer: Willem Jiang willem.ji...@gmail.com
Committed: Tue Feb 25 15:23:15 2014 +0800

--
 etc/scripts/release-distro.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/c39570c9/etc/scripts/release-distro.sh
--
diff --git a/etc/scripts/release-distro.sh b/etc/scripts/release-distro.sh
index 5bfd249..4945bb7 100755
--- a/etc/scripts/release-distro.sh
+++ b/etc/scripts/release-distro.sh
@@ -46,7 +46,7 @@ echo ${DOWNLOAD}/${VERSION}
 wget -e robots=off --wait 3 --no-check-certificate \
  -r -np --reject=html,txt --follow-tags= \
  -P ${DOWNLOAD}/${VERSION} -nH --cut-dirs=3 --level=1 --ignore-length \
- 
http://repository.apache.org/content/repositories/releases/org/apache/camel/apache-camel/${VERSION}/;
+ 
https://repository.apache.org/content/repositories/releases/org/apache/camel/apache-camel/${VERSION}/;
 # Remove the signature check sum files
 rm ${DOWNLOAD}/${VERSION}/org/apache/camel/apache-camel/${VERSION}/*.asc.md5
 rm ${DOWNLOAD}/${VERSION}/org/apache/camel/apache-camel/${VERSION}/*.asc.sha1

[CONF] Apache Camel Camel 2.11.4 release

[willem jiang (Confluence)]

  


willem jiang created a page:
 


Camel 2.11.4 release   





Camel 2.11.4 release

  


New and Noteworthy
Welcome to the 2.11.4 release whichcomes with about 26 issues resolved.
For more details see the JIRA tickets 
Known Issues

See Camel 2.11.0 Release 

Important changes to consider when upgrading

See Camel 2.11.0 Release 

Notice

See Camel 2.11.0 Release 

Getting the Distributions
Binary Distributions




 Description 
 Download Link 
 PGP Signature file of download 


 Windows Distribution 
  apache-camel-2.11.4.zip  
  apache-camel-2.11.4.zip.asc  


 Unix/Linux/Cygwin Distribution 
  apache-camel-2.11.4.tar.gz  
  apache-camel-2.11.4.tar.gz.asc  





The above URLs use redirection
Icon

The above URLs use the Apache Mirror system to redirect you to a suitable mirror for your download. Some users have experienced issues with some versions of browsers (e.g. some Safari browsers). If the download doesn't seem to work for you from the above URL then try using FireFox 


Source Distributions

[CONF] Apache Camel Camel 2.11.4 Release

[willem jiang (Confluence)]

  


willem jiang edited the page:
 


Camel 2.11.4 Release   






 Camel 2.11.4 release 



 Wiki Markup




 {div:style=padding-right:20px;float:left;margin-left:-20px;}
!http://camel.apache.org/download.data/camel-box-v1.0-150x200.png!
{div} 






 Wiki Markup




 {div:style=min-height:200px}
{div} 



 New and Noteworthy 
Welcome to the 2.11.4 release whichcomes with about 26 issues resolved.
For more details see the JIRA tickets 
 Known Issues 

See Camel 2.11.0 Release 

 Important changes to consider when upgrading 

See Camel 2.11.0 Release 

 Notice 

See Camel 2.11.0 Release 

 Getting the Distributions 
 Binary Distributions 




 Description 
 Download Link 
 PGP Signature file of download 


 Windows Distribution 
  apache-camel-2.11.4.zip  
  apache-camel-2.11.4.zip.asc