[camel] branch master updated: removed duplicate lines

[cmueller]

This is an automated email from the ASF dual-hosted git repository.

cmueller pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/master by this push:
 new 641b86f  removed duplicate lines
641b86f is described below

commit 641b86f207e67ae2660e7e7706028f1a8ba0edf6
Author: Christian Mueller 
AuthorDate: Mon Apr 13 15:23:42 2020 +0200

removed duplicate lines
---
 .../src/main/java/org/apache/camel/component/jms/JmsConfiguration.java  | 2 --
 1 file changed, 2 deletions(-)

diff --git 
a/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java
 
b/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java
index 589a2fd..5da5131 100644
--- 
a/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java
+++ 
b/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java
@@ -1466,8 +1466,6 @@ public class JmsConfiguration implements Cloneable {
 protected void 
configureMessageListenerContainer(AbstractMessageListenerContainer container,
  JmsEndpoint endpoint) 
throws Exception {
 container.setConnectionFactory(getOrCreateListenerConnectionFactory());
-container.setConnectionFactory(getOrCreateListenerConnectionFactory());
-container.setConnectionFactory(getOrCreateListenerConnectionFactory());
 if (endpoint instanceof DestinationEndpoint) {
 
container.setDestinationResolver(createDestinationResolver((DestinationEndpoint)
 endpoint));
 } else if (destinationResolver != null) {

[camel] branch camel-2.20.x updated: fixed a checkstyle error

[cmueller]

This is an automated email from the ASF dual-hosted git repository.

cmueller pushed a commit to branch camel-2.20.x
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/camel-2.20.x by this push:
 new 26dc647  fixed a checkstyle error
26dc647 is described below

commit 26dc647a8f726dae78790d77e7c6a06e9e723773
Author: Christian Mueller <c...@amazon.com>
AuthorDate: Sat Mar 3 18:15:07 2018 +0100

fixed a checkstyle error
---
 .../camel/component/aws/sns/SnsProducerTest.java   | 24 ++
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git 
a/components/camel-aws/src/test/java/org/apache/camel/component/aws/sns/SnsProducerTest.java
 
b/components/camel-aws/src/test/java/org/apache/camel/component/aws/sns/SnsProducerTest.java
index bba7698..38fffdc 100644
--- 
a/components/camel-aws/src/test/java/org/apache/camel/component/aws/sns/SnsProducerTest.java
+++ 
b/components/camel-aws/src/test/java/org/apache/camel/component/aws/sns/SnsProducerTest.java
@@ -1,9 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.apache.camel.component.aws.sns;
 
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-import static org.mockito.Mockito.when;
-
 import java.util.HashMap;
 import java.util.Map;
 
@@ -19,6 +31,10 @@ import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.runners.MockitoJUnitRunner;
 
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+import static org.mockito.Mockito.when;
+
 @RunWith(MockitoJUnitRunner.class)
 public class SnsProducerTest {
 

-- 
To stop receiving notification emails like this one, please contact
cmuel...@apache.org.

[camel] branch master updated: fixed a checkstyle error

[cmueller]

This is an automated email from the ASF dual-hosted git repository.

cmueller pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/master by this push:
 new 960a276  fixed a checkstyle error
960a276 is described below

commit 960a2762dd4c624531251d9044e587f870fc82e2
Author: Christian Mueller <c...@amazon.com>
AuthorDate: Sat Mar 3 18:12:42 2018 +0100

fixed a checkstyle error
---
 .../camel/component/aws/sns/SnsProducerTest.java   | 24 ++
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git 
a/components/camel-aws/src/test/java/org/apache/camel/component/aws/sns/SnsProducerTest.java
 
b/components/camel-aws/src/test/java/org/apache/camel/component/aws/sns/SnsProducerTest.java
index 56f1b91..394db6d 100644
--- 
a/components/camel-aws/src/test/java/org/apache/camel/component/aws/sns/SnsProducerTest.java
+++ 
b/components/camel-aws/src/test/java/org/apache/camel/component/aws/sns/SnsProducerTest.java
@@ -1,9 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.apache.camel.component.aws.sns;
 
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-import static org.mockito.Mockito.when;
-
 import java.util.HashMap;
 import java.util.Map;
 
@@ -19,6 +31,10 @@ import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
 
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+import static org.mockito.Mockito.when;
+
 @RunWith(MockitoJUnitRunner.class)
 public class SnsProducerTest {
 

-- 
To stop receiving notification emails like this one, please contact
cmuel...@apache.org.

[camel] branch camel-2.19.x updated: CAMEL-12292: SnsProducer/SqsProducer setting MessageAttributes with empty values which causes errors

[cmueller]

This is an automated email from the ASF dual-hosted git repository.

cmueller pushed a commit to branch camel-2.19.x
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/camel-2.19.x by this push:
 new ac04b60  CAMEL-12292: SnsProducer/SqsProducer setting 
MessageAttributes with empty values which causes errors
ac04b60 is described below

commit ac04b60541572f861ef68701779f880f003e2313
Author: Christian Mueller <c...@amazon.com>
AuthorDate: Sat Mar 3 17:10:09 2018 +0100

CAMEL-12292: SnsProducer/SqsProducer setting MessageAttributes with empty 
values which causes errors
---
 .../camel/component/aws/sns/SnsProducer.java   |  4 +-
 .../camel/component/aws/sqs/SqsProducer.java   |  6 +-
 .../camel/component/aws/sns/SnsProducerTest.java   | 67 ++
 .../camel/component/aws/sqs/SqsProducerTest.java   | 20 ++-
 4 files changed, 91 insertions(+), 6 deletions(-)

diff --git 
a/components/camel-aws/src/main/java/org/apache/camel/component/aws/sns/SnsProducer.java
 
b/components/camel-aws/src/main/java/org/apache/camel/component/aws/sns/SnsProducer.java
index 36c4a15..d87add7 100644
--- 
a/components/camel-aws/src/main/java/org/apache/camel/component/aws/sns/SnsProducer.java
+++ 
b/components/camel-aws/src/main/java/org/apache/camel/component/aws/sns/SnsProducer.java
@@ -87,14 +87,14 @@ public class SnsProducer extends DefaultProducer {
 return structure;
 }
 
-private Map<String, MessageAttributeValue> translateAttributes(Map<String, 
Object> headers, Exchange exchange) {
+Map<String, MessageAttributeValue> translateAttributes(Map<String, Object> 
headers, Exchange exchange) {
 Map<String, MessageAttributeValue> result = new HashMap<String, 
MessageAttributeValue>();
 HeaderFilterStrategy headerFilterStrategy = 
getEndpoint().getHeaderFilterStrategy();
 for (Entry<String, Object> entry : headers.entrySet()) {
 // only put the message header which is not filtered into the 
message attribute
 if 
(!headerFilterStrategy.applyFilterToCamelHeaders(entry.getKey(), 
entry.getValue(), exchange)) {
 Object value = entry.getValue();
-if (value instanceof String) {
+if (value instanceof String && !((String)value).isEmpty()) {
 MessageAttributeValue mav = new MessageAttributeValue();
 mav.setDataType("String");
 mav.withStringValue((String)value);
diff --git 
a/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsProducer.java
 
b/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsProducer.java
index 682d75e..6268ea8 100644
--- 
a/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsProducer.java
+++ 
b/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsProducer.java
@@ -102,15 +102,15 @@ public class SqsProducer extends DefaultProducer {
 }
 return sqsProducerToString;
 }
-
-private Map<String, MessageAttributeValue> translateAttributes(Map<String, 
Object> headers, Exchange exchange) {
+
+Map<String, MessageAttributeValue> translateAttributes(Map<String, Object> 
headers, Exchange exchange) {
 Map<String, MessageAttributeValue> result = new HashMap<String, 
MessageAttributeValue>();
 HeaderFilterStrategy headerFilterStrategy = 
getEndpoint().getHeaderFilterStrategy();
 for (Entry<String, Object> entry : headers.entrySet()) {
 // only put the message header which is not filtered into the 
message attribute
 if 
(!headerFilterStrategy.applyFilterToCamelHeaders(entry.getKey(), 
entry.getValue(), exchange)) {
 Object value = entry.getValue();
-if (value instanceof String) {
+if (value instanceof String && !((String)value).isEmpty()) {
 MessageAttributeValue mav = new MessageAttributeValue();
 mav.setDataType("String");
 mav.withStringValue((String)value);
diff --git 
a/components/camel-aws/src/test/java/org/apache/camel/component/aws/sns/SnsProducerTest.java
 
b/components/camel-aws/src/test/java/org/apache/camel/component/aws/sns/SnsProducerTest.java
new file mode 100644
index 000..38fffdc
--- /dev/null
+++ 
b/components/camel-aws/src/test/java/org/apache/camel/component/aws/sns/SnsProducerTest.java
@@ -0,0 +1,67 @@
+/**
+ * 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

[camel] branch camel-2.20.x updated: CAMEL-12292: SnsProducer/SqsProducer setting MessageAttributes with empty values which causes errors

[cmueller]

This is an automated email from the ASF dual-hosted git repository.

cmueller pushed a commit to branch camel-2.20.x
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/camel-2.20.x by this push:
 new 519e639  CAMEL-12292: SnsProducer/SqsProducer setting 
MessageAttributes with empty values which causes errors
519e639 is described below

commit 519e63989512b35b4d7aac22c1c5b4e3fde01c8c
Author: Christian Mueller <c...@amazon.com>
AuthorDate: Sat Mar 3 17:10:09 2018 +0100

CAMEL-12292: SnsProducer/SqsProducer setting MessageAttributes with empty 
values which causes errors
---
 .../camel/component/aws/sns/SnsProducer.java   |  4 +-
 .../camel/component/aws/sqs/SqsProducer.java   |  6 +--
 .../camel/component/aws/sns/SnsProducerTest.java   | 51 ++
 .../camel/component/aws/sqs/SqsProducerTest.java   | 22 +-
 4 files changed, 76 insertions(+), 7 deletions(-)

diff --git 
a/components/camel-aws/src/main/java/org/apache/camel/component/aws/sns/SnsProducer.java
 
b/components/camel-aws/src/main/java/org/apache/camel/component/aws/sns/SnsProducer.java
index 36c4a15..d87add7 100644
--- 
a/components/camel-aws/src/main/java/org/apache/camel/component/aws/sns/SnsProducer.java
+++ 
b/components/camel-aws/src/main/java/org/apache/camel/component/aws/sns/SnsProducer.java
@@ -87,14 +87,14 @@ public class SnsProducer extends DefaultProducer {
 return structure;
 }
 
-private Map<String, MessageAttributeValue> translateAttributes(Map<String, 
Object> headers, Exchange exchange) {
+Map<String, MessageAttributeValue> translateAttributes(Map<String, Object> 
headers, Exchange exchange) {
 Map<String, MessageAttributeValue> result = new HashMap<String, 
MessageAttributeValue>();
 HeaderFilterStrategy headerFilterStrategy = 
getEndpoint().getHeaderFilterStrategy();
 for (Entry<String, Object> entry : headers.entrySet()) {
 // only put the message header which is not filtered into the 
message attribute
 if 
(!headerFilterStrategy.applyFilterToCamelHeaders(entry.getKey(), 
entry.getValue(), exchange)) {
 Object value = entry.getValue();
-if (value instanceof String) {
+if (value instanceof String && !((String)value).isEmpty()) {
 MessageAttributeValue mav = new MessageAttributeValue();
 mav.setDataType("String");
 mav.withStringValue((String)value);
diff --git 
a/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsProducer.java
 
b/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsProducer.java
index 682d75e..6268ea8 100644
--- 
a/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsProducer.java
+++ 
b/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsProducer.java
@@ -102,15 +102,15 @@ public class SqsProducer extends DefaultProducer {
 }
 return sqsProducerToString;
 }
-
-private Map<String, MessageAttributeValue> translateAttributes(Map<String, 
Object> headers, Exchange exchange) {
+
+Map<String, MessageAttributeValue> translateAttributes(Map<String, Object> 
headers, Exchange exchange) {
 Map<String, MessageAttributeValue> result = new HashMap<String, 
MessageAttributeValue>();
 HeaderFilterStrategy headerFilterStrategy = 
getEndpoint().getHeaderFilterStrategy();
 for (Entry<String, Object> entry : headers.entrySet()) {
 // only put the message header which is not filtered into the 
message attribute
 if 
(!headerFilterStrategy.applyFilterToCamelHeaders(entry.getKey(), 
entry.getValue(), exchange)) {
 Object value = entry.getValue();
-if (value instanceof String) {
+if (value instanceof String && !((String)value).isEmpty()) {
 MessageAttributeValue mav = new MessageAttributeValue();
 mav.setDataType("String");
 mav.withStringValue((String)value);
diff --git 
a/components/camel-aws/src/test/java/org/apache/camel/component/aws/sns/SnsProducerTest.java
 
b/components/camel-aws/src/test/java/org/apache/camel/component/aws/sns/SnsProducerTest.java
new file mode 100644
index 000..bba7698
--- /dev/null
+++ 
b/components/camel-aws/src/test/java/org/apache/camel/component/aws/sns/SnsProducerTest.java
@@ -0,0 +1,51 @@
+package org.apache.camel.component.aws.sns;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+import static org.mockito.Mockito.when;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import com.amazonaws.services.dynamodbv2.model.GetRecordsRequest;
+import com.ama

[camel] branch master updated: CAMEL-12292: SnsProducer/SqsProducer setting MessageAttributes with empty values which causes errors

[cmueller]

This is an automated email from the ASF dual-hosted git repository.

cmueller pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/master by this push:
 new aff032b  CAMEL-12292: SnsProducer/SqsProducer setting 
MessageAttributes with empty values which causes errors
aff032b is described below

commit aff032b7b415c73815d33cd44432ba52789127e3
Author: Christian Mueller <c...@amazon.com>
AuthorDate: Sat Mar 3 17:10:09 2018 +0100

CAMEL-12292: SnsProducer/SqsProducer setting MessageAttributes with empty 
values which causes errors
---
 .../camel/component/aws/sns/SnsProducer.java   |  4 +-
 .../camel/component/aws/sqs/SqsProducer.java   |  4 +-
 .../camel/component/aws/sns/SnsProducerTest.java   | 51 ++
 .../camel/component/aws/sqs/SqsProducerTest.java   | 19 +++-
 4 files changed, 73 insertions(+), 5 deletions(-)

diff --git 
a/components/camel-aws/src/main/java/org/apache/camel/component/aws/sns/SnsProducer.java
 
b/components/camel-aws/src/main/java/org/apache/camel/component/aws/sns/SnsProducer.java
index 36c4a15..d87add7 100644
--- 
a/components/camel-aws/src/main/java/org/apache/camel/component/aws/sns/SnsProducer.java
+++ 
b/components/camel-aws/src/main/java/org/apache/camel/component/aws/sns/SnsProducer.java
@@ -87,14 +87,14 @@ public class SnsProducer extends DefaultProducer {
 return structure;
 }
 
-private Map<String, MessageAttributeValue> translateAttributes(Map<String, 
Object> headers, Exchange exchange) {
+Map<String, MessageAttributeValue> translateAttributes(Map<String, Object> 
headers, Exchange exchange) {
 Map<String, MessageAttributeValue> result = new HashMap<String, 
MessageAttributeValue>();
 HeaderFilterStrategy headerFilterStrategy = 
getEndpoint().getHeaderFilterStrategy();
 for (Entry<String, Object> entry : headers.entrySet()) {
 // only put the message header which is not filtered into the 
message attribute
 if 
(!headerFilterStrategy.applyFilterToCamelHeaders(entry.getKey(), 
entry.getValue(), exchange)) {
 Object value = entry.getValue();
-if (value instanceof String) {
+if (value instanceof String && !((String)value).isEmpty()) {
 MessageAttributeValue mav = new MessageAttributeValue();
 mav.setDataType("String");
 mav.withStringValue((String)value);
diff --git 
a/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsProducer.java
 
b/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsProducer.java
index dfc2279..04a66e0 100644
--- 
a/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsProducer.java
+++ 
b/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsProducer.java
@@ -118,14 +118,14 @@ public class SqsProducer extends DefaultProducer {
 return sqsProducerToString;
 }
 
-private Map<String, MessageAttributeValue> translateAttributes(Map<String, 
Object> headers, Exchange exchange) {
+Map<String, MessageAttributeValue> translateAttributes(Map<String, Object> 
headers, Exchange exchange) {
 Map<String, MessageAttributeValue> result = new HashMap<String, 
MessageAttributeValue>();
 HeaderFilterStrategy headerFilterStrategy = 
getEndpoint().getHeaderFilterStrategy();
 for (Entry<String, Object> entry : headers.entrySet()) {
 // only put the message header which is not filtered into the 
message attribute
 if 
(!headerFilterStrategy.applyFilterToCamelHeaders(entry.getKey(), 
entry.getValue(), exchange)) {
 Object value = entry.getValue();
-if (value instanceof String) {
+if (value instanceof String && !((String)value).isEmpty()) {
 MessageAttributeValue mav = new MessageAttributeValue();
 mav.setDataType("String");
 mav.withStringValue((String)value);
diff --git 
a/components/camel-aws/src/test/java/org/apache/camel/component/aws/sns/SnsProducerTest.java
 
b/components/camel-aws/src/test/java/org/apache/camel/component/aws/sns/SnsProducerTest.java
new file mode 100644
index 000..56f1b91
--- /dev/null
+++ 
b/components/camel-aws/src/test/java/org/apache/camel/component/aws/sns/SnsProducerTest.java
@@ -0,0 +1,51 @@
+package org.apache.camel.component.aws.sns;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+import static org.mockito.Mockito.when;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import com.amazonaws.services.dynamodbv2.model.GetRecordsRequest;
+import com.amazonaws.services.sns.model.MessageAttributeValue;
+import org.apa

camel git commit: fixed CS error

[cmueller]

Repository: camel
Updated Branches:
  refs/heads/master fce2a5ab5 -> d0dafc6f9


fixed CS error


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

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

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


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

camel git commit: added integration test for Amazon Kinesis Streams integration

[cmueller]

Repository: camel
Updated Branches:
  refs/heads/master 833a1a301 -> fce2a5ab5


added integration test for Amazon Kinesis Streams integration


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

Branch: refs/heads/master
Commit: fce2a5ab51ec7371fa77a354856ae19b3f5862fb
Parents: 833a1a3
Author: cmueller <christian.muel...@gmail.com>
Authored: Sun Mar 26 12:50:16 2017 +0200
Committer: cmueller <christian.muel...@gmail.com>
Committed: Sun Mar 26 12:50:16 2017 +0200

--
 .../KinesisComponentIntegrationTest.java| 103 +++
 1 file changed, 103 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/fce2a5ab/components/camel-aws/src/test/java/org/apache/camel/component/aws/kinesis/integration/KinesisComponentIntegrationTest.java
--
diff --git 
a/components/camel-aws/src/test/java/org/apache/camel/component/aws/kinesis/integration/KinesisComponentIntegrationTest.java
 
b/components/camel-aws/src/test/java/org/apache/camel/component/aws/kinesis/integration/KinesisComponentIntegrationTest.java
new file mode 100644
index 000..5764c59
--- /dev/null
+++ 
b/components/camel-aws/src/test/java/org/apache/camel/component/aws/kinesis/integration/KinesisComponentIntegrationTest.java
@@ -0,0 +1,103 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.aws.kinesis.integration;
+
+import org.apache.camel.EndpointInject;
+import org.apache.camel.Exchange;
+import org.apache.camel.ExchangePattern;
+import org.apache.camel.Processor;
+import org.apache.camel.ProducerTemplate;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.aws.kinesis.KinesisConstants;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.impl.JndiRegistry;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Ignore;
+import org.junit.Test;
+
+import com.amazonaws.regions.Regions;
+import com.amazonaws.services.kinesis.AmazonKinesis;
+import com.amazonaws.services.kinesis.AmazonKinesisClientBuilder;
+import com.amazonaws.services.kinesis.model.Record;
+
+@Ignore("Must be manually tested.")
+public class KinesisComponentIntegrationTest extends CamelTestSupport {
+
+@EndpointInject(uri = "direct:start")
+private ProducerTemplate template;
+
+@EndpointInject(uri = "mock:result")
+private MockEndpoint result;
+
+@Test
+public void send() throws Exception {
+result.expectedMessageCount(2);
+
+template.send("direct:start", ExchangePattern.InOnly, new Processor() {
+public void process(Exchange exchange) throws Exception {
+exchange.getIn().setHeader(KinesisConstants.PARTITION_KEY, 
"partition-1");
+exchange.getIn().setBody("Kinesis Event 1.");
+}
+});
+
+template.send("direct:start", ExchangePattern.InOut, new Processor() {
+public void process(Exchange exchange) throws Exception {
+exchange.getIn().setHeader(KinesisConstants.PARTITION_KEY, 
"partition-1");
+exchange.getIn().setBody("Kinesis Event 2.");
+}
+});
+
+assertMockEndpointsSatisfied();
+
+assertResultExchange(result.getExchanges().get(0), "Kinesis Event 1.", 
"partition-1");
+assertResultExchange(result.getExchanges().get(1), "Kinesis Event 2.", 
"partition-1");
+}
+
+private void assertResultExchange(Exchange resultExchange, String data, 
String partition) {
+assertIsInstanceOf(Record.class, resultExchange.getIn().getBody());
+Record record = resultExchange

camel git commit: updated CXF from 3.1.7 to 3.1.8

[cmueller]

Repository: camel
Updated Branches:
  refs/heads/master 8c1d54c6d -> 739f818d5


updated CXF from 3.1.7 to 3.1.8


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

Branch: refs/heads/master
Commit: 739f818d5f246652ed18c925104772b75998460f
Parents: 8c1d54c
Author: Christian Mueller 
Authored: Sat Nov 5 19:28:06 2016 +0100
Committer: Christian Mueller 
Committed: Sat Nov 5 19:28:06 2016 +0100

--
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/739f818d/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index bb8761d..d35d165 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -148,7 +148,7 @@
 0.12.7_1
 2.7
 2.11.0
-3.1.7
+3.1.8
 [3.0,4.0)
 3.0.5
 3.0.5

camel git commit: updated dependency-check-maven plugin from 1.4.3 to 1.4.4

[cmueller]

Repository: camel
Updated Branches:
  refs/heads/master 0c0442637 -> 8c1d54c6d


updated dependency-check-maven plugin from 1.4.3 to 1.4.4


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

Branch: refs/heads/master
Commit: 8c1d54c6d0cfe283a4bd1ffe1ddd11c3f4a6c504
Parents: 0c04426
Author: Christian Mueller 
Authored: Sat Nov 5 18:05:57 2016 +0100
Committer: Christian Mueller 
Committed: Sat Nov 5 18:05:57 2016 +0100

--
 parent/pom.xml | 24 
 1 file changed, 12 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/8c1d54c6/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 62e845e..bb8761d 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -409,11 +409,11 @@
 ${maven-bundle-plugin-version}
 3.2.0
 2.17
-
 6.17
-1.4.3
+1.4.4
 2.10
 2.6
 2.9.1
@@ -479,7 +479,7 @@
 1.3.2
 1.8.6
 1.8.12
-0.6  
+0.6
 1.6.1
 3.1.0
 0.28_1
@@ -657,7 +657,7 @@
 
[$(version;==;$(@)),$(version;+;$(@)))
 
   !org.springframework.boot.*,
-  !org.springframework.context.annotation.*;resolution:=optional,
+  !org.springframework.context.annotation.*;resolution:=optional,
   org.osgi.framework;version="[1.5,2)",
   org.osgi.framework.wiring;version="[1.0,2)",
   org.springframework.ws.*;version="[2,3)",
@@ -1181,7 +1181,7 @@
 org.apache.camel
 camel-ignite
 ${project.version}
-
+  
   
 org.apache.camel
 camel-irc
@@ -3115,7 +3115,7 @@
   
 
   
-
+
   
 com.fasterxml.jackson.core
 jackson-annotations
@@ -3177,7 +3177,7 @@
 netty-all
 ${netty-version}
   
-  
+
   
   
 org.apache.abdera
@@ -3191,7 +3191,7 @@
 commons-pool2
 ${commons-pool2-version}
   
-  
+
   
   
 org.apache.cxf
@@ -3299,7 +3299,7 @@
 kafka-clients
 ${kafka-version}
   
-  
+
   
   
 com.github.ben-manes.caffeine
@@ -3626,7 +3626,7 @@
 scala-library
 ${scala-version}
   
-  
+
   
 javax.annotation
 jsr250-api
@@ -4015,7 +4015,7 @@
 jira-rest-java-client
 ${jira-rest-client-version}
   
- 
+
   
   
 com.google.code.scriptengines
@@ -4686,7 +4686,7 @@
   
 
   
-  
+
   
 org.apache.felix
 maven-bundle-plugin

camel git commit: added the missing license and notice files to the new camel-bonita component

[cmueller]

Repository: camel
Updated Branches:
  refs/heads/master e55502ea0 -> 0c0442637


added the missing license and notice files to the new camel-bonita component


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

Branch: refs/heads/master
Commit: 0c044263768edd847f9efb8620483a0d1c7c40f0
Parents: e55502e
Author: Christian Mueller 
Authored: Sat Nov 5 13:57:34 2016 +0100
Committer: Christian Mueller 
Committed: Sat Nov 5 13:57:34 2016 +0100

--
 .../src/main/resources/META-INF/LICENSE.txt | 203 +++
 .../src/main/resources/META-INF/NOTICE.txt  |  11 +
 2 files changed, 214 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/0c044263/components/camel-bonita/src/main/resources/META-INF/LICENSE.txt
--
diff --git a/components/camel-bonita/src/main/resources/META-INF/LICENSE.txt 
b/components/camel-bonita/src/main/resources/META-INF/LICENSE.txt
new file mode 100755
index 000..6b0b127
--- /dev/null
+++ b/components/camel-bonita/src/main/resources/META-INF/LICENSE.txt
@@ -0,0 +1,203 @@
+
+ Apache License
+   Version 2.0, January 2004
+http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+  "License" shall mean the terms and conditions for use, reproduction,
+  and distribution as defined by Sections 1 through 9 of this document.
+
+  "Licensor" shall mean the copyright owner or entity authorized by
+  the copyright owner that is granting the License.
+
+  "Legal Entity" shall mean the union of the acting entity and all
+  other entities that control, are controlled by, or are under common
+  control with that entity. For the purposes of this definition,
+  "control" means (i) the power, direct or indirect, to cause the
+  direction or management of such entity, whether by contract or
+  otherwise, or (ii) ownership of fifty percent (50%) or more of the
+  outstanding shares, or (iii) beneficial ownership of such entity.
+
+  "You" (or "Your") shall mean an individual or Legal Entity
+  exercising permissions granted by this License.
+
+  "Source" form shall mean the preferred form for making modifications,
+  including but not limited to software source code, documentation
+  source, and configuration files.
+
+  "Object" form shall mean any form resulting from mechanical
+  transformation or translation of a Source form, including but
+  not limited to compiled object code, generated documentation,
+  and conversions to other media types.
+
+  "Work" shall mean the work of authorship, whether in Source or
+  Object form, made available under the License, as indicated by a
+  copyright notice that is included in or attached to the work
+  (an example is provided in the Appendix below).
+
+  "Derivative Works" shall mean any work, whether in Source or Object
+  form, that is based on (or derived from) the Work and for which the
+  editorial revisions, annotations, elaborations, or other modifications
+  represent, as a whole, an original work of authorship. For the purposes
+  of this License, Derivative Works shall not include works that remain
+  separable from, or merely link (or bind by name) to the interfaces of,
+  the Work and Derivative Works thereof.
+
+  "Contribution" shall mean any work of authorship, including
+  the original version of the Work and any modifications or additions
+  to that Work or Derivative Works thereof, that is intentionally
+  submitted to Licensor for inclusion in the Work by the copyright owner
+  or by an individual or Legal Entity authorized to submit on behalf of
+  the copyright owner. For the purposes of this definition, "submitted"
+  means any form of electronic, verbal, or written communication sent
+  to the Licensor or its representatives, including but not limited to
+  communication on electronic mailing lists, source code control systems,
+  and issue tracking systems that are managed by, or on behalf of, the
+  Licensor for the purpose of discussing and improving the Work, but
+  excluding communication that is conspicuously marked or otherwise
+  designated in writing by the copyright owner as "Not a Contribution."
+
+  "Contributor" shall mean Licensor and any individual or Legal Entity
+  on behalf of whom a Contribution has been received by 

camel git commit: fixed a CS error

[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,

camel git commit: added the missing license and notice file to the camel-telegram component

[cmueller]

Repository: camel
Updated Branches:
  refs/heads/master fb5901681 -> 03f231e0b


added the missing license and notice file to the camel-telegram component


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

Branch: refs/heads/master
Commit: 03f231e0b7f9a735ae06805ae16d953faa1dad24
Parents: fb59016
Author: Christian Mueller 
Authored: Thu Oct 6 07:57:37 2016 +0200
Committer: Christian Mueller 
Committed: Thu Oct 6 07:57:37 2016 +0200

--
 .../src/main/resources/META-INF/LICENSE.txt | 203 +++
 .../src/main/resources/META-INF/NOTICE.txt  |  11 +
 2 files changed, 214 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/03f231e0/components/camel-telegram/src/main/resources/META-INF/LICENSE.txt
--
diff --git a/components/camel-telegram/src/main/resources/META-INF/LICENSE.txt 
b/components/camel-telegram/src/main/resources/META-INF/LICENSE.txt
new file mode 100644
index 000..6b0b127
--- /dev/null
+++ b/components/camel-telegram/src/main/resources/META-INF/LICENSE.txt
@@ -0,0 +1,203 @@
+
+ Apache License
+   Version 2.0, January 2004
+http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+  "License" shall mean the terms and conditions for use, reproduction,
+  and distribution as defined by Sections 1 through 9 of this document.
+
+  "Licensor" shall mean the copyright owner or entity authorized by
+  the copyright owner that is granting the License.
+
+  "Legal Entity" shall mean the union of the acting entity and all
+  other entities that control, are controlled by, or are under common
+  control with that entity. For the purposes of this definition,
+  "control" means (i) the power, direct or indirect, to cause the
+  direction or management of such entity, whether by contract or
+  otherwise, or (ii) ownership of fifty percent (50%) or more of the
+  outstanding shares, or (iii) beneficial ownership of such entity.
+
+  "You" (or "Your") shall mean an individual or Legal Entity
+  exercising permissions granted by this License.
+
+  "Source" form shall mean the preferred form for making modifications,
+  including but not limited to software source code, documentation
+  source, and configuration files.
+
+  "Object" form shall mean any form resulting from mechanical
+  transformation or translation of a Source form, including but
+  not limited to compiled object code, generated documentation,
+  and conversions to other media types.
+
+  "Work" shall mean the work of authorship, whether in Source or
+  Object form, made available under the License, as indicated by a
+  copyright notice that is included in or attached to the work
+  (an example is provided in the Appendix below).
+
+  "Derivative Works" shall mean any work, whether in Source or Object
+  form, that is based on (or derived from) the Work and for which the
+  editorial revisions, annotations, elaborations, or other modifications
+  represent, as a whole, an original work of authorship. For the purposes
+  of this License, Derivative Works shall not include works that remain
+  separable from, or merely link (or bind by name) to the interfaces of,
+  the Work and Derivative Works thereof.
+
+  "Contribution" shall mean any work of authorship, including
+  the original version of the Work and any modifications or additions
+  to that Work or Derivative Works thereof, that is intentionally
+  submitted to Licensor for inclusion in the Work by the copyright owner
+  or by an individual or Legal Entity authorized to submit on behalf of
+  the copyright owner. For the purposes of this definition, "submitted"
+  means any form of electronic, verbal, or written communication sent
+  to the Licensor or its representatives, including but not limited to
+  communication on electronic mailing lists, source code control systems,
+  and issue tracking systems that are managed by, or on behalf of, the
+  Licensor for the purpose of discussing and improving the Work, but
+  excluding communication that is conspicuously marked or otherwise
+  designated in writing by the copyright owner as "Not a Contribution."
+
+  "Contributor" shall mean Licensor and any individual or Legal Entity
+  on behalf of whom a Contribution has been received by 

camel git commit: added the missing license and notice file to the camel-servicenow component

[cmueller]

Repository: camel
Updated Branches:
  refs/heads/master dfa25dbfb -> fb5901681


added the missing license and notice file to the camel-servicenow component


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

Branch: refs/heads/master
Commit: fb5901681c35ad9cbadd243ef98fda73bc29
Parents: dfa25db
Author: Christian Mueller 
Authored: Thu Oct 6 07:54:38 2016 +0200
Committer: Christian Mueller 
Committed: Thu Oct 6 07:54:38 2016 +0200

--
 .../src/main/resources/META-INF/LICENSE.txt | 203 +++
 .../src/main/resources/META-INF/NOTICE.txt  |  11 +
 2 files changed, 214 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/fb590168/components/camel-servicenow/src/main/resources/META-INF/LICENSE.txt
--
diff --git 
a/components/camel-servicenow/src/main/resources/META-INF/LICENSE.txt 
b/components/camel-servicenow/src/main/resources/META-INF/LICENSE.txt
new file mode 100644
index 000..6b0b127
--- /dev/null
+++ b/components/camel-servicenow/src/main/resources/META-INF/LICENSE.txt
@@ -0,0 +1,203 @@
+
+ Apache License
+   Version 2.0, January 2004
+http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+  "License" shall mean the terms and conditions for use, reproduction,
+  and distribution as defined by Sections 1 through 9 of this document.
+
+  "Licensor" shall mean the copyright owner or entity authorized by
+  the copyright owner that is granting the License.
+
+  "Legal Entity" shall mean the union of the acting entity and all
+  other entities that control, are controlled by, or are under common
+  control with that entity. For the purposes of this definition,
+  "control" means (i) the power, direct or indirect, to cause the
+  direction or management of such entity, whether by contract or
+  otherwise, or (ii) ownership of fifty percent (50%) or more of the
+  outstanding shares, or (iii) beneficial ownership of such entity.
+
+  "You" (or "Your") shall mean an individual or Legal Entity
+  exercising permissions granted by this License.
+
+  "Source" form shall mean the preferred form for making modifications,
+  including but not limited to software source code, documentation
+  source, and configuration files.
+
+  "Object" form shall mean any form resulting from mechanical
+  transformation or translation of a Source form, including but
+  not limited to compiled object code, generated documentation,
+  and conversions to other media types.
+
+  "Work" shall mean the work of authorship, whether in Source or
+  Object form, made available under the License, as indicated by a
+  copyright notice that is included in or attached to the work
+  (an example is provided in the Appendix below).
+
+  "Derivative Works" shall mean any work, whether in Source or Object
+  form, that is based on (or derived from) the Work and for which the
+  editorial revisions, annotations, elaborations, or other modifications
+  represent, as a whole, an original work of authorship. For the purposes
+  of this License, Derivative Works shall not include works that remain
+  separable from, or merely link (or bind by name) to the interfaces of,
+  the Work and Derivative Works thereof.
+
+  "Contribution" shall mean any work of authorship, including
+  the original version of the Work and any modifications or additions
+  to that Work or Derivative Works thereof, that is intentionally
+  submitted to Licensor for inclusion in the Work by the copyright owner
+  or by an individual or Legal Entity authorized to submit on behalf of
+  the copyright owner. For the purposes of this definition, "submitted"
+  means any form of electronic, verbal, or written communication sent
+  to the Licensor or its representatives, including but not limited to
+  communication on electronic mailing lists, source code control systems,
+  and issue tracking systems that are managed by, or on behalf of, the
+  Licensor for the purpose of discussing and improving the Work, but
+  excluding communication that is conspicuously marked or otherwise
+  designated in writing by the copyright owner as "Not a Contribution."
+
+  "Contributor" shall mean Licensor and any individual or Legal Entity
+  on behalf of whom a Contribution has been 

camel git commit: added the missing license and notice file to the camel-cm-sms component

[cmueller]

Repository: camel
Updated Branches:
  refs/heads/master 53afcd0fb -> dfa25dbfb


added the missing license and notice file to the camel-cm-sms component


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

Branch: refs/heads/master
Commit: dfa25dbfb11a2745e7d99d601c4fe1d9d1887f44
Parents: 53afcd0
Author: Christian Mueller 
Authored: Thu Oct 6 07:47:35 2016 +0200
Committer: Christian Mueller 
Committed: Thu Oct 6 07:47:35 2016 +0200

--
 .../src/main/resources/META-INF/LICENSE.txt | 203 +++
 .../src/main/resources/META-INF/NOTICE.txt  |  11 +
 2 files changed, 214 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/dfa25dbf/components/camel-cm-sms/src/main/resources/META-INF/LICENSE.txt
--
diff --git a/components/camel-cm-sms/src/main/resources/META-INF/LICENSE.txt 
b/components/camel-cm-sms/src/main/resources/META-INF/LICENSE.txt
new file mode 100644
index 000..6b0b127
--- /dev/null
+++ b/components/camel-cm-sms/src/main/resources/META-INF/LICENSE.txt
@@ -0,0 +1,203 @@
+
+ Apache License
+   Version 2.0, January 2004
+http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+  "License" shall mean the terms and conditions for use, reproduction,
+  and distribution as defined by Sections 1 through 9 of this document.
+
+  "Licensor" shall mean the copyright owner or entity authorized by
+  the copyright owner that is granting the License.
+
+  "Legal Entity" shall mean the union of the acting entity and all
+  other entities that control, are controlled by, or are under common
+  control with that entity. For the purposes of this definition,
+  "control" means (i) the power, direct or indirect, to cause the
+  direction or management of such entity, whether by contract or
+  otherwise, or (ii) ownership of fifty percent (50%) or more of the
+  outstanding shares, or (iii) beneficial ownership of such entity.
+
+  "You" (or "Your") shall mean an individual or Legal Entity
+  exercising permissions granted by this License.
+
+  "Source" form shall mean the preferred form for making modifications,
+  including but not limited to software source code, documentation
+  source, and configuration files.
+
+  "Object" form shall mean any form resulting from mechanical
+  transformation or translation of a Source form, including but
+  not limited to compiled object code, generated documentation,
+  and conversions to other media types.
+
+  "Work" shall mean the work of authorship, whether in Source or
+  Object form, made available under the License, as indicated by a
+  copyright notice that is included in or attached to the work
+  (an example is provided in the Appendix below).
+
+  "Derivative Works" shall mean any work, whether in Source or Object
+  form, that is based on (or derived from) the Work and for which the
+  editorial revisions, annotations, elaborations, or other modifications
+  represent, as a whole, an original work of authorship. For the purposes
+  of this License, Derivative Works shall not include works that remain
+  separable from, or merely link (or bind by name) to the interfaces of,
+  the Work and Derivative Works thereof.
+
+  "Contribution" shall mean any work of authorship, including
+  the original version of the Work and any modifications or additions
+  to that Work or Derivative Works thereof, that is intentionally
+  submitted to Licensor for inclusion in the Work by the copyright owner
+  or by an individual or Legal Entity authorized to submit on behalf of
+  the copyright owner. For the purposes of this definition, "submitted"
+  means any form of electronic, verbal, or written communication sent
+  to the Licensor or its representatives, including but not limited to
+  communication on electronic mailing lists, source code control systems,
+  and issue tracking systems that are managed by, or on behalf of, the
+  Licensor for the purpose of discussing and improving the Work, but
+  excluding communication that is conspicuously marked or otherwise
+  designated in writing by the copyright owner as "Not a Contribution."
+
+  "Contributor" shall mean Licensor and any individual or Legal Entity
+  on behalf of whom a Contribution has been received by Licensor 

svn commit: r15208 - /release/camel/apache-camel/2.17.2/

[cmueller]

Author: cmueller
Date: Wed Sep  7 21:12:52 2016
New Revision: 15208

Log:
Removed the old release

Removed:
release/camel/apache-camel/2.17.2/

camel git commit: added the missing notice and license files

[cmueller]

Repository: camel
Updated Branches:
  refs/heads/camel-2.17.x f85da -> e9bb6ba36


added the missing notice and license files


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

Branch: refs/heads/camel-2.17.x
Commit: e9bb6ba365edb27e3951acacd94301ffd84833a9
Parents: f85
Author: Christian Mueller 
Authored: Thu Mar 24 22:58:23 2016 +0100
Committer: Christian Mueller 
Committed: Thu Mar 24 23:00:30 2016 +0100

--
 .../src/main/resources/META-INF/LICENSE.txt | 203 +++
 .../src/main/resources/META-INF/NOTICE.txt  |  11 +
 .../src/main/resources/META-INF/LICENSE.txt | 203 +++
 .../src/main/resources/META-INF/NOTICE.txt  |  11 +
 .../src/main/resources/META-INF/LICENSE.txt | 203 +++
 .../src/main/resources/META-INF/NOTICE.txt  |  11 +
 .../src/main/resources/META-INF/LICENSE.txt | 203 +++
 .../src/main/resources/META-INF/NOTICE.txt  |  11 +
 8 files changed, 856 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/e9bb6ba3/components/camel-braintree/src/main/resources/META-INF/LICENSE.txt
--
diff --git a/components/camel-braintree/src/main/resources/META-INF/LICENSE.txt 
b/components/camel-braintree/src/main/resources/META-INF/LICENSE.txt
new file mode 100644
index 000..6b0b127
--- /dev/null
+++ b/components/camel-braintree/src/main/resources/META-INF/LICENSE.txt
@@ -0,0 +1,203 @@
+
+ Apache License
+   Version 2.0, January 2004
+http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+  "License" shall mean the terms and conditions for use, reproduction,
+  and distribution as defined by Sections 1 through 9 of this document.
+
+  "Licensor" shall mean the copyright owner or entity authorized by
+  the copyright owner that is granting the License.
+
+  "Legal Entity" shall mean the union of the acting entity and all
+  other entities that control, are controlled by, or are under common
+  control with that entity. For the purposes of this definition,
+  "control" means (i) the power, direct or indirect, to cause the
+  direction or management of such entity, whether by contract or
+  otherwise, or (ii) ownership of fifty percent (50%) or more of the
+  outstanding shares, or (iii) beneficial ownership of such entity.
+
+  "You" (or "Your") shall mean an individual or Legal Entity
+  exercising permissions granted by this License.
+
+  "Source" form shall mean the preferred form for making modifications,
+  including but not limited to software source code, documentation
+  source, and configuration files.
+
+  "Object" form shall mean any form resulting from mechanical
+  transformation or translation of a Source form, including but
+  not limited to compiled object code, generated documentation,
+  and conversions to other media types.
+
+  "Work" shall mean the work of authorship, whether in Source or
+  Object form, made available under the License, as indicated by a
+  copyright notice that is included in or attached to the work
+  (an example is provided in the Appendix below).
+
+  "Derivative Works" shall mean any work, whether in Source or Object
+  form, that is based on (or derived from) the Work and for which the
+  editorial revisions, annotations, elaborations, or other modifications
+  represent, as a whole, an original work of authorship. For the purposes
+  of this License, Derivative Works shall not include works that remain
+  separable from, or merely link (or bind by name) to the interfaces of,
+  the Work and Derivative Works thereof.
+
+  "Contribution" shall mean any work of authorship, including
+  the original version of the Work and any modifications or additions
+  to that Work or Derivative Works thereof, that is intentionally
+  submitted to Licensor for inclusion in the Work by the copyright owner
+  or by an individual or Legal Entity authorized to submit on behalf of
+  the copyright owner. For the purposes of this definition, "submitted"
+  means any form of electronic, verbal, or written communication sent
+  to the Licensor or its representatives, including but not limited to
+  communication on electronic mailing lists, source code control systems,
+  and issue tracking systems that are managed by, or 

camel git commit: added the missing notice and license files

[cmueller]

Repository: camel
Updated Branches:
  refs/heads/master b4e7644bd -> 8533e76e6


added the missing notice and license files


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

Branch: refs/heads/master
Commit: 8533e76e647478b1a089558924f575eda2492f4a
Parents: b4e7644
Author: Christian Mueller 
Authored: Thu Mar 24 22:58:23 2016 +0100
Committer: Christian Mueller 
Committed: Thu Mar 24 22:58:23 2016 +0100

--
 .../src/main/resources/META-INF/LICENSE.txt | 203 +++
 .../src/main/resources/META-INF/NOTICE.txt  |  11 +
 .../src/main/resources/META-INF/LICENSE.txt | 203 +++
 .../src/main/resources/META-INF/NOTICE.txt  |  11 +
 .../src/main/resources/META-INF/LICENSE.txt | 203 +++
 .../src/main/resources/META-INF/NOTICE.txt  |  11 +
 .../src/main/resources/META-INF/LICENSE.txt | 203 +++
 .../src/main/resources/META-INF/NOTICE.txt  |  11 +
 8 files changed, 856 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/8533e76e/components/camel-braintree/src/main/resources/META-INF/LICENSE.txt
--
diff --git a/components/camel-braintree/src/main/resources/META-INF/LICENSE.txt 
b/components/camel-braintree/src/main/resources/META-INF/LICENSE.txt
new file mode 100644
index 000..6b0b127
--- /dev/null
+++ b/components/camel-braintree/src/main/resources/META-INF/LICENSE.txt
@@ -0,0 +1,203 @@
+
+ Apache License
+   Version 2.0, January 2004
+http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+  "License" shall mean the terms and conditions for use, reproduction,
+  and distribution as defined by Sections 1 through 9 of this document.
+
+  "Licensor" shall mean the copyright owner or entity authorized by
+  the copyright owner that is granting the License.
+
+  "Legal Entity" shall mean the union of the acting entity and all
+  other entities that control, are controlled by, or are under common
+  control with that entity. For the purposes of this definition,
+  "control" means (i) the power, direct or indirect, to cause the
+  direction or management of such entity, whether by contract or
+  otherwise, or (ii) ownership of fifty percent (50%) or more of the
+  outstanding shares, or (iii) beneficial ownership of such entity.
+
+  "You" (or "Your") shall mean an individual or Legal Entity
+  exercising permissions granted by this License.
+
+  "Source" form shall mean the preferred form for making modifications,
+  including but not limited to software source code, documentation
+  source, and configuration files.
+
+  "Object" form shall mean any form resulting from mechanical
+  transformation or translation of a Source form, including but
+  not limited to compiled object code, generated documentation,
+  and conversions to other media types.
+
+  "Work" shall mean the work of authorship, whether in Source or
+  Object form, made available under the License, as indicated by a
+  copyright notice that is included in or attached to the work
+  (an example is provided in the Appendix below).
+
+  "Derivative Works" shall mean any work, whether in Source or Object
+  form, that is based on (or derived from) the Work and for which the
+  editorial revisions, annotations, elaborations, or other modifications
+  represent, as a whole, an original work of authorship. For the purposes
+  of this License, Derivative Works shall not include works that remain
+  separable from, or merely link (or bind by name) to the interfaces of,
+  the Work and Derivative Works thereof.
+
+  "Contribution" shall mean any work of authorship, including
+  the original version of the Work and any modifications or additions
+  to that Work or Derivative Works thereof, that is intentionally
+  submitted to Licensor for inclusion in the Work by the copyright owner
+  or by an individual or Legal Entity authorized to submit on behalf of
+  the copyright owner. For the purposes of this definition, "submitted"
+  means any form of electronic, verbal, or written communication sent
+  to the Licensor or its representatives, including but not limited to
+  communication on electronic mailing lists, source code control systems,
+  and issue tracking systems that are managed by, or on behalf 

camel git commit: fixed CS error

[cmueller]

Repository: camel
Updated Branches:
  refs/heads/camel-2.16.x 395675341 -> f8c8bdcd9


fixed CS error


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

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

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


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

camel git commit: fixed CS error

[cmueller]

Repository: camel
Updated Branches:
  refs/heads/camel-2.15.x 00d37f6ff -> b7aeb46a9


fixed CS error


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

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

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


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

camel git commit: fixed CS error

[cmueller]

Repository: camel
Updated Branches:
  refs/heads/master c8833ddf9 -> ac4fff949


fixed CS error


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

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

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


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

svn commit: r10956 - /release/camel/apache-camel/2.15.4/

[cmueller]

Author: cmueller
Date: Thu Oct 29 21:11:25 2015
New Revision: 10956

Log:
Apache Camel 2.15.4 released artifacts.

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

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

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

Added: release/camel/apache-camel/2.15.4/apache-camel-2.15.4-src.zip.asc
==
--- release/camel/apache-camel/2.15.4/apache-camel-2.15.4-src.zip.asc (added)
+++ release/camel/apache-camel/2.15.4/apache-camel-2.15.4-src.zip.asc Thu Oct 
29 21:11:25 2015
@@ -0,0 +1,17 @@
+-BEGIN PGP SIGNATURE-
+Version: GnuPG v1
+
+iQIcBAABAgAGBQJWKtGnAAoJEJ1b7/pZQsBJPKAP/A2ygiPlw2VQnGA5nhmrh8tW
+rYbEse27NYhaGEIccFOQjhGlb4L1EbrAOK9Qx7yt/ECoaKlh3LY1U7j5pcWiPtyz
+SUyvGqLnSGViAazTfIzkQKy7QUrOH/XwAB0i5faA0muP7zwz4kAC+zr3lMrCJgUv
+ft2mr90gNNGatn8zr2clQyBTD9W8UhLlntOMT3jlA1f/GSb0coz6EV9pEPApwPJD
+jKFsnbOjUCQgelnfg2u5Ohr9yTkOCi9cvIQYVgwvCuAGoFl8+VO+GfZ3ZoVrtxUJ
+AfVIOeyZnmdrelmAQTjYvVUXO84nQ/c2UUlL7VV/HCJZhVi8YeTLTr0hrjkl0ng+
+xuhIr6Oywtvo1/SjEMAp1ayCboVj6WHKCqdQoQkHfFuH8hcoOlk3G2uAfHKKe1LX
+p59JhrwMvFJNvuyivXgm/w0gMmvn0HMnGEpj6e27HljHcEBJ/8LI0BEYgxFpWVMq
+Xrb4LIfbhhzrnbtHy9r7u6FwQDxfmh0JAnYH1VybVakD6TLPMmPxbTh8LhkC2OvZ
+AH7MFOMS9L46OUY9KxYc63XQU+YzC03nevP4R5MqWaIAEBZOhp74d8JDqBHz2GdQ
+xDOsN75lMpgR0O3i4NFxSNv+/JWc5aK0PFFqV6AxHVWwshPDd5w6SYrnP7dk4CMu
+Mi4IXn7R8BsbOfr4GVCA
+=Zxqh
+-END PGP SIGNATURE-

Added: release/camel/apache-camel/2.15.4/apache-camel-2.15.4-src.zip.md5
==
--- release/camel/apache-camel/2.15.4/apache-camel-2.15.4-src.zip.md5 (added)
+++ release/camel/apache-camel/2.15.4/apache-camel-2.15.4-src.zip.md5 Thu Oct 
29 21:11:25 2015
@@ -0,0 +1 @@
+e2d3742fdc3f52e99badd8c14ef7fa49
\ No newline at end of file

Added: release/camel/apache-camel/2.15.4/apache-camel-2.15.4-src.zip.sha1
==
--- release/camel/apache-camel/2.15.4/apache-camel-2.15.4-src.zip.sha1 (added)
+++ release/camel/apache-camel/2.15.4/apache-camel-2.15.4-src.zip.sha1 Thu Oct 
29 21:11:25 2015
@@ -0,0 +1 @@
+e19a493dc7954cbbb01dfb928339de46c49df289
\ No newline at end of file

Added: release/camel/apache-camel/2.15.4/apache-camel-2.15.4.pom
==
--- release/camel/apache-camel/2.15.4/apache-camel-2.15.4.pom (added)
+++ release/camel/apache-camel/2.15.4/apache-camel-2.15.4.pom Thu Oct 29 
21:11:25 2015
@@ -0,0 +1,998 @@
+
+
+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 
http://maven.apache.org/maven-v4_0_0.xsd;>
+
+  4.0.0
+
+  
+org.apache.camel
+camel-parent
+2.15.4
+../parent
+  
+
+  apache-camel
+  Camel :: Assembly
+  Apache Camel Assembly
+  pom
+
+  
+true
+false
+1.0.1
+  
+
+  
+   
+
+  org.apache.camel
+  camel-core
+
+
+  org.apache.camel
+  camel-core-osgi
+
+
+  org.apache.camel
+  camel-core-xml
+
+
+  org.apache.camel
+  camel-ahc
+
+
+  org.apache.camel
+  camel-ahc-ws
+
+
+  org.apache.camel
+  camel-amqp
+
+
+  org.apache.camel
+  camel-apns
+
+
+  org.apache.camel
+  camel-atmos
+
+
+  org.apache.camel
+  camel-atmosphere-websocket
+
+
+  org.apache.camel
+  camel-atom
+
+
+  org.apache.camel
+  camel-aws
+
+
+  org

svn commit: r10957 - /release/camel/apache-camel/KEYS

[cmueller]

Author: cmueller
Date: Thu Oct 29 21:17:42 2015
New Revision: 10957

Log:
updated the KEYS file because of new entries

Modified:
release/camel/apache-camel/KEYS

Modified: release/camel/apache-camel/KEYS
==
--- release/camel/apache-camel/KEYS (original)
+++ release/camel/apache-camel/KEYS Thu Oct 29 21:17:42 2015
@@ -727,14 +727,18 @@ aXBFB9GtEAATQf2vS/UJw/PtInCQlF3Or3MmBPYR
 =aGvL
 -END PGP PUBLIC KEY BLOCK-
 pub   1024D/AE8DE9E4 2008-02-26
-  Key fingerprint = 2D6C 3C63 1196 B77D 12D8  C92F 2350 9298 AE8D E9E4
 uid  Willem Jiang <ningji...@apache.org>
+sig 3AE8DE9E4 2011-01-07  Willem Jiang <ningji...@apache.org>
+sig 27FBBDC54 2008-02-29  Freeman Fang <freeman.f...@gmail.com>
 sub   2048g/7103E49E 2008-02-26
+sig  AE8DE9E4 2008-02-26  Willem Jiang <ningji...@apache.org>
 
 pub   4096R/14D0DEE9 2011-01-07
-  Key fingerprint = 5000 847E C0EE 4523 38CE  B801 F058 8A55 14D0 DEE9
 uid  Willem Jiang (CODE SIGNING KEY) <ningji...@apache.org>
+sig 314D0DEE9 2011-01-07  Willem Jiang (CODE SIGNING KEY) 
<ningji...@apache.org>
+sig  AE8DE9E4 2011-01-07  Willem Jiang <ningji...@apache.org>
 sub   4096R/FE639F22 2011-01-07
+sig  14D0DEE9 2011-01-07  Willem Jiang (CODE SIGNING KEY) 
<ningji...@apache.org>
 -BEGIN PGP PUBLIC KEY BLOCK-
 Version: GnuPG/MacGPG2 v2.0.16 (Darwin)
 
@@ -966,3 +970,106 @@ cQOcLlStKrxTnxqjiuK2WDC8cQmYc4g9klmFqkqG
 21fnJtXDujubpXKuQqFl/SY=
 =drZJ
 -END PGP PUBLIC KEY BLOCK-
+pub   2048R/94CB9113 2013-02-04 [verfÅ llt: 2017-02-04]
+uid  Babak Vahdat <babak.vah...@swissonline.ch>
+sig 394CB9113 2013-02-04  Babak Vahdat <babak.vah...@swissonline.ch>
+sub   2048R/CB41C100 2013-02-04 [verfÅ llt: 2017-02-04]
+sig  94CB9113 2013-02-04  Babak Vahdat <babak.vah...@swissonline.ch>
+
+-BEGIN PGP PUBLIC KEY BLOCK-
+Version: GnuPG/MacGPG2 v2.0.18 (Darwin)
+Comment: GPGTools - http://gpgtools.org
+
+mQENBFEPoC0BCADOHoYuArLsNeoKg5n3w+YGF5GtrSJYQKH2DOewCTBgijgQ/oPH
+RcSk7jatZc7AYaFGiVoLQ6uhgffHOpXTTYrsLrOTiWYYy/clrgZ2SIkzQFDDbXSD
+GtYr3CQQcobWTmS/38UZxEh9W+Y1iHcS377oefvS9voC8uMmmXCEf9lYYtxygOQp
+Kq/EABdy3Dx4sNKWyGIDdm7eBeSwwPnFDPw5+uln4PDnI6gAI37/kVLL4veKcQA7
+43hQC2mvoGqhQaeZFMQu14qHypa2ZE71EHYTvDT2BY8+hf3ft6MseT/ScbjVigKk
+JlgdNQVxJfh92k7dYvtMQrIDd/cvdOTdm+fTABEBAAG0KkJhYmFrIFZhaGRhdCA8
+YmFiYWsudmFoZGF0QHN3aXNzb25saW5lLmNoPokBPwQTAQIAKQUCUQ+gLQIbLwUJ
+B4YfgAcLCQgHAwIBBhUIAgkKCwQWAgMBAh4BAheAAAoJEBVy5c6Uy5ETJL8IAJMp
+knyEUBbRDg9oaMmQgllF3YjGY5D1qrYQb/jxZdysIEPZ9Pq3zZLR2FqmZ5oGmWPG
+p/nKB/mtALUKE+sot6DMwe2BovWBD2ctq5TI9c48vnT5mX99Gf/C3jL8FyGdznR2
+fRMW1QgfRONLqnDCZeLoOH8TyRGi2sUeMTh6OPKHYFAOThHNM6NLCYAIVnrW95wv
+P7XDLAqlSeK1z+RaAG/OErkhsn/5xe0UEOmm5Q8Jge8ZbQzVNhW0Lrrk0i4rVNuC
+DOTDsm3KqSqLaXaHMXzvDFeoJ0HCFBoujVHCpvvJ2LlxxON7G8TscqZH3pihvvsi
+DgnISqkaUBktvTct2F25AQ0EUQ+gLQEIAKp8TIZA3EqkfWZJ5/5c+q1ZLwNsUl67
+BG8/JtsJhtaKuag9oxTwXDRxVfXrqP7tisWc/+wqTiyQp9JCl+e4qwlnGAczTegC
+SOYXuqbE50Dwf7ltjInwxXG+yF9Fn7gGUAUWwsch/WLGyAScxsYRGivwbDUJTy2M
+a6UA8uR83FLFZ880hlRmup/Bxtqy91cqGRnG/lA8VyUgHqGoaJprIn+ft7z+3EQa
+RvwEUb3/bghN8jqhqcpGPzhNJQZeWX0xapY/lrTNt4cdWG9P0DV6tAQ9kltV7EgS
+IV+dnPHvyJyYdNeTXbUhhIBWSWLhboAhIZIlODIwyqer7jlcUTmfkfUAEQEAAYkC
+RAQYAQIADwUCUQ+gLQIbLgUJB4YfgAEpCRAVcuXOlMuRE8BdIAQZAQIABgUCUQ+g
+LQAKCRBDukSZy0HBABMdB/wIAVq2oWnnwx80sXaZXRzO/pqjxjpKNjJfkPQSes1a
+MVyEy5+QCQYceq98MqxDCOE0qdmy95POA/oIvETrIkX9+uC/R1Mqdai4KTgT3XO0
+ZM/+lzrkkn+7iQJcwn6WSShliksCq+IxcgwWavmbZSB7QMQzS59y2D6090gH5MBw
++1ZVZCE7lldXxkzKoBqVsY6jBZAH72n6bvoBC4vfKpDYkRbkVuwysyfiMuMbWy28
+D50Qoz4RXqqsQ5EMuomALTHLptJMWLOLBgL0rhWIKoHE5Exccj9w4RKumw7yXnaV
+CKVKRutKFaKdNok8keL3sNRGd01Ju5XWTTnTHf1ajKMvn6sH/2gC3coEsLFEVRPB
+MxSnc9ZKB9PnUNU9mRfhZFXI8dab2UrP1npelQpCo8amF/RSrAZdpdHbDli+hes/
+IKWpp/TLE5CA2Dj5OwPHeu3JmJBdnWzIar9DAY2H9w3T/Aq8VUaeVyCpDa2txHyi
+huoKAx/wDajEDmbqNxFKP8Rn75r2WBzSL2zNQW1nhREp5I+x3vMhjdGHDR6mUaND
+ly+0IqM8hQmA113GdFh8FPs9PuOvln7gp1Lqn4f7JKBZHHQbLkD/ppn3sLlZb/Xq
+/pj5By9UW4K+7MNama24yVHYfKwBuI825auZvGV5maIGZQOqxUAlwh2n8ko19VMp
+S0maYlA=
+=OANb
+-END PGP PUBLIC KEY BLOCK-
+
+pub   4096R/5942C049 2015-10-15
+uid  Gregor Zurowski <gzurow...@apache.org>
+sig 35942C049 2015-10-15  Gregor Zurowski <gzurow...@apache.org>
+sub   4096R/A48CCE10 2015-10-15
+sig  5942C049 2015-10-15  Gregor Zurowski <gzurow...@apache.org>
+
+-BEGIN PGP PUBLIC KEY BLOCK-
+Version: GnuPG v1
+
+mQINBFYgF44BEACxR9vzD/W006okO77T9aEOrUCfRJAuqmwBr/VLCGHIAWTTg/cS
+WKLWfV+jIcCvsfOmo05P9zrf/VtPvuKIVOeBkKA/RCbCAKCkNdp3lyaIHZl/2ees
+oZ7whVMXqCx46L2im8cavi96JPM+gKeX8UVQxThNBdmlgZ8R4Z3ZfxT/ya3QqUmB
+LqAZk7EqvToIaOMmaay5tIr0vKettwnWPhK9kgPuH8i7ZdWHeSVFofHC6uB0/TPV
+zBgfJfZidPfnP9Ho+swnN1R54cXNyKlwe+FfOhtxU3urpUhr4GKXwBC3wn4vG4n5
+D4+Qzd8xKzhB8mHqnu4jQvvvkomXZv21yPa42+/meVxQK47l3BwogddQAGBSYp1O
+TAL3wvp

svn commit: r970683 [4/5] - in /websites/production/camel/content/schema: blueprint/ cxf/ spring-security/ spring/ spring/integration/

[cmueller]

Added: websites/production/camel/content/schema/spring/camel-spring-2.15.4.xsd
==
--- websites/production/camel/content/schema/spring/camel-spring-2.15.4.xsd 
(added)
+++ websites/production/camel/content/schema/spring/camel-spring-2.15.4.xsd Thu 
Oct 29 20:26:28 2015
@@ -0,0 +1,6189 @@
+http://www.w3.org/2001/XMLSchema; 
xmlns:tns="http://camel.apache.org/schema/spring; 
elementFormDefault="qualified" 
targetNamespace="http://camel.apache.org/schema/spring; version="1.0">
+
+  
+
+  Aggregates many messages into a single 
message
+
+  
+
+  
+
+  Does processing before and/or after the 
route is completed
+
+  
+
+  
+
+  Avro data format
+
+  
+
+  
+
+  Barcode data format
+
+  
+
+  
+
+  Base64 data format
+
+  
+
+  
+
+  Configures batch-processing resequence 
eip.
+
+  
+
+  
+
+  Calls a java bean
+
+  
+
+  
+
+  
+
+  BeanIO data format
+
+  
+
+  
+
+  Bindy data format
+
+  
+
+  
+
+  
+
+  Castor data format
+
+  
+
+  
+
+  Routes messages based on a series of 
predicates
+
+  
+
+  
+
+  Circuit break load 
balancer
+
+  
+
+  
+
+  For expressions and predicates using a 
constant
+
+  
+
+  
+
+  
+
+  Scans for Java 
org.apache.camel.builder.RouteBuilder instances in the context 
org.apache.camel.spi.Registry.
+
+  
+
+  
+
+  Converts the message body to another 
type
+
+  
+
+  
+
+  Crypto data format
+
+  
+
+  
+
+  CSV data format
+
+  
+
+  
+
+  Custom data format
+
+  
+
+  
+
+  Custom load balancer
+
+  
+
+  
+
+  To configure data 
formats
+
+  
+
+  
+
+  Delays processing for a specified length 
of time
+
+  
+
+  
+
+  Rest DELETE command
+
+  
+
+  
+
+  To provide comments about the 
node.
+
+  
+
+  
+
+  Catches exceptions as part of a try 
catch finally block
+
+  
+
+  
+
+  Path traversed when a try catch finally 
block exits
+
+  
+
+  
+
+  Marks the beginning of a try catch 
finally block
+
+  
+
+  
+
+  Routes messages based on dynamic 
rules
+
+  
+
+  
+
+  For EL expressions and 
predicates
+
+  
+
+  
+
+  
+
+  Enriches a message with data from a 
secondary resource
+
+  
+
+  
+
+  
+
+  An expression which extracts the named 
exchange property
+
+  
+
+  
+
+  
+
+  A useful base class for an 
expression
+
+  
+
+  
+
+  
+
+  Failover load balancer
+
+  
+
+  
+
+  Filter out messages based using a 
predicate
+
+  
+
+  
+
+  Flatpack data format
+
+  
+
+  
+
+  Act as a message source as input to a 
route
+
+  
+
+  
+
+  Rest GET command
+
+  
+
+  
+
+  For Groovy expressions and 
predicates
+
+  
+
+  
+
+  GZip data format
+
+  
+
+  
+
+  Rest HEAD command
+
+  
+
+  
+
+  An expression which extracts the named 
exchange header
+
+  
+
+  
+
+  HL7 data format
+
+  
+
+  
+
+  iCal data format
+
+  
+
+  
+
+  Filters out duplicate 
messages
+
+  
+
+  
+
+  Marks the exchange pattern for the route 
to one way
+
+  
+
+  
+
+  Marks the exchange pattern for the route 
to request/reply
+
+  
+
+  
+
+  Intercepts a message at each step in the 
route
+
+  
+
+  
+
+  Intercepts incoming 
messages
+
+  
+
+  
+
+  Intercepts messages being sent to an 
endpoint
+
+  
+
+  
+
+  For JavaScript expressions and 
predicates
+
+  
+
+  
+
+  JAXB data format
+
+  
+
+  
+
+  JiBX data format
+
+  
+
+  
+
+  
+
+  Json data format
+
+  
+
+  
+
+  For JSonPath expressions and 
predicates
+
+  
+
+  
+
+  For JXPath expressions and 
predicates
+
+  
+
+  
+
+  
+
+  Represents a parameterised language 
expression which can support any language at runtime using the language 
attribute.
+
+  
+
+  
+
+  Balances message processing among a 
number of nodes
+
+  
+
+  
+
+  Logs the defined message to the 
logger
+
+  
+
+  
+
+  Processes a message multiple 
times
+
+  
+
+  
+
+  Marshals data into a specified format 
for transmission over a transport or component
+
+  
+
+  
+
+  For expressions and predicates using a 
java bean (aka method call)
+
+  
+
+  
+
+  Routes the same message to multiple 
paths either sequentially or in parallel.
+
+  
+
+  
+
+  For MVEL expressions and 
predicates
+
+  
+
+  
+
+  For OGNL expressions and 
predicates
+
+  
+
+  
+
+  Route to be executed when normal route 
processing completes
+
+  

svn commit: r970683 [2/5] - in /websites/production/camel/content/schema: blueprint/ cxf/ spring-security/ spring/ spring/integration/

[cmueller]

Added: 
websites/production/camel/content/schema/blueprint/camel-blueprint-2.15.4.xsd
==
--- 
websites/production/camel/content/schema/blueprint/camel-blueprint-2.15.4.xsd 
(added)
+++ 
websites/production/camel/content/schema/blueprint/camel-blueprint-2.15.4.xsd 
Thu Oct 29 20:26:28 2015
@@ -0,0 +1,6190 @@
+http://www.w3.org/2001/XMLSchema; 
xmlns:tns="http://camel.apache.org/schema/blueprint; 
elementFormDefault="qualified" 
targetNamespace="http://camel.apache.org/schema/blueprint; version="1.0">
+
+  
+
+  Aggregates many messages into a single 
message
+
+  
+
+  
+
+  Does processing before and/or after the 
route is completed
+
+  
+
+  
+
+  Avro data format
+
+  
+
+  
+
+  Barcode data format
+
+  
+
+  
+
+  Base64 data format
+
+  
+
+  
+
+  Configures batch-processing resequence 
eip.
+
+  
+
+  
+
+  Calls a java bean
+
+  
+
+  
+
+  BeanIO data format
+
+  
+
+  
+
+  Bindy data format
+
+  
+
+  
+
+  
+
+  Castor data format
+
+  
+
+  
+
+  Routes messages based on a series of 
predicates
+
+  
+
+  
+
+  Circuit break load 
balancer
+
+  
+
+  
+
+  For expressions and predicates using a 
constant
+
+  
+
+  
+
+  
+
+  Scans for Java 
org.apache.camel.builder.RouteBuilder instances in the context 
org.apache.camel.spi.Registry.
+
+  
+
+  
+
+  Converts the message body to another 
type
+
+  
+
+  
+
+  Crypto data format
+
+  
+
+  
+
+  CSV data format
+
+  
+
+  
+
+  Custom data format
+
+  
+
+  
+
+  Custom load balancer
+
+  
+
+  
+
+  To configure data 
formats
+
+  
+
+  
+
+  Delays processing for a specified length 
of time
+
+  
+
+  
+
+  Rest DELETE command
+
+  
+
+  
+
+  To provide comments about the 
node.
+
+  
+
+  
+
+  Catches exceptions as part of a try 
catch finally block
+
+  
+
+  
+
+  Path traversed when a try catch finally 
block exits
+
+  
+
+  
+
+  Marks the beginning of a try catch 
finally block
+
+  
+
+  
+
+  Routes messages based on dynamic 
rules
+
+  
+
+  
+
+  For EL expressions and 
predicates
+
+  
+
+  
+
+  
+
+  Enriches a message with data from a 
secondary resource
+
+  
+
+  
+
+  
+
+  An expression which extracts the named 
exchange property
+
+  
+
+  
+
+  
+
+  A useful base class for an 
expression
+
+  
+
+  
+
+  
+
+  Failover load balancer
+
+  
+
+  
+
+  Filter out messages based using a 
predicate
+
+  
+
+  
+
+  Flatpack data format
+
+  
+
+  
+
+  Act as a message source as input to a 
route
+
+  
+
+  
+
+  Rest GET command
+
+  
+
+  
+
+  For Groovy expressions and 
predicates
+
+  
+
+  
+
+  GZip data format
+
+  
+
+  
+
+  Rest HEAD command
+
+  
+
+  
+
+  An expression which extracts the named 
exchange header
+
+  
+
+  
+
+  HL7 data format
+
+  
+
+  
+
+  iCal data format
+
+  
+
+  
+
+  Filters out duplicate 
messages
+
+  
+
+  
+
+  Marks the exchange pattern for the route 
to one way
+
+  
+
+  
+
+  Marks the exchange pattern for the route 
to request/reply
+
+  
+
+  
+
+  Intercepts a message at each step in the 
route
+
+  
+
+  
+
+  Intercepts incoming 
messages
+
+  
+
+  
+
+  Intercepts messages being sent to an 
endpoint
+
+  
+
+  
+
+  For JavaScript expressions and 
predicates
+
+  
+
+  
+
+  JAXB data format
+
+  
+
+  
+
+  JiBX data format
+
+  
+
+  
+
+  
+
+  Json data format
+
+  
+
+  
+
+  For JSonPath expressions and 
predicates
+
+  
+
+  
+
+  For JXPath expressions and 
predicates
+
+  
+
+  
+
+  
+
+  Represents a parameterised language 
expression which can support any language at runtime using the language 
attribute.
+
+  
+
+  
+
+  Balances message processing among a 
number of nodes
+
+  
+
+  
+
+  Logs the defined message to the 
logger
+
+  
+
+  
+
+  Processes a message multiple 
times
+
+  
+
+  
+
+  Marshals data into a specified format 
for transmission over a transport or component
+
+  
+
+  
+
+  For expressions and predicates using a 
java bean (aka method call)
+
+  
+
+  
+
+  Routes the same message to multiple 
paths either sequentially or in parallel.
+
+  
+
+  
+
+  For MVEL expressions and 
predicates
+
+  
+
+  
+
+  For OGNL expressions and 
predicates
+
+  
+
+  
+
+  Route to be executed when normal route 

svn commit: r970683 [1/5] - in /websites/production/camel/content/schema: blueprint/ cxf/ spring-security/ spring/ spring/integration/

[cmueller]

Author: cmueller
Date: Thu Oct 29 20:26:28 2015
New Revision: 970683

Log:
Uploading released schemas for camel-2.15.4

Added:

websites/production/camel/content/schema/blueprint/camel-blueprint-2.15.4.xsd
websites/production/camel/content/schema/cxf/camel-cxf-2.15.4-blueprint.xsd
websites/production/camel/content/schema/cxf/camel-cxf-2.15.4-spring.xsd

websites/production/camel/content/schema/spring-security/camel-spring-security-2.15.4.xsd
websites/production/camel/content/schema/spring/camel-spring-2.15.4.xsd

websites/production/camel/content/schema/spring/integration/camel-spring-integration-2.15.4.xsd

svn commit: r970683 [3/5] - in /websites/production/camel/content/schema: blueprint/ cxf/ spring-security/ spring/ spring/integration/

[cmueller]

Added: 
websites/production/camel/content/schema/cxf/camel-cxf-2.15.4-blueprint.xsd
==
--- websites/production/camel/content/schema/cxf/camel-cxf-2.15.4-blueprint.xsd 
(added)
+++ websites/production/camel/content/schema/cxf/camel-cxf-2.15.4-blueprint.xsd 
Thu Oct 29 20:26:28 2015
@@ -0,0 +1,178 @@
+
+
+http://camel.apache.org/schema/blueprint/cxf;
+xmlns:xsd="http://www.w3.org/2001/XMLSchema;
+xmlns:beans="http://www.osgi.org/xmlns/blueprint/v1.0.0;
+xmlns:cxf-beans="http://cxf.apache.org/configuration/beans;
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+targetNamespace="http://camel.apache.org/schema/blueprint/cxf;
+elementFormDefault="qualified"
+attributeFormDefault="unqualified"
+xsi:schemaLocation="http://www.osgi.org/xmlns/blueprint/v1.0.0 
http://www.osgi.org/xmlns/blueprint/v1.0.0/blueprint.xsd;>
+
+  http://www.osgi.org/xmlns/blueprint/v1.0.0; 
schemaLocation="http://www.osgi.org/xmlns/blueprint/v1.0.0/blueprint.xsd"/>
+  http://cxf.apache.org/configuration/beans; 
schemaLocation="http://cxf.apache.org/schemas/configuration/cxf-beans.xsd"/>
+
+  
+
+  
+
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+  
+
+  
+
+
+
+
+
+
+  
+
+  
+  
+  
+
+  
+
+
+  
+
\ No newline at end of file

Added: websites/production/camel/content/schema/cxf/camel-cxf-2.15.4-spring.xsd
==
--- websites/production/camel/content/schema/cxf/camel-cxf-2.15.4-spring.xsd 
(added)
+++ websites/production/camel/content/schema/cxf/camel-cxf-2.15.4-spring.xsd 
Thu Oct 29 20:26:28 2015
@@ -0,0 +1,179 @@
+
+
+http://camel.apache.org/schema/cxf;
+  xmlns:xsd="http://www.w3.org/2001/XMLSchema;
+  xmlns:beans="http://www.springframework.org/schema/beans;
+  xmlns:cxf-beans="http://cxf.apache.org/configuration/beans;
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+  targetNamespace="http://camel.apache.org/schema/cxf; 
+  elementFormDefault="qualified"
+  attributeFormDefault="unqualified">
+
+  http://www.springframework.org/schema/beans; 
schemaLocation="http://www.springframework.org/schema/beans/spring-beans.xsd"/>
+  http://cxf.apache.org/configuration/beans; 
schemaLocation="http://cxf.apache.org/schemas/configuration/cxf-beans.xsd"/>
+
+  
+
+  
+
+  
+
+ 
   
+
+
+
+
+
+
+
+
+
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+
+  
+
+  
+  
+  
+
+  
+
+  
+
+
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  
+  
+  
+  
+ 
 
+  
+  
+
+  
+  
+  
+  
+
+  
+
+  
+  
+  
+
+  
+
+  
+
+
+
+ 

svn commit: r970683 [5/5] - in /websites/production/camel/content/schema: blueprint/ cxf/ spring-security/ spring/ spring/integration/

[cmueller]

Added: 
websites/production/camel/content/schema/spring/integration/camel-spring-integration-2.15.4.xsd
==
--- 
websites/production/camel/content/schema/spring/integration/camel-spring-integration-2.15.4.xsd
 (added)
+++ 
websites/production/camel/content/schema/spring/integration/camel-spring-integration-2.15.4.xsd
 Thu Oct 29 20:26:28 2015
@@ -0,0 +1,65 @@
+
+
+http://camel.apache.org/schema/spring/integration;
+  xmlns:xsd="http://www.w3.org/2001/XMLSchema;
+  xmlns:beans="http://www.springframework.org/schema/beans;
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+  xmlns:camel-spring="http://camel.apache.org/schema/spring;
+  targetNamespace="http://camel.apache.org/schema/spring/integration;
+  elementFormDefault="qualified"
+  attributeFormDefault="unqualified">
+
+  http://www.springframework.org/schema/beans; 
schemaLocation="http://www.springframework.org/schema/beans/spring-beans.xsd"/>
+  http://camel.apache.org/schema/spring; 
schemaLocation="http://camel.apache.org/schema/spring/camel-spring.xsd"/>
+
+  
+   
+   
+   
+   
+   
+   
+   
+   
+  
+
+  
+ 
+
+   
+ Defines a camel-source for handling the Camel context message 
in Spring Integration message bus.
+   
+   
+
+  
+  
+ 
+   
+ 
+  
+
+  
+
+   
+ Defines a camel-target to feed Spring Integration message to 
the Camel context.
+   
+   
+  
+

camel git commit: updated the release-website.sh because we do not create a pdf file anymore

[cmueller]

Repository: camel
Updated Branches:
  refs/heads/master a7c8c5c97 -> c07f0cb93


updated the release-website.sh because we do not create a pdf file anymore


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

Branch: refs/heads/master
Commit: c07f0cb93b1adddebb35db7d3bf4e6cbe8a81db0
Parents: a7c8c5c
Author: Christian Mueller 
Authored: Thu Oct 29 21:31:00 2015 +0100
Committer: Christian Mueller 
Committed: Thu Oct 29 21:31:25 2015 +0100

--
 etc/scripts/release-website.sh | 1 -
 1 file changed, 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/c07f0cb9/etc/scripts/release-website.sh
--
diff --git a/etc/scripts/release-website.sh b/etc/scripts/release-website.sh
index cb2b3b4..c536fa7 100755
--- a/etc/scripts/release-website.sh
+++ b/etc/scripts/release-website.sh
@@ -106,6 +106,5 @@ echo
 echo "cd ${SITE_DIR}/${VERSION}/manual/"
 echo "svn status"
 echo "svn add camel-manual-${VERSION}.html"
-echo "svn add camel-manual-${VERSION}.pdf"
 echo "svn ci -m \"Uploading released manuals for camel-${VERSION}\""
 echo

svn commit: r10955 - /release/camel/apache-camel/2.15.4/

[cmueller]

Author: cmueller
Date: Thu Oct 29 20:50:11 2015
New Revision: 10955

Log:
Apache Camel 2.15.4 release distro placeholder.

Added:
release/camel/apache-camel/2.15.4/

svn commit: r970685 - /websites/production/camel/content/manual/camel-manual-2.15.4.html

[cmueller]

Author: cmueller
Date: Thu Oct 29 20:28:10 2015
New Revision: 970685

Log:
Uploading released manuals for camel-2.15.4

Added:
websites/production/camel/content/manual/camel-manual-2.15.4.html

Added: websites/production/camel/content/manual/camel-manual-2.15.4.html
==
--- websites/production/camel/content/manual/camel-manual-2.15.4.html (added)
+++ websites/production/camel/content/manual/camel-manual-2.15.4.html Thu Oct 
29 20:28:10 2015
@@ -0,0 +1,27179 @@
+
+
+http://camel.apache.org/styles/camel-manual.css; rel="stylesheet" 
type="text/css" />
+
+@page :left {
+@top-left {
+content: "Apache Camel 2.15.4 Developer's 
Manual";
+}
+}
+
+
+
+
+
+
+
+
+
+
+
+SyntaxHighlighter.defaults['toolbar'] = false;
+SyntaxHighlighter.all();
+
+
+Apache CamelUser GuideVersion 2.15.4
+ Copyright 2007-2015, Apache Software Foundation
+
+Table of Contents
+
+
+Table 
of ContentsIntroductionQuickstartGetting 
StartedArchitectureEnterprise 
Integration PatternsCook BookTutorialsLanguage AppendixDataFormat 
AppendixPattern AppendixComponent AppendixIndex
+
+
+Introduction
+
+Apache Camel  is a versatile open-source integration framework based on 
known Enterprise 
Integration Patterns.
+
+Camel empowers you to define routing and mediation rules in a variety of 
domain-specific languages, including a Java-based Fluent API, Spring 
or Blueprint XML Configuration files, and a 
Scala DSL. This means you get smart 
completion of routing rules in your IDE, whether in a Java, Scala or XML 
editor.
+
+Apache Camel uses URIs to work 
directly with any kind of Transport 
or messaging model such as HTTP, ActiveMQ, JMS, JBI, SCA, MINA or CXF, as well as pluggable Components and Data Format options. Apache Camel is a small 
library with minimal dependencies for easy embedding in 
any Java application. Apache Camel lets you work with the same API regardless which kind of Transport is used - so learn the API once and you can 
interact with all the Components provided out-of-box.
+
+Apache Camel provides support for Bean Binding and seamless integration with popular 
frameworks such as Spring, Blueprint and Guice.  Camel also has extensive support for 
unit testing your routes. 
+
+The following projects can leverage Apache Camel as a routing and mediation 
engine:
+
+http://servicemix.apache.org/;>Apache ServiceMix - a popular 
distributed open source ESB and JBI containerhttp://activemq.apache.org/;>Apache ActiveMQ - 
a mature, widely used open source message brokerhttp://cxf.apache.org/;>Apache CXF - a smart web services suite 
(JAX-WS and JAX-RS)http://karaf.apache.org/;>Apache Karaf - a small OSGi based runtime 
in which applications can be deployedhttp://mina.apache.org/;>Apache MINA - a 
high-performance http://en.wikipedia.org/wiki/New_I/O; rel="nofollow">NIO-driven 
networking framework
+
+
+So don't get the hump - try Camel today! https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/smile.png;
 data-emoticon-name="smile" alt="(smile)">
+
+Too many buzzwords - what exactly is Camel?
+Okay, so the description above is technology focused.  
+There's a great discussion about Camel at http://stackoverflow.com/questions/8845186/what-exactly-is-apache-camel; 
rel="nofollow">Stack Overflow. We suggest you view the post, read the 
comments, and browse the suggested links for more details.
+
+Quickstart
+
+To start using Apache Camel quickly, you can read through some simple 
examples in this chapter. For readers who would like a more thorough 
introduction, please skip ahead to Chapter 3.
+
+Walk through an Example 
CodeThis mini-guide takes you through the source code of a https://svn.apache.org/repos/asf/camel/trunk/examples/camel-example-jms-file/src/main/java/org/apache/camel/example/jmstofile/CamelJmsToFileExample.java;>simple
 example.Camel can be configured either by using Spring or directly in Java - which https://svn.apache.org/repos/asf/camel/trunk/examples/camel-example-jms-file/src/main/java/org/apache/camel/example/jmstofile/CamelJmsToFileExample.java;>this
 example does.This example is available in the 
examples\camel-example-jms-file directory of the Camel distribution.We start with creating a CamelContext - which

svn commit: r10954 - /release/camel/apache-camel/2.15.3/

[cmueller]

Author: cmueller
Date: Thu Oct 29 20:36:38 2015
New Revision: 10954

Log:
Removed the old release

Removed:
release/camel/apache-camel/2.15.3/

camel git commit: upgrade ehcache 2.10.0 to 2.10.1

[cmueller]

Repository: camel
Updated Branches:
  refs/heads/master c0ff13750 -> 1f9db4036


upgrade ehcache 2.10.0 to 2.10.1


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

Branch: refs/heads/master
Commit: 1f9db4036cff4b19b6fefd51c0e1f9d669d14654
Parents: c0ff137
Author: Christian Mueller 
Authored: Tue Oct 27 22:59:07 2015 +0100
Committer: Christian Mueller 
Committed: Tue Oct 27 22:59:07 2015 +0100

--
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/1f9db403/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index eda6610..36097ae 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -141,7 +141,7 @@
 3.2
 4.2.2
 
3.3.0-v20070426
-2.10.0
+2.10.1
 2.1.5
 2.1.5_1
 1.7.1_1

camel git commit: upgrade ehcache 2.10.0 to 2.10.1

[cmueller]

Repository: camel
Updated Branches:
  refs/heads/camel-2.16.x 3c3bee15a -> 74a990566


upgrade ehcache 2.10.0 to 2.10.1


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

Branch: refs/heads/camel-2.16.x
Commit: 74a9905666bb0a95700fce39d3d4d1b953634f5a
Parents: 3c3bee1
Author: Christian Mueller 
Authored: Tue Oct 27 22:59:07 2015 +0100
Committer: Christian Mueller 
Committed: Tue Oct 27 23:00:26 2015 +0100

--
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/74a99056/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 5d95f94..ae160ba 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -141,7 +141,7 @@
 3.2
 4.2.2
 
3.3.0-v20070426
-2.10.0
+2.10.1
 2.1.5
 2.1.5_1
 1.7.1_1

camel git commit: added the missing NOTICE and LICENSE file to the camel-grape component

[cmueller]

Repository: camel
Updated Branches:
  refs/heads/master 602016319 -> 6491f7c33


added the missing NOTICE and LICENSE file to the camel-grape component


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

Branch: refs/heads/master
Commit: 6491f7c3363b8a736c6981c6098fb1c29ad91b9d
Parents: 6020163
Author: Christian Mueller 
Authored: Thu Oct 1 22:16:34 2015 +0200
Committer: Christian Mueller 
Committed: Thu Oct 1 22:16:34 2015 +0200

--
 .../src/main/resources/META-INF/LICENSE.txt | 203 +++
 .../src/main/resources/META-INF/NOTICE.txt  |  11 +
 2 files changed, 214 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/6491f7c3/components/camel-grape/src/main/resources/META-INF/LICENSE.txt
--
diff --git a/components/camel-grape/src/main/resources/META-INF/LICENSE.txt 
b/components/camel-grape/src/main/resources/META-INF/LICENSE.txt
new file mode 100755
index 000..6b0b127
--- /dev/null
+++ b/components/camel-grape/src/main/resources/META-INF/LICENSE.txt
@@ -0,0 +1,203 @@
+
+ Apache License
+   Version 2.0, January 2004
+http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+  "License" shall mean the terms and conditions for use, reproduction,
+  and distribution as defined by Sections 1 through 9 of this document.
+
+  "Licensor" shall mean the copyright owner or entity authorized by
+  the copyright owner that is granting the License.
+
+  "Legal Entity" shall mean the union of the acting entity and all
+  other entities that control, are controlled by, or are under common
+  control with that entity. For the purposes of this definition,
+  "control" means (i) the power, direct or indirect, to cause the
+  direction or management of such entity, whether by contract or
+  otherwise, or (ii) ownership of fifty percent (50%) or more of the
+  outstanding shares, or (iii) beneficial ownership of such entity.
+
+  "You" (or "Your") shall mean an individual or Legal Entity
+  exercising permissions granted by this License.
+
+  "Source" form shall mean the preferred form for making modifications,
+  including but not limited to software source code, documentation
+  source, and configuration files.
+
+  "Object" form shall mean any form resulting from mechanical
+  transformation or translation of a Source form, including but
+  not limited to compiled object code, generated documentation,
+  and conversions to other media types.
+
+  "Work" shall mean the work of authorship, whether in Source or
+  Object form, made available under the License, as indicated by a
+  copyright notice that is included in or attached to the work
+  (an example is provided in the Appendix below).
+
+  "Derivative Works" shall mean any work, whether in Source or Object
+  form, that is based on (or derived from) the Work and for which the
+  editorial revisions, annotations, elaborations, or other modifications
+  represent, as a whole, an original work of authorship. For the purposes
+  of this License, Derivative Works shall not include works that remain
+  separable from, or merely link (or bind by name) to the interfaces of,
+  the Work and Derivative Works thereof.
+
+  "Contribution" shall mean any work of authorship, including
+  the original version of the Work and any modifications or additions
+  to that Work or Derivative Works thereof, that is intentionally
+  submitted to Licensor for inclusion in the Work by the copyright owner
+  or by an individual or Legal Entity authorized to submit on behalf of
+  the copyright owner. For the purposes of this definition, "submitted"
+  means any form of electronic, verbal, or written communication sent
+  to the Licensor or its representatives, including but not limited to
+  communication on electronic mailing lists, source code control systems,
+  and issue tracking systems that are managed by, or on behalf of, the
+  Licensor for the purpose of discussing and improving the Work, but
+  excluding communication that is conspicuously marked or otherwise
+  designated in writing by the copyright owner as "Not a Contribution."
+
+  "Contributor" shall mean Licensor and any individual or Legal Entity
+  on behalf of whom a Contribution has been received by Licensor and
+   

camel git commit: added the missing NOTICE and LICENSE file to the camel-slack component

[cmueller]

Repository: camel
Updated Branches:
  refs/heads/master 6491f7c33 -> e0b4e656a


added the missing NOTICE and LICENSE file to the camel-slack component


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

Branch: refs/heads/master
Commit: e0b4e656a7d0cc0d3584086066d5f1a339a0c0cc
Parents: 6491f7c
Author: Christian Mueller 
Authored: Thu Oct 1 22:18:25 2015 +0200
Committer: Christian Mueller 
Committed: Thu Oct 1 22:18:25 2015 +0200

--
 .../src/main/resources/META-INF/LICENSE.txt | 203 +++
 .../src/main/resources/META-INF/NOTICE.txt  |  11 +
 2 files changed, 214 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/e0b4e656/components/camel-slack/src/main/resources/META-INF/LICENSE.txt
--
diff --git a/components/camel-slack/src/main/resources/META-INF/LICENSE.txt 
b/components/camel-slack/src/main/resources/META-INF/LICENSE.txt
new file mode 100755
index 000..6b0b127
--- /dev/null
+++ b/components/camel-slack/src/main/resources/META-INF/LICENSE.txt
@@ -0,0 +1,203 @@
+
+ Apache License
+   Version 2.0, January 2004
+http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+  "License" shall mean the terms and conditions for use, reproduction,
+  and distribution as defined by Sections 1 through 9 of this document.
+
+  "Licensor" shall mean the copyright owner or entity authorized by
+  the copyright owner that is granting the License.
+
+  "Legal Entity" shall mean the union of the acting entity and all
+  other entities that control, are controlled by, or are under common
+  control with that entity. For the purposes of this definition,
+  "control" means (i) the power, direct or indirect, to cause the
+  direction or management of such entity, whether by contract or
+  otherwise, or (ii) ownership of fifty percent (50%) or more of the
+  outstanding shares, or (iii) beneficial ownership of such entity.
+
+  "You" (or "Your") shall mean an individual or Legal Entity
+  exercising permissions granted by this License.
+
+  "Source" form shall mean the preferred form for making modifications,
+  including but not limited to software source code, documentation
+  source, and configuration files.
+
+  "Object" form shall mean any form resulting from mechanical
+  transformation or translation of a Source form, including but
+  not limited to compiled object code, generated documentation,
+  and conversions to other media types.
+
+  "Work" shall mean the work of authorship, whether in Source or
+  Object form, made available under the License, as indicated by a
+  copyright notice that is included in or attached to the work
+  (an example is provided in the Appendix below).
+
+  "Derivative Works" shall mean any work, whether in Source or Object
+  form, that is based on (or derived from) the Work and for which the
+  editorial revisions, annotations, elaborations, or other modifications
+  represent, as a whole, an original work of authorship. For the purposes
+  of this License, Derivative Works shall not include works that remain
+  separable from, or merely link (or bind by name) to the interfaces of,
+  the Work and Derivative Works thereof.
+
+  "Contribution" shall mean any work of authorship, including
+  the original version of the Work and any modifications or additions
+  to that Work or Derivative Works thereof, that is intentionally
+  submitted to Licensor for inclusion in the Work by the copyright owner
+  or by an individual or Legal Entity authorized to submit on behalf of
+  the copyright owner. For the purposes of this definition, "submitted"
+  means any form of electronic, verbal, or written communication sent
+  to the Licensor or its representatives, including but not limited to
+  communication on electronic mailing lists, source code control systems,
+  and issue tracking systems that are managed by, or on behalf of, the
+  Licensor for the purpose of discussing and improving the Work, but
+  excluding communication that is conspicuously marked or otherwise
+  designated in writing by the copyright owner as "Not a Contribution."
+
+  "Contributor" shall mean Licensor and any individual or Legal Entity
+  on behalf of whom a Contribution has been received by Licensor and
+   

camel git commit: CAMEL-8957: Added unit test

[cmueller]

Repository: camel
Updated Branches:
  refs/heads/master 8dbdfd28b - a93800e6e


CAMEL-8957: Added unit test


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

Branch: refs/heads/master
Commit: a93800e6ee1a3a27833a408f0ae0eb7b1440ad8b
Parents: 8dbdfd2
Author: Christian Mueller cmuel...@apache.org
Authored: Mon Jul 20 19:11:05 2015 +0200
Committer: Christian Mueller cmuel...@apache.org
Committed: Mon Jul 20 19:11:05 2015 +0200

--
 ...rceptSendToEndpointWithLoadbalancerTest.java | 70 
 ...erceptSendToEndpointWithLoadbalancerTest.xml | 30 +
 2 files changed, 100 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/a93800e6/components/camel-test-spring/src/test/java/org/apache/camel/test/issues/AdviceWithInterceptSendToEndpointWithLoadbalancerTest.java
--
diff --git 
a/components/camel-test-spring/src/test/java/org/apache/camel/test/issues/AdviceWithInterceptSendToEndpointWithLoadbalancerTest.java
 
b/components/camel-test-spring/src/test/java/org/apache/camel/test/issues/AdviceWithInterceptSendToEndpointWithLoadbalancerTest.java
new file mode 100644
index 000..9bb41c8
--- /dev/null
+++ 
b/components/camel-test-spring/src/test/java/org/apache/camel/test/issues/AdviceWithInterceptSendToEndpointWithLoadbalancerTest.java
@@ -0,0 +1,70 @@
+/**
+ * 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.test.issues;
+
+import org.apache.camel.Exchange;
+import org.apache.camel.Processor;
+import org.apache.camel.builder.AdviceWithRouteBuilder;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.model.RouteDefinition;
+import org.apache.camel.test.spring.CamelSpringTestSupport;
+import org.junit.Test;
+import org.springframework.context.support.AbstractApplicationContext;
+import org.springframework.context.support.ClassPathXmlApplicationContext;
+
+public class AdviceWithInterceptSendToEndpointWithLoadbalancerTest extends 
CamelSpringTestSupport {
+
+@Override
+protected AbstractApplicationContext createApplicationContext() {
+return new 
ClassPathXmlApplicationContext(org/apache/camel/test/issues/AdviceWithInterceptSendToEndpointWithLoadbalancerTest.xml);
+}
+
+@Override
+public boolean isUseAdviceWith() {
+return true;
+}
+
+@Test
+public void testSimpleMultipleAdvice() throws Exception {
+RouteDefinition route = context.getRouteDefinitions().get(0);
+route.adviceWith(context, new RouteBuilder() {
+public void configure() throws Exception {
+interceptSendToEndpoint(seda:end1)
+.skipSendToOriginalEndpoint()
+.to(mock:end);
+}
+});
+
+context.start();
+
+getMockEndpoint(mock:end).expectedMessageCount(1);
+
+template.sendBody(direct:start, Hello World);
+
+assertMockEndpointsSatisfied();
+}
+
+public static class LoadbalancerTestRoute extends RouteBuilder {
+
+@Override
+public void configure() throws Exception {
+from(direct:start)
+.loadBalance().failover()
+.to(seda:end1, seda:end2);
+}
+}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/camel/blob/a93800e6/components/camel-test-spring/src/test/resources/org/apache/camel/test/issues/AdviceWithInterceptSendToEndpointWithLoadbalancerTest.xml
--
diff --git 
a/components/camel-test-spring/src/test/resources/org/apache/camel/test/issues/AdviceWithInterceptSendToEndpointWithLoadbalancerTest.xml
 
b/components/camel-test-spring/src/test/resources/org/apache/camel/test/issues/AdviceWithInterceptSendToEndpointWithLoadbalancerTest.xml
new file mode 100644
index 000..7fb613d
--- 

camel git commit: upgrade testng 6.8.8 to 6.8.21

[cmueller]

Repository: camel
Updated Branches:
  refs/heads/camel-2.14.x 17e465365 - ed9cc2665


upgrade testng 6.8.8 to 6.8.21


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

Branch: refs/heads/camel-2.14.x
Commit: ed9cc26651df0b3d782931f75f4856ae6e478457
Parents: 17e4653
Author: Christian Mueller cmuel...@apache.org
Authored: Sun Apr 26 13:22:39 2015 +0200
Committer: Christian Mueller cmuel...@apache.org
Committed: Sun Apr 26 13:22:39 2015 +0200

--
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/ed9cc266/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 7816bcb..5fc4b6c 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -427,7 +427,7 @@
 taglist-maven-plugin-version2.4/taglist-maven-plugin-version
 tagsoup-bundle-version1.2_5/tagsoup-bundle-version
 tagsoup-version1.2.1/tagsoup-version
-testng-version6.8.8/testng-version
+testng-version6.8.21/testng-version
 twitter4j-bundle-version4.0.2_1/twitter4j-bundle-version
 twitter4j-version4.0.2/twitter4j-version
 urlrewritefilter-version4.0.4/urlrewritefilter-version

camel git commit: upgrade slf4j 1.7.7 to 1.7.12

[cmueller]

Repository: camel
Updated Branches:
  refs/heads/camel-2.14.x ed9cc2665 - 2637d5b49


upgrade slf4j 1.7.7 to 1.7.12


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

Branch: refs/heads/camel-2.14.x
Commit: 2637d5b4996dbf5b708ba2a20facc5f962119c98
Parents: ed9cc26
Author: Christian Mueller cmuel...@apache.org
Authored: Sun Apr 26 13:23:32 2015 +0200
Committer: Christian Mueller cmuel...@apache.org
Committed: Sun Apr 26 13:23:32 2015 +0200

--
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/2637d5b4/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 5fc4b6c..45d2b66 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -388,7 +388,7 @@
 shiro-version1.2.3/shiro-version
 !-- use slf4j-api 1.6.x to be easy compatible with older Camel releases 
--
 slf4j-api-version1.6.6/slf4j-api-version
-slf4j-version1.7.7/slf4j-version
+slf4j-version1.7.12/slf4j-version
 smack-bundle-version3.2.1_1/smack-bundle-version
 smack-version3.2.1/smack-version
 snappy-version1.1.0.1/snappy-version

camel git commit: upgrade testng 6.8.8 to 6.8.21

[cmueller]

Repository: camel
Updated Branches:
  refs/heads/camel-2.15.x 9afed176e - 7e98b56c7


upgrade testng 6.8.8 to 6.8.21


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

Branch: refs/heads/camel-2.15.x
Commit: 7e98b56c7ff8f39b40f94e9118b902653d04c1d4
Parents: 9afed17
Author: Christian Mueller cmuel...@apache.org
Authored: Fri Apr 24 23:53:43 2015 +0200
Committer: Christian Mueller cmuel...@apache.org
Committed: Sun Apr 26 13:18:00 2015 +0200

--
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/7e98b56c/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 6e76f52..b562766 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -466,7 +466,7 @@
 taglist-maven-plugin-version2.4/taglist-maven-plugin-version
 tagsoup-bundle-version1.2_5/tagsoup-bundle-version
 tagsoup-version1.2.1/tagsoup-version
-testng-version6.8.8/testng-version
+testng-version6.8.21/testng-version
 twitter4j-bundle-version4.0.3_1/twitter4j-bundle-version
 twitter4j-version4.0.3/twitter4j-version
 univocity-parsers-version1.2.1/univocity-parsers-version

camel git commit: upgrade slf4j 1.7.10 to 1.7.12

[cmueller]

Repository: camel
Updated Branches:
  refs/heads/camel-2.15.x 7e98b56c7 - 30d3dca11


upgrade slf4j 1.7.10 to 1.7.12


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

Branch: refs/heads/camel-2.15.x
Commit: 30d3dca11630223fa46dea4be4f3fa2fa1e7486d
Parents: 7e98b56
Author: Christian Mueller cmuel...@apache.org
Authored: Fri Apr 24 23:55:08 2015 +0200
Committer: Christian Mueller cmuel...@apache.org
Committed: Sun Apr 26 13:18:25 2015 +0200

--
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/30d3dca1/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index b562766..cc8294c 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -415,7 +415,7 @@
 shiro-version1.2.3/shiro-version
 !-- use slf4j-api 1.6.x to be easy compatible with older Camel releases 
--
 slf4j-api-version1.6.6/slf4j-api-version
-slf4j-version1.7.10/slf4j-version
+slf4j-version1.7.12/slf4j-version
 smack-bundle-version4.0.6/smack-bundle-version
 smack-version4.0.7/smack-version
 snakeyaml-version1.14/snakeyaml-version

camel git commit: upgrade ognl 3.0.8 to 3.0.9

[cmueller]

Repository: camel
Updated Branches:
  refs/heads/camel-2.15.x 9a69b3686 - 9afed176e


upgrade ognl 3.0.8 to 3.0.9


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

Branch: refs/heads/camel-2.15.x
Commit: 9afed176e328c3c2c564537536eb97d70109be1a
Parents: 9a69b368
Author: Christian Mueller cmuel...@apache.org
Authored: Fri Apr 24 23:45:16 2015 +0200
Committer: Christian Mueller cmuel...@apache.org
Committed: Sun Apr 26 13:15:26 2015 +0200

--
 parent/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/9afed176/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 1cd8ece..6e76f52 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -360,8 +360,8 @@
 openwebbeans-version1.2.0/openwebbeans-version
 olingo2-version2.0.0/olingo2-version
 
olingo-odata2-core-bundle-version2.0.0_1/olingo-odata2-core-bundle-version
-ognl-version3.0.8/ognl-version
-ognl-bundle-version3.0.8_1/ognl-bundle-version
+ognl-version3.0.9/ognl-version
+ognl-bundle-version3.0.9_1/ognl-bundle-version
 oncrpc-version1.1.2/oncrpc-version
 openejb-version4.6.0.2/openejb-version
 openjpa-version2.3.0/openjpa-version

camel git commit: upgrade ognl 3.0.8 to 3.0.9

[cmueller]

Repository: camel
Updated Branches:
  refs/heads/camel-2.14.x bd1f252f8 - 17e465365


upgrade ognl 3.0.8 to 3.0.9


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

Branch: refs/heads/camel-2.14.x
Commit: 17e46536579b5be5e6a8610360c87db0c0e263de
Parents: bd1f252
Author: Christian Mueller cmuel...@apache.org
Authored: Sun Apr 26 13:21:13 2015 +0200
Committer: Christian Mueller cmuel...@apache.org
Committed: Sun Apr 26 13:21:13 2015 +0200

--
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/17e46536/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 2f65777..7816bcb 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -335,7 +335,7 @@
 openwebbeans-version1.2.0/openwebbeans-version
 olingo2-version2.0.0/olingo2-version
 
olingo-odata2-core-bundle-version2.0.0_1/olingo-odata2-core-bundle-version
-ognl-version3.0.8_1/ognl-version
+ognl-version3.0.9_1/ognl-version
 openejb-version4.6.0.2/openejb-version
 openjpa-version2.3.0/openjpa-version
 opensaml-version2.5.1_2/opensaml-version

camel git commit: downgrade JUnit 4.12 to 4.11 as camel-itest-karaf doesn't work with JUnit 4.12 at present

[cmueller]

Repository: camel
Updated Branches:
  refs/heads/master 16f4d2e92 - 799d3cbc7


downgrade JUnit 4.12 to 4.11 as camel-itest-karaf doesn't work with JUnit 4.12 
at present


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

Branch: refs/heads/master
Commit: 799d3cbc7b1103070d1631b4cd5c00cf7202c361
Parents: 16f4d2e
Author: Christian Mueller cmuel...@apache.org
Authored: Sat Apr 25 17:28:25 2015 +0200
Committer: Christian Mueller cmuel...@apache.org
Committed: Sat Apr 25 17:28:25 2015 +0200

--
 parent/pom.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/799d3cbc/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 525bcac..d64f230 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -294,8 +294,9 @@
 jt400-bundle-version6.7_1/jt400-bundle-version
 juel-bundle-version2.1.3_1/juel-bundle-version
 juel-version2.1.3/juel-version
-junit-bundle-version4.12_1/junit-bundle-version
-junit-version4.12/junit-version
+!-- camel-itest-karaf doesn't work with JUnit 4.12 at present --
+junit-bundle-version4.11_1/junit-bundle-version
+junit-version4.11/junit-version
 jython-version2.5.3/jython-version
 jzlib-version1.1.3/jzlib-version
 kafka-version0.8.2.0/kafka-version

camel git commit: CAMEL-8694: java.lang.NullPointerException in at org.apache.camel.component.netty4.http.NettyHttpProducer.done

[cmueller]

Repository: camel
Updated Branches:
  refs/heads/master 3a68f1242 - dbd6b584e


CAMEL-8694: java.lang.NullPointerException in at 
org.apache.camel.component.netty4.http.NettyHttpProducer.done


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

Branch: refs/heads/master
Commit: dbd6b584e02f5ce0ae46e50d2f4ee6a2785dd7d4
Parents: 3a68f12
Author: Christian Mueller cmuel...@apache.org
Authored: Fri Apr 24 23:26:18 2015 +0200
Committer: Christian Mueller cmuel...@apache.org
Committed: Fri Apr 24 23:26:18 2015 +0200

--
 .../org/apache/camel/component/netty4/http/NettyHttpProducer.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/dbd6b584/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpProducer.java
--
diff --git 
a/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpProducer.java
 
b/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpProducer.java
index c021494..f88b0b2 100644
--- 
a/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpProducer.java
+++ 
b/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpProducer.java
@@ -95,8 +95,8 @@ public class NettyHttpProducer extends NettyProducer {
 FullHttpResponse response = nettyMessage.getHttpResponse();
 // Need to retain the ByteBuffer for producer to consumer
 // TODO Remove this part of ByteBuffer right away
-response.content().retain();
 if (response != null) {
+response.content().retain();
 // the actual url is stored on the IN message in the 
getRequestBody method as its accessed on-demand
 String actualUrl = 
exchange.getIn().getHeader(Exchange.HTTP_URL, String.class);
 int code = response.getStatus() != null ? 
response.getStatus().code() : -1;
@@ -116,5 +116,4 @@ public class NettyHttpProducer extends NettyProducer {
 }
 }
 }
-
 }

camel git commit: CAMEL-8694: java.lang.NullPointerException in at org.apache.camel.component.netty4.http.NettyHttpProducer.done

[cmueller]

Repository: camel
Updated Branches:
  refs/heads/camel-2.15.x f51e06167 - 9a69b3686


CAMEL-8694: java.lang.NullPointerException in at 
org.apache.camel.component.netty4.http.NettyHttpProducer.done


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

Branch: refs/heads/camel-2.15.x
Commit: 9a69b3686ff9031d82ebe9ab357af42382765395
Parents: f51e061
Author: Christian Mueller cmuel...@apache.org
Authored: Fri Apr 24 23:26:18 2015 +0200
Committer: Christian Mueller cmuel...@apache.org
Committed: Fri Apr 24 23:27:16 2015 +0200

--
 .../org/apache/camel/component/netty4/http/NettyHttpProducer.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/9a69b368/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpProducer.java
--
diff --git 
a/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpProducer.java
 
b/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpProducer.java
index c021494..f88b0b2 100644
--- 
a/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpProducer.java
+++ 
b/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpProducer.java
@@ -95,8 +95,8 @@ public class NettyHttpProducer extends NettyProducer {
 FullHttpResponse response = nettyMessage.getHttpResponse();
 // Need to retain the ByteBuffer for producer to consumer
 // TODO Remove this part of ByteBuffer right away
-response.content().retain();
 if (response != null) {
+response.content().retain();
 // the actual url is stored on the IN message in the 
getRequestBody method as its accessed on-demand
 String actualUrl = 
exchange.getIn().getHeader(Exchange.HTTP_URL, String.class);
 int code = response.getStatus() != null ? 
response.getStatus().code() : -1;
@@ -116,5 +116,4 @@ public class NettyHttpProducer extends NettyProducer {
 }
 }
 }
-
 }

camel git commit: CAMEL-8694: java.lang.NullPointerException in at org.apache.camel.component.netty4.http.NettyHttpProducer.done

[cmueller]

Repository: camel
Updated Branches:
  refs/heads/camel-2.14.x 6a1bfc63c - bd1f252f8


CAMEL-8694: java.lang.NullPointerException in at 
org.apache.camel.component.netty4.http.NettyHttpProducer.done


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

Branch: refs/heads/camel-2.14.x
Commit: bd1f252f81dd8a117f9466a5c0ee528b8e7a4763
Parents: 6a1bfc6
Author: Christian Mueller cmuel...@apache.org
Authored: Fri Apr 24 23:26:18 2015 +0200
Committer: Christian Mueller cmuel...@apache.org
Committed: Fri Apr 24 23:30:02 2015 +0200

--
 .../org/apache/camel/component/netty4/http/NettyHttpProducer.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/bd1f252f/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpProducer.java
--
diff --git 
a/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpProducer.java
 
b/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpProducer.java
index c021494..f88b0b2 100644
--- 
a/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpProducer.java
+++ 
b/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpProducer.java
@@ -95,8 +95,8 @@ public class NettyHttpProducer extends NettyProducer {
 FullHttpResponse response = nettyMessage.getHttpResponse();
 // Need to retain the ByteBuffer for producer to consumer
 // TODO Remove this part of ByteBuffer right away
-response.content().retain();
 if (response != null) {
+response.content().retain();
 // the actual url is stored on the IN message in the 
getRequestBody method as its accessed on-demand
 String actualUrl = 
exchange.getIn().getHeader(Exchange.HTTP_URL, String.class);
 int code = response.getStatus() != null ? 
response.getStatus().code() : -1;
@@ -116,5 +116,4 @@ public class NettyHttpProducer extends NettyProducer {
 }
 }
 }
-
 }

camel git commit: upgrade junit 4.11 to 4.12

[cmueller]

Repository: camel
Updated Branches:
  refs/heads/master dbd6b584e - 3c083cb07


upgrade junit 4.11 to 4.12


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

Branch: refs/heads/master
Commit: 3c083cb079751096a68a897c3cb13ce0caa5268d
Parents: dbd6b58
Author: Christian Mueller cmuel...@apache.org
Authored: Fri Apr 24 23:39:08 2015 +0200
Committer: Christian Mueller cmuel...@apache.org
Committed: Fri Apr 24 23:39:08 2015 +0200

--
 parent/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/3c083cb0/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 31b6330..4035351 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -294,8 +294,8 @@
 jt400-bundle-version6.7_1/jt400-bundle-version
 juel-bundle-version2.1.3_1/juel-bundle-version
 juel-version2.1.3/juel-version
-junit-bundle-version4.11_2/junit-bundle-version
-junit-version4.11/junit-version
+junit-bundle-version4.12_1/junit-bundle-version
+junit-version4.12/junit-version
 jython-version2.5.3/jython-version
 jzlib-version1.1.3/jzlib-version
 kafka-version0.8.2.0/kafka-version

camel git commit: upgrade ognl 3.0.8 to 3.0.9

[cmueller]

Repository: camel
Updated Branches:
  refs/heads/master 3c083cb07 - a9093733c


upgrade ognl 3.0.8 to 3.0.9


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

Branch: refs/heads/master
Commit: a9093733c64d9b217f1b3fc704400e19b370495b
Parents: 3c083cb
Author: Christian Mueller cmuel...@apache.org
Authored: Fri Apr 24 23:45:16 2015 +0200
Committer: Christian Mueller cmuel...@apache.org
Committed: Fri Apr 24 23:45:16 2015 +0200

--
 parent/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/a9093733/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 4035351..c742695 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -362,8 +362,8 @@
 openwebbeans-version1.2.0/openwebbeans-version
 olingo2-version2.0.0/olingo2-version
 
olingo-odata2-core-bundle-version2.0.0_1/olingo-odata2-core-bundle-version
-ognl-version3.0.8/ognl-version
-ognl-bundle-version3.0.8_1/ognl-bundle-version
+ognl-version3.0.9/ognl-version
+ognl-bundle-version3.0.9_1/ognl-bundle-version
 oncrpc-version1.1.2/oncrpc-version
 openejb-version4.6.0.2/openejb-version
 openjpa-version2.3.0/openjpa-version

camel git commit: upgrade openjpa 2.3.0 to 2.4.0

[cmueller]

Repository: camel
Updated Branches:
  refs/heads/master a9093733c - 1a24e6a34


upgrade openjpa 2.3.0 to 2.4.0


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

Branch: refs/heads/master
Commit: 1a24e6a343b71c5b58a29037f3e3fc64210bacca
Parents: a909373
Author: Christian Mueller cmuel...@apache.org
Authored: Fri Apr 24 23:50:51 2015 +0200
Committer: Christian Mueller cmuel...@apache.org
Committed: Fri Apr 24 23:50:51 2015 +0200

--
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/1a24e6a3/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index c742695..b1cd644 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -366,7 +366,7 @@
 ognl-bundle-version3.0.9_1/ognl-bundle-version
 oncrpc-version1.1.2/oncrpc-version
 openejb-version4.6.0.2/openejb-version
-openjpa-version2.3.0/openjpa-version
+openjpa-version2.4.0/openjpa-version
 openshift-java-client-version2.7.0.Final/openshift-java-client-version
 optaplanner-version6.2.0.Final/optaplanner-version
 oro-bundle-version2.0.8_6/oro-bundle-version

camel git commit: upgrade testng 6.8.8 to 6.8.21

[cmueller]

Repository: camel
Updated Branches:
  refs/heads/master 1a24e6a34 - 7a853c000


upgrade testng 6.8.8 to 6.8.21


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

Branch: refs/heads/master
Commit: 7a853c000f772bb52c484e5a64417cb1ad1c3ed3
Parents: 1a24e6a
Author: Christian Mueller cmuel...@apache.org
Authored: Fri Apr 24 23:53:43 2015 +0200
Committer: Christian Mueller cmuel...@apache.org
Committed: Fri Apr 24 23:53:43 2015 +0200

--
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/7a853c00/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index b1cd644..ab7f7f4 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -469,7 +469,7 @@
 taglist-maven-plugin-version2.4/taglist-maven-plugin-version
 tagsoup-bundle-version1.2_5/tagsoup-bundle-version
 tagsoup-version1.2.1/tagsoup-version
-testng-version6.8.8/testng-version
+testng-version6.8.21/testng-version
 twitter4j-bundle-version4.0.3_1/twitter4j-bundle-version
 twitter4j-version4.0.3/twitter4j-version
 univocity-parsers-version1.2.1/univocity-parsers-version

camel git commit: upgrade slf4j 1.7.10 to 1.7.12

[cmueller]

Repository: camel
Updated Branches:
  refs/heads/master 7a853c000 - 16ea61e23


upgrade slf4j 1.7.10 to 1.7.12


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

Branch: refs/heads/master
Commit: 16ea61e2377a94390824cb358c188a62923a4768
Parents: 7a853c0
Author: Christian Mueller cmuel...@apache.org
Authored: Fri Apr 24 23:55:08 2015 +0200
Committer: Christian Mueller cmuel...@apache.org
Committed: Fri Apr 24 23:55:08 2015 +0200

--
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/16ea61e2/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index ab7f7f4..525bcac 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -418,7 +418,7 @@
 shiro-version1.2.3/shiro-version
 !-- use slf4j-api 1.6.x to be easy compatible with older Camel releases 
--
 slf4j-api-version1.6.6/slf4j-api-version
-slf4j-version1.7.10/slf4j-version
+slf4j-version1.7.12/slf4j-version
 smack-bundle-version4.0.6/smack-bundle-version
 smack-version4.0.7/smack-version
 snakeyaml-version1.14/snakeyaml-version

[2/2] camel git commit: CAMEL-8692: Improve the PredicateBuilder with the missing vargs and list or helper method

[cmueller]

CAMEL-8692: Improve the PredicateBuilder with the missing vargs and list or 
helper method


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

Branch: refs/heads/master
Commit: 6c2467222ce47d82323b34afb9434bb41eb5a46e
Parents: 8bcd609
Author: Christian Mueller cmuel...@apache.org
Authored: Thu Apr 23 21:40:17 2015 +0200
Committer: Christian Mueller cmuel...@apache.org
Committed: Thu Apr 23 21:40:17 2015 +0200

--
 .../apache/camel/builder/PredicateBuilder.java  | 30 
 .../camel/builder/PredicateBuilderTest.java |  6 ++--
 2 files changed, 33 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/6c246722/camel-core/src/main/java/org/apache/camel/builder/PredicateBuilder.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/builder/PredicateBuilder.java 
b/camel-core/src/main/java/org/apache/camel/builder/PredicateBuilder.java
index ae9e9c4..c2eb5c9 100644
--- a/camel-core/src/main/java/org/apache/camel/builder/PredicateBuilder.java
+++ b/camel-core/src/main/java/org/apache/camel/builder/PredicateBuilder.java
@@ -105,6 +105,36 @@ public final class PredicateBuilder {
 }
 
 /**
+ * Concat the given predicates into a single predicate, which matches
+ * if at least one predicates matches.
+ *
+ * @param predicates predicates
+ * @return a single predicate containing all the predicates
+ */
+public static Predicate or(ListPredicate predicates) {
+Predicate answer = null;
+for (Predicate predicate : predicates) {
+if (answer == null) {
+answer = predicate;
+} else {
+answer = or(answer, predicate);
+}
+}
+return answer;
+}
+
+/**
+ * Concat the given predicates into a single predicate, which matches
+ * if at least one predicates matches.
+ *
+ * @param predicates predicates
+ * @return a single predicate containing all the predicates
+ */
+public static Predicate or(Predicate... predicates) {
+return or(Arrays.asList(predicates));
+}
+
+/**
  * A helper method to return true if any of the predicates matches.
  */
 public static Predicate in(final Predicate... predicates) {

http://git-wip-us.apache.org/repos/asf/camel/blob/6c246722/camel-core/src/test/java/org/apache/camel/builder/PredicateBuilderTest.java
--
diff --git 
a/camel-core/src/test/java/org/apache/camel/builder/PredicateBuilderTest.java 
b/camel-core/src/test/java/org/apache/camel/builder/PredicateBuilderTest.java
index 6ada574..b1c0338 100644
--- 
a/camel-core/src/test/java/org/apache/camel/builder/PredicateBuilderTest.java
+++ 
b/camel-core/src/test/java/org/apache/camel/builder/PredicateBuilderTest.java
@@ -30,10 +30,8 @@ import static org.apache.camel.builder.Builder.constant;
 import static org.apache.camel.builder.PredicateBuilder.in;
 import static org.apache.camel.builder.PredicateBuilder.not;
 
-/**
- * @version 
- */
 public class PredicateBuilderTest extends TestSupport {
+
 protected Exchange exchange = new DefaultExchange(new 
DefaultCamelContext());
 
 public void testRegexPredicates() throws Exception {
@@ -91,9 +89,11 @@ public class PredicateBuilderTest extends TestSupport {
 
 // check method signature with varargs
 assertMatches(PredicateBuilder.in(p1, p2, p3));
+assertMatches(PredicateBuilder.or(p1, p2, p3));
 
 // maybe a list of predicates?
 assertMatches(PredicateBuilder.in(Arrays.asList(p1, p2, p3)));
+assertMatches(PredicateBuilder.or(Arrays.asList(p1, p2, p3)));
 }
 
 public void testCompoundAndOrPredicates() throws Exception {

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

[cmueller]

Repository: camel
Updated Branches:
  refs/heads/master ae7b52acb - 6c2467222


fixed CS error


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

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

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


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

Git Push Summary

[cmueller]

Repository: camel
Updated Branches:
  refs/remotes/origin/trunk [deleted] ec0e3a736

Git Push Summary

[cmueller]

Repository: camel
Updated Branches:
  refs/remotes/origin/trunk [created] ec0e3a736

[2/2] camel git commit: CAMEL-8574: Feature camel-hdfs doesn't install all required dependencies

[cmueller]

CAMEL-8574: Feature camel-hdfs doesn't install all required dependencies


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

Branch: refs/heads/camel-2.15.x
Commit: ce0ffeeec8c30b45c1b213990816b522031a856c
Parents: be93eb2
Author: Christian Mueller cmuel...@apache.org
Authored: Mon Mar 30 23:33:09 2015 +0200
Committer: Christian Mueller cmuel...@apache.org
Committed: Mon Mar 30 23:33:09 2015 +0200

--
 parent/pom.xml   | 1 +
 platforms/karaf/features/src/main/resources/features.xml | 2 ++
 2 files changed, 3 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/ce0ffeee/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index a5561d6..9144dd6 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -177,6 +177,7 @@
 geronimo-jsp-spec-version1.1/geronimo-jsp-spec-version
 geronimo-jta-spec-version1.1.1/geronimo-jta-spec-version
 geronimo-servlet-spec-version1.0/geronimo-servlet-spec-version
+geronimo-servlet-2.5-spec-version1.2/geronimo-servlet-2.5-spec-version
 
geronimo-ws-metadata-spec-version1.1.3/geronimo-ws-metadata-spec-version
 gmaven-plugin-version1.4/gmaven-plugin-version
 gmetric4j-version1.0.10/gmetric4j-version

http://git-wip-us.apache.org/repos/asf/camel/blob/ce0ffeee/platforms/karaf/features/src/main/resources/features.xml
--
diff --git a/platforms/karaf/features/src/main/resources/features.xml 
b/platforms/karaf/features/src/main/resources/features.xml
index 7a19f03..d9d3f7d 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -588,6 +588,8 @@
 !-- see https://issues.apache.org/jira/browse/HADOOP-7101 --
 detailsHadoop does not currently work properly in OSGi 
environment./details
 feature version='${project.version}'camel-core/feature
+bundle 
dependency='true'mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/${geronimo-servlet-2.5-spec-version}/bundle
+bundle dependency=truewrap:mvn:javax.servlet.jsp/jsp-api/2.1/bundle
 featurewar/feature
 bundle 
dependency='true'mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo-jta-spec-version}/bundle
 bundle 
dependency='true'mvn:javax.mail/mail/${javax-mail-version}/bundle

[1/2] camel git commit: CAMEL-8573: Feature camel-hbase doesn't install all required dependencies

[cmueller]

Repository: camel
Updated Branches:
  refs/heads/camel-2.15.x 50017e615 - ce0ffeeec


CAMEL-8573: Feature camel-hbase doesn't install all required dependencies


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

Branch: refs/heads/camel-2.15.x
Commit: be93eb2fb8bba7783156dcbe29445101feb86bff
Parents: 50017e6
Author: Christian Mueller cmuel...@apache.org
Authored: Mon Mar 30 23:28:13 2015 +0200
Committer: Christian Mueller cmuel...@apache.org
Committed: Mon Mar 30 23:28:13 2015 +0200

--
 platforms/karaf/features/src/main/resources/features.xml | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/be93eb2f/platforms/karaf/features/src/main/resources/features.xml
--
diff --git a/platforms/karaf/features/src/main/resources/features.xml 
b/platforms/karaf/features/src/main/resources/features.xml
index c02f5c1..7a19f03 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -526,6 +526,7 @@
 detailsHadoop does not currently work properly in OSGi 
environment./details
 feature version='${project.version}'camel-core/feature
 feature version='${cxf-version-range}'cxf-specs/feature
+bundle dependency=truewrap:mvn:javax.servlet.jsp/jsp-api/2.1/bundle
 featurewar/feature
 bundle 
dependency='true'mvn:org.osgi/org.osgi.compendium/${osgi-version}/bundle
 bundle 
dependency='true'mvn:org.apache.geronimo.specs/geronimo-interceptor_1.1_spec/1.0/bundle

[2/2] camel git commit: CAMEL-8573: Feature camel-hbase doesn't install all required dependencies

[cmueller]

CAMEL-8573: Feature camel-hbase doesn't install all required dependencies


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

Branch: refs/heads/master
Commit: 99d44de036b2bc23f08a91f54ce5c40d384adf93
Parents: 17fd873
Author: Christian Mueller cmuel...@apache.org
Authored: Mon Mar 30 22:34:15 2015 +0200
Committer: Christian Mueller cmuel...@apache.org
Committed: Mon Mar 30 23:06:00 2015 +0200

--
 platforms/karaf/features/src/main/resources/features.xml | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/99d44de0/platforms/karaf/features/src/main/resources/features.xml
--
diff --git a/platforms/karaf/features/src/main/resources/features.xml 
b/platforms/karaf/features/src/main/resources/features.xml
index 28531c2..8953bc5 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -531,6 +531,7 @@
 detailsHadoop does not currently work properly in OSGi 
environment./details
 feature version='${project.version}'camel-core/feature
 feature version='${cxf-version-range}'cxf-specs/feature
+bundle dependency=truewrap:mvn:javax.servlet.jsp/jsp-api/2.1/bundle
 featurewar/feature
 bundle 
dependency='true'mvn:org.osgi/org.osgi.compendium/${osgi-version}/bundle
 bundle 
dependency='true'mvn:org.apache.geronimo.specs/geronimo-interceptor_1.1_spec/1.0/bundle

[1/2] camel git commit: CAMEL-8574: Feature camel-hdfs doesn't install all required dependencies

[cmueller]

Repository: camel
Updated Branches:
  refs/heads/master 17fd873cc - d01e51f02


CAMEL-8574: Feature camel-hdfs doesn't install all required dependencies


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

Branch: refs/heads/master
Commit: d01e51f02bf692b8c13c07474952e652147be99f
Parents: 99d44de
Author: Christian Mueller cmuel...@apache.org
Authored: Mon Mar 30 22:59:16 2015 +0200
Committer: Christian Mueller cmuel...@apache.org
Committed: Mon Mar 30 23:06:00 2015 +0200

--
 parent/pom.xml   | 1 +
 platforms/karaf/features/src/main/resources/features.xml | 2 ++
 2 files changed, 3 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/d01e51f0/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 99815d8..8840541 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -178,6 +178,7 @@
 geronimo-jsp-spec-version1.1/geronimo-jsp-spec-version
 geronimo-jta-spec-version1.1.1/geronimo-jta-spec-version
 geronimo-servlet-spec-version1.0/geronimo-servlet-spec-version
+geronimo-servlet-2.5-spec-version1.2/geronimo-servlet-2.5-spec-version
 
geronimo-ws-metadata-spec-version1.1.3/geronimo-ws-metadata-spec-version
 gmaven-plugin-version1.4/gmaven-plugin-version
 gmetric4j-version1.0.10/gmetric4j-version

http://git-wip-us.apache.org/repos/asf/camel/blob/d01e51f0/platforms/karaf/features/src/main/resources/features.xml
--
diff --git a/platforms/karaf/features/src/main/resources/features.xml 
b/platforms/karaf/features/src/main/resources/features.xml
index 8953bc5..d44eb20 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -593,6 +593,8 @@
 !-- see https://issues.apache.org/jira/browse/HADOOP-7101 --
 detailsHadoop does not currently work properly in OSGi 
environment./details
 feature version='${project.version}'camel-core/feature
+bundle 
dependency='true'mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/${geronimo-servlet-2.5-spec-version}/bundle
+bundle dependency=truewrap:mvn:javax.servlet.jsp/jsp-api/2.1/bundle
 featurewar/feature
 bundle 
dependency='true'mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo-jta-spec-version}/bundle
 bundle 
dependency='true'mvn:javax.mail/mail/${javax-mail-version}/bundle

[1/2] camel git commit: CAMEL-8566: Feature camel-cxf doesn't install all required dependencies

[cmueller]

Repository: camel
Updated Branches:
  refs/heads/master b1d482888 - 2c5d084c4


CAMEL-8566: Feature camel-cxf doesn't install all required dependencies


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

Branch: refs/heads/master
Commit: fd47e97ca9d3bafd1cd5e71c088e29307c6a9d0a
Parents: b1d4828
Author: Christian Mueller cmuel...@apache.org
Authored: Sun Mar 29 22:20:16 2015 +0200
Committer: Christian Mueller cmuel...@apache.org
Committed: Sun Mar 29 22:20:16 2015 +0200

--
 platforms/karaf/features/src/main/resources/features.xml | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/fd47e97c/platforms/karaf/features/src/main/resources/features.xml
--
diff --git a/platforms/karaf/features/src/main/resources/features.xml 
b/platforms/karaf/features/src/main/resources/features.xml
index 6288517..0309ea5 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -300,6 +300,7 @@
 feature version='${cxf-version-range}'cxf-http-jetty/feature
 feature version='${cxf-version-range}'cxf-databinding-jaxb/feature
 feature version='${cxf-version-range}'cxf-bindings-soap/feature
+feature version='${project.version}'camel-spring/feature
 
bundlemvn:org.apache.camel/camel-cxf-transport/${project.version}/bundle
 bundlemvn:org.apache.camel/camel-cxf/${project.version}/bundle
   /feature

[2/2] camel git commit: update the copyright year to 2015

[cmueller]

update the copyright year to 2015


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

Branch: refs/heads/master
Commit: 2c5d084c4984cc713716665b8b30df0297212c05
Parents: fd47e97
Author: Christian Mueller cmuel...@apache.org
Authored: Sun Mar 29 22:20:58 2015 +0200
Committer: Christian Mueller cmuel...@apache.org
Committed: Sun Mar 29 22:20:58 2015 +0200

--
 tooling/camel-manual/src/styles/docbook-fo.xsl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/2c5d084c/tooling/camel-manual/src/styles/docbook-fo.xsl
--
diff --git a/tooling/camel-manual/src/styles/docbook-fo.xsl 
b/tooling/camel-manual/src/styles/docbook-fo.xsl
index 4458809..c40bd8c 100644
--- a/tooling/camel-manual/src/styles/docbook-fo.xsl
+++ b/tooling/camel-manual/src/styles/docbook-fo.xsl
@@ -70,7 +70,7 @@
fo:table-cell 
text-align=center
fo:block 
font-family=Helvetica font-size=12pt 
padding=10mm
-   
xsl:textCopyright copyright; 2004-2007, 
+   
xsl:textCopyright copyright; 2004-2015, 
Apache 
Software Foundation/xsl:text
/fo:block
!--fo:block--

camel git commit: CAMEL-8566: Feature camel-cxf doesn't install all required dependencies

[cmueller]

Repository: camel
Updated Branches:
  refs/heads/camel-2.15.x c5363b16f - df8584354


CAMEL-8566: Feature camel-cxf doesn't install all required dependencies


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

Branch: refs/heads/camel-2.15.x
Commit: df85843544e7b1546745f6ea278cc853ec5b7e52
Parents: c5363b1
Author: Christian Mueller cmuel...@apache.org
Authored: Sun Mar 29 22:20:16 2015 +0200
Committer: Christian Mueller cmuel...@apache.org
Committed: Sun Mar 29 22:22:29 2015 +0200

--
 platforms/karaf/features/src/main/resources/features.xml | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/df858435/platforms/karaf/features/src/main/resources/features.xml
--
diff --git a/platforms/karaf/features/src/main/resources/features.xml 
b/platforms/karaf/features/src/main/resources/features.xml
index ad099ad..4d56c9e 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -295,6 +295,7 @@
 feature version='${cxf-version-range}'cxf-http-jetty/feature
 feature version='${cxf-version-range}'cxf-databinding-jaxb/feature
 feature version='${cxf-version-range}'cxf-bindings-soap/feature
+feature version='${project.version}'camel-spring/feature
 
bundlemvn:org.apache.camel/camel-cxf-transport/${project.version}/bundle
 bundlemvn:org.apache.camel/camel-cxf/${project.version}/bundle
   /feature

svn commit: r1669957 - /camel/website/template/template.camel

[cmueller]

Author: cmueller
Date: Sun Mar 29 19:45:45 2015
New Revision: 1669957

URL: http://svn.apache.org/r1669957
Log:
update the year in copyright to 2015

Modified:
camel/website/template/template.camel

Modified: camel/website/template/template.camel
URL: 
http://svn.apache.org/viewvc/camel/website/template/template.camel?rev=1669957r1=1669956r2=1669957view=diff
==
--- camel/website/template/template.camel (original)
+++ camel/website/template/template.camel Sun Mar 29 19:45:45 2015
@@ -123,7 +123,7 @@ $content
 /div
 /div
 div class=design_attribution
-copy; 2004-2014 The Apache Software Foundation.
+copy; 2004-2015 The Apache Software Foundation.
 br  
 Apache Camel, Camel, Apache, the Apache feather logo, and the Apache Camel 
project logo are trademarks of The Apache Software Foundation.  All other marks 
mentioned may be trademarks or registered trademarks of their respective owners.
 br

camel git commit: CAMEL-8568: Feature camel-swagger doesn't install all required dependencies

[cmueller]

Repository: camel
Updated Branches:
  refs/heads/camel-2.15.x df8584354 - f92078e14


CAMEL-8568: Feature camel-swagger doesn't install all required dependencies


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

Branch: refs/heads/camel-2.15.x
Commit: f92078e148d5a8f347f2a5e314b1859632f72ee2
Parents: df85843
Author: Christian Mueller cmuel...@apache.org
Authored: Sun Mar 29 23:39:29 2015 +0200
Committer: Christian Mueller cmuel...@apache.org
Committed: Sun Mar 29 23:40:38 2015 +0200

--
 platforms/karaf/features/src/main/resources/features.xml | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/f92078e1/platforms/karaf/features/src/main/resources/features.xml
--
diff --git a/platforms/karaf/features/src/main/resources/features.xml 
b/platforms/karaf/features/src/main/resources/features.xml
index 4d56c9e..c02f5c1 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -1425,6 +1425,7 @@
 feature version='${project.version}'camel-core/feature
 !-- must use Scala 2.10 --
 bundle 
dependency='true'mvn:org.scala-lang/scala-library/${scala-2.10-version}/bundle
+bundle 
dependency='true'mvn:org.scala-lang/scala-reflect/${scala-2.10-version}/bundle
 bundlemvn:javax.ws.rs/jsr311-api/${jsr311-api-version}/bundle
 bundle 
dependency='true'mvn:com.google.guava/guava/${swagger-guava-version}/bundle
 bundle 
dependency='true'mvn:com.fasterxml.jackson.core/jackson-core/${jackson2-version}/bundle

camel git commit: added the missing license and notice file

[cmueller]

Repository: camel
Updated Branches:
  refs/heads/master 2c5d084c4 - e3926e71e


added the missing license and notice file


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

Branch: refs/heads/master
Commit: e3926e71e7b273ba1cf7954fb05649c27665606d
Parents: 2c5d084
Author: Christian Mueller cmuel...@apache.org
Authored: Sun Mar 29 23:17:50 2015 +0200
Committer: Christian Mueller cmuel...@apache.org
Committed: Sun Mar 29 23:17:50 2015 +0200

--
 .../src/main/resources/META-INF/LICENSE.txt | 203 +++
 .../src/main/resources/META-INF/NOTICE.txt  |  11 +
 2 files changed, 214 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/e3926e71/components/camel-paho/src/main/resources/META-INF/LICENSE.txt
--
diff --git a/components/camel-paho/src/main/resources/META-INF/LICENSE.txt 
b/components/camel-paho/src/main/resources/META-INF/LICENSE.txt
new file mode 100755
index 000..6b0b127
--- /dev/null
+++ b/components/camel-paho/src/main/resources/META-INF/LICENSE.txt
@@ -0,0 +1,203 @@
+
+ Apache License
+   Version 2.0, January 2004
+http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+  License shall mean the terms and conditions for use, reproduction,
+  and distribution as defined by Sections 1 through 9 of this document.
+
+  Licensor shall mean the copyright owner or entity authorized by
+  the copyright owner that is granting the License.
+
+  Legal Entity shall mean the union of the acting entity and all
+  other entities that control, are controlled by, or are under common
+  control with that entity. For the purposes of this definition,
+  control means (i) the power, direct or indirect, to cause the
+  direction or management of such entity, whether by contract or
+  otherwise, or (ii) ownership of fifty percent (50%) or more of the
+  outstanding shares, or (iii) beneficial ownership of such entity.
+
+  You (or Your) shall mean an individual or Legal Entity
+  exercising permissions granted by this License.
+
+  Source form shall mean the preferred form for making modifications,
+  including but not limited to software source code, documentation
+  source, and configuration files.
+
+  Object form shall mean any form resulting from mechanical
+  transformation or translation of a Source form, including but
+  not limited to compiled object code, generated documentation,
+  and conversions to other media types.
+
+  Work shall mean the work of authorship, whether in Source or
+  Object form, made available under the License, as indicated by a
+  copyright notice that is included in or attached to the work
+  (an example is provided in the Appendix below).
+
+  Derivative Works shall mean any work, whether in Source or Object
+  form, that is based on (or derived from) the Work and for which the
+  editorial revisions, annotations, elaborations, or other modifications
+  represent, as a whole, an original work of authorship. For the purposes
+  of this License, Derivative Works shall not include works that remain
+  separable from, or merely link (or bind by name) to the interfaces of,
+  the Work and Derivative Works thereof.
+
+  Contribution shall mean any work of authorship, including
+  the original version of the Work and any modifications or additions
+  to that Work or Derivative Works thereof, that is intentionally
+  submitted to Licensor for inclusion in the Work by the copyright owner
+  or by an individual or Legal Entity authorized to submit on behalf of
+  the copyright owner. For the purposes of this definition, submitted
+  means any form of electronic, verbal, or written communication sent
+  to the Licensor or its representatives, including but not limited to
+  communication on electronic mailing lists, source code control systems,
+  and issue tracking systems that are managed by, or on behalf of, the
+  Licensor for the purpose of discussing and improving the Work, but
+  excluding communication that is conspicuously marked or otherwise
+  designated in writing by the copyright owner as Not a Contribution.
+
+  Contributor shall mean Licensor and any individual or Legal Entity
+  on behalf of whom a Contribution has been received by Licensor and
+  subsequently incorporated within the Work.
+
+   2. Grant of 

camel git commit: CAMEL-8568: Feature camel-swagger doesn't install all required dependencies

[cmueller]

Repository: camel
Updated Branches:
  refs/heads/master e3926e71e - d0a071dc6


CAMEL-8568: Feature camel-swagger doesn't install all required dependencies


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

Branch: refs/heads/master
Commit: d0a071dc639448ba76bd22dcfc17c8385787a775
Parents: e3926e7
Author: Christian Mueller cmuel...@apache.org
Authored: Sun Mar 29 23:39:29 2015 +0200
Committer: Christian Mueller cmuel...@apache.org
Committed: Sun Mar 29 23:39:29 2015 +0200

--
 platforms/karaf/features/src/main/resources/features.xml | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/d0a071dc/platforms/karaf/features/src/main/resources/features.xml
--
diff --git a/platforms/karaf/features/src/main/resources/features.xml 
b/platforms/karaf/features/src/main/resources/features.xml
index 0309ea5..28531c2 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -1435,6 +1435,7 @@
 feature version='${project.version}'camel-core/feature
 !-- must use Scala 2.10 --
 bundle 
dependency='true'mvn:org.scala-lang/scala-library/${scala-2.10-version}/bundle
+bundle 
dependency='true'mvn:org.scala-lang/scala-reflect/${scala-2.10-version}/bundle
 bundlemvn:javax.ws.rs/jsr311-api/${jsr311-api-version}/bundle
 bundle 
dependency='true'mvn:com.google.guava/guava/${swagger-guava-version}/bundle
 bundle 
dependency='true'mvn:com.fasterxml.jackson.core/jackson-core/${jackson2-version}/bundle

camel git commit: added missing license and notice files

[cmueller]

Repository: camel
Updated Branches:
  refs/heads/master 88f7a86b7 - 4ccd72677


added missing license and notice files


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

Branch: refs/heads/master
Commit: 4ccd72677a363d001eee7346d3bb5852aa5dbf3a
Parents: 88f7a86
Author: Christian Mueller cmuel...@apache.org
Authored: Wed Mar 11 08:53:27 2015 +0100
Committer: Christian Mueller cmuel...@apache.org
Committed: Wed Mar 11 08:53:27 2015 +0100

--
 .../src/main/resources/META-INF/LICENSE.txt | 203 +++
 .../src/main/resources/META-INF/NOTICE.txt  |  11 +
 .../src/main/resources/META-INF/LICENSE.txt | 203 +++
 .../src/main/resources/META-INF/NOTICE.txt  |  11 +
 .../src/main/resources/META-INF/LICENSE.txt | 203 +++
 .../src/main/resources/META-INF/NOTICE.txt  |  11 +
 .../src/main/resources/META-INF/LICENSE.txt | 203 +++
 .../src/main/resources/META-INF/NOTICE.txt  |  11 +
 8 files changed, 856 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/4ccd7267/components/camel-google-calendar/src/main/resources/META-INF/LICENSE.txt
--
diff --git 
a/components/camel-google-calendar/src/main/resources/META-INF/LICENSE.txt 
b/components/camel-google-calendar/src/main/resources/META-INF/LICENSE.txt
new file mode 100755
index 000..6b0b127
--- /dev/null
+++ b/components/camel-google-calendar/src/main/resources/META-INF/LICENSE.txt
@@ -0,0 +1,203 @@
+
+ Apache License
+   Version 2.0, January 2004
+http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+  License shall mean the terms and conditions for use, reproduction,
+  and distribution as defined by Sections 1 through 9 of this document.
+
+  Licensor shall mean the copyright owner or entity authorized by
+  the copyright owner that is granting the License.
+
+  Legal Entity shall mean the union of the acting entity and all
+  other entities that control, are controlled by, or are under common
+  control with that entity. For the purposes of this definition,
+  control means (i) the power, direct or indirect, to cause the
+  direction or management of such entity, whether by contract or
+  otherwise, or (ii) ownership of fifty percent (50%) or more of the
+  outstanding shares, or (iii) beneficial ownership of such entity.
+
+  You (or Your) shall mean an individual or Legal Entity
+  exercising permissions granted by this License.
+
+  Source form shall mean the preferred form for making modifications,
+  including but not limited to software source code, documentation
+  source, and configuration files.
+
+  Object form shall mean any form resulting from mechanical
+  transformation or translation of a Source form, including but
+  not limited to compiled object code, generated documentation,
+  and conversions to other media types.
+
+  Work shall mean the work of authorship, whether in Source or
+  Object form, made available under the License, as indicated by a
+  copyright notice that is included in or attached to the work
+  (an example is provided in the Appendix below).
+
+  Derivative Works shall mean any work, whether in Source or Object
+  form, that is based on (or derived from) the Work and for which the
+  editorial revisions, annotations, elaborations, or other modifications
+  represent, as a whole, an original work of authorship. For the purposes
+  of this License, Derivative Works shall not include works that remain
+  separable from, or merely link (or bind by name) to the interfaces of,
+  the Work and Derivative Works thereof.
+
+  Contribution shall mean any work of authorship, including
+  the original version of the Work and any modifications or additions
+  to that Work or Derivative Works thereof, that is intentionally
+  submitted to Licensor for inclusion in the Work by the copyright owner
+  or by an individual or Legal Entity authorized to submit on behalf of
+  the copyright owner. For the purposes of this definition, submitted
+  means any form of electronic, verbal, or written communication sent
+  to the Licensor or its representatives, including but not limited to
+  communication on electronic mailing lists, source code control systems,
+  and issue tracking systems that are managed by, or on behalf of, the
+ 

camel git commit: added missing license and notice files

[cmueller]

Repository: camel
Updated Branches:
  refs/heads/camel-2.15.x 3dab2d812 - 893774209


added missing license and notice files


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

Branch: refs/heads/camel-2.15.x
Commit: 893774209fcbdea61fc713dba9df8fa98ba6d46b
Parents: 3dab2d8
Author: Christian Mueller cmuel...@apache.org
Authored: Wed Mar 11 08:53:27 2015 +0100
Committer: Christian Mueller cmuel...@apache.org
Committed: Wed Mar 11 08:54:33 2015 +0100

--
 .../src/main/resources/META-INF/LICENSE.txt | 203 +++
 .../src/main/resources/META-INF/NOTICE.txt  |  11 +
 .../src/main/resources/META-INF/LICENSE.txt | 203 +++
 .../src/main/resources/META-INF/NOTICE.txt  |  11 +
 .../src/main/resources/META-INF/LICENSE.txt | 203 +++
 .../src/main/resources/META-INF/NOTICE.txt  |  11 +
 .../src/main/resources/META-INF/LICENSE.txt | 203 +++
 .../src/main/resources/META-INF/NOTICE.txt  |  11 +
 8 files changed, 856 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/89377420/components/camel-google-calendar/src/main/resources/META-INF/LICENSE.txt
--
diff --git 
a/components/camel-google-calendar/src/main/resources/META-INF/LICENSE.txt 
b/components/camel-google-calendar/src/main/resources/META-INF/LICENSE.txt
new file mode 100755
index 000..6b0b127
--- /dev/null
+++ b/components/camel-google-calendar/src/main/resources/META-INF/LICENSE.txt
@@ -0,0 +1,203 @@
+
+ Apache License
+   Version 2.0, January 2004
+http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+  License shall mean the terms and conditions for use, reproduction,
+  and distribution as defined by Sections 1 through 9 of this document.
+
+  Licensor shall mean the copyright owner or entity authorized by
+  the copyright owner that is granting the License.
+
+  Legal Entity shall mean the union of the acting entity and all
+  other entities that control, are controlled by, or are under common
+  control with that entity. For the purposes of this definition,
+  control means (i) the power, direct or indirect, to cause the
+  direction or management of such entity, whether by contract or
+  otherwise, or (ii) ownership of fifty percent (50%) or more of the
+  outstanding shares, or (iii) beneficial ownership of such entity.
+
+  You (or Your) shall mean an individual or Legal Entity
+  exercising permissions granted by this License.
+
+  Source form shall mean the preferred form for making modifications,
+  including but not limited to software source code, documentation
+  source, and configuration files.
+
+  Object form shall mean any form resulting from mechanical
+  transformation or translation of a Source form, including but
+  not limited to compiled object code, generated documentation,
+  and conversions to other media types.
+
+  Work shall mean the work of authorship, whether in Source or
+  Object form, made available under the License, as indicated by a
+  copyright notice that is included in or attached to the work
+  (an example is provided in the Appendix below).
+
+  Derivative Works shall mean any work, whether in Source or Object
+  form, that is based on (or derived from) the Work and for which the
+  editorial revisions, annotations, elaborations, or other modifications
+  represent, as a whole, an original work of authorship. For the purposes
+  of this License, Derivative Works shall not include works that remain
+  separable from, or merely link (or bind by name) to the interfaces of,
+  the Work and Derivative Works thereof.
+
+  Contribution shall mean any work of authorship, including
+  the original version of the Work and any modifications or additions
+  to that Work or Derivative Works thereof, that is intentionally
+  submitted to Licensor for inclusion in the Work by the copyright owner
+  or by an individual or Legal Entity authorized to submit on behalf of
+  the copyright owner. For the purposes of this definition, submitted
+  means any form of electronic, verbal, or written communication sent
+  to the Licensor or its representatives, including but not limited to
+  communication on electronic mailing lists, source code control systems,
+  and issue tracking systems that are managed by, or on 

camel git commit: documented the dependency to libsnappyjava.dylib for the camel-infinispan features

[cmueller]

Repository: camel
Updated Branches:
  refs/heads/master 6a75adf57 - 9532383bf


documented the dependency to libsnappyjava.dylib for the camel-infinispan 
features


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

Branch: refs/heads/master
Commit: 9532383bf1a9019ba47e725b4b047399bab6753d
Parents: 6a75adf
Author: Christian Mueller cmuel...@apache.org
Authored: Tue Mar 10 10:34:46 2015 +0100
Committer: Christian Mueller cmuel...@apache.org
Committed: Tue Mar 10 10:34:46 2015 +0100

--
 platforms/karaf/features/src/main/resources/features.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/9532383b/platforms/karaf/features/src/main/resources/features.xml
--
diff --git a/platforms/karaf/features/src/main/resources/features.xml 
b/platforms/karaf/features/src/main/resources/features.xml
index 5f94ce9..7ca8560 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -697,7 +697,7 @@
 bundlemvn:org.apache.camel/camel-ical/${project.version}/bundle
   /feature
   feature name='camel-infinispan' version='${project.version}' 
resolver='(obr)' start-level='50'
-detailsThe camel-infinispan feature can only run on a SUN JVM. You need 
to add the package sun.misc to the java platform packages in the 
etc/jre.properties file. /details
+detailsThe camel-infinispan feature can only run on a SUN JVM. You need 
to add the package sun.misc to the java platform packages in the 
etc/jre.properties file. It also needs libsnappyjava.dylib in 
java.library.path/details
featuretransaction/feature
 bundle 
dependency='true'mvn:org.infinispan/infinispan-core/${infinispan-version}/bundle
 bundle 
dependency='true'mvn:org.infinispan/infinispan-commons/${infinispan-version}/bundle

camel git commit: fixed CS error

[cmueller]

Repository: camel
Updated Branches:
  refs/heads/master df4a9413e - 2cbd2a4eb


fixed CS error


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

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

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


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

camel git commit: fixed CS error

[cmueller]

Repository: camel
Updated Branches:
  refs/heads/master 2cbd2a4eb - 1bb97cc69


fixed CS error


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

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

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


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

camel git commit: upgrade Hibernate 4.2.15.Final to 4.2.16.Final

[cmueller]

Repository: camel
Updated Branches:
  refs/heads/camel-2.14.x 5b1fd0d1b - 7ee090e4b


upgrade Hibernate 4.2.15.Final to 4.2.16.Final


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

Branch: refs/heads/camel-2.14.x
Commit: 7ee090e4b580fdab18c52f7cf4a5382e158e0aa3
Parents: 5b1fd0d
Author: Christian Mueller cmuel...@apache.org
Authored: Fri Jan 2 22:27:02 2015 +0100
Committer: Christian Mueller cmuel...@apache.org
Committed: Fri Jan 2 22:29:22 2015 +0100

--
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/7ee090e4/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index e6c62a4..5b16111 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -191,7 +191,7 @@
 hbase-bundle-version0.94.6_1/hbase-bundle-version
 hibernate-validator-version5.0.3.Final/hibernate-validator-version
 !-- Spring 3.2.x and 4.0.x still stick to JPA 2.0. Hibernate 4.3.x 
upgraded to JPA 2.1. --
-hibernate-version4.2.15.Final/hibernate-version
+hibernate-version4.2.16.Final/hibernate-version
 hsqldb-version2.3.2/hsqldb-version
 htmlunit.version2.15/htmlunit.version
 httpunit-version1.7/httpunit-version

camel git commit: upgrade Hibernate 4.2.13.Final to 4.2.16.Final

[cmueller]

Repository: camel
Updated Branches:
  refs/heads/camel-2.13.x 5c9d6aef3 - 87436931d


upgrade Hibernate 4.2.13.Final to 4.2.16.Final


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

Branch: refs/heads/camel-2.13.x
Commit: 87436931d1c1c090808032ecc0872c17767606b2
Parents: 5c9d6ae
Author: Christian Mueller cmuel...@apache.org
Authored: Fri Jan 2 22:27:02 2015 +0100
Committer: Christian Mueller cmuel...@apache.org
Committed: Fri Jan 2 22:31:12 2015 +0100

--
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/87436931/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 5e02dd6..ccaa34e 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -179,7 +179,7 @@
 hbase-bundle-version0.94.6_1/hbase-bundle-version
 hibernate-validator-version5.0.3.Final/hibernate-validator-version
 !-- Spring 3.2.x and 4.0.x still stick to JPA 2.0. Hibernate 4.3.x 
upgraded to JPA 2.1. --
-hibernate-version4.2.13.Final/hibernate-version
+hibernate-version4.2.16.Final/hibernate-version
 hsqldb-version2.3.2/hsqldb-version
 httpunit-version1.7/httpunit-version
 httpcore4-version4.3.2/httpcore4-version

camel git commit: upgrade Hibernate 4.2.15.Final to 4.2.16.Final

[cmueller]

Repository: camel
Updated Branches:
  refs/heads/master 1b47670f6 - ceb35df04


upgrade Hibernate 4.2.15.Final to 4.2.16.Final


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

Branch: refs/heads/master
Commit: ceb35df049d39f16ae3fffaa092d8aa392138a84
Parents: 1b47670
Author: Christian Mueller cmuel...@apache.org
Authored: Fri Jan 2 22:27:02 2015 +0100
Committer: Christian Mueller cmuel...@apache.org
Committed: Fri Jan 2 22:27:02 2015 +0100

--
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/ceb35df0/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 2113b1a..431238b 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -203,7 +203,7 @@
 hbase-bundle-version0.94.6_1/hbase-bundle-version
 hibernate-validator-version5.0.3.Final/hibernate-validator-version
 !-- Spring 3.2.x and 4.0.x still stick to JPA 2.0. Hibernate 4.3.x 
upgraded to JPA 2.1. --
-hibernate-version4.2.15.Final/hibernate-version
+hibernate-version4.2.16.Final/hibernate-version
 hsqldb-version2.3.2/hsqldb-version
 htmlunit.version2.15/htmlunit.version
 httpunit-version1.7/httpunit-version

camel git commit: upgrade CXF 2.7.13 to 2.7.14

[cmueller]

Repository: camel
Updated Branches:
  refs/heads/camel-2.13.x abde55056 - 5c9d6aef3


upgrade CXF 2.7.13 to 2.7.14


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

Branch: refs/heads/camel-2.13.x
Commit: 5c9d6aef3c43c819a31a812f30403d083e76674a
Parents: abde550
Author: Christian Mueller cmuel...@apache.org
Authored: Fri Jan 2 19:45:48 2015 +0100
Committer: Christian Mueller cmuel...@apache.org
Committed: Fri Jan 2 19:45:48 2015 +0100

--
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/5c9d6aef/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 27de44e..5e02dd6 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -106,7 +106,7 @@
 commons-vfs2-version2.0/commons-vfs2-version
 concurrentlinkedhashmap.version1.4/concurrentlinkedhashmap.version
 cobertura-maven-plugin-version2.5.2/cobertura-maven-plugin-version
-cxf-version2.7.13/cxf-version
+cxf-version2.7.14/cxf-version
 cxf-version-range[2.6,4.0)/cxf-version-range
 cxf-xjc-utils-version2.7.0/cxf-xjc-utils-version
 deltaspike-version0.7/deltaspike-version

camel git commit: upgrade CXF 3.0.2 to 3.0.3

[cmueller]

Repository: camel
Updated Branches:
  refs/heads/camel-2.14.x 0a5a7dc4a - 5b1fd0d1b


upgrade CXF 3.0.2 to 3.0.3


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

Branch: refs/heads/camel-2.14.x
Commit: 5b1fd0d1b689fcd6853c1ceb4bc553d584be2506
Parents: 0a5a7dc
Author: Christian Mueller cmuel...@apache.org
Authored: Fri Jan 2 19:26:32 2015 +0100
Committer: Christian Mueller cmuel...@apache.org
Committed: Fri Jan 2 19:37:47 2015 +0100

--
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/5b1fd0d1/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index aa5892f..e6c62a4 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -113,7 +113,7 @@
 commons-vfs2-version2.0/commons-vfs2-version
 concurrentlinkedhashmap.version1.4/concurrentlinkedhashmap.version
 cobertura-maven-plugin-version2.5.2/cobertura-maven-plugin-version
-cxf-version3.0.2/cxf-version
+cxf-version3.0.3/cxf-version
 cxf-version-range[2.7,4.0)/cxf-version-range
 cxf-xjc-utils-version3.0.2/cxf-xjc-utils-version
 deltaspike-version1.0.2/deltaspike-version

camel git commit: upgrade CXF 3.0.2 to 3.0.3

[cmueller]

Repository: camel
Updated Branches:
  refs/heads/master e1deab97e - 1b47670f6


upgrade CXF 3.0.2 to 3.0.3


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

Branch: refs/heads/master
Commit: 1b47670f6956e9a82563e57c4153ada722468096
Parents: e1deab9
Author: Christian Mueller cmuel...@apache.org
Authored: Fri Jan 2 19:26:32 2015 +0100
Committer: Christian Mueller cmuel...@apache.org
Committed: Fri Jan 2 19:26:32 2015 +0100

--
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/1b47670f/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 46675f7..2113b1a 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -119,7 +119,7 @@
 commons-vfs2-version2.0/commons-vfs2-version
 concurrentlinkedhashmap.version1.4/concurrentlinkedhashmap.version
 cobertura-maven-plugin-version2.5.2/cobertura-maven-plugin-version
-cxf-version3.0.2/cxf-version
+cxf-version3.0.3/cxf-version
 cxf-version-range[2.7,4.0)/cxf-version-range
 cxf-xjc-utils-version3.0.2/cxf-xjc-utils-version
 deltaspike-version1.2.1/deltaspike-version

camel git commit: upgrade Derby 10.10.2.0 to 10.11.1.1

[cmueller]

Repository: camel
Updated Branches:
  refs/heads/master ca3ae74f7 - e1deab97e


upgrade Derby 10.10.2.0 to 10.11.1.1


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

Branch: refs/heads/master
Commit: e1deab97ee4177b786dc57c4aec29b9e50674126
Parents: ca3ae74
Author: Christian Mueller cmuel...@apache.org
Authored: Fri Jan 2 19:17:33 2015 +0100
Committer: Christian Mueller cmuel...@apache.org
Committed: Fri Jan 2 19:17:54 2015 +0100

--
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/e1deab97/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index e1c416b..46675f7 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -123,7 +123,7 @@
 cxf-version-range[2.7,4.0)/cxf-version-range
 cxf-xjc-utils-version3.0.2/cxf-xjc-utils-version
 deltaspike-version1.2.1/deltaspike-version
-derby-version10.10.2.0/derby-version
+derby-version10.11.1.1/derby-version
 disruptor-version3.3.0/disruptor-version
 dnsjava-version2.1.6/dnsjava-version
 dnsjava-bundle-version2.1.6_1/dnsjava-bundle-version

camel git commit: fixed CS error

[cmueller]

Repository: camel
Updated Branches:
  refs/heads/master 85778bc43 - 1d5ba0570


fixed CS error


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

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

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


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

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

camel git commit: upgrade Spring 4.1.3.RELEASE to 4.1.4.RELEASE

[cmueller]

Repository: camel
Updated Branches:
  refs/heads/master b1552656f - 1e2b8f2e0


upgrade Spring 4.1.3.RELEASE to 4.1.4.RELEASE


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

Branch: refs/heads/master
Commit: 1e2b8f2e0fb3bb70f892f1be10bcae71ca3aea83
Parents: b155265
Author: Christian Mueller cmuel...@apache.org
Authored: Thu Jan 1 13:22:16 2015 +0100
Committer: Christian Mueller cmuel...@apache.org
Committed: Thu Jan 1 13:22:16 2015 +0100

--
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/1e2b8f2e/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 39e4faf..7785267 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -431,7 +431,7 @@
 spring-version${spring4-version}/spring-version
 spring32-version3.2.11.RELEASE/spring32-version
 spring40-version4.0.7.RELEASE/spring40-version
-spring4-version4.1.3.RELEASE/spring4-version
+spring4-version4.1.4.RELEASE/spring4-version
 spring-osgi-version1.2.1/spring-osgi-version
 spring-security-version3.2.5.RELEASE/spring-security-version
 spring-ws-version2.1.4.RELEASE/spring-ws-version

[1/2] camel git commit: upgrade jruby 1.7.16 to 1.7.18

[cmueller]

Repository: camel
Updated Branches:
  refs/heads/master 7bde7d010 - b1552656f


upgrade jruby 1.7.16 to 1.7.18


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

Branch: refs/heads/master
Commit: c02a759acba28bd012502feedac51e52f1d9f40d
Parents: 7bde7d0
Author: Christian Mueller cmuel...@apache.org
Authored: Wed Dec 31 17:54:31 2014 +0100
Committer: Christian Mueller cmuel...@apache.org
Committed: Wed Dec 31 18:04:40 2014 +0100

--
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/c02a759a/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index ee79596..39e4faf 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -268,7 +268,7 @@
 jolokia-version1.2.3/jolokia-version
 josql-bundle-version1.5_5/josql-bundle-version
 josql-version1.5/josql-version
-jruby-version1.7.16/jruby-version
+jruby-version1.7.18/jruby-version
 jsendnsca-version1.3.1/jsendnsca-version
 jsmpp-version2.1.0_5/jsmpp-version
 jsch-version0.1.51/jsch-version

[2/2] camel git commit: CAMEL-8201: NPE with language:ruby and concurrentConsumers - added unit test which is reproducing the issue

[cmueller]

CAMEL-8201: NPE with language:ruby and concurrentConsumers - added unit test 
which is reproducing the issue


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

Branch: refs/heads/master
Commit: b1552656f52b33379773b2e26cf4df8a64790039
Parents: c02a759
Author: Christian Mueller cmuel...@apache.org
Authored: Wed Dec 31 18:04:07 2014 +0100
Committer: Christian Mueller cmuel...@apache.org
Committed: Wed Dec 31 18:04:41 2014 +0100

--
 .../builder/script/RubyScriptTextTest.java  | 71 
 1 file changed, 71 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/b1552656/components/camel-script/src/test/java/org/apache/camel/builder/script/RubyScriptTextTest.java
--
diff --git 
a/components/camel-script/src/test/java/org/apache/camel/builder/script/RubyScriptTextTest.java
 
b/components/camel-script/src/test/java/org/apache/camel/builder/script/RubyScriptTextTest.java
new file mode 100755
index 000..875f309
--- /dev/null
+++ 
b/components/camel-script/src/test/java/org/apache/camel/builder/script/RubyScriptTextTest.java
@@ -0,0 +1,71 @@
+package org.apache.camel.builder.script;
+
+
+import java.util.HashSet;
+import java.util.Set;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.apache.camel.EndpointInject;
+import org.apache.camel.Exchange;
+import org.apache.camel.Processor;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Test;
+
+public class RubyScriptTextTest extends CamelTestSupport {
+
+@EndpointInject(uri = mock:result)
+MockEndpoint resultEndpoint;
+
+final int messageCount = 500;
+
+@Test
+public void parallelExecutionWithCachedScriptAndReusedScriptEngine() 
throws Exception {
+context.addRoutes(new RouteBuilder() {
+public void configure() throws Exception {
+getContext().getProperties().put(Exchange.REUSE_SCRIPT_ENGINE, 
true);
+//getContext().getProperties().put(Exchange.COMPILE_SCRIPT, 
true);
+
+from(seda:jruby?concurrentConsumers=5)
+.to(language:ruby:puts $request.body;result = 
$request.body?cacheScript=true)
+.to(resultEndpoint);
+}
+});
+
+resultEndpoint.setExpectedMessageCount(messageCount);
+resultEndpoint.assertNoDuplicates(body());
+
+for (int i = 1; i  messageCount + 1; i++) {
+template.sendBody(seda:jruby, BODY + i);
+}
+
+assertMockEndpointsSatisfied(5, TimeUnit.SECONDS);
+}
+
+@Test
+@Ignore
+public void 
parallelExecutionWithoutCachedScriptAndNewScriptEngineForEachExchange() throws 
Exception {
+context.addRoutes(new RouteBuilder() {
+public void configure() throws Exception {
+//getContext().getProperties().put(Exchange.COMPILE_SCRIPT, 
true);
+
+from(seda:jruby?concurrentConsumers=5)
+.to(language:ruby:puts $request.body;result = 
$request.body)
+.to(resultEndpoint);
+}
+});
+
+resultEndpoint.setExpectedMessageCount(messageCount);
+resultEndpoint.assertNoDuplicates(body());
+
+for (int i = 1; i  messageCount + 1; i++) {
+template.sendBody(seda:jruby, BODY + i);
+}
+
+assertMockEndpointsSatisfied(5, TimeUnit.SECONDS);
+}
+}

camel git commit: upgrade jruby 1.7.16 to 1.7.18

[cmueller]

Repository: camel
Updated Branches:
  refs/heads/camel-2.14.x c1d61bc62 - fb4cb5c10


upgrade jruby 1.7.16 to 1.7.18

Conflicts:
parent/pom.xml


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

Branch: refs/heads/camel-2.14.x
Commit: fb4cb5c1075c2c92a1314ddd69fb6084cd7b186a
Parents: c1d61bc
Author: Christian Mueller cmuel...@apache.org
Authored: Wed Dec 31 17:54:31 2014 +0100
Committer: Christian Mueller cmuel...@apache.org
Committed: Wed Dec 31 18:07:06 2014 +0100

--
 parent/pom.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/fb4cb5c1/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index a8267b8d..711fe6f 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -253,8 +253,7 @@
 jodatime2-bundle-version2.5/jodatime2-bundle-version
 josql-bundle-version1.5_5/josql-bundle-version
 josql-version1.5/josql-version
-!-- jruby-core 1.7.14 and 1.7.15 are not valid OSGI bundles: see 
https://github.com/jruby/jruby/issues/1971 --
-jruby-version1.7.13/jruby-version
+jruby-version1.7.18/jruby-version
 jsendnsca-version1.3.1/jsendnsca-version
 jsmpp-version2.1.0_4/jsmpp-version
 jsch-version0.1.51/jsch-version

camel git commit: upgrade jruby 1.7.16 to 1.7.18

[cmueller]

Repository: camel
Updated Branches:
  refs/heads/camel-2.13.x 945c7272c - abde55056


upgrade jruby 1.7.16 to 1.7.18

Conflicts:
parent/pom.xml


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

Branch: refs/heads/camel-2.13.x
Commit: abde5505661b2f9cb900c7a0ab997701b353a077
Parents: 945c727
Author: Christian Mueller cmuel...@apache.org
Authored: Wed Dec 31 17:54:31 2014 +0100
Committer: Christian Mueller cmuel...@apache.org
Committed: Wed Dec 31 18:08:04 2014 +0100

--
 parent/pom.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/abde5505/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index e6bf41d..27de44e 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -236,8 +236,7 @@
 jodatime2-bundle-version2.3/jodatime2-bundle-version
 josql-bundle-version1.5_5/josql-bundle-version
 josql-version1.5/josql-version
-!-- jruby-core 1.7.14 and 1.7.15 are not valid OSGI bundles: see 
https://github.com/jruby/jruby/issues/1971 --
-jruby-version1.7.13/jruby-version
+jruby-version1.7.18/jruby-version
 jsendnsca-version1.3.1/jsendnsca-version
 jsmpp-version2.1.0_4/jsmpp-version
 jsch-version0.1.51/jsch-version

[JIRA] [ghprb-plugin] (JENKINS-25709) Revert to proper SEMVER style

[cmueller.418+jira-jenk...@gmail.com (JIRA)]

Clemens Müller
 commented on  JENKINS-25709


Revert to proper SEMVER style















This also breaks the `jenkins_plugin` when installing jenkins via chef:

== jenkins: 
== jenkins: Error executing action `install` on resource 'jenkins_pluginghprb'
== jenkins: 
== jenkins:
== jenkins: ArgumentError
== jenkins: -
== jenkins: Malformed version number string 1.16-6
== jenkins:
== jenkins: Cookbook Trace:
== jenkins: ---
== jenkins: /tmp/vagrant-chef-2/chef-solo-1/cookbooks/jenkins/libraries/plugin.rb:258:in `new'
== jenkins: /tmp/vagrant-chef-2/chef-solo-1/cookbooks/jenkins/libraries/plugin.rb:258:in `install_plugin_from_update_center'
== jenkins: /tmp/vagrant-chef-2/chef-solo-1/cookbooks/jenkins/libraries/plugin.rb:124:in `block (2 levels) in class:JenkinsPlugin'
== jenkins: /tmp/vagrant-chef-2/chef-solo-1/cookbooks/jenkins/libraries/plugin.rb:155:in `block in class:JenkinsPlugin'



























This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators.
For more information on JIRA, see: http://www.atlassian.com/software/jira







-- 
You received this message because you are subscribed to the Google Groups Jenkins Issues group.
To unsubscribe from this group and stop receiving emails from it, send an email to jenkinsci-issues+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

svn commit: r928492 - /websites/production/camel/content/cache/main.pageCache

[cmueller]

Author: cmueller
Date: Sun Nov  9 12:49:12 2014
New Revision: 928492

Log:
trigger full site export because of a new blog post

Removed:
websites/production/camel/content/cache/main.pageCache

svn commit: r927830 - /websites/production/camel/content/cache/main.pageCache

[cmueller]

Author: cmueller
Date: Mon Nov  3 20:13:46 2014
New Revision: 927830

Log:
trigger full site export because of a new blog post

Removed:
websites/production/camel/content/cache/main.pageCache

svn commit: r7003 - in /release/camel/apache-camel/2.13.3: apache-camel-2.13.3.zip.asc apache-camel-2.13.3.zip.md5

[cmueller]

Author: cmueller
Date: Mon Nov  3 21:53:31 2014
New Revision: 7003

Log:
fixed the bad signature and md5 file

Modified:
release/camel/apache-camel/2.13.3/apache-camel-2.13.3.zip.asc
release/camel/apache-camel/2.13.3/apache-camel-2.13.3.zip.md5

Modified: release/camel/apache-camel/2.13.3/apache-camel-2.13.3.zip.asc
==
--- release/camel/apache-camel/2.13.3/apache-camel-2.13.3.zip.asc (original)
+++ release/camel/apache-camel/2.13.3/apache-camel-2.13.3.zip.asc Mon Nov  3 
21:53:31 2014
@@ -2,17 +2,17 @@
 Version: GnuPG/MacGPG2 v2.0.22 (Darwin)
 Comment: GPGTools - http://gpgtools.org
 
-iQIcBAABAgAGBQJUT3jFAAoJEImh9lEqI5wsSj8QAIlLn5FU+zqR6luIyADSE3Sh
-5CDZH/LWzW3NhlMjtWB7UnqFXZqz81rD8XcxLwGgDjabw9IXx1qZVejesX5VcFA2
-Jgw4bILWa61aoUqWJSzAZ7XSQZZ3TU1LAZjzpwwBmjvNhbd+VzBVbMTk3lO+swmX
-0ZPbDO0gixtOgTDbMG9+9unyXwpxoGaM2L4vyBCqCVZfEUfFWp9tUVsQhD/L6ubz
-HA7IwfKLkeRa5gZS5TiXORfSZr/QnadnKPl820iPY4R2mdHUtDZHSYcQkgOaiJrB
-qzUcrsDwlDnCYcYd/EExLp2GxkHDUFm31+0o4T9yZWo5byRyeu3fINC62Iwa5XBg
-oKAUnE42YudY2kGS7bxXJcnqmeLf2PQHnn3LhUb0sebVNiE/stfSG25BCQxKYSml
-BzK3ru8C/24DRd3BzfnuyOJY8dlzVTd7DoDGXEkay+y67AXAffu4Nt2vGYY5rzkj
-dJth8xi3PoEAgve5VngFkQkD+v6LnhviDHthXrDcEoTgqSb/E97+Lvm+NeoWFqLb
-EiaW2VdFKxsoBri8oLE1PLgUKOse13kh7zN6Iu0HqWBzF3sS31j7qAclGGF0YSQG
-zjL1ce6+dMs2L7zpZHP0aZb+NKAQpwp2vFe8VstaeNqFh231XwARK9rznAg6YG3H
-u0AF4kNiycsVdrow6AMR
-=kO1x
+iQIcBAABAgAGBQJUV/fUAAoJEImh9lEqI5wsPV0P+wdtaMjw+kPDNq8jsMMDlyDv
+dqE9NDHzh9OOTGvajptPi/7Nq2oUnzaff74ORwUN9MkHuIFvKsZ2aT20KOBTiAVs
+CqCkjK81zL4rDSJg9GanECwrdQ+2eJLcQPsDRo8YEU/6Qzz9hxHjj7wknfFB7q7L
+3g4FIYnfKwEI8JMO4YltHQWc8ighRFMXd3O32jNRwoqfI8DKeqHUKMkhFKrPsgc2
+AEMH6gZhVyqQ+IVjErv816/I/PlgFE9qtLCK2tqcX2YE5GTFnABKyGSUT+DpIkkC
+26xAU6eGy8FTdPiNo5PFuM+ggD67JUEQtX5cg8GH4/fGQVv7UNaBbOdgrErYhaSR
+FM9IKEnDLSGa9H4AK+lT+KNM90apyotkMmP7Gm+AAOggA48cxRzucdwIL8WFRx+G
+PV0OECfdRjk4E3w62K7HJM/xBT//qAIAgkcnsFB/EZkP4hb+nNIQ4p2P4+ArESPW
+z452Pc1qMsJwG6F5H9MM/6aU8d6ijE+Oyj2bWXGXhjR6+P4EyHZCPLK02n496GSo
+kTv3Xsv0PjncF6IQ95gFGfvFpNSlNUApkB5+D000Nf0Jf7TmtvMD75rTnF34CdJ2
+HgiV9dJUhop18lQRzj9AdSo8Qqh2oQdgAPUpd5flnl0eZmi4qWOR5Skt51T1N0to
+pkaUFQBuYjsb4ZbQ58AE
+=TpFv
 -END PGP SIGNATURE-

Modified: release/camel/apache-camel/2.13.3/apache-camel-2.13.3.zip.md5
==
--- release/camel/apache-camel/2.13.3/apache-camel-2.13.3.zip.md5 (original)
+++ release/camel/apache-camel/2.13.3/apache-camel-2.13.3.zip.md5 Mon Nov  3 
21:53:31 2014
@@ -1 +1 @@
-ba9c0c4dc7496134687afa3afe52dfed
\ No newline at end of file
+69986bc73b3597169e9143d6ad4f6578
\ No newline at end of file

[1/4] Revert [maven-release-plugin] rollback the release of camel-2.13.3

[cmueller]

Repository: camel
Updated Branches:
  refs/heads/camel-2.13.x a13eaa9e9 - c280b27de


http://git-wip-us.apache.org/repos/asf/camel/blob/06c48b2c/tooling/maven/camel-maven-plugin/pom.xml
--
diff --git a/tooling/maven/camel-maven-plugin/pom.xml 
b/tooling/maven/camel-maven-plugin/pom.xml
index 7ee92eb..8d0ac4d 100644
--- a/tooling/maven/camel-maven-plugin/pom.xml
+++ b/tooling/maven/camel-maven-plugin/pom.xml
@@ -21,7 +21,7 @@
   parent
 groupIdorg.apache.camel/groupId
 artifactIdmaven-plugins/artifactId
-version2.13.3-SNAPSHOT/version
+version2.13.4-SNAPSHOT/version
   /parent
 
   artifactIdcamel-maven-plugin/artifactId

http://git-wip-us.apache.org/repos/asf/camel/blob/06c48b2c/tooling/maven/camel-package-maven-plugin/pom.xml
--
diff --git a/tooling/maven/camel-package-maven-plugin/pom.xml 
b/tooling/maven/camel-package-maven-plugin/pom.xml
index be1220b..b9e5224 100644
--- a/tooling/maven/camel-package-maven-plugin/pom.xml
+++ b/tooling/maven/camel-package-maven-plugin/pom.xml
@@ -21,7 +21,7 @@
   parent
 groupIdorg.apache.camel/groupId
 artifactIdmaven-plugins/artifactId
-version2.13.3-SNAPSHOT/version
+version2.13.4-SNAPSHOT/version
   /parent
 
   artifactIdcamel-package-maven-plugin/artifactId

http://git-wip-us.apache.org/repos/asf/camel/blob/06c48b2c/tooling/maven/guice-maven-plugin/pom.xml
--
diff --git a/tooling/maven/guice-maven-plugin/pom.xml 
b/tooling/maven/guice-maven-plugin/pom.xml
index af1a632..9a377bb 100644
--- a/tooling/maven/guice-maven-plugin/pom.xml
+++ b/tooling/maven/guice-maven-plugin/pom.xml
@@ -21,7 +21,7 @@
   parent
 groupIdorg.apache.camel/groupId
 artifactIdmaven-plugins/artifactId
-version2.13.3-SNAPSHOT/version
+version2.13.4-SNAPSHOT/version
   /parent
 
   artifactIdguice-maven-plugin/artifactId

http://git-wip-us.apache.org/repos/asf/camel/blob/06c48b2c/tooling/maven/pom.xml
--
diff --git a/tooling/maven/pom.xml b/tooling/maven/pom.xml
index 3af3621..6479e31 100644
--- a/tooling/maven/pom.xml
+++ b/tooling/maven/pom.xml
@@ -21,7 +21,7 @@
   parent
 groupIdorg.apache.camel/groupId
 artifactIdtooling/artifactId
-version2.13.3-SNAPSHOT/version
+version2.13.4-SNAPSHOT/version
   /parent
 
   artifactIdmaven-plugins/artifactId

http://git-wip-us.apache.org/repos/asf/camel/blob/06c48b2c/tooling/pom.xml
--
diff --git a/tooling/pom.xml b/tooling/pom.xml
index fefcbe9..17cd100 100644
--- a/tooling/pom.xml
+++ b/tooling/pom.xml
@@ -21,7 +21,7 @@
   parent
 groupIdorg.apache.camel/groupId
 artifactIdcamel-parent/artifactId
-version2.13.3-SNAPSHOT/version
+version2.13.4-SNAPSHOT/version
 relativePath../parent/relativePath
   /parent
 

http://git-wip-us.apache.org/repos/asf/camel/blob/06c48b2c/tooling/spi-annotations/pom.xml
--
diff --git a/tooling/spi-annotations/pom.xml b/tooling/spi-annotations/pom.xml
index 8c0cf97..0393653 100644
--- a/tooling/spi-annotations/pom.xml
+++ b/tooling/spi-annotations/pom.xml
@@ -22,7 +22,7 @@
   parent
 groupIdorg.apache.camel/groupId
 artifactIdtooling/artifactId
-version2.13.3-SNAPSHOT/version
+version2.13.4-SNAPSHOT/version
   /parent
 
   !-- should not be OSGi bundle as we shade this component into camel-core --

[4/4] git commit: fixed the Maven version numbers

[cmueller]

fixed the Maven version numbers


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

Branch: refs/heads/camel-2.13.x
Commit: c280b27de5955278ddba445db6caff013b40b283
Parents: 06c48b2
Author: Christian Mueller cmuel...@apache.org
Authored: Fri Oct 31 21:57:29 2014 +0100
Committer: Christian Mueller cmuel...@apache.org
Committed: Fri Oct 31 21:57:29 2014 +0100

--
 etc/pom.xml   | 2 +-
 tests/camel-itest-karaf/pom.xml   | 2 +-
 tests/camel-itest-osgi/pom.xml| 2 +-
 tests/camel-itest-performance/pom.xml | 2 +-
 tests/camel-performance/pom.xml   | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/c280b27d/etc/pom.xml
--
diff --git a/etc/pom.xml b/etc/pom.xml
index c759593..638b572 100755
--- a/etc/pom.xml
+++ b/etc/pom.xml
@@ -23,7 +23,7 @@
   parent
 groupIdorg.apache.camel/groupId
 artifactIdcamel-parent/artifactId
-version2.13.3-SNAPSHOT/version
+version2.13.4-SNAPSHOT/version
 relativePath../parent/relativePath
   /parent
 

http://git-wip-us.apache.org/repos/asf/camel/blob/c280b27d/tests/camel-itest-karaf/pom.xml
--
diff --git a/tests/camel-itest-karaf/pom.xml b/tests/camel-itest-karaf/pom.xml
index c423882..1e97e5b 100644
--- a/tests/camel-itest-karaf/pom.xml
+++ b/tests/camel-itest-karaf/pom.xml
@@ -23,7 +23,7 @@
 parent
 groupIdorg.apache.camel/groupId
 artifactIdtests/artifactId
-version2.13.3-SNAPSHOT/version
+version2.13.4-SNAPSHOT/version
 /parent
 
 artifactIdcamel-itest-karaf/artifactId

http://git-wip-us.apache.org/repos/asf/camel/blob/c280b27d/tests/camel-itest-osgi/pom.xml
--
diff --git a/tests/camel-itest-osgi/pom.xml b/tests/camel-itest-osgi/pom.xml
index 7b1fb46..6ac47b1 100644
--- a/tests/camel-itest-osgi/pom.xml
+++ b/tests/camel-itest-osgi/pom.xml
@@ -22,7 +22,7 @@
   parent
 groupIdorg.apache.camel/groupId
 artifactIdtests/artifactId
-version2.13.3-SNAPSHOT/version
+version2.13.4-SNAPSHOT/version
   /parent
 
   artifactIdcamel-itest-osgi/artifactId

http://git-wip-us.apache.org/repos/asf/camel/blob/c280b27d/tests/camel-itest-performance/pom.xml
--
diff --git a/tests/camel-itest-performance/pom.xml 
b/tests/camel-itest-performance/pom.xml
index 0e2b837..f23ff54 100644
--- a/tests/camel-itest-performance/pom.xml
+++ b/tests/camel-itest-performance/pom.xml
@@ -22,7 +22,7 @@
   parent
 groupIdorg.apache.camel/groupId
 artifactIdtests/artifactId
-version2.13.3-SNAPSHOT/version
+version2.13.4-SNAPSHOT/version
   /parent
 
   artifactIdcamel-itest-performance/artifactId

http://git-wip-us.apache.org/repos/asf/camel/blob/c280b27d/tests/camel-performance/pom.xml
--
diff --git a/tests/camel-performance/pom.xml b/tests/camel-performance/pom.xml
index fa41124..1e4ea84 100644
--- a/tests/camel-performance/pom.xml
+++ b/tests/camel-performance/pom.xml
@@ -22,7 +22,7 @@
   parent
 groupIdorg.apache.camel/groupId
 artifactIdtests/artifactId
-version2.13.3-SNAPSHOT/version
+version2.13.4-SNAPSHOT/version
   /parent
 
   artifactIdcamel-performance/artifactId

[2/4] Revert [maven-release-plugin] rollback the release of camel-2.13.3

[cmueller]

http://git-wip-us.apache.org/repos/asf/camel/blob/06c48b2c/components/camel-salesforce/pom.xml
--
diff --git a/components/camel-salesforce/pom.xml 
b/components/camel-salesforce/pom.xml
index 680db4c..b308825 100644
--- a/components/camel-salesforce/pom.xml
+++ b/components/camel-salesforce/pom.xml
@@ -22,7 +22,7 @@
 parent
 groupIdorg.apache.camel/groupId
 artifactIdcomponents/artifactId
-version2.13.3-SNAPSHOT/version
+version2.13.4-SNAPSHOT/version
 /parent
 
 artifactIdcamel-salesforce-parent/artifactId

http://git-wip-us.apache.org/repos/asf/camel/blob/06c48b2c/components/camel-sap-netweaver/pom.xml
--
diff --git a/components/camel-sap-netweaver/pom.xml 
b/components/camel-sap-netweaver/pom.xml
index 78e0612..6afc468 100644
--- a/components/camel-sap-netweaver/pom.xml
+++ b/components/camel-sap-netweaver/pom.xml
@@ -21,7 +21,7 @@
 parent
 artifactIdcomponents/artifactId
 groupIdorg.apache.camel/groupId
-version2.13.3-SNAPSHOT/version
+version2.13.4-SNAPSHOT/version
 /parent
 
 groupIdorg.apache.camel/groupId

http://git-wip-us.apache.org/repos/asf/camel/blob/06c48b2c/components/camel-saxon/pom.xml
--
diff --git a/components/camel-saxon/pom.xml b/components/camel-saxon/pom.xml
index ba51897..2b178de 100644
--- a/components/camel-saxon/pom.xml
+++ b/components/camel-saxon/pom.xml
@@ -21,7 +21,7 @@
   parent
 groupIdorg.apache.camel/groupId
 artifactIdcomponents/artifactId
-version2.13.3-SNAPSHOT/version
+version2.13.4-SNAPSHOT/version
   /parent
 
   artifactIdcamel-saxon/artifactId

http://git-wip-us.apache.org/repos/asf/camel/blob/06c48b2c/components/camel-scala/pom.xml
--
diff --git a/components/camel-scala/pom.xml b/components/camel-scala/pom.xml
index 01b68e8..b8de3d4 100644
--- a/components/camel-scala/pom.xml
+++ b/components/camel-scala/pom.xml
@@ -21,7 +21,7 @@
 parent
 groupIdorg.apache.camel/groupId
 artifactIdcomponents/artifactId
-version2.13.3-SNAPSHOT/version
+version2.13.4-SNAPSHOT/version
 /parent
 
 artifactIdcamel-scala/artifactId

http://git-wip-us.apache.org/repos/asf/camel/blob/06c48b2c/components/camel-script/pom.xml
--
diff --git a/components/camel-script/pom.xml b/components/camel-script/pom.xml
index 259a5bc..24b33c2 100644
--- a/components/camel-script/pom.xml
+++ b/components/camel-script/pom.xml
@@ -21,7 +21,7 @@
 parent
 groupIdorg.apache.camel/groupId
 artifactIdcomponents/artifactId
-version2.13.3-SNAPSHOT/version
+version2.13.4-SNAPSHOT/version
 /parent
 
 artifactIdcamel-script/artifactId

http://git-wip-us.apache.org/repos/asf/camel/blob/06c48b2c/components/camel-servlet/pom.xml
--
diff --git a/components/camel-servlet/pom.xml b/components/camel-servlet/pom.xml
index 443664f..d88393b 100644
--- a/components/camel-servlet/pom.xml
+++ b/components/camel-servlet/pom.xml
@@ -21,7 +21,7 @@
 parent
 groupIdorg.apache.camel/groupId
 artifactIdcomponents/artifactId
-version2.13.3-SNAPSHOT/version
+version2.13.4-SNAPSHOT/version
 /parent
 
   groupIdorg.apache.camel/groupId

http://git-wip-us.apache.org/repos/asf/camel/blob/06c48b2c/components/camel-servletlistener/pom.xml
--
diff --git a/components/camel-servletlistener/pom.xml 
b/components/camel-servletlistener/pom.xml
index 77419bc..7a918c7 100644
--- a/components/camel-servletlistener/pom.xml
+++ b/components/camel-servletlistener/pom.xml
@@ -21,7 +21,7 @@
 parent
 groupIdorg.apache.camel/groupId
 artifactIdcomponents/artifactId
-version2.13.3-SNAPSHOT/version
+version2.13.4-SNAPSHOT/version
 /parent
 
   groupIdorg.apache.camel/groupId

http://git-wip-us.apache.org/repos/asf/camel/blob/06c48b2c/components/camel-shiro/pom.xml
--
diff --git a/components/camel-shiro/pom.xml b/components/camel-shiro/pom.xml
index 96d90a0..b13208d 100644
--- a/components/camel-shiro/pom.xml
+++ b/components/camel-shiro/pom.xml
@@ -21,7 +21,7 @@
parent
artifactIdcomponents/artifactId
groupIdorg.apache.camel/groupId
-   version2.13.3-SNAPSHOT/version
+   version2.13.4-SNAPSHOT/version
/parent
 
artifactIdcamel-shiro/artifactId

http://git-wip-us.apache.org/repos/asf/camel/blob/06c48b2c/components/camel-sip/pom.xml

[3/4] git commit: Revert [maven-release-plugin] rollback the release of camel-2.13.3

[cmueller]

Revert [maven-release-plugin] rollback the release of camel-2.13.3

This reverts commit 2f2dde16c6b954ce77eda4921e1fddbf0d39268f.


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

Branch: refs/heads/camel-2.13.x
Commit: 06c48b2c456aa7e90e948e4750e31fa734d30945
Parents: a13eaa9
Author: Christian Mueller cmuel...@apache.org
Authored: Fri Oct 31 21:53:24 2014 +0100
Committer: Christian Mueller cmuel...@apache.org
Committed: Fri Oct 31 21:53:24 2014 +0100

--
 apache-camel/pom.xml   | 2 +-
 buildingtools/pom.xml  | 2 +-
 camel-core/pom.xml | 2 +-
 components/camel-ahc/pom.xml   | 2 +-
 components/camel-amqp/pom.xml  | 2 +-
 components/camel-apns/pom.xml  | 2 +-
 components/camel-atom/pom.xml  | 2 +-
 components/camel-avro/pom.xml  | 2 +-
 components/camel-aws/pom.xml   | 2 +-
 components/camel-bam/pom.xml   | 2 +-
 components/camel-base64/pom.xml| 2 +-
 components/camel-bean-validator/pom.xml| 2 +-
 components/camel-beanio/pom.xml| 2 +-
 components/camel-bindy/pom.xml | 2 +-
 components/camel-blueprint/pom.xml | 2 +-
 components/camel-cache/pom.xml | 2 +-
 components/camel-castor/pom.xml| 2 +-
 components/camel-cdi/pom.xml   | 2 +-
 components/camel-cmis/pom.xml  | 2 +-
 components/camel-cometd/pom.xml| 2 +-
 components/camel-context/pom.xml   | 2 +-
 components/camel-core-osgi/pom.xml | 2 +-
 components/camel-core-xml/pom.xml  | 2 +-
 components/camel-couchdb/pom.xml   | 2 +-
 components/camel-crypto/pom.xml| 2 +-
 components/camel-csv/pom.xml   | 2 +-
 components/camel-cxf-transport/pom.xml | 2 +-
 components/camel-cxf/pom.xml   | 2 +-
 components/camel-disruptor/pom.xml | 2 +-
 components/camel-dns/pom.xml   | 2 +-
 components/camel-dozer/pom.xml | 2 +-
 components/camel-eclipse/pom.xml   | 2 +-
 components/camel-ejb/pom.xml   | 2 +-
 components/camel-elasticsearch/pom.xml | 2 +-
 components/camel-eventadmin/pom.xml| 2 +-
 components/camel-exec/pom.xml  | 2 +-
 components/camel-facebook/pom.xml  | 2 +-
 components/camel-flatpack/pom.xml  | 2 +-
 components/camel-fop/pom.xml   | 2 +-
 components/camel-freemarker/pom.xml| 2 +-
 components/camel-ftp/pom.xml   | 2 +-
 components/camel-gae/pom.xml   | 2 +-
 components/camel-geocoder/pom.xml  | 2 +-
 components/camel-groovy/pom.xml| 2 +-
 components/camel-gson/pom.xml  | 2 +-
 components/camel-guava-eventbus/pom.xml| 2 +-
 components/camel-guice/pom.xml | 2 +-
 components/camel-hawtdb/pom.xml| 2 +-
 components/camel-hazelcast/pom.xml | 2 +-
 components/camel-hbase/pom.xml | 2 +-
 components/camel-hdfs/pom.xml  | 2 +-
 components/camel-hdfs2/pom.xml | 2 +-
 components/camel-hl7/pom.xml   | 2 +-
 components/camel-http/pom.xml  | 2 +-
 components/camel-http4/pom.xml | 2 +-
 components/camel-ibatis/pom.xml| 2 +-
 components/camel-ical/pom.xml  

svn commit: r6978 - /release/camel/apache-camel/2.13.3/

[cmueller]

Author: cmueller
Date: Fri Oct 31 21:14:20 2014
New Revision: 6978

Log:
Apache Camel 2.13.3 release distro placeholder.

Added:
release/camel/apache-camel/2.13.3/

svn commit: r6979 - /release/camel/apache-camel/2.13.2/

[cmueller]

Author: cmueller
Date: Fri Oct 31 21:22:16 2014
New Revision: 6979

Log:
Removed the old release

Removed:
release/camel/apache-camel/2.13.2/

svn commit: r6980 - /release/camel/apache-camel/2.13.3/

[cmueller]

Author: cmueller
Date: Fri Oct 31 21:29:19 2014
New Revision: 6980

Log:
Apache Camel 2.13.3 released artifacts.

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

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

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

Added: release/camel/apache-camel/2.13.3/apache-camel-2.13.3-src.zip.asc
==
--- release/camel/apache-camel/2.13.3/apache-camel-2.13.3-src.zip.asc (added)
+++ release/camel/apache-camel/2.13.3/apache-camel-2.13.3-src.zip.asc Fri Oct 
31 21:29:19 2014
@@ -0,0 +1,18 @@
+-BEGIN PGP SIGNATURE-
+Version: GnuPG/MacGPG2 v2.0.22 (Darwin)
+Comment: GPGTools - http://gpgtools.org
+
+iQIcBAABAgAGBQJUT3jGAAoJEImh9lEqI5wsV1YP/3hdTWMNstj2fCJMQBINHMH6
+/1EpdmYEj1CMSCiP1lkXQB0LtyYqdDQWNRPZENpeFcwOOWhY5cjCRoUX8ELSCBnw
+n9qw7V738Ftk6fH2aJqI4o5HLb7pBUEFHSWAy967AHLNfgMbqDwsLGECWTODiPtg
+C7HSCNZfvJQeI2v1NwKBW/VxqGazU/4nSs5QBng3+qmcwKfQUs5E/gSajk7LJV+J
+6AhwbVH1kzJJwEUKM63nxIpEJ+3x2YTFqLhfMdvVgpTpGE/SAlQkM8Kxgk9iuMk+
+iR6BgIFbPC8pExW9XjtRP1xBREfO4dwhXMUSS71aGoc4FYH/JPR4QMmIqhZfKoki
+6AA18bsJqMySC4FSimR90NrrM6qgFw9MuwayFKfuov7KCRNGGm7am58Y8dqmR9gR
+VuZVnIrXsLDMWP/Lu8++uj3ZvjJN0liKNkHifjZt4VirXQ22f3DuH0nCsA1l6hjX
+6Vtsv8X9N3vZpksXzGm5Pklu0a29zAVLZCNRVdb3qiDW0OfaceZXj58CHQpYlDG6
+vdQUPVXxcWWCOpcib9R+KYTEgJApzoiaaEP7MErdtnCDnzU0asgQjEfyJY2NtAgW
+uIQNalrcHbul+lUsCr9zio/yZHYpF1F3mvuqfuYdDr6mxPO9F1+aQXIo+pSKa+Wc
+wA0A0OBw0voKrw29kl8h
+=/5wB
+-END PGP SIGNATURE-

Added: release/camel/apache-camel/2.13.3/apache-camel-2.13.3-src.zip.md5
==
--- release/camel/apache-camel/2.13.3/apache-camel-2.13.3-src.zip.md5 (added)
+++ release/camel/apache-camel/2.13.3/apache-camel-2.13.3-src.zip.md5 Fri Oct 
31 21:29:19 2014
@@ -0,0 +1 @@
+481960f5a5da6497bdb0453d88ffc408
\ No newline at end of file

Added: release/camel/apache-camel/2.13.3/apache-camel-2.13.3-src.zip.sha1
==
--- release/camel/apache-camel/2.13.3/apache-camel-2.13.3-src.zip.sha1 (added)
+++ release/camel/apache-camel/2.13.3/apache-camel-2.13.3-src.zip.sha1 Fri Oct 
31 21:29:19 2014
@@ -0,0 +1 @@
+4d318d4689921d885a801f3d43c052022c65c8e0
\ No newline at end of file

Added: release/camel/apache-camel/2.13.3/apache-camel-2.13.3.pom
==
--- release/camel/apache-camel/2.13.3/apache-camel-2.13.3.pom (added)
+++ release/camel/apache-camel/2.13.3/apache-camel-2.13.3.pom Fri Oct 31 
21:29:19 2014
@@ -0,0 +1,857 @@
+?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 
http

svn commit: r927562 [5/5] - in /websites/production/camel/content/schema: blueprint/ cxf/ spring-security/ spring/ spring/integration/

[cmueller]

Added: 
websites/production/camel/content/schema/spring/integration/camel-spring-integration-2.13.3.xsd
==
--- 
websites/production/camel/content/schema/spring/integration/camel-spring-integration-2.13.3.xsd
 (added)
+++ 
websites/production/camel/content/schema/spring/integration/camel-spring-integration-2.13.3.xsd
 Fri Oct 31 21:49:07 2014
@@ -0,0 +1,65 @@
+?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.
+--
+xsd:schema xmlns=http://camel.apache.org/schema/spring/integration;
+  xmlns:xsd=http://www.w3.org/2001/XMLSchema;
+  xmlns:beans=http://www.springframework.org/schema/beans;
+  xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance;
+  xmlns:camel-spring=http://camel.apache.org/schema/spring;
+  targetNamespace=http://camel.apache.org/schema/spring/integration;
+  elementFormDefault=qualified
+  attributeFormDefault=unqualified
+
+  xsd:import namespace=http://www.springframework.org/schema/beans; 
schemaLocation=http://www.springframework.org/schema/beans/spring-beans.xsd/
+  xsd:import namespace=http://camel.apache.org/schema/spring; 
schemaLocation=http://camel.apache.org/schema/spring/camel-spring.xsd/
+
+  xsd:complexType name=camelEndpointType
+   xsd:sequence
+   xsd:element ref=camel-spring:camelContext minOccurs=0 /
+   xsd:element name=camelContextRef type=xsd:string 
minOccurs=0 /
+   /xsd:sequence
+   xsd:attribute name=id type=xsd:ID use=required /
+   xsd:attribute name=camelEndpointUri type=xsd:string /
+   xsd:attribute name=replyChannel type=xsd:string /
+   xsd:attribute name=expectReply type=xsd:boolean default=true/
+  /xsd:complexType
+
+  xsd:element name=camelSource
+ xsd:complexType
+xsd:annotation
+   xsd:documentation
+ Defines a camel-source for handling the Camel context message 
in Spring Integration message bus.
+   /xsd:documentation
+   /xsd:annotation
+xsd:complexContent
+  xsd:extension base=camelEndpointType
+   xsd:attribute name=requestChannel type=xsd:string 
use=required /   
+ /xsd:extension
+   /xsd:complexContent
+ /xsd:complexType
+  /xsd:element
+
+  xsd:element name=camelTarget type=camelEndpointType
+xsd:annotation
+   xsd:documentation
+ Defines a camel-target to feed Spring Integration message to 
the Camel context.
+   /xsd:documentation
+   /xsd:annotation
+  /xsd:element
+/xsd:schema

svn commit: r927562 [4/5] - in /websites/production/camel/content/schema: blueprint/ cxf/ spring-security/ spring/ spring/integration/

[cmueller]

Added: websites/production/camel/content/schema/spring/camel-spring-2.13.3.xsd
==
--- websites/production/camel/content/schema/spring/camel-spring-2.13.3.xsd 
(added)
+++ websites/production/camel/content/schema/spring/camel-spring-2.13.3.xsd Fri 
Oct 31 21:49:07 2014
@@ -0,0 +1,3221 @@
+?xml version=1.0 encoding=UTF-8 standalone=yes?
+xs:schema elementFormDefault=qualified version=1.0 
targetNamespace=http://camel.apache.org/schema/spring; 
xmlns:tns=http://camel.apache.org/schema/spring; 
xmlns:xs=http://www.w3.org/2001/XMLSchema;
+
+  xs:element name=aggregate type=tns:aggregateDefinition/
+
+  xs:element name=aop type=tns:aopDefinition/
+
+  xs:element name=avro type=tns:avroDataFormat/
+
+  xs:element name=base64 type=tns:base64DataFormat/
+
+  xs:element name=batchResequencerConfig type=tns:batchResequencerConfig/
+
+  xs:element name=bean type=tns:beanDefinition/
+
+  xs:element name=beanPostProcessor type=tns:camelBeanPostProcessor/
+
+  xs:element name=beanio type=tns:beanioDataFormat/
+
+  xs:element name=bindy type=tns:bindyDataFormat/
+
+  xs:element name=camelContext type=tns:camelContextFactoryBean/
+
+  xs:element name=castor type=tns:castorDataFormat/
+
+  xs:element name=choice type=tns:choiceDefinition/
+
+  xs:element name=constant type=tns:constantExpression/
+
+  xs:element name=consumerTemplate 
type=tns:camelConsumerTemplateFactoryBean/
+
+  xs:element name=contextScan type=tns:contextScanDefinition/
+
+  xs:element name=convertBodyTo type=tns:convertBodyDefinition/
+
+  xs:element name=crypto type=tns:cryptoDataFormat/
+
+  xs:element name=csv type=tns:csvDataFormat/
+
+  xs:element name=customDataFormat type=tns:customDataFormat/
+
+  xs:element name=customLoadBalancer 
type=tns:customLoadBalancerDefinition/
+
+  xs:element name=dataFormats type=tns:dataFormatsDefinition/
+
+  xs:element name=delay type=tns:delayDefinition/
+
+  xs:element name=description type=tns:descriptionDefinition/
+
+  xs:element name=doCatch type=tns:catchDefinition/
+
+  xs:element name=doFinally type=tns:finallyDefinition/
+
+  xs:element name=doTry type=tns:tryDefinition/
+
+  xs:element name=dynamicRouter type=tns:dynamicRouterDefinition/
+
+  xs:element name=el type=tns:elExpression/
+
+  xs:element name=endpoint type=tns:camelEndpointFactoryBean/
+
+  xs:element name=enrich type=tns:enrichDefinition/
+
+  xs:element name=errorHandler type=tns:errorHandlerDefinition/
+
+  xs:element name=export type=tns:camelServiceExporterDefinition/
+
+  xs:element name=expression type=tns:expressionSubElementDefinition/
+
+  xs:element name=expressionDefinition type=tns:expression/
+
+  xs:element name=failover type=tns:failoverLoadBalancerDefinition/
+
+  xs:element name=filter type=tns:filterDefinition/
+
+  xs:element name=flatpack type=tns:flatpackDataFormat/
+
+  xs:element name=from type=tns:fromDefinition/
+
+  xs:element name=groovy type=tns:groovyExpression/
+
+  xs:element name=gzip type=tns:gzipDataFormat/
+
+  xs:element name=header type=tns:headerExpression/
+
+  xs:element name=hl7 type=tns:hl7DataFormat/
+
+  xs:element name=idempotentConsumer 
type=tns:idempotentConsumerDefinition/
+
+  xs:element name=inOnly type=tns:inOnlyDefinition/
+
+  xs:element name=inOut type=tns:inOutDefinition/
+
+  xs:element name=intercept type=tns:interceptDefinition/
+
+  xs:element name=interceptFrom type=tns:interceptFromDefinition/
+
+  xs:element name=interceptToEndpoint 
type=tns:interceptSendToEndpointDefinition/
+
+  xs:element name=javaScript type=tns:javaScriptExpression/
+
+  xs:element name=jaxb type=tns:jaxbDataFormat/
+
+  xs:element name=jibx type=tns:jibxDataFormat/
+
+  xs:element name=jmxAgent type=tns:camelJMXAgentDefinition/
+
+  xs:element name=json type=tns:jsonDataFormat/
+
+  xs:element name=jsonpath type=tns:jsonPathExpression/
+
+  xs:element name=jxpath type=tns:jxPathExpression/
+
+  xs:element name=keyStoreParameters 
type=tns:keyStoreParametersFactoryBean/
+
+  xs:element name=language type=tns:languageExpression/
+
+  xs:element name=loadBalance type=tns:loadBalanceDefinition/
+
+  xs:element name=log type=tns:logDefinition/
+
+  xs:element name=loop type=tns:loopDefinition/
+
+  xs:element name=marshal type=tns:marshalDefinition/
+
+  xs:element name=method type=tns:methodCallExpression/
+
+  xs:element name=multicast type=tns:multicastDefinition/
+
+  xs:element name=mvel type=tns:mvelExpression/
+
+  xs:element name=ognl type=tns:ognlExpression/
+
+  xs:element name=onCompletion type=tns:onCompletionDefinition/
+
+  xs:element name=onException type=tns:onExceptionDefinition/
+
+  xs:element name=optimisticLockRetryPolicy 
type=tns:optimisticLockRetryPolicyDefinition/
+
+  xs:element name=otherwise type=tns:otherwiseDefinition/
+
+  xs:element name=packageScan type=tns:packageScanDefinition/
+
+  xs:element name=pgp type=tns:pgpDataFormat/
+
+  xs:element name=php type=tns:phpExpression/
+
+  xs:element 

svn commit: r927562 [2/5] - in /websites/production/camel/content/schema: blueprint/ cxf/ spring-security/ spring/ spring/integration/

[cmueller]

Added: 
websites/production/camel/content/schema/blueprint/camel-blueprint-2.13.3.xsd
==
--- 
websites/production/camel/content/schema/blueprint/camel-blueprint-2.13.3.xsd 
(added)
+++ 
websites/production/camel/content/schema/blueprint/camel-blueprint-2.13.3.xsd 
Fri Oct 31 21:49:07 2014
@@ -0,0 +1,3214 @@
+?xml version=1.0 encoding=UTF-8 standalone=yes?
+xs:schema elementFormDefault=qualified version=1.0 
targetNamespace=http://camel.apache.org/schema/blueprint; 
xmlns:tns=http://camel.apache.org/schema/blueprint; 
xmlns:xs=http://www.w3.org/2001/XMLSchema;
+
+  xs:element name=aggregate type=tns:aggregateDefinition/
+
+  xs:element name=aop type=tns:aopDefinition/
+
+  xs:element name=avro type=tns:avroDataFormat/
+
+  xs:element name=base64 type=tns:base64DataFormat/
+
+  xs:element name=batchResequencerConfig type=tns:batchResequencerConfig/
+
+  xs:element name=bean type=tns:beanDefinition/
+
+  xs:element name=beanio type=tns:beanioDataFormat/
+
+  xs:element name=bindy type=tns:bindyDataFormat/
+
+  xs:element name=camelContext type=tns:camelContextFactoryBean/
+
+  xs:element name=castor type=tns:castorDataFormat/
+
+  xs:element name=choice type=tns:choiceDefinition/
+
+  xs:element name=constant type=tns:constantExpression/
+
+  xs:element name=consumerTemplate 
type=tns:camelConsumerTemplateFactoryBean/
+
+  xs:element name=contextScan type=tns:contextScanDefinition/
+
+  xs:element name=convertBodyTo type=tns:convertBodyDefinition/
+
+  xs:element name=crypto type=tns:cryptoDataFormat/
+
+  xs:element name=csv type=tns:csvDataFormat/
+
+  xs:element name=customDataFormat type=tns:customDataFormat/
+
+  xs:element name=customLoadBalancer 
type=tns:customLoadBalancerDefinition/
+
+  xs:element name=dataFormats type=tns:dataFormatsDefinition/
+
+  xs:element name=delay type=tns:delayDefinition/
+
+  xs:element name=description type=tns:descriptionDefinition/
+
+  xs:element name=doCatch type=tns:catchDefinition/
+
+  xs:element name=doFinally type=tns:finallyDefinition/
+
+  xs:element name=doTry type=tns:tryDefinition/
+
+  xs:element name=dynamicRouter type=tns:dynamicRouterDefinition/
+
+  xs:element name=el type=tns:elExpression/
+
+  xs:element name=endpoint type=tns:camelEndpointFactoryBean/
+
+  xs:element name=enrich type=tns:enrichDefinition/
+
+  xs:element name=errorHandler type=tns:camelErrorHandlerFactoryBean/
+
+  xs:element name=export type=tns:camelServiceExporterDefinition/
+
+  xs:element name=expression type=tns:expressionSubElementDefinition/
+
+  xs:element name=expressionDefinition type=tns:expression/
+
+  xs:element name=failover type=tns:failoverLoadBalancerDefinition/
+
+  xs:element name=filter type=tns:filterDefinition/
+
+  xs:element name=flatpack type=tns:flatpackDataFormat/
+
+  xs:element name=from type=tns:fromDefinition/
+
+  xs:element name=groovy type=tns:groovyExpression/
+
+  xs:element name=gzip type=tns:gzipDataFormat/
+
+  xs:element name=header type=tns:headerExpression/
+
+  xs:element name=hl7 type=tns:hl7DataFormat/
+
+  xs:element name=idempotentConsumer 
type=tns:idempotentConsumerDefinition/
+
+  xs:element name=inOnly type=tns:inOnlyDefinition/
+
+  xs:element name=inOut type=tns:inOutDefinition/
+
+  xs:element name=intercept type=tns:interceptDefinition/
+
+  xs:element name=interceptFrom type=tns:interceptFromDefinition/
+
+  xs:element name=interceptToEndpoint 
type=tns:interceptSendToEndpointDefinition/
+
+  xs:element name=javaScript type=tns:javaScriptExpression/
+
+  xs:element name=jaxb type=tns:jaxbDataFormat/
+
+  xs:element name=jibx type=tns:jibxDataFormat/
+
+  xs:element name=jmxAgent type=tns:camelJMXAgentDefinition/
+
+  xs:element name=json type=tns:jsonDataFormat/
+
+  xs:element name=jsonpath type=tns:jsonPathExpression/
+
+  xs:element name=jxpath type=tns:jxPathExpression/
+
+  xs:element name=keyStoreParameters 
type=tns:keyStoreParametersFactoryBean/
+
+  xs:element name=language type=tns:languageExpression/
+
+  xs:element name=loadBalance type=tns:loadBalanceDefinition/
+
+  xs:element name=log type=tns:logDefinition/
+
+  xs:element name=loop type=tns:loopDefinition/
+
+  xs:element name=marshal type=tns:marshalDefinition/
+
+  xs:element name=method type=tns:methodCallExpression/
+
+  xs:element name=multicast type=tns:multicastDefinition/
+
+  xs:element name=mvel type=tns:mvelExpression/
+
+  xs:element name=ognl type=tns:ognlExpression/
+
+  xs:element name=onCompletion type=tns:onCompletionDefinition/
+
+  xs:element name=onException type=tns:onExceptionDefinition/
+
+  xs:element name=optimisticLockRetryPolicy 
type=tns:optimisticLockRetryPolicyDefinition/
+
+  xs:element name=otherwise type=tns:otherwiseDefinition/
+
+  xs:element name=packageScan type=tns:packageScanDefinition/
+
+  xs:element name=pgp type=tns:pgpDataFormat/
+
+  xs:element name=php type=tns:phpExpression/
+
+  xs:element name=pipeline type=tns:pipelineDefinition/
+
+  

svn commit: r927562 [3/5] - in /websites/production/camel/content/schema: blueprint/ cxf/ spring-security/ spring/ spring/integration/

[cmueller]

Added: 
websites/production/camel/content/schema/cxf/camel-cxf-2.13.3-blueprint.xsd
==
--- websites/production/camel/content/schema/cxf/camel-cxf-2.13.3-blueprint.xsd 
(added)
+++ websites/production/camel/content/schema/cxf/camel-cxf-2.13.3-blueprint.xsd 
Fri Oct 31 21:49:07 2014
@@ -0,0 +1,176 @@
+?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.
+--
+xsd:schema xmlns=http://camel.apache.org/schema/blueprint/cxf;
+xmlns:xsd=http://www.w3.org/2001/XMLSchema;
+xmlns:beans=http://www.osgi.org/xmlns/blueprint/v1.0.0;
+xmlns:cxf-beans=http://cxf.apache.org/configuration/beans;
+xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance;
+targetNamespace=http://camel.apache.org/schema/blueprint/cxf;
+elementFormDefault=qualified
+attributeFormDefault=unqualified
+xsi:schemaLocation=http://www.osgi.org/xmlns/blueprint/v1.0.0 
http://www.osgi.org/xmlns/blueprint/v1.0.0/blueprint.xsd;
+
+  xsd:import namespace=http://www.osgi.org/xmlns/blueprint/v1.0.0; 
schemaLocation=http://www.osgi.org/xmlns/blueprint/v1.0.0/blueprint.xsd/
+  xsd:import namespace=http://cxf.apache.org/configuration/beans; 
schemaLocation=http://cxf.apache.org/schemas/configuration/cxf-beans.xsd/
+
+  xsd:element name=cxfEndpoint
+xsd:complexType
+  xsd:complexContent
+xsd:extension base=beans:Tcomponent
+  xsd:all
+xsd:element name=binding type=xsd:anyType minOccurs=0/
+xsd:element name=dataBinding type=xsd:anyType minOccurs=0/
+xsd:element name=features type=xsd:anyType minOccurs=0/
+xsd:element name=inInterceptors type=xsd:anyType 
minOccurs=0/
+xsd:element name=inFaultInterceptors type=xsd:anyType 
minOccurs=0/
+xsd:element name=outInterceptors type=xsd:anyType 
minOccurs=0/
+xsd:element name=outFaultInterceptors type=xsd:anyType 
minOccurs=0/
+xsd:element name=handlers type=xsd:anyType minOccurs=0/
+xsd:element name=properties type=beans:Tmap minOccurs=0/
+xsd:element name=schemaLocations type=schemasType 
minOccurs=0/
+xsd:element name=serviceBean type=xsd:anyType minOccurs=0/
+xsd:element name=serviceFactory type=xsd:anyType 
minOccurs=0/
+  /xsd:all
+  !-- xsd:attributeGroup ref=cxf-beans:beanAttributes/--
+  xsd:attribute name=address type=xsd:string/
+  xsd:attribute name=bindingId type=xsd:string/
+  xsd:attribute name=bus type=xsd:string/
+  xsd:attribute name=serviceClass type=xsd:string/
+  xsd:attribute name=transportId type=xsd:string/
+  xsd:attribute name=wsdlURL type=xsd:string/
+  xsd:attribute name=endpointName type=xsd:QName/
+  xsd:attribute name=serviceName type=xsd:QName/
+  xsd:attribute name=loggingFeatureEnabled type=xsd:boolean/
+  xsd:attribute name=loggingSizeLimit type=xsd:integer /
+/xsd:extension
+  /xsd:complexContent
+/xsd:complexType
+  /xsd:element
+
+  xsd:element name=rsServer
+xsd:complexType
+  xsd:complexContent
+xsd:extension base=beans:Tcomponent
+  xsd:all
+xsd:element name=executor type=xsd:anyType minOccurs=0/
+xsd:element name=features type=xsd:anyType minOccurs=0/
+xsd:element name=binding type=xsd:anyType minOccurs=0/
+xsd:element name=inInterceptors type=xsd:anyType 
minOccurs=0/
+xsd:element name=inFaultInterceptors type=xsd:anyType 
minOccurs=0/
+xsd:element name=invoker type=xsd:anyType minOccurs=0/
+xsd:element name=outInterceptors type=xsd:anyType 
minOccurs=0/
+xsd:element name=outFaultInterceptors type=xsd:anyType 
minOccurs=0/
+xsd:element name=properties type=beans:Tmap minOccurs=0/
+xsd:element name=serviceBeans type=xsd:anyType minOccurs=0/
+xsd:element name=modelBeans type=xsd:anyType minOccurs=0/
+xsd:element name=model type=model minOccurs=0/
+xsd:element name=providers type=xsd:anyType minOccurs=0/
+