[1/4] camel git commit: Fixed catalog to handle uris with property placeholders and other unsafe charachters

[davsclaus]

Repository: camel
Updated Branches:
  refs/heads/camel-2.16.x c73de90d2 -> af94e7839
  refs/heads/master 0589a1490 -> 19771345d


Fixed catalog to handle uris with property placeholders and other unsafe 
charachters


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

Branch: refs/heads/master
Commit: ed574cbd7faf246e02c775a2ff6101a775963f0f
Parents: 0589a14
Author: Claus Ibsen 
Authored: Wed Nov 11 10:36:01 2015 +0100
Committer: Claus Ibsen 
Committed: Wed Nov 11 10:36:01 2015 +0100

--
 .../camel/catalog/DefaultCamelCatalog.java  |   5 +-
 .../org/apache/camel/catalog/URISupport.java|  11 +
 .../catalog/UnsafeUriCharactersEncoder.java | 206 +++
 .../apache/camel/catalog/CamelCatalogTest.java  |  11 +
 4 files changed, 232 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/ed574cbd/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
--
diff --git 
a/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
 
b/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
index 2471bb7..0cf52f0 100644
--- 
a/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
+++ 
b/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
@@ -44,6 +44,7 @@ import static org.apache.camel.catalog.CatalogHelper.after;
 import static 
org.apache.camel.catalog.JSonSchemaHelper.getPropertyDefaultValue;
 import static org.apache.camel.catalog.JSonSchemaHelper.isPropertyRequired;
 import static org.apache.camel.catalog.URISupport.createQueryString;
+import static org.apache.camel.catalog.URISupport.normalizeUri;
 import static org.apache.camel.catalog.URISupport.stripQuery;
 
 /**
@@ -464,8 +465,10 @@ public class DefaultCamelCatalog implements CamelCatalog {
 // NOTICE: This logic is similar to 
org.apache.camel.util.EndpointHelper#endpointProperties
 // as the catalog also offers similar functionality (without having 
camel-core on classpath)
 
+// need to normalize uri first
+
 // parse the uri
-URI u = new URI(uri);
+URI u = normalizeUri(uri);
 String scheme = u.getScheme();
 
 String json = componentJSonSchema(scheme);

http://git-wip-us.apache.org/repos/asf/camel/blob/ed574cbd/platforms/catalog/src/main/java/org/apache/camel/catalog/URISupport.java
--
diff --git 
a/platforms/catalog/src/main/java/org/apache/camel/catalog/URISupport.java 
b/platforms/catalog/src/main/java/org/apache/camel/catalog/URISupport.java
index 3c09d41..2742d0c 100644
--- a/platforms/catalog/src/main/java/org/apache/camel/catalog/URISupport.java
+++ b/platforms/catalog/src/main/java/org/apache/camel/catalog/URISupport.java
@@ -41,6 +41,17 @@ public final class URISupport {
 }
 
 /**
+ * Normalizes the URI so unsafe charachters is encoded
+ *
+ * @param uri the input uri
+ * @return as URI instance
+ * @throws URISyntaxException is thrown if syntax error in the input uri
+ */
+public static URI normalizeUri(String uri) throws URISyntaxException {
+return new URI(UnsafeUriCharactersEncoder.encode(uri, true));
+}
+
+/**
  * Strips the query parameters from the uri
  *
  * @param uri  the uri

http://git-wip-us.apache.org/repos/asf/camel/blob/ed574cbd/platforms/catalog/src/main/java/org/apache/camel/catalog/UnsafeUriCharactersEncoder.java
--
diff --git 
a/platforms/catalog/src/main/java/org/apache/camel/catalog/UnsafeUriCharactersEncoder.java
 
b/platforms/catalog/src/main/java/org/apache/camel/catalog/UnsafeUriCharactersEncoder.java
new file mode 100644
index 000..1d137d2
--- /dev/null
+++ 
b/platforms/catalog/src/main/java/org/apache/camel/catalog/UnsafeUriCharactersEncoder.java
@@ -0,0 +1,206 @@
+/**
+ * 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
+ * 

[3/4] camel git commit: Fixed catalog to handle uris with property placeholders and other unsafe charachters

[davsclaus]

Fixed catalog to handle uris with property placeholders and other unsafe 
charachters


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

Branch: refs/heads/camel-2.16.x
Commit: 7e41e83c1211c26424698430d5afcf0ab9206481
Parents: c73de90
Author: Claus Ibsen 
Authored: Wed Nov 11 10:36:01 2015 +0100
Committer: Claus Ibsen 
Committed: Wed Nov 11 10:36:33 2015 +0100

--
 .../camel/catalog/DefaultCamelCatalog.java  |   5 +-
 .../org/apache/camel/catalog/URISupport.java|  11 +
 .../catalog/UnsafeUriCharactersEncoder.java | 206 +++
 .../apache/camel/catalog/CamelCatalogTest.java  |  11 +
 4 files changed, 232 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/7e41e83c/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
--
diff --git 
a/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
 
b/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
index 2471bb7..0cf52f0 100644
--- 
a/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
+++ 
b/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
@@ -44,6 +44,7 @@ import static org.apache.camel.catalog.CatalogHelper.after;
 import static 
org.apache.camel.catalog.JSonSchemaHelper.getPropertyDefaultValue;
 import static org.apache.camel.catalog.JSonSchemaHelper.isPropertyRequired;
 import static org.apache.camel.catalog.URISupport.createQueryString;
+import static org.apache.camel.catalog.URISupport.normalizeUri;
 import static org.apache.camel.catalog.URISupport.stripQuery;
 
 /**
@@ -464,8 +465,10 @@ public class DefaultCamelCatalog implements CamelCatalog {
 // NOTICE: This logic is similar to 
org.apache.camel.util.EndpointHelper#endpointProperties
 // as the catalog also offers similar functionality (without having 
camel-core on classpath)
 
+// need to normalize uri first
+
 // parse the uri
-URI u = new URI(uri);
+URI u = normalizeUri(uri);
 String scheme = u.getScheme();
 
 String json = componentJSonSchema(scheme);

http://git-wip-us.apache.org/repos/asf/camel/blob/7e41e83c/platforms/catalog/src/main/java/org/apache/camel/catalog/URISupport.java
--
diff --git 
a/platforms/catalog/src/main/java/org/apache/camel/catalog/URISupport.java 
b/platforms/catalog/src/main/java/org/apache/camel/catalog/URISupport.java
index 3c09d41..2742d0c 100644
--- a/platforms/catalog/src/main/java/org/apache/camel/catalog/URISupport.java
+++ b/platforms/catalog/src/main/java/org/apache/camel/catalog/URISupport.java
@@ -41,6 +41,17 @@ public final class URISupport {
 }
 
 /**
+ * Normalizes the URI so unsafe charachters is encoded
+ *
+ * @param uri the input uri
+ * @return as URI instance
+ * @throws URISyntaxException is thrown if syntax error in the input uri
+ */
+public static URI normalizeUri(String uri) throws URISyntaxException {
+return new URI(UnsafeUriCharactersEncoder.encode(uri, true));
+}
+
+/**
  * Strips the query parameters from the uri
  *
  * @param uri  the uri

http://git-wip-us.apache.org/repos/asf/camel/blob/7e41e83c/platforms/catalog/src/main/java/org/apache/camel/catalog/UnsafeUriCharactersEncoder.java
--
diff --git 
a/platforms/catalog/src/main/java/org/apache/camel/catalog/UnsafeUriCharactersEncoder.java
 
b/platforms/catalog/src/main/java/org/apache/camel/catalog/UnsafeUriCharactersEncoder.java
new file mode 100644
index 000..1d137d2
--- /dev/null
+++ 
b/platforms/catalog/src/main/java/org/apache/camel/catalog/UnsafeUriCharactersEncoder.java
@@ -0,0 +1,206 @@
+/**
+ * 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 

[2/4] camel git commit: Polished

[davsclaus]

Polished


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

Branch: refs/heads/master
Commit: 19771345d5946f4e925d604ced2d12759bde5ac5
Parents: ed574cb
Author: Claus Ibsen 
Authored: Wed Nov 11 10:36:10 2015 +0100
Committer: Claus Ibsen 
Committed: Wed Nov 11 10:36:10 2015 +0100

--
 .../main/java/org/apache/camel/util/UnsafeUriCharactersEncoder.java | 1 -
 1 file changed, 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/19771345/camel-core/src/main/java/org/apache/camel/util/UnsafeUriCharactersEncoder.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/util/UnsafeUriCharactersEncoder.java
 
b/camel-core/src/main/java/org/apache/camel/util/UnsafeUriCharactersEncoder.java
index e0775a0..783af6c 100644
--- 
a/camel-core/src/main/java/org/apache/camel/util/UnsafeUriCharactersEncoder.java
+++ 
b/camel-core/src/main/java/org/apache/camel/util/UnsafeUriCharactersEncoder.java
@@ -22,7 +22,6 @@ import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-
 /**
  * Encoder for unsafe URI characters.
  * 

[2/4] camel git commit: Fixed CS

[davsclaus]

Fixed CS


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

Branch: refs/heads/master
Commit: ad33d9e4fdce6a9cd97be288daef0925ea158f7d
Parents: a9e8316
Author: Claus Ibsen 
Authored: Wed Nov 11 11:00:31 2015 +0100
Committer: Claus Ibsen 
Committed: Wed Nov 11 11:00:31 2015 +0100

--
 .../apache/camel/catalog/UnsafeUriCharactersEncoder.java  | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/ad33d9e4/platforms/catalog/src/main/java/org/apache/camel/catalog/UnsafeUriCharactersEncoder.java
--
diff --git 
a/platforms/catalog/src/main/java/org/apache/camel/catalog/UnsafeUriCharactersEncoder.java
 
b/platforms/catalog/src/main/java/org/apache/camel/catalog/UnsafeUriCharactersEncoder.java
index 1d137d2..2a58f3f 100644
--- 
a/platforms/catalog/src/main/java/org/apache/camel/catalog/UnsafeUriCharactersEncoder.java
+++ 
b/platforms/catalog/src/main/java/org/apache/camel/catalog/UnsafeUriCharactersEncoder.java
@@ -5,9 +5,9 @@
  * 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
- * 
+ *
+ *  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.
@@ -31,7 +31,7 @@ public final class UnsafeUriCharactersEncoder {
 private static BitSet unsafeCharactersRfc1738;
 private static BitSet unsafeCharactersHttp;
 private static final char[] HEX_DIGITS = {'0', '1', '2', '3', '4', '5', 
'6', '7', '8', '9', 'A', 'B', 'C',
-'D', 'E', 'F', 'a', 'b', 'c', 'd', 'e', 'f'};
+'D', 'E', 'F', 'a', 'b', 'c', 'd', 'e', 'f'};
 
 static {
 unsafeCharactersRfc1738 = new BitSet(256);
@@ -147,7 +147,7 @@ public final class UnsafeUriCharactersEncoder {
 
 // First check whether we actually need to encode
 char chars[] = s.toCharArray();
-for (int i = 0; ; ) {
+for (int i = 0;;) {
 // just deal with the ascii character
 if (chars[i] > 0 && chars[i] < 128) {
 if (unsafeCharacters.get(chars[i])) {

[3/4] camel git commit: Camel catalog should allow to turn off encode uri when building a uri from options.

[davsclaus]

Camel catalog should allow to turn off encode uri when building a uri from 
options.


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

Branch: refs/heads/camel-2.16.x
Commit: e6395632b9497c44db7f1f09ffeecaf6341e6b86
Parents: af94e78
Author: Claus Ibsen 
Authored: Wed Nov 11 10:58:36 2015 +0100
Committer: Claus Ibsen 
Committed: Wed Nov 11 11:00:46 2015 +0100

--
 .../org/apache/camel/catalog/CamelCatalog.java  |  8 ++--
 .../camel/catalog/DefaultCamelCatalog.java  | 24 ++--
 .../org/apache/camel/catalog/URISupport.java| 18 ++---
 .../apache/camel/catalog/CamelCatalogTest.java  | 39 +---
 4 files changed, 55 insertions(+), 34 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/e6395632/platforms/catalog/src/main/java/org/apache/camel/catalog/CamelCatalog.java
--
diff --git 
a/platforms/catalog/src/main/java/org/apache/camel/catalog/CamelCatalog.java 
b/platforms/catalog/src/main/java/org/apache/camel/catalog/CamelCatalog.java
index ed8c317..bf34b0a 100644
--- a/platforms/catalog/src/main/java/org/apache/camel/catalog/CamelCatalog.java
+++ b/platforms/catalog/src/main/java/org/apache/camel/catalog/CamelCatalog.java
@@ -178,7 +178,7 @@ public interface CamelCatalog {
  * @return the constructed endpoint uri
  * @throws java.net.URISyntaxException is thrown if there is encoding error
  */
-String asEndpointUri(String scheme, String json) throws URISyntaxException;
+String asEndpointUri(String scheme, String json, boolean encode) throws 
URISyntaxException;
 
 /**
  * Creates an endpoint uri in XML style (eg escape & as ) from the 
information in the json schema
@@ -188,7 +188,7 @@ public interface CamelCatalog {
  * @return the constructed endpoint uri
  * @throws java.net.URISyntaxException is thrown if there is encoding error
  */
-String asEndpointUriXml(String scheme, String json) throws 
URISyntaxException;
+String asEndpointUriXml(String scheme, String json, boolean encode) throws 
URISyntaxException;
 
 /**
  * Creates an endpoint uri in Java style from the information from the 
properties
@@ -198,7 +198,7 @@ public interface CamelCatalog {
  * @return the constructed endpoint uri
  * @throws java.net.URISyntaxException is thrown if there is encoding error
  */
-String asEndpointUri(String scheme, Map properties) throws 
URISyntaxException;
+String asEndpointUri(String scheme, Map properties, 
boolean encode) throws URISyntaxException;
 
 /**
  * Creates an endpoint uri in XML style (eg escape & as ) from the 
information from the properties
@@ -208,7 +208,7 @@ public interface CamelCatalog {
  * @return the constructed endpoint uri
  * @throws java.net.URISyntaxException is thrown if there is encoding error
  */
-String asEndpointUriXml(String scheme, Map properties) 
throws URISyntaxException;
+String asEndpointUriXml(String scheme, Map properties, 
boolean encode) throws URISyntaxException;
 
 /**
  * Lists all the components summary details in JSon

http://git-wip-us.apache.org/repos/asf/camel/blob/e6395632/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
--
diff --git 
a/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
 
b/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
index 0cf52f0..01766fc 100644
--- 
a/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
+++ 
b/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
@@ -607,16 +607,16 @@ public class DefaultCamelCatalog implements CamelCatalog {
 }
 
 @Override
-public String asEndpointUri(String scheme, String json) throws 
URISyntaxException {
-return doAsEndpointUri(scheme, json, "&");
+public String asEndpointUri(String scheme, String json, boolean encode) 
throws URISyntaxException {
+return doAsEndpointUri(scheme, json, "&", encode);
 }
 
 @Override
-public String asEndpointUriXml(String scheme, String json) throws 
URISyntaxException {
-return doAsEndpointUri(scheme, json, "");
+public String asEndpointUriXml(String scheme, String json, boolean encode) 
throws URISyntaxException {
+return doAsEndpointUri(scheme, json, "", encode);
 }
 
-private String doAsEndpointUri(String 

[1/4] camel git commit: Camel catalog should allow to turn off encode uri when building a uri from options.

[davsclaus]

Repository: camel
Updated Branches:
  refs/heads/camel-2.16.x af94e7839 -> 08f531413
  refs/heads/master 19771345d -> ad33d9e4f


Camel catalog should allow to turn off encode uri when building a uri from 
options.


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

Branch: refs/heads/master
Commit: a9e8316eb55db4643ac6f3c68effa75356c7bf66
Parents: 1977134
Author: Claus Ibsen 
Authored: Wed Nov 11 10:58:36 2015 +0100
Committer: Claus Ibsen 
Committed: Wed Nov 11 10:58:36 2015 +0100

--
 .../org/apache/camel/catalog/CamelCatalog.java  |  8 ++--
 .../camel/catalog/DefaultCamelCatalog.java  | 24 ++--
 .../org/apache/camel/catalog/URISupport.java| 18 ++---
 .../apache/camel/catalog/CamelCatalogTest.java  | 39 +---
 4 files changed, 55 insertions(+), 34 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/a9e8316e/platforms/catalog/src/main/java/org/apache/camel/catalog/CamelCatalog.java
--
diff --git 
a/platforms/catalog/src/main/java/org/apache/camel/catalog/CamelCatalog.java 
b/platforms/catalog/src/main/java/org/apache/camel/catalog/CamelCatalog.java
index ed8c317..bf34b0a 100644
--- a/platforms/catalog/src/main/java/org/apache/camel/catalog/CamelCatalog.java
+++ b/platforms/catalog/src/main/java/org/apache/camel/catalog/CamelCatalog.java
@@ -178,7 +178,7 @@ public interface CamelCatalog {
  * @return the constructed endpoint uri
  * @throws java.net.URISyntaxException is thrown if there is encoding error
  */
-String asEndpointUri(String scheme, String json) throws URISyntaxException;
+String asEndpointUri(String scheme, String json, boolean encode) throws 
URISyntaxException;
 
 /**
  * Creates an endpoint uri in XML style (eg escape & as ) from the 
information in the json schema
@@ -188,7 +188,7 @@ public interface CamelCatalog {
  * @return the constructed endpoint uri
  * @throws java.net.URISyntaxException is thrown if there is encoding error
  */
-String asEndpointUriXml(String scheme, String json) throws 
URISyntaxException;
+String asEndpointUriXml(String scheme, String json, boolean encode) throws 
URISyntaxException;
 
 /**
  * Creates an endpoint uri in Java style from the information from the 
properties
@@ -198,7 +198,7 @@ public interface CamelCatalog {
  * @return the constructed endpoint uri
  * @throws java.net.URISyntaxException is thrown if there is encoding error
  */
-String asEndpointUri(String scheme, Map properties) throws 
URISyntaxException;
+String asEndpointUri(String scheme, Map properties, 
boolean encode) throws URISyntaxException;
 
 /**
  * Creates an endpoint uri in XML style (eg escape & as ) from the 
information from the properties
@@ -208,7 +208,7 @@ public interface CamelCatalog {
  * @return the constructed endpoint uri
  * @throws java.net.URISyntaxException is thrown if there is encoding error
  */
-String asEndpointUriXml(String scheme, Map properties) 
throws URISyntaxException;
+String asEndpointUriXml(String scheme, Map properties, 
boolean encode) throws URISyntaxException;
 
 /**
  * Lists all the components summary details in JSon

http://git-wip-us.apache.org/repos/asf/camel/blob/a9e8316e/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
--
diff --git 
a/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
 
b/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
index 0cf52f0..01766fc 100644
--- 
a/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
+++ 
b/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
@@ -607,16 +607,16 @@ public class DefaultCamelCatalog implements CamelCatalog {
 }
 
 @Override
-public String asEndpointUri(String scheme, String json) throws 
URISyntaxException {
-return doAsEndpointUri(scheme, json, "&");
+public String asEndpointUri(String scheme, String json, boolean encode) 
throws URISyntaxException {
+return doAsEndpointUri(scheme, json, "&", encode);
 }
 
 @Override
-public String asEndpointUriXml(String scheme, String json) throws 
URISyntaxException {
-return doAsEndpointUri(scheme, json, "");
+public String asEndpointUriXml(String scheme, String json, boolean encode) 
throws 

[4/4] camel git commit: Fixed CS

[davsclaus]

Fixed CS


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

Branch: refs/heads/camel-2.16.x
Commit: 08f53141320897f5a1185d0169d1941dbd60cecd
Parents: e639563
Author: Claus Ibsen 
Authored: Wed Nov 11 11:00:31 2015 +0100
Committer: Claus Ibsen 
Committed: Wed Nov 11 11:00:51 2015 +0100

--
 .../apache/camel/catalog/UnsafeUriCharactersEncoder.java  | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/08f53141/platforms/catalog/src/main/java/org/apache/camel/catalog/UnsafeUriCharactersEncoder.java
--
diff --git 
a/platforms/catalog/src/main/java/org/apache/camel/catalog/UnsafeUriCharactersEncoder.java
 
b/platforms/catalog/src/main/java/org/apache/camel/catalog/UnsafeUriCharactersEncoder.java
index 1d137d2..2a58f3f 100644
--- 
a/platforms/catalog/src/main/java/org/apache/camel/catalog/UnsafeUriCharactersEncoder.java
+++ 
b/platforms/catalog/src/main/java/org/apache/camel/catalog/UnsafeUriCharactersEncoder.java
@@ -5,9 +5,9 @@
  * 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
- * 
+ *
+ *  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.
@@ -31,7 +31,7 @@ public final class UnsafeUriCharactersEncoder {
 private static BitSet unsafeCharactersRfc1738;
 private static BitSet unsafeCharactersHttp;
 private static final char[] HEX_DIGITS = {'0', '1', '2', '3', '4', '5', 
'6', '7', '8', '9', 'A', 'B', 'C',
-'D', 'E', 'F', 'a', 'b', 'c', 'd', 'e', 'f'};
+'D', 'E', 'F', 'a', 'b', 'c', 'd', 'e', 'f'};
 
 static {
 unsafeCharactersRfc1738 = new BitSet(256);
@@ -147,7 +147,7 @@ public final class UnsafeUriCharactersEncoder {
 
 // First check whether we actually need to encode
 char chars[] = s.toCharArray();
-for (int i = 0; ; ) {
+for (int i = 0;;) {
 // just deal with the ascii character
 if (chars[i] > 0 && chars[i] < 128) {
 if (unsafeCharacters.get(chars[i])) {

camel git commit: [CAMEL-9297] Expose more configuration options from Camel's XStream

[ay]

Repository: camel
Updated Branches:
  refs/heads/camel-2.16.x f4e95d15a -> 369d0a6d6


[CAMEL-9297] Expose more configuration options from Camel's XStream


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

Branch: refs/heads/camel-2.16.x
Commit: 369d0a6d605055cb843e7962b101e3bbcd113fec
Parents: f4e95d1
Author: Akitoshi Yoshida 
Authored: Wed Nov 11 10:44:24 2015 +0100
Committer: Akitoshi Yoshida 
Committed: Wed Nov 11 12:06:40 2015 +0100

--
 .../model/dataformat/XStreamDataFormat.java |  17 +-
 .../xstream/AbstractXStreamWrapper.java |  64 ++-
 .../xstream/MarshalDomainObjectTest.java|  12 ++
 .../xstream/UnmarshalThenMarshalTest.java   |  13 ++
 .../xstream/XStreamConcurrencyTest.java |  12 ++
 .../xstream/XStreamConfigurationTest.java   |  12 ++
 .../XStreamDataFormatDriverConfigTest.java  |   1 -
 ...DataFormatPermissionsSystemPropertyTest.java |  47 +
 .../XStreamDataFormatPermissionsTest.java   | 178 +++
 .../dataformat/xstream/XStreamTestUtils.java|  46 +
 .../xstream/SpringXStreamConfigurationTest.xml  |   3 +-
 parent/pom.xml  |   2 +-
 12 files changed, 401 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/369d0a6d/camel-core/src/main/java/org/apache/camel/model/dataformat/XStreamDataFormat.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/model/dataformat/XStreamDataFormat.java
 
b/camel-core/src/main/java/org/apache/camel/model/dataformat/XStreamDataFormat.java
index e1f86db..4d433d2 100644
--- 
a/camel-core/src/main/java/org/apache/camel/model/dataformat/XStreamDataFormat.java
+++ 
b/camel-core/src/main/java/org/apache/camel/model/dataformat/XStreamDataFormat.java
@@ -57,6 +57,8 @@ public class XStreamDataFormat extends DataFormatDefinition {
 private String driverRef;
 @XmlAttribute
 private String mode;
+@XmlAttribute
+private String permissions;
 
 @XmlJavaTypeAdapter(ConvertersAdapter.class)
 @XmlElement(name = "converters")
@@ -180,6 +182,17 @@ public class XStreamDataFormat extends 
DataFormatDefinition {
 this.implicitCollections = implicitCollections;
 }
 
+public String getPermissions() {
+return permissions;
+}
+
+/**
+ * Adds permissionsList
+ */
+public void setPermissions(String permissions) {
+this.permissions = permissions;
+}
+
 @Override
 protected DataFormat createDataFormat(RouteContext routeContext) {
 if ("json".equals(this.driver)) {
@@ -210,6 +223,9 @@ public class XStreamDataFormat extends DataFormatDefinition 
{
 if (this.implicitCollections != null) {
 setProperty(camelContext, dataFormat, "implicitCollections", 
this.implicitCollections);
 }
+if (this.permissions != null) {
+setProperty(camelContext, dataFormat, "permissions", 
this.permissions);
+}
 if (this.mode != null) {
 setProperty(camelContext, dataFormat, "mode", mode);
 }
@@ -547,5 +563,4 @@ public class XStreamDataFormat extends DataFormatDefinition 
{
 return "OmitField[" + clsName + ", fields=" + 
Arrays.asList(this.fields) + "]";
 }
 }
-
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/camel/blob/369d0a6d/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/AbstractXStreamWrapper.java
--
diff --git 
a/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/AbstractXStreamWrapper.java
 
b/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/AbstractXStreamWrapper.java
index b98725e..41d6d7a 100644
--- 
a/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/AbstractXStreamWrapper.java
+++ 
b/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/AbstractXStreamWrapper.java
@@ -32,7 +32,10 @@ import 
com.thoughtworks.xstream.core.util.CompositeClassLoader;
 import com.thoughtworks.xstream.io.HierarchicalStreamDriver;
 import com.thoughtworks.xstream.io.HierarchicalStreamReader;
 import com.thoughtworks.xstream.io.HierarchicalStreamWriter;
-
+import com.thoughtworks.xstream.security.AnyTypePermission;
+import com.thoughtworks.xstream.security.ExplicitTypePermission;
+import com.thoughtworks.xstream.security.TypePermission;
+import com.thoughtworks.xstream.security.WildcardTypePermission;
 import 

[2/2] camel git commit: Camel catalog recent commits no need for this anymore.

[davsclaus]

Camel catalog recent commits no need for this anymore.


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

Branch: refs/heads/camel-2.16.x
Commit: f4e95d15a0fd023eb3d6c4cfc15cf3c389eb38d6
Parents: 08f5314
Author: Claus Ibsen 
Authored: Wed Nov 11 11:18:31 2015 +0100
Committer: Claus Ibsen 
Committed: Wed Nov 11 11:18:58 2015 +0100

--
 .../main/java/org/apache/camel/catalog/DefaultCamelCatalog.java   | 2 --
 .../src/test/java/org/apache/camel/catalog/CamelCatalogTest.java  | 3 +++
 2 files changed, 3 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/f4e95d15/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
--
diff --git 
a/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
 
b/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
index 01766fc..047167b 100644
--- 
a/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
+++ 
b/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
@@ -761,8 +761,6 @@ public class DefaultCamelCatalog implements CamelCatalog {
 // the last option may already contain a ? char, if so we should 
use & instead of ?
 sb.append(hasQuestionmark ? ampersand : '?');
 String query = createQueryString(copy, ampersand, encode);
-// we do not want to use %23 for # syntax
-query = query.replaceAll("\\=\\%23", "=#");
 sb.append(query);
 }
 

http://git-wip-us.apache.org/repos/asf/camel/blob/f4e95d15/platforms/catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
--
diff --git 
a/platforms/catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
 
b/platforms/catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
index f9a7c66..e467ecc 100644
--- 
a/platforms/catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
+++ 
b/platforms/catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
@@ -201,6 +201,9 @@ public class CamelCatalogTest {
 map.put("converter", "#myConverter");
 
 String uri = catalog.asEndpointUri("xslt", map, true);
+assertEquals("xslt:foo.xslt?converter=%23myConverter", uri);
+
+uri = catalog.asEndpointUri("xslt", map, false);
 assertEquals("xslt:foo.xslt?converter=#myConverter", uri);
 }
 

camel git commit: [CAMEL-9297] Expose more configuration options from Camel's XStream

[ay]

Repository: camel
Updated Branches:
  refs/heads/master 0e1e821c1 -> 4491c080c


[CAMEL-9297] Expose more configuration options from Camel's XStream


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

Branch: refs/heads/master
Commit: 4491c080cb6c8659fc05441e49307b7d4349aa56
Parents: 0e1e821
Author: Akitoshi Yoshida 
Authored: Wed Nov 11 10:44:24 2015 +0100
Committer: Akitoshi Yoshida 
Committed: Wed Nov 11 12:04:53 2015 +0100

--
 .../model/dataformat/XStreamDataFormat.java |  17 +-
 .../xstream/AbstractXStreamWrapper.java |  64 ++-
 .../xstream/MarshalDomainObjectTest.java|  12 ++
 .../xstream/UnmarshalThenMarshalTest.java   |  13 ++
 .../xstream/XStreamConcurrencyTest.java |  12 ++
 .../xstream/XStreamConfigurationTest.java   |  12 ++
 .../XStreamDataFormatDriverConfigTest.java  |   1 -
 ...DataFormatPermissionsSystemPropertyTest.java |  47 +
 .../XStreamDataFormatPermissionsTest.java   | 178 +++
 .../dataformat/xstream/XStreamTestUtils.java|  46 +
 .../xstream/SpringXStreamConfigurationTest.xml  |   3 +-
 parent/pom.xml  |   2 +-
 12 files changed, 401 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/4491c080/camel-core/src/main/java/org/apache/camel/model/dataformat/XStreamDataFormat.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/model/dataformat/XStreamDataFormat.java
 
b/camel-core/src/main/java/org/apache/camel/model/dataformat/XStreamDataFormat.java
index e1f86db..4d433d2 100644
--- 
a/camel-core/src/main/java/org/apache/camel/model/dataformat/XStreamDataFormat.java
+++ 
b/camel-core/src/main/java/org/apache/camel/model/dataformat/XStreamDataFormat.java
@@ -57,6 +57,8 @@ public class XStreamDataFormat extends DataFormatDefinition {
 private String driverRef;
 @XmlAttribute
 private String mode;
+@XmlAttribute
+private String permissions;
 
 @XmlJavaTypeAdapter(ConvertersAdapter.class)
 @XmlElement(name = "converters")
@@ -180,6 +182,17 @@ public class XStreamDataFormat extends 
DataFormatDefinition {
 this.implicitCollections = implicitCollections;
 }
 
+public String getPermissions() {
+return permissions;
+}
+
+/**
+ * Adds permissionsList
+ */
+public void setPermissions(String permissions) {
+this.permissions = permissions;
+}
+
 @Override
 protected DataFormat createDataFormat(RouteContext routeContext) {
 if ("json".equals(this.driver)) {
@@ -210,6 +223,9 @@ public class XStreamDataFormat extends DataFormatDefinition 
{
 if (this.implicitCollections != null) {
 setProperty(camelContext, dataFormat, "implicitCollections", 
this.implicitCollections);
 }
+if (this.permissions != null) {
+setProperty(camelContext, dataFormat, "permissions", 
this.permissions);
+}
 if (this.mode != null) {
 setProperty(camelContext, dataFormat, "mode", mode);
 }
@@ -547,5 +563,4 @@ public class XStreamDataFormat extends DataFormatDefinition 
{
 return "OmitField[" + clsName + ", fields=" + 
Arrays.asList(this.fields) + "]";
 }
 }
-
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/camel/blob/4491c080/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/AbstractXStreamWrapper.java
--
diff --git 
a/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/AbstractXStreamWrapper.java
 
b/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/AbstractXStreamWrapper.java
index b98725e..41d6d7a 100644
--- 
a/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/AbstractXStreamWrapper.java
+++ 
b/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/AbstractXStreamWrapper.java
@@ -32,7 +32,10 @@ import 
com.thoughtworks.xstream.core.util.CompositeClassLoader;
 import com.thoughtworks.xstream.io.HierarchicalStreamDriver;
 import com.thoughtworks.xstream.io.HierarchicalStreamReader;
 import com.thoughtworks.xstream.io.HierarchicalStreamWriter;
-
+import com.thoughtworks.xstream.security.AnyTypePermission;
+import com.thoughtworks.xstream.security.ExplicitTypePermission;
+import com.thoughtworks.xstream.security.TypePermission;
+import com.thoughtworks.xstream.security.WildcardTypePermission;
 import org.apache.camel.CamelContext;
 

[1/2] camel git commit: Camel catalog recent commits no need for this anymore.

[davsclaus]

Repository: camel
Updated Branches:
  refs/heads/camel-2.16.x 08f531413 -> f4e95d15a
  refs/heads/master ad33d9e4f -> 0e1e821c1


Camel catalog recent commits no need for this anymore.


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

Branch: refs/heads/master
Commit: 0e1e821c1992522da0a37c1fd2e4e85a4581c693
Parents: ad33d9e
Author: Claus Ibsen 
Authored: Wed Nov 11 11:18:31 2015 +0100
Committer: Claus Ibsen 
Committed: Wed Nov 11 11:18:31 2015 +0100

--
 .../main/java/org/apache/camel/catalog/DefaultCamelCatalog.java   | 2 --
 .../src/test/java/org/apache/camel/catalog/CamelCatalogTest.java  | 3 +++
 2 files changed, 3 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/0e1e821c/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
--
diff --git 
a/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
 
b/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
index 01766fc..047167b 100644
--- 
a/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
+++ 
b/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
@@ -761,8 +761,6 @@ public class DefaultCamelCatalog implements CamelCatalog {
 // the last option may already contain a ? char, if so we should 
use & instead of ?
 sb.append(hasQuestionmark ? ampersand : '?');
 String query = createQueryString(copy, ampersand, encode);
-// we do not want to use %23 for # syntax
-query = query.replaceAll("\\=\\%23", "=#");
 sb.append(query);
 }
 

http://git-wip-us.apache.org/repos/asf/camel/blob/0e1e821c/platforms/catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
--
diff --git 
a/platforms/catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
 
b/platforms/catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
index f9a7c66..e467ecc 100644
--- 
a/platforms/catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
+++ 
b/platforms/catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
@@ -201,6 +201,9 @@ public class CamelCatalogTest {
 map.put("converter", "#myConverter");
 
 String uri = catalog.asEndpointUri("xslt", map, true);
+assertEquals("xslt:foo.xslt?converter=%23myConverter", uri);
+
+uri = catalog.asEndpointUri("xslt", map, false);
 assertEquals("xslt:foo.xslt?converter=#myConverter", uri);
 }
 

[4/4] camel git commit: Polished

[davsclaus]

Polished


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

Branch: refs/heads/camel-2.16.x
Commit: af94e78392e587b05fb991a2bf11273bae4fbf9c
Parents: 7e41e83
Author: Claus Ibsen 
Authored: Wed Nov 11 10:36:10 2015 +0100
Committer: Claus Ibsen 
Committed: Wed Nov 11 10:36:38 2015 +0100

--
 .../main/java/org/apache/camel/util/UnsafeUriCharactersEncoder.java | 1 -
 1 file changed, 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/af94e783/camel-core/src/main/java/org/apache/camel/util/UnsafeUriCharactersEncoder.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/util/UnsafeUriCharactersEncoder.java
 
b/camel-core/src/main/java/org/apache/camel/util/UnsafeUriCharactersEncoder.java
index e0775a0..783af6c 100644
--- 
a/camel-core/src/main/java/org/apache/camel/util/UnsafeUriCharactersEncoder.java
+++ 
b/camel-core/src/main/java/org/apache/camel/util/UnsafeUriCharactersEncoder.java
@@ -22,7 +22,6 @@ import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-
 /**
  * Encoder for unsafe URI characters.
  * 

camel git commit: [CAMEL-9297] Expose more configuration options from Camel's XStream

[ay]

Repository: camel
Updated Branches:
  refs/heads/camel-2.15.x 5d266ce2c -> 157c0b4a3


[CAMEL-9297] Expose more configuration options from Camel's XStream


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

Branch: refs/heads/camel-2.15.x
Commit: 157c0b4a3c8017de432f1c99f83e374e97dc4d36
Parents: 5d266ce
Author: Akitoshi Yoshida 
Authored: Wed Nov 11 10:44:24 2015 +0100
Committer: Akitoshi Yoshida 
Committed: Wed Nov 11 13:30:37 2015 +0100

--
 .../model/dataformat/XStreamDataFormat.java |  17 +-
 .../xstream/AbstractXStreamWrapper.java |  63 ++-
 .../xstream/MarshalDomainObjectTest.java|  12 ++
 .../xstream/UnmarshalThenMarshalTest.java   |  13 ++
 .../xstream/XStreamConcurrencyTest.java |  12 ++
 .../xstream/XStreamConfigurationTest.java   |  12 ++
 ...DataFormatPermissionsSystemPropertyTest.java |  47 +
 .../XStreamDataFormatPermissionsTest.java   | 178 +++
 .../dataformat/xstream/XStreamTestUtils.java|  46 +
 .../xstream/SpringXStreamConfigurationTest.xml  |   3 +-
 parent/pom.xml  |   2 +-
 11 files changed, 401 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/157c0b4a/camel-core/src/main/java/org/apache/camel/model/dataformat/XStreamDataFormat.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/model/dataformat/XStreamDataFormat.java
 
b/camel-core/src/main/java/org/apache/camel/model/dataformat/XStreamDataFormat.java
index 287b887..e89bc7b 100644
--- 
a/camel-core/src/main/java/org/apache/camel/model/dataformat/XStreamDataFormat.java
+++ 
b/camel-core/src/main/java/org/apache/camel/model/dataformat/XStreamDataFormat.java
@@ -57,6 +57,8 @@ public class XStreamDataFormat extends DataFormatDefinition {
 private String driverRef;
 @XmlAttribute
 private String mode;
+@XmlAttribute
+private String permissions;
 
 @XmlJavaTypeAdapter(ConvertersAdapter.class)
 @XmlElement(name = "converters")
@@ -180,6 +182,17 @@ public class XStreamDataFormat extends 
DataFormatDefinition {
 this.implicitCollections = implicitCollections;
 }
 
+public String getPermissions() {
+return permissions;
+}
+
+/**
+ * Adds permissionsList
+ */
+public void setPermissions(String permissions) {
+this.permissions = permissions;
+}
+
 @Override
 protected DataFormat createDataFormat(RouteContext routeContext) {
 if ("json".equals(this.driver)) {
@@ -210,6 +223,9 @@ public class XStreamDataFormat extends DataFormatDefinition 
{
 if (this.implicitCollections != null) {
 setProperty(camelContext, dataFormat, "implicitCollections", 
this.implicitCollections);
 }
+if (this.permissions != null) {
+setProperty(camelContext, dataFormat, "permissions", 
this.permissions);
+}
 if (this.mode != null) {
 setProperty(camelContext, dataFormat, "mode", mode);
 }
@@ -547,5 +563,4 @@ public class XStreamDataFormat extends DataFormatDefinition 
{
 return "OmitField[" + clsName + ", fields=" + 
Arrays.asList(this.fields) + "]";
 }
 }
-
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/camel/blob/157c0b4a/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/AbstractXStreamWrapper.java
--
diff --git 
a/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/AbstractXStreamWrapper.java
 
b/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/AbstractXStreamWrapper.java
index 0f206fc..4881d5e 100644
--- 
a/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/AbstractXStreamWrapper.java
+++ 
b/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/AbstractXStreamWrapper.java
@@ -32,7 +32,10 @@ import 
com.thoughtworks.xstream.core.util.CompositeClassLoader;
 import com.thoughtworks.xstream.io.HierarchicalStreamDriver;
 import com.thoughtworks.xstream.io.HierarchicalStreamReader;
 import com.thoughtworks.xstream.io.HierarchicalStreamWriter;
-
+import com.thoughtworks.xstream.security.AnyTypePermission;
+import com.thoughtworks.xstream.security.ExplicitTypePermission;
+import com.thoughtworks.xstream.security.TypePermission;
+import com.thoughtworks.xstream.security.WildcardTypePermission;
 import org.apache.camel.CamelContext;
 import org.apache.camel.Exchange;
 import 

camel git commit: fix olingo2's sporadic test error caused by non-determinism

[ay]

Repository: camel
Updated Branches:
  refs/heads/camel-2.16.x 369d0a6d6 -> 44c1d7e04


fix olingo2's sporadic test error caused by non-determinism


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

Branch: refs/heads/camel-2.16.x
Commit: 44c1d7e04c41146c15e376f438937a794a5c4ec8
Parents: 369d0a6
Author: Akitoshi Yoshida 
Authored: Wed Nov 11 14:47:00 2015 +0100
Committer: Akitoshi Yoshida 
Committed: Wed Nov 11 14:52:26 2015 +0100

--
 .../camel/component/olingo2/Olingo2AppAPITest.java   | 15 +++
 1 file changed, 11 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/44c1d7e0/components/camel-olingo2/camel-olingo2-component/src/test/java/org/apache/camel/component/olingo2/Olingo2AppAPITest.java
--
diff --git 
a/components/camel-olingo2/camel-olingo2-component/src/test/java/org/apache/camel/component/olingo2/Olingo2AppAPITest.java
 
b/components/camel-olingo2/camel-olingo2-component/src/test/java/org/apache/camel/component/olingo2/Olingo2AppAPITest.java
index 3d1bdd2..2dd6ca4 100644
--- 
a/components/camel-olingo2/camel-olingo2-component/src/test/java/org/apache/camel/component/olingo2/Olingo2AppAPITest.java
+++ 
b/components/camel-olingo2/camel-olingo2-component/src/test/java/org/apache/camel/component/olingo2/Olingo2AppAPITest.java
@@ -41,6 +41,7 @@ import org.apache.camel.test.AvailablePortFinder;
 import org.apache.http.entity.ContentType;
 import org.apache.olingo.odata2.api.commons.HttpStatusCodes;
 import org.apache.olingo.odata2.api.edm.Edm;
+import org.apache.olingo.odata2.api.edm.EdmEntitySet;
 import org.apache.olingo.odata2.api.edm.EdmEntitySetInfo;
 import org.apache.olingo.odata2.api.ep.EntityProvider;
 import org.apache.olingo.odata2.api.ep.EntityProviderReadProperties;
@@ -104,6 +105,7 @@ public class Olingo2AppAPITest {
 
 private static Olingo2App olingoApp;
 private static Edm edm;
+private static Map edmEntitySetMap;
 
 private static Olingo2SampleServer server;
 
@@ -142,6 +144,11 @@ public class Olingo2AppAPITest {
 edm = responseHandler.await();
 LOG.info("Read default EntityContainer:  {}", 
responseHandler.await().getDefaultEntityContainer().getName());
 
+edmEntitySetMap = new HashMap();
+for (EdmEntitySet ees : edm.getEntitySets()) {
+edmEntitySetMap.put(ees.getName(), ees);
+}
+
 // wait for generated data to be registered in server
 Thread.sleep(2000);
 }
@@ -183,7 +190,7 @@ public class Olingo2AppAPITest {
 final InputStream rawfeed = responseHandler.await();
 assertNotNull("Data feed", rawfeed);
 // for this test, we just let EP to verify the stream data 
-final ODataFeed dataFeed = EntityProvider.readFeed(TEST_FORMAT_STRING, 
edm.getEntitySets().get(2), 
+final ODataFeed dataFeed = EntityProvider.readFeed(TEST_FORMAT_STRING, 
edmEntitySetMap.get(MANUFACTURERS), 
rawfeed, 
EntityProviderReadProperties.init().build());
 LOG.info("Entries:  {}", prettyPrint(dataFeed));
 }
@@ -218,7 +225,7 @@ public class Olingo2AppAPITest {
 
 olingoApp.uread(edm, TEST_MANUFACTURER, null, responseHandler);
 InputStream rawentry = responseHandler.await();
-ODataEntry entry = EntityProvider.readEntry(TEST_FORMAT_STRING, 
edm.getEntitySets().get(2), 
+ODataEntry entry = EntityProvider.readEntry(TEST_FORMAT_STRING, 
edmEntitySetMap.get(MANUFACTURERS), 
 rawentry, 
EntityProviderReadProperties.init().build());
 LOG.info("Single Entry:  {}", prettyPrint(entry));
 
@@ -226,7 +233,7 @@ public class Olingo2AppAPITest {
 
 olingoApp.uread(edm, TEST_CAR, null, responseHandler);
 rawentry = responseHandler.await();
-entry = EntityProvider.readEntry(TEST_FORMAT_STRING, 
edm.getEntitySets().get(0), 
+entry = EntityProvider.readEntry(TEST_FORMAT_STRING, 
edmEntitySetMap.get(CARS),
  rawentry, 
EntityProviderReadProperties.init().build());
 LOG.info("Single Entry:  {}", prettyPrint(entry));
 
@@ -237,7 +244,7 @@ public class Olingo2AppAPITest {
 olingoApp.uread(edm, TEST_MANUFACTURER, queryParams, responseHandler);
 
 rawentry = responseHandler.await();
-ODataEntry entryExpanded = 
EntityProvider.readEntry(TEST_FORMAT_STRING, edm.getEntitySets().get(2), 
+ODataEntry entryExpanded = 

camel git commit: Upgrade Http Async Client to version 4.1.1

[acosentino]

Repository: camel
Updated Branches:
  refs/heads/camel-2.16.x 570fbff93 -> d4e998775


Upgrade Http Async Client to version 4.1.1


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

Branch: refs/heads/camel-2.16.x
Commit: d4e998775b9c3f5b4d74c5b7ed443cc3e8601f31
Parents: 570fbff
Author: Andrea Cosentino 
Authored: Wed Nov 11 17:22:10 2015 +0100
Committer: Andrea Cosentino 
Committed: Wed Nov 11 17:25:47 2015 +0100

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


http://git-wip-us.apache.org/repos/asf/camel/blob/d4e99877/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 355928d..3273752 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -224,7 +224,7 @@
 4.4.4
 4.5.1
 4.4.1
-4.1
+4.1.1
 3.1
 2.3.4.726_4
 2.3.4.726

camel git commit: Upgrade JackRabbit to version 2.11.2

[acosentino]

Repository: camel
Updated Branches:
  refs/heads/master aa87d4622 -> 4ce334879


Upgrade JackRabbit to version 2.11.2


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

Branch: refs/heads/master
Commit: 4ce334879dbb90c06651ccaedc14e4c76a2f6f6c
Parents: aa87d46
Author: Andrea Cosentino 
Authored: Wed Nov 11 17:10:31 2015 +0100
Committer: Andrea Cosentino 
Committed: Wed Nov 11 17:10:32 2015 +0100

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


http://git-wip-us.apache.org/repos/asf/camel/blob/4ce33487/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index a3e1933..3b5f138 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -240,7 +240,7 @@
 1.9.12
 2.6.1
 2.6.3
-2.11.1
+2.11.2
 1.2.154_2
 6.0.44_1
 1.9.2_1

camel git commit: CAMEL-9305: PropertiesComponent.isDefaultCreated method only check the absence of defined locations

[davsclaus]

Repository: camel
Updated Branches:
  refs/heads/master 4491c080c -> 55223cf81


CAMEL-9305: PropertiesComponent.isDefaultCreated method only check the absence 
of defined locations


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

Branch: refs/heads/master
Commit: 55223cf81f2709bb3ca81c098ee4492af70a87fa
Parents: 4491c08
Author: Antonin Stefanutti 
Authored: Tue Nov 10 15:00:17 2015 +0100
Committer: Claus Ibsen 
Committed: Wed Nov 11 14:29:03 2015 +0100

--
 .../camel/component/properties/PropertiesComponent.java | 9 +++--
 .../main/java/org/apache/camel/util/CamelContextHelper.java | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/55223cf8/camel-core/src/main/java/org/apache/camel/component/properties/PropertiesComponent.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/component/properties/PropertiesComponent.java
 
b/camel-core/src/main/java/org/apache/camel/component/properties/PropertiesComponent.java
index 952606c..33866d6 100644
--- 
a/camel-core/src/main/java/org/apache/camel/component/properties/PropertiesComponent.java
+++ 
b/camel-core/src/main/java/org/apache/camel/component/properties/PropertiesComponent.java
@@ -92,6 +92,7 @@ public class PropertiesComponent extends DefaultComponent {
 private final Map functions = new 
HashMap();
 private PropertiesResolver propertiesResolver = new 
DefaultPropertiesResolver(this);
 private PropertiesParser propertiesParser = new 
DefaultPropertiesParser(this);
+private boolean isDefaultCreated;
 private String[] locations;
 private boolean ignoreMissingLocation;
 private String encoding;
@@ -115,7 +116,11 @@ public class PropertiesComponent extends DefaultComponent {
 addFunction(new ServiceHostPropertiesFunction());
 addFunction(new ServicePortPropertiesFunction());
 }
-
+
+public PropertiesComponent(boolean isDefaultCreated) {
+this.isDefaultCreated = isDefaultCreated;
+}
+
 public PropertiesComponent(String location) {
 this();
 setLocation(location);
@@ -207,7 +212,7 @@ public class PropertiesComponent extends DefaultComponent {
  * Is this component created as a default by {@link 
org.apache.camel.CamelContext} during starting up Camel.
  */
 public boolean isDefaultCreated() {
-return locations == null;
+return isDefaultCreated;
 }
 
 public String[] getLocations() {

http://git-wip-us.apache.org/repos/asf/camel/blob/55223cf8/camel-core/src/main/java/org/apache/camel/util/CamelContextHelper.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/util/CamelContextHelper.java 
b/camel-core/src/main/java/org/apache/camel/util/CamelContextHelper.java
index 1b01fef..d22fcff 100644
--- a/camel-core/src/main/java/org/apache/camel/util/CamelContextHelper.java
+++ b/camel-core/src/main/java/org/apache/camel/util/CamelContextHelper.java
@@ -582,7 +582,7 @@ public final class CamelContextHelper {
 // create a default properties component to be used as there may 
be default values we can use
 LOG.info("No existing PropertiesComponent has been configured, 
creating a new default PropertiesComponent with name: properties");
 // do not auto create using getComponent as spring auto-wire by 
constructor causes a side effect
-answer = new PropertiesComponent();
+answer = new PropertiesComponent(true);
 camelContext.addComponent("properties", answer);
 }
 return answer;

camel git commit: Upgrade JackRabbit to version 2.11.2

[acosentino]

Repository: camel
Updated Branches:
  refs/heads/camel-2.16.x 44c1d7e04 -> 570fbff93


Upgrade JackRabbit to version 2.11.2


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

Branch: refs/heads/camel-2.16.x
Commit: 570fbff93deb49f681dccfc944518f1c36310f5a
Parents: 44c1d7e
Author: Andrea Cosentino 
Authored: Wed Nov 11 17:10:31 2015 +0100
Committer: Andrea Cosentino 
Committed: Wed Nov 11 17:17:27 2015 +0100

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


http://git-wip-us.apache.org/repos/asf/camel/blob/570fbff9/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 498babb..355928d 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -240,7 +240,7 @@
 1.9.12
 2.6.1
 2.6.3
-2.11.1
+2.11.2
 1.2.154_2
 6.0.44_1
 1.9.2_1

camel git commit: Upgrade Http Async Client to version 4.1.1

[acosentino]

Repository: camel
Updated Branches:
  refs/heads/master 4ce334879 -> 7d30e2c4e


Upgrade Http Async Client to version 4.1.1


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

Branch: refs/heads/master
Commit: 7d30e2c4e406702101b9cd29546bbf981b259b7b
Parents: 4ce3348
Author: Andrea Cosentino 
Authored: Wed Nov 11 17:22:10 2015 +0100
Committer: Andrea Cosentino 
Committed: Wed Nov 11 17:22:11 2015 +0100

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


http://git-wip-us.apache.org/repos/asf/camel/blob/7d30e2c4/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 3b5f138..e321da4 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -224,7 +224,7 @@
 4.4.4
 4.5.1
 4.4.1
-4.1
+4.1.1
 3.1
 2.3.4.726_4
 2.3.4.726

buildbot success in ASF Buildbot on camel-site-production

[buildbot]

The Buildbot has detected a restored build on builder camel-site-production 
while building ASF Buildbot. Full details are available at:
http://ci.apache.org/builders/camel-site-production/builds/3221

Buildbot URL: http://ci.apache.org/

Buildslave for this Build: bb-cms-slave

Build Reason: The Nightly scheduler named 'camel-site-production' triggered 
this build
Build Source Stamp: [branch camel/website] HEAD
Blamelist: 

Build succeeded!

Sincerely,
 -The Buildbot

svn commit: r972075 - in /websites/production/camel/content: cache/main.pageCache camel-2170-release.html

[buildbot]

Author: buildbot
Date: Wed Nov 11 09:20:05 2015
New Revision: 972075

Log:
Production update by buildbot for camel

Modified:
websites/production/camel/content/cache/main.pageCache
websites/production/camel/content/camel-2170-release.html

Modified: websites/production/camel/content/cache/main.pageCache
==
Binary files - no diff available.

Modified: websites/production/camel/content/camel-2170-release.html
==
--- websites/production/camel/content/camel-2170-release.html (original)
+++ websites/production/camel/content/camel-2170-release.html Wed Nov 11 
09:20:05 2015
@@ -85,7 +85,7 @@

 
 
-Camel 2.17.0 
release (currently in progress)http://camel.apache.org/download.data/camel-box-v1.0-150x200.png; 
data-image-src="http://camel.apache.org/download.data/camel-box-v1.0-150x200.png;>New and NoteworthyWelcome to 
the x.y.z release which approx XXX issues resolved (new features, improvements 
and bug fixes such as...)highlighted issue fixedUpgraded 
camel-hbase to Hadoop 2.x and HBase 1.1.xBase directory of Paho file 
persistence store is now configurable.Camel commands forSpring BootFixed these 
issuesTheSwagger 
Java now parses nested types in the POJO model that has been annotated with 
the swagger api annotations to use in the schema api 
modelFixedRest DSL 
withapiContextPath fail to start if there are 2 ore more rest's in 
use.Paho component name is not limited to 4 characters anymore.New Enterprise Integration 
PatternsNew Componentscamel-kubernetes - Integrates 
Camel with KubernetesNew 
DSLNew AnnotationsNew Data FormatsNew LanguagesNew 
Examplescamel-example-spring-boot-metrics 
- showing a Camel spring-boot application that report metrics to Graphite. 
Requires Graphite running on your network.New TutorialsAPI breakingKnown IssuesDependency 
upgradesEHCache from 2.10.0 to 2.10.1Important 
changes to consider when upgradingRemoved camel-hbase as Karaf 
feature as it did not really work well in OSGicamel-infinispan 
requires Java 8.

camel git commit: fix olingo2's sporadic test error caused by non-determinism

[ay]

Repository: camel
Updated Branches:
  refs/heads/camel-2.15.x 157c0b4a3 -> 748ccaa51


fix olingo2's sporadic test error caused by non-determinism


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

Branch: refs/heads/camel-2.15.x
Commit: 748ccaa514822b34237ef940c4aaf60c155e0d38
Parents: 157c0b4
Author: Akitoshi Yoshida 
Authored: Wed Nov 11 14:47:00 2015 +0100
Committer: Akitoshi Yoshida 
Committed: Wed Nov 11 15:00:55 2015 +0100

--
 .../org/apache/camel/component/olingo2/Olingo2AppAPITest.java | 7 +++
 1 file changed, 7 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/748ccaa5/components/camel-olingo2/camel-olingo2-component/src/test/java/org/apache/camel/component/olingo2/Olingo2AppAPITest.java
--
diff --git 
a/components/camel-olingo2/camel-olingo2-component/src/test/java/org/apache/camel/component/olingo2/Olingo2AppAPITest.java
 
b/components/camel-olingo2/camel-olingo2-component/src/test/java/org/apache/camel/component/olingo2/Olingo2AppAPITest.java
index e502c6a..03c7da1 100644
--- 
a/components/camel-olingo2/camel-olingo2-component/src/test/java/org/apache/camel/component/olingo2/Olingo2AppAPITest.java
+++ 
b/components/camel-olingo2/camel-olingo2-component/src/test/java/org/apache/camel/component/olingo2/Olingo2AppAPITest.java
@@ -40,6 +40,7 @@ import org.apache.camel.test.AvailablePortFinder;
 import org.apache.http.entity.ContentType;
 import org.apache.olingo.odata2.api.commons.HttpStatusCodes;
 import org.apache.olingo.odata2.api.edm.Edm;
+import org.apache.olingo.odata2.api.edm.EdmEntitySet;
 import org.apache.olingo.odata2.api.edm.EdmEntitySetInfo;
 import org.apache.olingo.odata2.api.ep.entry.ODataEntry;
 import org.apache.olingo.odata2.api.ep.feed.ODataDeltaFeed;
@@ -100,6 +101,7 @@ public class Olingo2AppAPITest {
 
 private static Olingo2App olingoApp;
 private static Edm edm;
+private static Map edmEntitySetMap;
 
 private static Olingo2SampleServer server;
 
@@ -138,6 +140,11 @@ public class Olingo2AppAPITest {
 edm = responseHandler.await();
 LOG.info("Read default EntityContainer:  {}", 
responseHandler.await().getDefaultEntityContainer().getName());
 
+edmEntitySetMap = new HashMap();
+for (EdmEntitySet ees : edm.getEntitySets()) {
+edmEntitySetMap.put(ees.getName(), ees);
+}
+
 // wait for generated data to be registered in server
 Thread.sleep(2000);
 }

camel git commit: fix olingo2's sporadic test error caused by non-determinism

[ay]

Repository: camel
Updated Branches:
  refs/heads/master 55223cf81 -> aa87d4622


fix olingo2's sporadic test error caused by non-determinism


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

Branch: refs/heads/master
Commit: aa87d46227ace447a5db6388d6a35d7978241c14
Parents: 55223cf
Author: Akitoshi Yoshida 
Authored: Wed Nov 11 14:47:00 2015 +0100
Committer: Akitoshi Yoshida 
Committed: Wed Nov 11 14:47:45 2015 +0100

--
 .../camel/component/olingo2/Olingo2AppAPITest.java   | 15 +++
 1 file changed, 11 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/aa87d462/components/camel-olingo2/camel-olingo2-component/src/test/java/org/apache/camel/component/olingo2/Olingo2AppAPITest.java
--
diff --git 
a/components/camel-olingo2/camel-olingo2-component/src/test/java/org/apache/camel/component/olingo2/Olingo2AppAPITest.java
 
b/components/camel-olingo2/camel-olingo2-component/src/test/java/org/apache/camel/component/olingo2/Olingo2AppAPITest.java
index 3d1bdd2..2dd6ca4 100644
--- 
a/components/camel-olingo2/camel-olingo2-component/src/test/java/org/apache/camel/component/olingo2/Olingo2AppAPITest.java
+++ 
b/components/camel-olingo2/camel-olingo2-component/src/test/java/org/apache/camel/component/olingo2/Olingo2AppAPITest.java
@@ -41,6 +41,7 @@ import org.apache.camel.test.AvailablePortFinder;
 import org.apache.http.entity.ContentType;
 import org.apache.olingo.odata2.api.commons.HttpStatusCodes;
 import org.apache.olingo.odata2.api.edm.Edm;
+import org.apache.olingo.odata2.api.edm.EdmEntitySet;
 import org.apache.olingo.odata2.api.edm.EdmEntitySetInfo;
 import org.apache.olingo.odata2.api.ep.EntityProvider;
 import org.apache.olingo.odata2.api.ep.EntityProviderReadProperties;
@@ -104,6 +105,7 @@ public class Olingo2AppAPITest {
 
 private static Olingo2App olingoApp;
 private static Edm edm;
+private static Map edmEntitySetMap;
 
 private static Olingo2SampleServer server;
 
@@ -142,6 +144,11 @@ public class Olingo2AppAPITest {
 edm = responseHandler.await();
 LOG.info("Read default EntityContainer:  {}", 
responseHandler.await().getDefaultEntityContainer().getName());
 
+edmEntitySetMap = new HashMap();
+for (EdmEntitySet ees : edm.getEntitySets()) {
+edmEntitySetMap.put(ees.getName(), ees);
+}
+
 // wait for generated data to be registered in server
 Thread.sleep(2000);
 }
@@ -183,7 +190,7 @@ public class Olingo2AppAPITest {
 final InputStream rawfeed = responseHandler.await();
 assertNotNull("Data feed", rawfeed);
 // for this test, we just let EP to verify the stream data 
-final ODataFeed dataFeed = EntityProvider.readFeed(TEST_FORMAT_STRING, 
edm.getEntitySets().get(2), 
+final ODataFeed dataFeed = EntityProvider.readFeed(TEST_FORMAT_STRING, 
edmEntitySetMap.get(MANUFACTURERS), 
rawfeed, 
EntityProviderReadProperties.init().build());
 LOG.info("Entries:  {}", prettyPrint(dataFeed));
 }
@@ -218,7 +225,7 @@ public class Olingo2AppAPITest {
 
 olingoApp.uread(edm, TEST_MANUFACTURER, null, responseHandler);
 InputStream rawentry = responseHandler.await();
-ODataEntry entry = EntityProvider.readEntry(TEST_FORMAT_STRING, 
edm.getEntitySets().get(2), 
+ODataEntry entry = EntityProvider.readEntry(TEST_FORMAT_STRING, 
edmEntitySetMap.get(MANUFACTURERS), 
 rawentry, 
EntityProviderReadProperties.init().build());
 LOG.info("Single Entry:  {}", prettyPrint(entry));
 
@@ -226,7 +233,7 @@ public class Olingo2AppAPITest {
 
 olingoApp.uread(edm, TEST_CAR, null, responseHandler);
 rawentry = responseHandler.await();
-entry = EntityProvider.readEntry(TEST_FORMAT_STRING, 
edm.getEntitySets().get(0), 
+entry = EntityProvider.readEntry(TEST_FORMAT_STRING, 
edmEntitySetMap.get(CARS),
  rawentry, 
EntityProviderReadProperties.init().build());
 LOG.info("Single Entry:  {}", prettyPrint(entry));
 
@@ -237,7 +244,7 @@ public class Olingo2AppAPITest {
 olingoApp.uread(edm, TEST_MANUFACTURER, queryParams, responseHandler);
 
 rawentry = responseHandler.await();
-ODataEntry entryExpanded = 
EntityProvider.readEntry(TEST_FORMAT_STRING, edm.getEntitySets().get(2), 
+ODataEntry entryExpanded = 

svn commit: r972151 [2/2] - in /websites/production/camel/content: ./ 2015/11/ 2015/11/11/ cache/

[buildbot]

Modified: websites/production/camel/content/sitemap.html
==
--- websites/production/camel/content/sitemap.html (original)
+++ websites/production/camel/content/sitemap.html Wed Nov 11 23:27:00 2015
@@ -79,7 +79,7 @@
 ArchitectureDozer Type 
ConversionAOPAsyncBAMBatch ConsumerBrowsableEndpointCamelContextCamel-CoreComponentData FormatSerializationJAXBXmlBeansXStream<
 /a>CSVStringHL7 DataFormatEDIFlatpack DataFormatJSONZip DataFormatTidyMarkupBindyXMLSecurity DataFormatGZip data formatCastorProtobufSOAPCryptoSyslogJiBXCustom DataFormatICalBarcode Data FormatuniVocity-parsers formatsBoonJackson XMLBase64BeanIOXmlJsonDebuggerDelay InterceptorDependency InjectionDSLException ClauseFluent BuildersJava DSLRest DSLTry Catch FinallyEndpointError HandlerDefaultErrorHandlerRedeliveryPolicyTransactionErrorHandlerExchangeExchange PatternExpressionInjectorInterceptInversion Of Control With Smart 
DefaultsLanguagesBean 
LanguageConstantELExchangePropertyFile LanguageGroovy DSLHeaderJSonPathJXPathMvelOGNLPropertyRef LanguageScala DSLScala 
DSL - EIPScala DSL - Getting 
StartedScala DSL - Supported 
languagesScripting LanguagesBeanShellGroovyJavaScriptPHPPythonRubyScripting Languages 
ContextSimpleSpELSQL<
 a shape="rect" href="tokenizer.html">TokenizerUsing Languages In IDEVTD-XMLXMLTokenizerXPathXQueryLifecycleOnCompletionPluggable Class Resolverscamel-eclipsecamel-jbossPredicateProcessorRegistryJNDIRouteBuilderRoutePolicyCronScheduledRoutePolicyScheduledRoutePolicySimpleScheduledRoutePolicyRoutesServicePoolStream cachingToAsyncTracerTransportType ConverterURIsXml ConfigurationProcessorFactoryAsynchronous Routing 
EngineSecurityUuidGeneratorBindingRXCEPBacklogTracerEndpoint AnnotationsComponentConfigurationBacklogDebuggerEndpointCompleterClustering and 
loadbalancingThreading ModelTutorialsBetter 
JMS Transport for CXF Webservice using Apache CamelTutorial-AXIS-CamelTutorial-Business-PartnersTutorial-Example-ReportIncidentTutorial-Example-ReportIncident-Part1Tutorial-Example-ReportIncident-Part2Tutorial-Example-ReportIncident-Part3Tutorial-Example-ReportIncident-Part4Tutorial-Example-ReportIncident-Part5Tutorial-Example-ReportIncident-Part6Tutorial for 
Camel on Google App EngineTutorial-JmsRemotingTutorial-OAuthTutorial 
on using Camel in a Web Applicationtutorial-osgi-camel-part1tutorial-osgi-camel-part2tutorial-osgi-camel-part2atutorial-osgi-camel-part2btutorial-osgi-camel-part2cCookbookAsynchronous ProcessingCamel Transport for 
CXFDatabaseETLHiding MiddlewareImplementing 
Virtual Topics on other JMS providersHazelcast 
 Idempotent Repository TutorialParallel Processing and 
OrderingTemplatingEventNotifier 
to log details about all sent ExchangesVisualisationLoading routes from XML 
filesRunning Camel 
standalone and have it keep runningMDC loggingHow to 
use Camel as a HTTP proxy between a client and serverFine Grained 
Control Over a Channel<
 /li>BooksComponentsActiveMQAHCAHC-WSAMQPAPNSAtmosphere-WebsocketAtomavroAWSAWS-CWAWS-DDBAWS-EC2AWS-S3AWS-SDBAWS-SESAWS-SNShref="aws-sqs.html">AWS-SQShref="aws-swf.html">AWS-SWFhref="bean.html">Beanhref="beanstalk.html">Beanstalkhref="bean-validator.html">Bean Validatorhref="box.html">Boxhref="browse.html">Browsehref="cache.html">Cachehref="cachereplicationjmsexample.html">cacheReplicationJMSExample shape="rect" href="cassandra.html">Cassandrahref="cdi.html">CDIhref="chunk.html">Chunkhref="class.html">Classhref="cmis.html">CMIShref="cometd.html">Cometd
 ContextControlBus ComponentCouchDBCrypto (Digital 
Signatures)CXFCXF Bean ComponentCXFRSDataFormat ComponentDataSetDb4oDirectDirect-VMDisruptorDNSDockerDozerDropboxEJBhref="elasticsearch.html">ElasticSearchhref="esper.html">Esperhref="eventadmin.html">EventAdminhref="exec.html">Exechref="facebook.html">Facebookhref="file2.html">File2href="flatpack.html">Flatpackhref="fop.html">FOPhref="freemarker.html">FreeMarkerhref="ftp.html">FTPhref="ftp2.html">FTP2href="gae.html">GAEhref="gauth.html">gauthhref="ghttp.html">ghttphref="glogin.html">gloginhref="gmail.html">gmailgsecgtaskGangliaGeocoderGitHubGoogleCalendarGoogleDriveGoogleMailGoraGuava EventBusHawtDBHazelcast ComponenthbaseHDFSHDFS2HibernateHipchatHL7HTTPHTTP4iBATISInfinispanIRCJasyptJavaSpaceJBIJBI Service Unit 
ArchetypeJCIFSjcloudsJCRJDBCJettyJGroupsJingJIRA
 JMSJMXJPAJschJT400KafkaKestrelKratiKuraLanguageLDAPLevelDBLinkedInListLogLuceneMailMetrics ComponentMINA
 MINA2MockMongoDBMQTTMSVMustacheMVEL ComponentMyBatisNagiosNettyNetty4Netty HTTPNetty4 HTTPNMROlingo2OpenshiftOptaPlannerPax-LoggingPGEventPojoPrinterPropertiesQuartzQuartz2QueueQuickfixRabbitMQRCodeRefRestRestletRMIRouteboxRSSSalesforceSAP NetWeaverSchedulerSchematronSEDASERVLETServletListener ComponentShiro SecuritySipSJMSSmooksSMPPSNMPSolrSpark-restSplunkSpringBatchSpring BootSpring EventSpringIntegrationSpring LDAPSpring Neo4jSpring RedisSpring SecuritySpring Web ServicesSQL 

svn commit: r11148 - /release/camel/apache-camel/2.14.4/

[gzurowski]

Author: gzurowski
Date: Wed Nov 11 21:52:01 2015
New Revision: 11148

Log:
Apache Camel 2.14.4 release distro placeholder.

Added:
release/camel/apache-camel/2.14.4/

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

[gzurowski]

Added: 
websites/production/camel/content/schema/cxf/camel-cxf-2.14.4-blueprint.xsd
==
--- websites/production/camel/content/schema/cxf/camel-cxf-2.14.4-blueprint.xsd 
(added)
+++ websites/production/camel/content/schema/cxf/camel-cxf-2.14.4-blueprint.xsd 
Wed Nov 11 22:15:51 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.14.4-spring.xsd
==
--- websites/production/camel/content/schema/cxf/camel-cxf-2.14.4-spring.xsd 
(added)
+++ websites/production/camel/content/schema/cxf/camel-cxf-2.14.4-spring.xsd 
Wed Nov 11 22:15:51 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: r972141 [2/5] - in /websites/production/camel/content/schema: blueprint/ cxf/ spring-security/ spring/ spring/integration/

[gzurowski]

Added: 
websites/production/camel/content/schema/blueprint/camel-blueprint-2.14.4.xsd
==
--- 
websites/production/camel/content/schema/blueprint/camel-blueprint-2.14.4.xsd 
(added)
+++ 
websites/production/camel/content/schema/blueprint/camel-blueprint-2.14.4.xsd 
Wed Nov 11 22:15:51 2015
@@ -0,0 +1,3519 @@
+
+http://camel.apache.org/schema/blueprint; 
xmlns:tns="http://camel.apache.org/schema/blueprint; 
xmlns:xs="http://www.w3.org/2001/XMLSchema;>
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+
+  
+
+  
+
+  
+
+  
+
+
+  
+
+  
+
+  
+
+
+  
+
+  
+
+  
+
+  
+  
+  
+  
+  
+  
+  
+  
+
+
+
+
+
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+
+
+  
+
+  
+
+  
+
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  
+
+  
+
+  
+
+  
+
+
+  
+
+  
+
+  
+
+  
+  
+  
+
+  
+
+  
+
+  
+  
+
+  
+
+  
+
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  
+
+  
+
+  
+
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+
+
+  
+
+  
+
+  
+
+  
+
+
+
+
+  
+
+  
+
+  
+
+  
+
+
+
+
+
+  
+
+  
+
+  
+
+  
+
+  
+
+
+
+
+
+
+
+
+
+
+  
+
+  
+
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  
+
+  
+
+  
+
+
+  
+
+  
+
+  
+
+
+  
+
+  
+
+
+  
+
+  
+
+  
+
+  
+
+
+
+
+
+
+
+  
+
+  
+
+  
+
+  
+
+
+
+  
+
+  
+
+  
+
+
+
+
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+
+
+
+
+
+
+
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+
+
+
+  
+
+  
+
+  
+
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  
+
+  
+
+  
+
+  
+
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+
+
+
+
+  
+
+  
+
+  
+
+  
+
+
+
+
+  
+
+  
+
+  
+
+  
+
+ 

svn commit: r972142 - /websites/production/camel/content/manual/camel-manual-2.14.4.html

[gzurowski]

Author: gzurowski
Date: Wed Nov 11 22:16:36 2015
New Revision: 972142

Log:
Uploading released manuals for camel-2.14.4

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

Added: websites/production/camel/content/manual/camel-manual-2.14.4.html
==
--- websites/production/camel/content/manual/camel-manual-2.14.4.html (added)
+++ websites/production/camel/content/manual/camel-manual-2.14.4.html Wed Nov 
11 22:16:36 2015
@@ -0,0 +1,27001 @@
+
+
+http://camel.apache.org/styles/camel-manual.css; rel="stylesheet" 
type="text/css" />
+
+@page :left {
+@top-left {
+content: "Apache Camel 2.14.4 Developer's 
Manual";
+}
+}
+
+
+
+
+
+
+
+
+
+
+
+SyntaxHighlighter.defaults['toolbar'] = false;
+SyntaxHighlighter.all();
+
+
+Apache CamelUser GuideVersion 2.14.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 is a container 
for Components, Routes etc:
+

svn commit: r11149 - /release/camel/apache-camel/2.14.4/

[gzurowski]

Author: gzurowski
Date: Wed Nov 11 21:56:18 2015
New Revision: 11149

Log:
Apache Camel 2.14.4 released artifacts.

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

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

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

Added: release/camel/apache-camel/2.14.4/apache-camel-2.14.4-src.zip.asc
==
--- release/camel/apache-camel/2.14.4/apache-camel-2.14.4-src.zip.asc (added)
+++ release/camel/apache-camel/2.14.4/apache-camel-2.14.4-src.zip.asc Wed Nov 
11 21:56:18 2015
@@ -0,0 +1,17 @@
+-BEGIN PGP SIGNATURE-
+Version: GnuPG v1
+
+iQIcBAABAgAGBQJWPRv7AAoJEJ1b7/pZQsBJGJ8P/jJMIs+gpYKx2j9pDasQkzP2
+tfeErFLRxwOv4J+tLYRlnJu3XCc5Lom1gjwOXbntw0qrHTVXvlMPkxA0yZZjL5jg
+juxyXO5oH0BEk/clNVuDOgIqgWsr+1XJ//urj/Ghj65Pn9hgswrndeMyp+UaQBHd
+afo98EBr8AlGO2jhureQnK6NjhZfcbL15yEDUnYRUWJjUlhXQd2v23riFzWIqdGa
+uA/6l1nqIwg10ysrTSMOBBnaeUpvW0enBxK+PXfsHWNYhPcWVg53Zvb1HMsyjlVM
+xHS1cM7dE1Gh6ptiOqrvd6nGyqX1x+gEnB1qhYg9zm94fmbWtiQ+clIMVZ2l0toY
+KCTKlyjc7OkcbWTYqfy0qQILc9ryCMO03N9dp/eVGU+1kOfYQGHEpQt+3LvLvfrF
+Dznx+lochveJAoKD6VkDdC7+4VSbjlEnob414ITEKilnkUfWNokbpLX9uNYbO2ks
+b8zSrpPg6BCaZ8A/RYHY708MMZZ02x0AzBNhKS35KLchEPb/z598sfD6C5QEGFOS
+mUClm5FvTvHLgiqMunanYSrG3kXeFJlpdQtVwHkJ3voGW/5c6/c36L3eLr/6FTtG
+NuLRdlPQWXz+JfgzJZvasIluK40x9MDXde6983saUDzpAxcgebET78UGzqiXR22U
+04g0X48PCq2GrEh6qoH6
+=N+Dd
+-END PGP SIGNATURE-

Added: release/camel/apache-camel/2.14.4/apache-camel-2.14.4-src.zip.md5
==
--- release/camel/apache-camel/2.14.4/apache-camel-2.14.4-src.zip.md5 (added)
+++ release/camel/apache-camel/2.14.4/apache-camel-2.14.4-src.zip.md5 Wed Nov 
11 21:56:18 2015
@@ -0,0 +1 @@
+a2a493dbe0b7bcd3d74c5f1c90636f50
\ No newline at end of file

Added: release/camel/apache-camel/2.14.4/apache-camel-2.14.4-src.zip.sha1
==
--- release/camel/apache-camel/2.14.4/apache-camel-2.14.4-src.zip.sha1 (added)
+++ release/camel/apache-camel/2.14.4/apache-camel-2.14.4-src.zip.sha1 Wed Nov 
11 21:56:18 2015
@@ -0,0 +1 @@
+294da96ba68d050084d3a175ea0a5e342ff0ce7c
\ No newline at end of file

Added: release/camel/apache-camel/2.14.4/apache-camel-2.14.4.pom
==
--- release/camel/apache-camel/2.14.4/apache-camel-2.14.4.pom (added)
+++ release/camel/apache-camel/2.14.4/apache-camel-2.14.4.pom Wed Nov 11 
21:56:18 2015
@@ -0,0 +1,937 @@
+
+
+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.14.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-atmosphere-websocket
+
+
+  org.apache.camel
+  camel-atom
+
+
+  org.apache.camel
+  camel-aws
+
+
+  org.apache.camel
+  camel-avro
+
+
+  org.apache.camel

svn commit: r11150 - /release/camel/apache-camel/2.14.3/

[gzurowski]

Author: gzurowski
Date: Wed Nov 11 21:58:41 2015
New Revision: 11150

Log:
Remove old release 2.14.3

Removed:
release/camel/apache-camel/2.14.3/

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

[gzurowski]

Added: websites/production/camel/content/schema/spring/camel-spring-2.14.4.xsd
==
--- websites/production/camel/content/schema/spring/camel-spring-2.14.4.xsd 
(added)
+++ websites/production/camel/content/schema/spring/camel-spring-2.14.4.xsd Wed 
Nov 11 22:15:51 2015
@@ -0,0 +1,3518 @@
+
+http://camel.apache.org/schema/spring; 
xmlns:tns="http://camel.apache.org/schema/spring; 
xmlns:xs="http://www.w3.org/2001/XMLSchema;>
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+
+  
+
+  
+
+  
+
+  
+
+
+  
+
+  
+
+  
+
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+
+
+
+  
+
+  
+
+  
+
+  
+
+
+
+  
+
+  
+
+  
+
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  
+
+  
+
+  
+
+  
+
+
+
+
+
+
+
+
+
+  
+
+  
+
+  
+
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  
+
+  
+
+  
+
+  
+
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  
+
+  
+
+  
+
+  
+
+
+  
+
+  
+
+  
+
+  
+
+
+
+
+
+  
+
+  
+
+  
+
+  
+
+
+
+
+
+  
+
+  
+
+  
+
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+
+
+
+  
+
+  
+
+  
+
+  
+
+
+
+
+
+  
+
+  
+
+  
+
+  
+
+
+
+  
+
+  
+
+  
+
+  
+
+
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+
+
+
+
+  
+
+  
+
+  
+
+  
+
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  
+
+
+  
+
+  
+
+  
+
+  
+
+
+
+  
+
+  
+
+  
+
+  
+
+
+
+  
+
+  
+
+  
+
+
+
+
+
+  
+
+  
+
+  
+
+  
+
+  
+  
+  
+  
+  
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+   

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

[gzurowski]

Added: 
websites/production/camel/content/schema/spring/integration/camel-spring-integration-2.14.4.xsd
==
--- 
websites/production/camel/content/schema/spring/integration/camel-spring-integration-2.14.4.xsd
 (added)
+++ 
websites/production/camel/content/schema/spring/integration/camel-spring-integration-2.14.4.xsd
 Wed Nov 11 22:15:51 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.
+   
+   
+  
+

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

[gzurowski]

Author: gzurowski
Date: Wed Nov 11 22:15:51 2015
New Revision: 972141

Log:
Uploading released schemas for camel-2.14.4

Added:

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

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

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

svn commit: r972143 - in /websites/production/camel/content: cache/main.pageCache camel-2144-release.html community.html download.html

[buildbot]

Author: buildbot
Date: Wed Nov 11 22:19:13 2015
New Revision: 972143

Log:
Production update by buildbot for camel

Added:
websites/production/camel/content/camel-2144-release.html
Modified:
websites/production/camel/content/cache/main.pageCache
websites/production/camel/content/community.html
websites/production/camel/content/download.html

Modified: websites/production/camel/content/cache/main.pageCache
==
Binary files - no diff available.

Added: websites/production/camel/content/camel-2144-release.html
==
--- websites/production/camel/content/camel-2144-release.html (added)
+++ websites/production/camel/content/camel-2144-release.html Wed Nov 11 
22:19:13 2015
@@ -0,0 +1,168 @@
+http://www.w3.org/TR/html4/loose.dtd;>
+
+
+
+
+
+
+
+
+
+
+
+
+  .maincontent { overflow:hidden; }
+
+
+
+
+  
+  
+  
+  
+  
+  
+  
+  SyntaxHighlighter.defaults['toolbar'] = false;
+  SyntaxHighlighter.all();
+  
+
+
+Apache Camel: Camel 2.14.4 Release
+
+
+
+
+
+  
+
+
+  
+
+
+  
+
+  
+  
+
+   
+http://camel.apache.org/;>Camel
+http://www.apache.org;>Apache
+   
+
+  
+
+  
+
+Apache CamelCommunityDownloadCamel 2.14.4 Release
+  
+  
+Download 
| JavaDoc | Source | Forums | Support
+  
+
+
+   
+   
+
+
+Camel 2.14.4 Releasehttp://camel.apache.org/images/camel-box-small.png; 
data-image-src="http://camel.apache.org/images/camel-box-small.png;>New and NoteworthyWelcome to 
the 2.14.4 release which is mainly a bug-fix release with 18 issues 
resolved.For more details, see https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311211version=12332478;>the
 list of JIRA tickets.Known 
IssuesSee Camel 2.14.0 Release
 Important 
changes to consider when upgradingSeeCamel 2.14.0 ReleaseNoticeSeeCamel 2.14.0 ReleaseBinary DistributionsDescriptionDownload LinkPGP Signature file of 
downloadWindows Distribution (zip)http://www.apache.org/dyn/closer.cgi/camel/apache-camel/
 2.14.4/apache-camel-2.14.4.zip">apache-camel-2.14.4.ziphttp://www.apache.org/dist/camel/apache-camel/2.14.4/apache-camel-2.14.4.zip.asc;>apache-camel-2.14.4.zip.ascUnix/Linux/Cygwin Distribution 
(tar)http://www.apache.org/dyn/closer.cgi/camel/apache-camel/2.14.4/apache-camel-2.14.4.tar.gz;>apache-camel-2.14.4.tar.gzhttp://www.apache.org/dist/camel/apache-camel/2.14.4/apache-camel-2.14.4.tar.gz.asc;>apache-camel-2.14.4.tar.gz.ascThe above URLs use 
redirecti
 onThe above URLs use the Apache 
Mirror system to redirect you to a suitable mirror for your download. Some 
users have experienced issues with some versions of browsers (e.g. some Safari 
browsers). If the download doesn't seem to work for you from the above URL then 
try using http://www.mozilla.com/en-US/firefox/; 
rel="nofollow">FireFoxSource DistributionsDescriptionDownload LinkPGP Signature file of 
downloadSource f
 or Windows (zip)http://www.apache.org/dyn/closer.cgi/camel/apache-camel/2.14.4/apache-camel-2.14.4-src.zip;>apache-camel-2.14.4-src.ziphttp://www.apache.org/dist/camel/apache-camel/2.14.4/apache-camel-2.14.4-src.zip.asc;>apache-camel-2.14.4-src.zip.ascSource for Unix/Linux/Cygwin 
(tar)http://www.apache.org/dyn/closer.cgi/camel/apache-camel/2.14.4/apache-camel-2.14.4-src.tar.gz;
 style="line-height: 1.42857;">apache-camel-2.14.4-src.tar.gzhttp://www.apache.org/dist/camel/apache-camel/2.14.4/a
 pache-camel-2.14.4-src.tar.gz.asc" style="line-height: 
1.42857;">apache-camel-2.14.4-src.tar.gz.ascGetting the Binaries 
using Maven 2To use this release in your maven project, the proper 
dependency configuration that you should use in your http://maven.apache.org/guides/introduction/introduction-to-the-pom.html;>Maven
 POM is:
+
+Git Tag 
Checkout
+https://git-wip-us.apache.org/repos/asf/camel.git
+cd camel
+git checkout camel-2.14.4]]>
+ChangelogFor a more 
detailed view of new features and bug fixes, see the:https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311211version=12332478;>Release
 notes for 2.14.4
+
+
+  
+
+
+OverviewHomeDownloadGetting StartedFAQDocumentationUser 
GuideManualBooksTutorialsExamplesCookbookArchitectureEnterprise
  Integration PatternsDSLComponentsData FormatLanguagesSecuritySecurity AdvisoriesSearchhttp://www.google.com/cse;>
+  
+
+
+
+
+  
+

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

[gzurowski]

Author: gzurowski
Date: Wed Nov 11 22:57:17 2015
New Revision: 972146

Log: (empty)

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

[1/2] camel git commit: Update Spring schemas for Camel release 2.14.4

[gzurowski]

Repository: camel
Updated Branches:
  refs/heads/master 7d30e2c4e -> 795316b31


Update Spring schemas for Camel release 2.14.4

Signed-off-by: Gregor Zurowski 

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

Branch: refs/heads/master
Commit: d34a81a79f5bfe02c6f7e6a849c95930e478ad3b
Parents: 7d30e2c
Author: Gregor Zurowski 
Authored: Thu Nov 12 00:11:46 2015 +0100
Committer: Gregor Zurowski 
Committed: Thu Nov 12 00:13:01 2015 +0100

--
 components/camel-cxf/src/main/resources/META-INF/spring.schemas | 1 +
 .../src/main/resources/META-INF/spring.schemas  | 1 +
 .../src/main/resources/META-INF/spring.schemas  | 1 +
 components/camel-spring/src/main/resources/META-INF/spring.schemas  | 1 +
 4 files changed, 4 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/d34a81a7/components/camel-cxf/src/main/resources/META-INF/spring.schemas
--
diff --git a/components/camel-cxf/src/main/resources/META-INF/spring.schemas 
b/components/camel-cxf/src/main/resources/META-INF/spring.schemas
index f37f8ab..2b5874a 100644
--- a/components/camel-cxf/src/main/resources/META-INF/spring.schemas
+++ b/components/camel-cxf/src/main/resources/META-INF/spring.schemas
@@ -79,6 +79,7 @@ 
http\://camel.apache.org/schema/cxf/camel-cxf-2.13.4.xsd=schema/cxfEndpoint.xsd
 http\://camel.apache.org/schema/cxf/camel-cxf-2.14.0.xsd=schema/cxfEndpoint.xsd
 http\://camel.apache.org/schema/cxf/camel-cxf-2.14.1.xsd=schema/cxfEndpoint.xsd
 http\://camel.apache.org/schema/cxf/camel-cxf-2.14.2.xsd=schema/cxfEndpoint.xsd
+http\://camel.apache.org/schema/cxf/camel-cxf-2.14.4.xsd=schema/cxfEndpoint.xsd
 http\://camel.apache.org/schema/cxf/camel-cxf-2.15.0.xsd=schema/cxfEndpoint.xsd
 http\://camel.apache.org/schema/cxf/camel-cxf-2.15.1.xsd=schema/cxfEndpoint.xsd
 http\://camel.apache.org/schema/cxf/camel-cxf-2.15.2.xsd=schema/cxfEndpoint.xsd

http://git-wip-us.apache.org/repos/asf/camel/blob/d34a81a7/components/camel-spring-integration/src/main/resources/META-INF/spring.schemas
--
diff --git 
a/components/camel-spring-integration/src/main/resources/META-INF/spring.schemas
 
b/components/camel-spring-integration/src/main/resources/META-INF/spring.schemas
index 228acd3..60a7fa1 100644
--- 
a/components/camel-spring-integration/src/main/resources/META-INF/spring.schemas
+++ 
b/components/camel-spring-integration/src/main/resources/META-INF/spring.schemas
@@ -76,6 +76,7 @@ 
http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.13
 
http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.14.0.xsd=schema/camel-spring-integration.xsd
 
http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.14.1.xsd=schema/camel-spring-integration.xsd
 
http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.14.2.xsd=schema/camel-spring-integration.xsd
+http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.14.4.xsd=schema/camel-spring-integration.xsd
 
http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.15.0.xsd=schema/camel-spring-integration.xsd
 
http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.15.1.xsd=schema/camel-spring-integration.xsd
 
http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.15.2.xsd=schema/camel-spring-integration.xsd

http://git-wip-us.apache.org/repos/asf/camel/blob/d34a81a7/components/camel-spring-security/src/main/resources/META-INF/spring.schemas
--
diff --git 
a/components/camel-spring-security/src/main/resources/META-INF/spring.schemas 
b/components/camel-spring-security/src/main/resources/META-INF/spring.schemas
index 4a72eea..222b5ef 100644
--- 
a/components/camel-spring-security/src/main/resources/META-INF/spring.schemas
+++ 
b/components/camel-spring-security/src/main/resources/META-INF/spring.schemas
@@ -70,6 +70,7 @@ 
http\://camel.apache.org/schema/spring-security/camel-spring-security-2.13.4.xsd
 
http\://camel.apache.org/schema/spring-security/camel-spring-security-2.14.0.xsd=schema/camel-spring-security.xsd
 
http\://camel.apache.org/schema/spring-security/camel-spring-security-2.14.1.xsd=schema/camel-spring-security.xsd
 
http\://camel.apache.org/schema/spring-security/camel-spring-security-2.14.2.xsd=schema/camel-spring-security.xsd

[2/2] camel git commit: Add missing Spring schema references for Camel release 2.14.3

[gzurowski]

Add missing Spring schema references for Camel release 2.14.3

Signed-off-by: Gregor Zurowski 

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

Branch: refs/heads/master
Commit: 795316b311b632e3d2d2fe00d2d70c2027aef50a
Parents: d34a81a
Author: Gregor Zurowski 
Authored: Thu Nov 12 00:15:59 2015 +0100
Committer: Gregor Zurowski 
Committed: Thu Nov 12 00:15:59 2015 +0100

--
 components/camel-cxf/src/main/resources/META-INF/spring.schemas | 1 +
 .../src/main/resources/META-INF/spring.schemas  | 1 +
 .../src/main/resources/META-INF/spring.schemas  | 1 +
 components/camel-spring/src/main/resources/META-INF/spring.schemas  | 1 +
 4 files changed, 4 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/795316b3/components/camel-cxf/src/main/resources/META-INF/spring.schemas
--
diff --git a/components/camel-cxf/src/main/resources/META-INF/spring.schemas 
b/components/camel-cxf/src/main/resources/META-INF/spring.schemas
index 2b5874a..20d3a45 100644
--- a/components/camel-cxf/src/main/resources/META-INF/spring.schemas
+++ b/components/camel-cxf/src/main/resources/META-INF/spring.schemas
@@ -79,6 +79,7 @@ 
http\://camel.apache.org/schema/cxf/camel-cxf-2.13.4.xsd=schema/cxfEndpoint.xsd
 http\://camel.apache.org/schema/cxf/camel-cxf-2.14.0.xsd=schema/cxfEndpoint.xsd
 http\://camel.apache.org/schema/cxf/camel-cxf-2.14.1.xsd=schema/cxfEndpoint.xsd
 http\://camel.apache.org/schema/cxf/camel-cxf-2.14.2.xsd=schema/cxfEndpoint.xsd
+http\://camel.apache.org/schema/cxf/camel-cxf-2.14.3.xsd=schema/cxfEndpoint.xsd
 http\://camel.apache.org/schema/cxf/camel-cxf-2.14.4.xsd=schema/cxfEndpoint.xsd
 http\://camel.apache.org/schema/cxf/camel-cxf-2.15.0.xsd=schema/cxfEndpoint.xsd
 http\://camel.apache.org/schema/cxf/camel-cxf-2.15.1.xsd=schema/cxfEndpoint.xsd

http://git-wip-us.apache.org/repos/asf/camel/blob/795316b3/components/camel-spring-integration/src/main/resources/META-INF/spring.schemas
--
diff --git 
a/components/camel-spring-integration/src/main/resources/META-INF/spring.schemas
 
b/components/camel-spring-integration/src/main/resources/META-INF/spring.schemas
index 60a7fa1..9424275 100644
--- 
a/components/camel-spring-integration/src/main/resources/META-INF/spring.schemas
+++ 
b/components/camel-spring-integration/src/main/resources/META-INF/spring.schemas
@@ -76,6 +76,7 @@ 
http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.13
 
http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.14.0.xsd=schema/camel-spring-integration.xsd
 
http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.14.1.xsd=schema/camel-spring-integration.xsd
 
http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.14.2.xsd=schema/camel-spring-integration.xsd
+http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.14.3.xsd=schema/camel-spring-integration.xsd
 
http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.14.4.xsd=schema/camel-spring-integration.xsd
 
http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.15.0.xsd=schema/camel-spring-integration.xsd
 
http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.15.1.xsd=schema/camel-spring-integration.xsd

http://git-wip-us.apache.org/repos/asf/camel/blob/795316b3/components/camel-spring-security/src/main/resources/META-INF/spring.schemas
--
diff --git 
a/components/camel-spring-security/src/main/resources/META-INF/spring.schemas 
b/components/camel-spring-security/src/main/resources/META-INF/spring.schemas
index 222b5ef..56c7d5c 100644
--- 
a/components/camel-spring-security/src/main/resources/META-INF/spring.schemas
+++ 
b/components/camel-spring-security/src/main/resources/META-INF/spring.schemas
@@ -70,6 +70,7 @@ 
http\://camel.apache.org/schema/spring-security/camel-spring-security-2.13.4.xsd
 
http\://camel.apache.org/schema/spring-security/camel-spring-security-2.14.0.xsd=schema/camel-spring-security.xsd
 
http\://camel.apache.org/schema/spring-security/camel-spring-security-2.14.1.xsd=schema/camel-spring-security.xsd
 
http\://camel.apache.org/schema/spring-security/camel-spring-security-2.14.2.xsd=schema/camel-spring-security.xsd
+http\://camel.apache.org/schema/spring-security/camel-spring-security-2.14.3.xsd=schema/camel-spring-security.xsd
 

svn commit: r972151 [1/2] - in /websites/production/camel/content: ./ 2015/11/ 2015/11/11/ cache/

[buildbot]

Author: buildbot
Date: Wed Nov 11 23:27:00 2015
New Revision: 972151

Log:
Production update by buildbot for camel

Added:
websites/production/camel/content/2015/11/
websites/production/camel/content/2015/11/11/
websites/production/camel/content/2015/11/11/apache-camel-2144-released.html
websites/production/camel/content/cache/main.pageCache   (with props)
Modified:
websites/production/camel/content/book-component-appendix.html
websites/production/camel/content/book-in-one-page.html
websites/production/camel/content/book-tutorials.html
websites/production/camel/content/download-archives.html
websites/production/camel/content/index.html
websites/production/camel/content/news.html
websites/production/camel/content/servlet-tomcat-no-spring-example.html
websites/production/camel/content/siteindex.html
websites/production/camel/content/sitemap.html
websites/production/camel/content/spring-security-example.html
websites/production/camel/content/xml-reference.html

Added: 
websites/production/camel/content/2015/11/11/apache-camel-2144-released.html
==
--- 
websites/production/camel/content/2015/11/11/apache-camel-2144-released.html 
(added)
+++ 
websites/production/camel/content/2015/11/11/apache-camel-2144-released.html 
Wed Nov 11 23:27:00 2015
@@ -0,0 +1,147 @@
+http://www.w3.org/TR/html4/loose.dtd;>
+
+
+
+
+
+
+
+
+
+
+
+
+  .maincontent { overflow:hidden; }
+
+
+
+
+
+
+Apache Camel: Apache Camel 2.14.4 Released
+
+
+
+
+
+  
+
+
+  
+
+
+  
+
+  
+  
+
+   
+http://camel.apache.org/;>Camel
+http://www.apache.org;>Apache
+   
+
+  
+
+  
+
+Apache 
Camel2015Apache Camel 2.14.4 Released
+  
+  
+Download 
| JavaDoc | Source | Forums | Support
+  
+
+
+   
+   
+
+
+The Camel community announces the 
immediate availability of the new patch release Camel 2.14.4. This release 
contains 18 fixes applied in the past few weeks by the community on the Camel 
2.14.x maintenance branch. We expect this to be the last patch release for the 
2.14.x branch.The artifacts are published and ready for you to http://camel.apache.org/download.html;>download either from the 
Apache mirrors or from the Central Maven repository. For more details please 
take a look at the https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311211version=12332478;>release
 notes.Many thanks to all who made this release possible.On 
behalf of the Camel PMC,Gregor Zurowski
+
+
+  
+
+
+OverviewHomeDownloadGetting StartedFAQDocumentationUser 
GuideManualBooksTutorialsExamplesCookbookArchitectureEnterprise
  Integration PatternsDSLComponentsData FormatLanguagesSecuritySecurity AdvisoriesSearchhttp://www.google.com/cse;>
+  
+
+
+
+
+  
+
+http://www.google.com/coop/cse/brand?form=cse-search-box&lang=en";>CommunitySupportContributingDiscussion ForumsMailing ListsUser StoriesNewsArticlesSiteTeamhttp://camel-extra.googlecode.com/; rel="nofollow">Camel 
ExtraDevelopersDeveloper Guideshape="rect" href="source.html">Sourcehref="building.html">Buildinghref="javadoc.html">JavaDochref="irc-room.html">IRC Roomid="Navigation-ApacheSoftwareFoundation">Apache Software Foundationclass="alternate">href="http://www.apache.org/licenses/;>Licenseclass="external-link" 
 >href="http://www.apache.org/foundation/sponsorship.html;>Sponsorship shape="rect" class="external-link" 
 >href="http://www.apache.org/foundation/thanks.html;>Thanksshape="rect" class="external-link" 
 >href="http://www.apache.org/security/;>Security
+
+
+  
+
+
+   
+
+
+
+
+  
+
+  
+
+
+
+  
+
+  
+Privacy Policy -
+(https://cwiki.apache.org/confluence/pages/editpage.action?pageId=61328338;>edit
 page)
+(https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=61328338showComments=trueshowCommentArea=true#addcomment;>add
 comment)
+  
+
+  
+
+
+
+
+ 2004-2015 The Apache Software Foundation.
+  
+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.
+
+http://hiramchirino.com;>Graphic Design By Hiram
+
+
+
+
+
+  var _gaq = _gaq || [];
+  _gaq.push(['_setAccount', 'UA-25976253-1']);
+  _gaq.push(['_trackPageview']);
+
+  (function() {
+var ga = document.createElement('script'); ga.type = 'text/javascript'; 
ga.async = true;
+ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 
'

buildbot failure in ASF Buildbot on camel-site-production

[buildbot]

The Buildbot has detected a new failure on builder camel-site-production while 
building ASF Buildbot. Full details are available at:
http://ci.apache.org/builders/camel-site-production/builds/3220

Buildbot URL: http://ci.apache.org/

Buildslave for this Build: bb-cms-slave

Build Reason: The Nightly scheduler named 'camel-site-production' triggered 
this build
Build Source Stamp: [branch camel/website] HEAD
Blamelist: 

BUILD FAILED: failed shell

Sincerely,
 -The Buildbot