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

2016-11-29 Thread buildbot 
Author: buildbot
Date: Tue Nov 29 20:20:06 2016
New Revision: 1001849

Log:
Production update by buildbot for camel

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

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

Modified: websites/production/camel/content/camel-219-release.html
==
--- websites/production/camel/content/camel-219-release.html (original)
+++ websites/production/camel/content/camel-219-release.html Tue Nov 29 
20:20:06 2016
@@ -85,7 +85,7 @@

 
 
-Camel 2.19.0 
Release (currently in progress)http://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.19.0 release which approx XXX issues resolved (new features, improvements and 
bug fixes such 
as...)ReturningnullfromBean should work similar to 
howsetBodyandtransformworks 
when they set anullbody.The Camel Spring Boot 
starter components 
 now have their auto configuration depends 
onorg.apache.camel.springboot.CamelAutoConfiguration which 
makes it easier writing unit tests where you can 
excludeorg.apache.camel.springboot.CamelAutoConfiguration to 
turn off Camel Spring Boot auto configuration completely.Camel now 
supports OWASP dependency check maven pluginCamel-Nats component now 
supports TLSCamel-Nats component now supports explicit flushing (with 
timeout) of the connectionCamel-Metrics component now supports Gauge 
typeFileconsumer now 
supports idempotent-changed and idempotent-rename read lock strategies for 
clustering.Camel Catalog now supports custom runtime providers 
that only includes the supported Camel components, languages and data formats 
running in that container. For example for Karaf or Spring Boot in the 
camel-catalog-provider-karaf and camel-catalog-provider-sprin
 gboot.Thehttps://cwiki.apache.org/confluence/display/WW/bean;>bean component 
will when calling a method that returned an instance of 
Callablenow call that callable to obtain the chained result. 
This allows to call Groovy functions/closures etc.FailoverLoad Balancer with 
inheritErrorHandler=false, now allows Camel'sError Handler to react after the load balancer is 
exhausted.Salesforce 
component now supports limits, recent items and approvalsFixed 
these issuesFixedHystrix EIP to also execute fallback if execution 
was rejected or short-circuited or other reasons from 
Hystrix.Fixed adding new routes to running CamelContext and if 
the new routes would fail to startup, then befor
 e these routes would "hang around". Now only succesful started routes are 
added.Adding or removing routes that starts fromUndertow no longer restart the entire HTTP 
serverVM endpoint should prepare 
exchange with the CamelContext from the consumer and not from cached endpoint 
which can be differentFixed a bug when usingRest DSL withSERVLET could cause a java.io.IOException: Stream 
closed exception when using Beanin 
the route.Fixed an issue when usingpipeline 
in Java DSL not setting up the EIP correctly which could lead to runtime route 
not as intended.FixedDropbox to useStream caching to avoid reading en
 tire file into memory so Camel can process big filesFixed Netty 
douhle buffer release leak inNetty4 andNetty4 HTTPNew Enterprise Integration 
PatternsNew Componentscamel-bonita -allow you 
to communicate with a remote Bonita engine.camel-firebase - allow you 
to communicate with Google Firebase Databasecamel-google-pubsub - 
allow you communicate with Google Cloud Pub/SubNew DSLNew AnnotationsNew Data 
FormatNew LanguagesNew ExamplesNew TutorialsAPI breakingKnown IssuesImportant changes 
to consider when upgradingCamel now uses Karaf 4.x API and 
therefore not possible to run on older Karaf versionscamel-spring-boot 
now don't include prototype scoped beans when auto scanning for RouteBuilder 
instances, which is how camel-spring works. You can turn this back using 
theincludeNonSingletons option.Getting the DistributionsBinary DistributionsD
 escriptionDownload LinkPGP Signature file of downloadWindows 
Distributionhttp://www.apache.org/dyn/closer.cgi/camel/apache-camel/x.y.x/apache-camel-x.y.x.zip;>apache-camel-x.y.x.ziphttp://www.apache.org/dist/camel/apache-camel/x.y.x/apache-camel-x.y.x.zip.asc;>apache-camel-x.y.x.zip.ascUnix/Linux/Cygwin 
Distributionhttp://www.apache.org/dyn/closer.cgi/camel/apache-camel/x.y.x/apache-camel-x.y.x.tar.gz;>apache
 -camel-x.y.x.tar.gzhttp://www.apache.org/dist/camel/apache-camel/x.y.x/apache-camel-x.y.x.tar.gz.asc;>apache-camel-x.y.x.tar.gz.ascThe above URLs use 
redirectionThe above URLs use the Apache 
Mirror system to redirect you to a suitable mirror for your download. Some 
users have experienced issues with some

[camel] Git Push Summary

2016-11-29 Thread davsclaus 
Repository: camel
Updated Branches:
  refs/heads/CAMEL-10509 [deleted] 4ccf30dd5

[1/4] camel git commit: CAMEL-10509: Handle namespaces on XML dump and load operations

2016-11-29 Thread davsclaus 
Repository: camel
Updated Branches:
  refs/heads/camel-2.18.x e7571acc9 -> 20a1b012b
  refs/heads/master 81137b2af -> 61984d5c4


CAMEL-10509: Handle namespaces on XML dump and load operations


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

Branch: refs/heads/master
Commit: 61984d5c492ab35e0502c7799f3046bf3282f0e4
Parents: 6480fc5
Author: James Netherton 
Authored: Fri Nov 25 15:25:22 2016 +
Committer: Claus Ibsen 
Committed: Tue Nov 29 20:20:19 2016 +0100

--
 .../camel/converter/jaxp/XmlConverter.java  |  18 ++
 .../apache/camel/impl/DefaultCamelContext.java  |  28 +--
 .../org/apache/camel/model/ModelHelper.java | 209 ++-
 .../org/apache/camel/util/ExchangeHelper.java   |   2 +-
 .../properties/PropertiesRouteFromTest.java |   2 +-
 .../camel/converter/jaxp/XmlConverterTest.java  |  30 ++-
 .../management/ManagedFromRestGetTest.java  |   8 +-
 .../ManagedFromRestPlaceholderTest.java |   8 +-
 .../LoadRouteFromXmlWithNamespaceTest.java  |  44 
 .../camel/util/CreateModelFromXmlTest.java  | 123 +++
 .../util/DumpModelAsXmlAggregateRouteTest.java  |   2 +-
 .../camel/util/DumpModelAsXmlNamespaceTest.java |  26 ++-
 .../util/DumpModelAsXmlPlaceholdersTest.java|   7 +-
 .../apache/camel/model/routeWithNamespace.xml   |  32 +++
 .../org/apache/camel/util/simpleRoute.xml   |  30 +++
 .../camel/util/simpleRouteWithNamespaces.xml|  30 +++
 .../spring/DumpModelAsXmlPlaceholdersTest.java  |   4 +-
 17 files changed, 501 insertions(+), 102 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/61984d5c/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java 
b/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java
index 70f4f87..539eee6 100644
--- a/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java
+++ b/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java
@@ -283,6 +283,24 @@ public class XmlConverter {
 }
 
 /**
+ * Converts the given Document to into text
+ * @param document The document to convert
+ * @param outputOptions The {@link OutputKeys} properties to control 
various aspects of the XML output
+ * @return The string representation of the document
+ * @throws TransformerException
+ */
+public String toStringFromDocument(Document document, Properties 
outputOptions) throws TransformerException {
+if (document == null) {
+return null;
+}
+
+DOMSource source = new DOMSource(document);
+StringWriter buffer = new StringWriter();
+toResult(source, new StreamResult(buffer), outputOptions);
+return buffer.toString();
+}
+
+/**
  * Converts the source instance to a {@link DOMSource} or returns null if 
the conversion is not
  * supported (making it easy to derive from this class to add new kinds of 
conversion).
  * @deprecated will be removed in Camel 3.0. Use the method which has 2 
parameters.

http://git-wip-us.apache.org/repos/asf/camel/blob/61984d5c/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java 
b/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
index 9cd8e83..7739c26 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
@@ -98,6 +98,7 @@ import org.apache.camel.management.ManagementStrategyFactory;
 import org.apache.camel.model.DataFormatDefinition;
 import org.apache.camel.model.FromDefinition;
 import org.apache.camel.model.ModelCamelContext;
+import org.apache.camel.model.ModelHelper;
 import org.apache.camel.model.ProcessorDefinition;
 import org.apache.camel.model.ProcessorDefinitionHelper;
 import org.apache.camel.model.RouteDefinition;
@@ -882,32 +883,7 @@ public class DefaultCamelContext extends ServiceSupport 
implements ModelCamelCon
 }
 
 public synchronized RoutesDefinition loadRoutesDefinition(InputStream is) 
throws Exception {
-// load routes using JAXB
-if (jaxbContext == null) {
-// must use classloader from CamelContext to have JAXB working
-jaxbContext =

[3/4] camel git commit: CAMEL-10509: dump model to xml should include namespaces. Work in progress.

2016-11-29 Thread davsclaus 
CAMEL-10509: dump model to xml should include namespaces. Work in progress.


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

Branch: refs/heads/camel-2.18.x
Commit: 9b432243fa44ccc47ebafc90891bdd888f4dae5e
Parents: e7571ac
Author: Claus Ibsen 
Authored: Wed Nov 23 14:22:52 2016 +0100
Committer: Claus Ibsen 
Committed: Tue Nov 29 20:45:08 2016 +0100

--
 .../builder/xml/DefaultNamespaceContext.java|  4 ++
 .../apache/camel/builder/xml/XPathBuilder.java  |  4 ++
 .../org/apache/camel/model/ModelHelper.java | 58 
 .../model/dataformat/XMLSecurityDataFormat.java |  6 +-
 .../org/apache/camel/spi/NamespaceAware.java|  5 ++
 .../support/XMLTokenExpressionIterator.java |  5 ++
 .../util/DumpModelAsXmlAggregateRouteTest.java  |  2 +-
 .../camel/util/DumpModelAsXmlNamespaceTest.java | 46 
 .../camel/component/xquery/XQueryBuilder.java   |  4 ++
 9 files changed, 132 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/9b432243/camel-core/src/main/java/org/apache/camel/builder/xml/DefaultNamespaceContext.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/builder/xml/DefaultNamespaceContext.java
 
b/camel-core/src/main/java/org/apache/camel/builder/xml/DefaultNamespaceContext.java
index 63cedd2..8555e1c 100644
--- 
a/camel-core/src/main/java/org/apache/camel/builder/xml/DefaultNamespaceContext.java
+++ 
b/camel-core/src/main/java/org/apache/camel/builder/xml/DefaultNamespaceContext.java
@@ -99,6 +99,10 @@ public class DefaultNamespaceContext implements 
NamespaceContext, NamespaceAware
 map.putAll(namespaces);
 }
 
+public Map getNamespaces() {
+return map;
+}
+
 /**
  * toString() implementation that outputs the namespace mappings with the 
following format: "[me: {prefix -> value}, {prefix -> value}], [parent: {prefix 
-> value}, {prefix -> value}].
  * Recurses up the parent's chain.

http://git-wip-us.apache.org/repos/asf/camel/blob/9b432243/camel-core/src/main/java/org/apache/camel/builder/xml/XPathBuilder.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/builder/xml/XPathBuilder.java 
b/camel-core/src/main/java/org/apache/camel/builder/xml/XPathBuilder.java
index 932d1ce..dc7ffb3 100644
--- a/camel-core/src/main/java/org/apache/camel/builder/xml/XPathBuilder.java
+++ b/camel-core/src/main/java/org/apache/camel/builder/xml/XPathBuilder.java
@@ -524,6 +524,10 @@ public class XPathBuilder extends ServiceSupport 
implements Expression, Predicat
 this.namespaces.putAll(namespaces);
 }
 
+public Map getNamespaces() {
+return namespaces;
+}
+
 /**
  * Gets the {@link XPathFunction} for getting the input message body.
  * 

http://git-wip-us.apache.org/repos/asf/camel/blob/9b432243/camel-core/src/main/java/org/apache/camel/model/ModelHelper.java
--
diff --git a/camel-core/src/main/java/org/apache/camel/model/ModelHelper.java 
b/camel-core/src/main/java/org/apache/camel/model/ModelHelper.java
index 801d2a0..3a1aa68 100644
--- a/camel-core/src/main/java/org/apache/camel/model/ModelHelper.java
+++ b/camel-core/src/main/java/org/apache/camel/model/ModelHelper.java
@@ -19,15 +19,24 @@ package org.apache.camel.model;
 import java.io.InputStream;
 import java.io.StringReader;
 import java.io.StringWriter;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
 import javax.xml.bind.JAXBContext;
 import javax.xml.bind.JAXBException;
 import javax.xml.bind.Marshaller;
 import javax.xml.bind.Unmarshaller;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.Expression;
 import org.apache.camel.NamedNode;
+import org.apache.camel.model.language.ExpressionDefinition;
+import org.apache.camel.spi.NamespaceAware;
 import org.apache.camel.util.IOHelper;
 
+import static 
org.apache.camel.model.ProcessorDefinitionHelper.filterTypeInOutputs;
+
 /**
  * Helper for the Camel {@link org.apache.camel.model model} classes.
  */
@@ -53,6 +62,21 @@ public final class ModelHelper {
 jaxbContext = 
context.getModelJAXBContextFactory().newJAXBContext();
 }
 
+final Map namespaces = new LinkedHashMap<>();
+
+// gather all namespaces from the routes or route which is stored on 
the expression nodes
+if (definition

[2/4] camel git commit: CAMEL-10509: dump model to xml should include namespaces. Work in progress.

2016-11-29 Thread davsclaus 
CAMEL-10509: dump model to xml should include namespaces. Work in progress.


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

Branch: refs/heads/master
Commit: 6480fc57fa97ba764ff0bfe1b3b43fe74ccfdf02
Parents: 81137b2
Author: Claus Ibsen 
Authored: Wed Nov 23 14:22:52 2016 +0100
Committer: Claus Ibsen 
Committed: Tue Nov 29 20:20:19 2016 +0100

--
 .../builder/xml/DefaultNamespaceContext.java|  4 ++
 .../apache/camel/builder/xml/XPathBuilder.java  |  4 ++
 .../org/apache/camel/model/ModelHelper.java | 58 
 .../model/dataformat/XMLSecurityDataFormat.java |  6 +-
 .../org/apache/camel/spi/NamespaceAware.java|  5 ++
 .../support/XMLTokenExpressionIterator.java |  5 ++
 .../util/DumpModelAsXmlAggregateRouteTest.java  |  2 +-
 .../camel/util/DumpModelAsXmlNamespaceTest.java | 46 
 .../camel/component/xquery/XQueryBuilder.java   |  4 ++
 9 files changed, 132 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/6480fc57/camel-core/src/main/java/org/apache/camel/builder/xml/DefaultNamespaceContext.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/builder/xml/DefaultNamespaceContext.java
 
b/camel-core/src/main/java/org/apache/camel/builder/xml/DefaultNamespaceContext.java
index 63cedd2..8555e1c 100644
--- 
a/camel-core/src/main/java/org/apache/camel/builder/xml/DefaultNamespaceContext.java
+++ 
b/camel-core/src/main/java/org/apache/camel/builder/xml/DefaultNamespaceContext.java
@@ -99,6 +99,10 @@ public class DefaultNamespaceContext implements 
NamespaceContext, NamespaceAware
 map.putAll(namespaces);
 }
 
+public Map getNamespaces() {
+return map;
+}
+
 /**
  * toString() implementation that outputs the namespace mappings with the 
following format: "[me: {prefix -> value}, {prefix -> value}], [parent: {prefix 
-> value}, {prefix -> value}].
  * Recurses up the parent's chain.

http://git-wip-us.apache.org/repos/asf/camel/blob/6480fc57/camel-core/src/main/java/org/apache/camel/builder/xml/XPathBuilder.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/builder/xml/XPathBuilder.java 
b/camel-core/src/main/java/org/apache/camel/builder/xml/XPathBuilder.java
index 932d1ce..dc7ffb3 100644
--- a/camel-core/src/main/java/org/apache/camel/builder/xml/XPathBuilder.java
+++ b/camel-core/src/main/java/org/apache/camel/builder/xml/XPathBuilder.java
@@ -524,6 +524,10 @@ public class XPathBuilder extends ServiceSupport 
implements Expression, Predicat
 this.namespaces.putAll(namespaces);
 }
 
+public Map getNamespaces() {
+return namespaces;
+}
+
 /**
  * Gets the {@link XPathFunction} for getting the input message body.
  * 

http://git-wip-us.apache.org/repos/asf/camel/blob/6480fc57/camel-core/src/main/java/org/apache/camel/model/ModelHelper.java
--
diff --git a/camel-core/src/main/java/org/apache/camel/model/ModelHelper.java 
b/camel-core/src/main/java/org/apache/camel/model/ModelHelper.java
index 801d2a0..3a1aa68 100644
--- a/camel-core/src/main/java/org/apache/camel/model/ModelHelper.java
+++ b/camel-core/src/main/java/org/apache/camel/model/ModelHelper.java
@@ -19,15 +19,24 @@ package org.apache.camel.model;
 import java.io.InputStream;
 import java.io.StringReader;
 import java.io.StringWriter;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
 import javax.xml.bind.JAXBContext;
 import javax.xml.bind.JAXBException;
 import javax.xml.bind.Marshaller;
 import javax.xml.bind.Unmarshaller;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.Expression;
 import org.apache.camel.NamedNode;
+import org.apache.camel.model.language.ExpressionDefinition;
+import org.apache.camel.spi.NamespaceAware;
 import org.apache.camel.util.IOHelper;
 
+import static 
org.apache.camel.model.ProcessorDefinitionHelper.filterTypeInOutputs;
+
 /**
  * Helper for the Camel {@link org.apache.camel.model model} classes.
  */
@@ -53,6 +62,21 @@ public final class ModelHelper {
 jaxbContext = 
context.getModelJAXBContextFactory().newJAXBContext();
 }
 
+final Map namespaces = new LinkedHashMap<>();
+
+// gather all namespaces from the routes or route which is stored on 
the expression nodes
+if (definition instanceof

[4/4] camel git commit: CAMEL-10509: Handle namespaces on XML dump and load operations

2016-11-29 Thread davsclaus 
CAMEL-10509: Handle namespaces on XML dump and load operations


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

Branch: refs/heads/camel-2.18.x
Commit: 20a1b012bd03c58b702af615dde0b0198284fb52
Parents: 9b43224
Author: James Netherton 
Authored: Fri Nov 25 15:25:22 2016 +
Committer: Claus Ibsen 
Committed: Tue Nov 29 20:45:15 2016 +0100

--
 .../camel/converter/jaxp/XmlConverter.java  |  18 ++
 .../apache/camel/impl/DefaultCamelContext.java  |  28 +--
 .../org/apache/camel/model/ModelHelper.java | 209 ++-
 .../org/apache/camel/util/ExchangeHelper.java   |   2 +-
 .../properties/PropertiesRouteFromTest.java |   2 +-
 .../camel/converter/jaxp/XmlConverterTest.java  |  30 ++-
 .../management/ManagedFromRestGetTest.java  |   8 +-
 .../ManagedFromRestPlaceholderTest.java |   8 +-
 .../LoadRouteFromXmlWithNamespaceTest.java  |  44 
 .../camel/util/CreateModelFromXmlTest.java  | 123 +++
 .../util/DumpModelAsXmlAggregateRouteTest.java  |   2 +-
 .../camel/util/DumpModelAsXmlNamespaceTest.java |  26 ++-
 .../util/DumpModelAsXmlPlaceholdersTest.java|   7 +-
 .../apache/camel/model/routeWithNamespace.xml   |  32 +++
 .../org/apache/camel/util/simpleRoute.xml   |  30 +++
 .../camel/util/simpleRouteWithNamespaces.xml|  30 +++
 .../spring/DumpModelAsXmlPlaceholdersTest.java  |   4 +-
 17 files changed, 501 insertions(+), 102 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/20a1b012/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java 
b/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java
index 70f4f87..539eee6 100644
--- a/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java
+++ b/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java
@@ -283,6 +283,24 @@ public class XmlConverter {
 }
 
 /**
+ * Converts the given Document to into text
+ * @param document The document to convert
+ * @param outputOptions The {@link OutputKeys} properties to control 
various aspects of the XML output
+ * @return The string representation of the document
+ * @throws TransformerException
+ */
+public String toStringFromDocument(Document document, Properties 
outputOptions) throws TransformerException {
+if (document == null) {
+return null;
+}
+
+DOMSource source = new DOMSource(document);
+StringWriter buffer = new StringWriter();
+toResult(source, new StreamResult(buffer), outputOptions);
+return buffer.toString();
+}
+
+/**
  * Converts the source instance to a {@link DOMSource} or returns null if 
the conversion is not
  * supported (making it easy to derive from this class to add new kinds of 
conversion).
  * @deprecated will be removed in Camel 3.0. Use the method which has 2 
parameters.

http://git-wip-us.apache.org/repos/asf/camel/blob/20a1b012/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java 
b/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
index 8cf7a78..8948e6c 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
@@ -97,6 +97,7 @@ import org.apache.camel.management.ManagementStrategyFactory;
 import org.apache.camel.model.DataFormatDefinition;
 import org.apache.camel.model.FromDefinition;
 import org.apache.camel.model.ModelCamelContext;
+import org.apache.camel.model.ModelHelper;
 import org.apache.camel.model.ProcessorDefinition;
 import org.apache.camel.model.ProcessorDefinitionHelper;
 import org.apache.camel.model.RouteDefinition;
@@ -873,32 +874,7 @@ public class DefaultCamelContext extends ServiceSupport 
implements ModelCamelCon
 }
 
 public synchronized RoutesDefinition loadRoutesDefinition(InputStream is) 
throws Exception {
-// load routes using JAXB
-if (jaxbContext == null) {
-// must use classloader from CamelContext to have JAXB working
-jaxbContext = getModelJAXBContextFactory().newJAXBContext();
-}
-
-Unmarshaller unmarshaller = jaxbContext.createUnmarshaller();
-Object result =

svn commit: r1001831 - in /websites/production/camel/content: articles.html cache/main.pageCache

2016-11-29 Thread buildbot 
Author: buildbot
Date: Tue Nov 29 16:18:56 2016
New Revision: 1001831

Log:
Production update by buildbot for camel

Modified:
websites/production/camel/content/articles.html
websites/production/camel/content/cache/main.pageCache

Modified: websites/production/camel/content/articles.html
==
--- websites/production/camel/content/articles.html (original)
+++ websites/production/camel/content/articles.html Tue Nov 29 16:18:56 2016
@@ -75,7 +75,7 @@

 
 
-See alsoSee also http://camel.apache.org/user-stories.html;>Camel 
User Stories.If you have never used or seen Camel 
before, then you should start with http://www.kai-waehner.de/blog/2012/05/04/apache-camel-tutorial-introduction/;
 rel="nofollow">Apache Camel Tutorial  Introduction to EIP, Routes, 
Components, Testing, and other Concepts - an article by Kai Whner, 
where he puts EIP and Camel into the big picture and gives a run down of the 
important Camel concepts. https://github.com/megachucky/camel-infoq; rel="nofollow">Demo source code
  can be downloaded at github to get started with your first Camel project 
easily.Archived Webinars 
and Screencastshttps://www.youtube.com/watch?v=fxpS9pf6TVklist=PLUDjw7NbNcoyOyhrIIw9cChAHWdaCxIobindex=17;
 rel="nofollow">Apache Camel - The Integration Library - A 50 minute video 
from September 2016 where Claus Ibsen presents Apache Camel at the JDKIO 2016 
conference.https://www.youtube.com/watch?v=jZE-YSHK_gwsns=tw; 
rel="nofollow">Apache Camel First Steps - A 10 minute video from December 
2015 where Vivian van Zyl gives a high level overview of Apache Camel and 
demonstrates how to start using Camel with live code demo.https://www.youtube.com/watch?v=ouJ3SQHnQ6Ifeature=youtu.bea; 
rel="nofollow">Fabric8 Camel Microservices for Docker an
 d Kubernetes - A 55 minute video from http://rigadevday.lv/#/index; rel="nofollow">Riga 
Dev Day 2016 conference where Claus Ibsen talks about developing Camel 
microservices ready for the container platforms.https://www.youtube.com/watch?v=91UiQgazt3g; 
rel="nofollow">Developing Microservices with Apache Camel - Video from 
November 2015 at the MSA Day in New York where Claus Ibsen talks developing 
Camel based microservices for docker containers running on Kubernetes. http://www.slideshare.net/davsclaus/developing-microservices-with-apache-camel;
 rel="nofollow">Slides are here.https://www.youtube.com/watch?v=o8ZRE9DM3Es; 
rel="nofollow">Wild Flies and A Camel - Video from Oredev 2015 where Markus 
Eisele talks about Apache Camel and JBoss Wildfly.https://www.youtube.com/watch?v=nqQaR7vUxfgindex=13list=PLPIzp-E1msrZz6RNdbDiK0nKuxAUZPs77;
 rel="nofollow">JavaOne 2015 Riding a Camel through the JEEHara - Video 
from JavaOne 2015 where Markus Eisele introduces Apache Camel and how to use it 
with JEE.https://www.youtube.com/watch?v=jbj1TJ_2XBQfeature=youtu.bea; 
style="line-height: 1.42857;" rel="nofollow">Apache Camel in the clouds - 
Video from Devnexus 2015 where Markus Eisele talk about Apache Camel in the 
clouds running on openshifthttps://vimeo.com/130993910; rel="nofollow">GeeCON 2015: Markus Eisele - 
Wild Flies and a Camel - Java EE Integration- Video from GeeCon 2015 
where Markus Eisele talks about Apache Camel and how Camel can work with 
Wildflyhttps://vimeo.com/105743314; rel="nofollow">Hvordan f en ka
 mel til  danse (September 2014) byPer Jrgen 
Walstrm  Audun Fauchald Strand - (JavaZone 2014) in 
Norwegianhttp://www.youtube.com/watch?v=_pEwoztbfYIfeature=youtu.bea; 
rel="nofollow">Integration using Apache Camel and Groovy (June 2014) by 
Claus Ibsen, presenting Camel, Groovy, and http://hawt.io/; rel="nofollow">hawtio at http://gr8conf.eu/#/; 
rel="nofollow">gr8conf 2014.https://skillsmatter.com/skillscasts/5074-effective-system-integrations-with-apache-camel;
 rel="nofollow">Effective System Integrations with Apache Camel (March 
2014) by Jakub Korabhttp://www.youtube.com/watch?v=lOxUs_JleSsfeature=youtu.bea; 
rel="nofollow">Getting started with Apache Camel video from Barcel
 onaJUG (January 2014) by Claus Ibsenhttp://vimeo.com/68442425; rel="nofollow">Camel in 
the cloud demo from CamelOne 2013 - Video presentation from CamelOne 2013 
demonstrating Camel in the cloud using http://fuse.fusesource.org/fabric/; rel="nofollow">Fuse Fabric and http://hawt.io/; 
rel="nofollow">hawtiohttp://javagruppen.dk/index.php/moder/historiske-moder/285-javagruppemode-115-apache-camel-i-aarhus;
 rel="nofollow">Getting started with Apache Camel - Video presentation from 
Javagruppen meeting by Claus Ibsen (May 2013)http://blip.tv/dzone/apache-camel-essential-components-6511579; 
rel="nofollow">Apache Camel Essential Components by Christian 
Posta (January 2013)http://www.youtube.com/watch?v=i_g91CzHgxg; 
rel="nofollow">Leverage Enterprise Integration Patterns with Apache Camel and 
Twitter by Bruno Borges (JavaOne

[1/2] camel git commit: CAMEL-10539: Jetty http producer bridge endpoint should avoid NPE error and detect invalid uri and provide exception with suggestions what to do.

2016-11-29 Thread davsclaus 
Repository: camel
Updated Branches:
  refs/heads/camel-2.18.x 061c980e6 -> e7571acc9
  refs/heads/master 3ac821873 -> 81137b2af


CAMEL-10539: Jetty http producer bridge endpoint should avoid NPE error and 
detect invalid uri and provide exception with suggestions what to do.


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

Branch: refs/heads/master
Commit: 81137b2af1f06c82be32a13a61ba24dd48ef8892
Parents: 3ac8218
Author: Claus Ibsen 
Authored: Tue Nov 29 10:32:31 2016 +0100
Committer: Claus Ibsen 
Committed: Tue Nov 29 16:49:01 2016 +0100

--
 .../component/jetty/JettyHttpProducer.java  | 15 ++
 .../jetty/rest/RestBridgeEndpointTest.java  | 52 ++
 .../jetty/rest/RestNoBridgeEndpointTest.java| 56 
 3 files changed, 123 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/81137b2a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpProducer.java
--
diff --git 
a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpProducer.java
 
b/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpProducer.java
index e8a7f1b..9de51f6 100644
--- 
a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpProducer.java
+++ 
b/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpProducer.java
@@ -21,6 +21,7 @@ import java.io.InputStream;
 import java.io.Serializable;
 import java.net.CookieStore;
 import java.net.URI;
+import java.net.URISyntaxException;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
@@ -115,6 +116,20 @@ public class JettyHttpProducer extends 
DefaultAsyncProducer implements AsyncProc
 
 JettyContentExchange httpExchange = 
getEndpoint().createContentExchange();
 httpExchange.init(exchange, getBinding(), client, callback);
+
+// url must have scheme
+try {
+uri = new URI(url);
+String scheme = uri.getScheme();
+if (scheme == null) {
+throw new IllegalArgumentException("Url must include scheme: " 
+ url + ". If you are bridging endpoints set bridgeEndpoint=true."
++ " If you want to call a specific url, then you may 
need to remove all CamelHttp* headers in the route before this."
++ " See more details at: 
http://camel.apache.org/how-to-remove-the-http-protocol-headers-in-the-camel-message.html;);
+}
+} catch (URISyntaxException e) {
+// ignore
+}
+
 httpExchange.setURL(url); // Url has to be set first
 httpExchange.setMethod(methodName);
 

http://git-wip-us.apache.org/repos/asf/camel/blob/81137b2a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/rest/RestBridgeEndpointTest.java
--
diff --git 
a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/rest/RestBridgeEndpointTest.java
 
b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/rest/RestBridgeEndpointTest.java
new file mode 100644
index 000..dc85698
--- /dev/null
+++ 
b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/rest/RestBridgeEndpointTest.java
@@ -0,0 +1,52 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.jetty.rest;
+
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.jetty.BaseJettyTest;
+import org.junit.Test;
+
+public class RestBridgeEndpointTest extends BaseJettyTest {
+
+@Test
+public void testJettyBridgeEndpoint() throws Exception {
+

[2/2] camel git commit: CAMEL-10539: Jetty http producer bridge endpoint should avoid NPE error and detect invalid uri and provide exception with suggestions what to do.

2016-11-29 Thread davsclaus 
CAMEL-10539: Jetty http producer bridge endpoint should avoid NPE error and 
detect invalid uri and provide exception with suggestions what to do.


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

Branch: refs/heads/camel-2.18.x
Commit: e7571acc92dd8860f65c26b7c08160ca812804f8
Parents: 061c980
Author: Claus Ibsen 
Authored: Tue Nov 29 10:32:31 2016 +0100
Committer: Claus Ibsen 
Committed: Tue Nov 29 16:49:27 2016 +0100

--
 .../component/jetty/JettyHttpProducer.java  | 15 ++
 .../jetty/rest/RestBridgeEndpointTest.java  | 52 ++
 .../jetty/rest/RestNoBridgeEndpointTest.java| 56 
 3 files changed, 123 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/e7571acc/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpProducer.java
--
diff --git 
a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpProducer.java
 
b/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpProducer.java
index e0595bc..7280b0c 100644
--- 
a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpProducer.java
+++ 
b/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpProducer.java
@@ -20,6 +20,7 @@ import java.io.ByteArrayOutputStream;
 import java.io.InputStream;
 import java.io.Serializable;
 import java.net.URI;
+import java.net.URISyntaxException;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
@@ -114,6 +115,20 @@ public class JettyHttpProducer extends 
DefaultAsyncProducer implements AsyncProc
 
 JettyContentExchange httpExchange = 
getEndpoint().createContentExchange();
 httpExchange.init(exchange, getBinding(), client, callback);
+
+// url must have scheme
+try {
+uri = new URI(url);
+String scheme = uri.getScheme();
+if (scheme == null) {
+throw new IllegalArgumentException("Url must include scheme: " 
+ url + ". If you are bridging endpoints set bridgeEndpoint=true."
++ " If you want to call a specific url, then you may 
need to remove all CamelHttp* headers in the route before this."
++ " See more details at: 
http://camel.apache.org/how-to-remove-the-http-protocol-headers-in-the-camel-message.html;);
+}
+} catch (URISyntaxException e) {
+// ignore
+}
+
 httpExchange.setURL(url); // Url has to be set first
 httpExchange.setMethod(methodName);
 

http://git-wip-us.apache.org/repos/asf/camel/blob/e7571acc/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/rest/RestBridgeEndpointTest.java
--
diff --git 
a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/rest/RestBridgeEndpointTest.java
 
b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/rest/RestBridgeEndpointTest.java
new file mode 100644
index 000..dc85698
--- /dev/null
+++ 
b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/rest/RestBridgeEndpointTest.java
@@ -0,0 +1,52 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.jetty.rest;
+
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.jetty.BaseJettyTest;
+import org.junit.Test;
+
+public class RestBridgeEndpointTest extends BaseJettyTest {
+
+@Test
+public void testJettyBridgeEndpoint() throws Exception {
+getMockEndpoint("mock:result").expectedMessageCount(1);
+
+String out = template.requestBody("http://localhost:; +

svn commit: r1001818 [2/3] - in /websites/production/camel/content: book-in-one-page.html book-languages-appendix.html cache/main.pageCache simple.html

2016-11-29 Thread buildbot 
Modified: websites/production/camel/content/book-languages-appendix.html
==
--- websites/production/camel/content/book-languages-appendix.html (original)
+++ websites/production/camel/content/book-languages-appendix.html Tue Nov 29 
09:20:58 2016
@@ -890,7 +890,7 @@ result = body * 2 + 1
 /dependency
 ]]>
 
-Simple Expression 
LanguageThe Simple Expression Language was a really simple language 
when it was created, but has since grown more powerful. It is primarily 
intended for being a really small and simple language for evaluating Expressions and Predicates without requiring any new dependencies or 
knowledge of XPath; so it is ideal for 
testing in camel-core. The idea was to cover 95% 
of the common use cases when you need a little bit of expression based script 
in your Camel routes.However for much more complex use cases you are 
generally recommended to choose a more expressive and powerful language such 
as:SpELMvelGroovy
 JavaScriptELOGNLone of the supported Scripting LanguagesThe simple 
language uses ${body} placeholders for complex 
expressions where the expression contains constant literals. 
The${ } placeholders can be omitted if the 
expression is only the token itself.Alternative syntaxFrom Camel 2.5 you can also use 
the alternative syntax which uses$simple{ } 
as placeholders. This can be used in situations to avoid clashes when using for 
exampl
 e Spring property placeholder together with Camel.Configuring result typeFrom Camel 2.8 you can configure 
the result type of the Simple 
expression. For example to set the type as a 
java.lang.Boolean or a 
java.lang.Integer etc.File language is now 
merged with Simple languageFrom Camel 2.2, the File Language is now merged w
 ith Simple language which means you can 
use all the file syntax directly within the simple 
language.Simple Language 
Changes in Camel 2.9 onwardsThe Simple language have been improved from Camel 2.9 to use 
a better syntax parser, which can do index precise error messages, so you know 
exactly what is wrong and where the problem is. For example if you have made a 
typo in one of the operators, then previously the parser would not be able to 
detect this, and cause the evaluation to be true. There are a few changes in 
the syntax which are no longer backwards compatible. When using Simple language as a Predicate then the literal text 
must be enclosed in either single or double quotes. For 
example: "${body} == 'Camel'". Notice how we have 
single quotes around the literal. The old style of using 
"body" and 
"header.foo" to refer to the message body and 
header is @deprecated, and it is encouraged to 
always use${ } tokens for the built-in 
functions. The range operator now requires the range to be in 
single quote as well as shown: "${header.zip} between 
'3..3'".To get the body of the in 
message: body, or 
in.body or 
${body}.A complex expression must 
use${ } placeholders, such as: Hello ${in.header.name} how are you?.You can 
have multiple functions in the same expression: "Hello 
${in.header.name} this is ${in.header.me} speaking". However 
you can not nest functions in Camel 2.8.x or older 
e.g., having another${ } placeholder in an 
existing, is not allowed. From Camel 2.9 you can nest 
functions.Variables
+Simple Expression 
LanguageThe Simple Expression Language was a really simple language 
when it was created, but has since grown more powerful. It is primarily 
intended for being a really small and simple language for evaluating Expressions and Predicates without requiring any new dependencies or 
knowledge of XPath; so it is ideal for 
testing in camel-core. The idea was to cover 95% 
of the common use cases when you need a little bit of expression based script 
in your Camel routes.However for much more complex use cases you are 
generally recommended to choose a more expressive and powerful language such 
as:SpELMvelGroovy
 JavaScriptELOGNLone of the supported Scripting LanguagesThe simple 
language uses ${body} placeholders for complex 
expressions where the expression contains constant 
literals.Deprecated:The${ 
} placeholders can be omitted if the expression starts with the 
token, or if the token is only itself.Alternative syntaxFrom Camel 2.5 you can also use 
the alternative syntax which uses$simple{ } 
as placeholders. 
 This can be used in situations to avoid clashes when using for example Spring 
property placeholder together with Camel.Configuring result typeFrom Camel 2.8 you can configure 
the result type of the Simple 
expression. For example to set the type as a 
java.lang.Boolean or a 
java.lang.Integer etc.File language is now 
merged with Simple languageFrom Camel 2.2, the File Language is now merged with Simple language which means you can use all 
the file syntax directly within the simple language.Simple Language 
Changes in Camel 2.9 onwardsThe Simple language have been improved from Camel 2.9 to

svn commit: r1001818 [1/3] - in /websites/production/camel/content: book-in-one-page.html book-languages-appendix.html cache/main.pageCache simple.html

2016-11-29 Thread buildbot 
Author: buildbot
Date: Tue Nov 29 09:20:58 2016
New Revision: 1001818

Log:
Production update by buildbot for camel

Modified:
websites/production/camel/content/book-in-one-page.html
websites/production/camel/content/book-languages-appendix.html
websites/production/camel/content/cache/main.pageCache
websites/production/camel/content/simple.html

Modified: websites/production/camel/content/book-in-one-page.html
==
--- websites/production/camel/content/book-in-one-page.html (original)
+++ websites/production/camel/content/book-in-one-page.html Tue Nov 29 09:20:58 
2016
@@ -87,7 +87,7 @@

 
 
-Apache CamelUser GuideVersion 
2.15.0 Copyright 2007-2015, Apache Software 
Foundation
+Apache CamelUser GuideVersion 
2.15.0 Copyright 2007-2016, Apache Software 
Foundation
 Table of 
Contents 
  Table 
of ContentsIntroductionQuickstartGetting 
StartedArchitectureEnterprise 
Integration PatternsCook BookTutorialsLanguage AppendixDataFormat 
AppendixPattern AppendixComponent AppendixIndex 
 IntroductionEnterprise Integration 
PatternsCamel 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 CDI,

svn commit: r1001818 [3/3] - in /websites/production/camel/content: book-in-one-page.html book-languages-appendix.html cache/main.pageCache simple.html

2016-11-29 Thread buildbot 
Modified: websites/production/camel/content/simple.html
==
--- websites/production/camel/content/simple.html (original)
+++ websites/production/camel/content/simple.html Tue Nov 29 09:20:58 2016
@@ -86,7 +86,7 @@

 
 
-Simple Expression LanguageThe 
Simple Expression Language was a really simple language when it was created, 
but has since grown more powerful. It is primarily intended for being a really 
small and simple language for evaluating Expressions and Predicates without requiring any new dependencies or 
knowledge of XPath; so it is ideal for 
testing in camel-core. The idea was to cover 95% 
of the common use cases when you need a little bit of expression based script 
in your Camel routes.However for much more complex use cases you are 
generally recommended to choose a more expressive and powerful language such 
as:SpELMvelGroovyJavaScriptELOGNLone of the supported Scripting LanguagesThe simple 
language uses ${body} placeholders for complex 
expressions where the expression contains constant literals. 
The${ } placeholders can be omitted if the 
expression is only the token itself.Alternative syntaxFrom Camel 2.5 you can also use 
the alternative syntax which uses$simple{ } 
as placeholders. This can be used in situations to avoid clashe
 s when using for example Spring property placeholder together with 
Camel.Configuring result 
typeFrom Camel 2.8 you can configure 
the result type of the Simple 
expression. For example to set the type as a 
java.lang.Boolean or a 
java.lang.Integer etc.File language is now 
merged with Simple languageFrom Camel 2.2, the File Langu
 age is now merged with Simple 
language which means you can use all the file syntax directly within the simple 
language.Simple Language 
Changes in Camel 2.9 onwardsThe Simple language have been improved from Camel 2.9 to use 
a better syntax parser, which can do index precise error messages, so you know 
exactly what is wrong and where the problem is. For example if you have made a 
typo in one of the operators, then previously the parser would not be able to 
detect this, and cause the evaluation to be true. There are a few changes in 
the syntax which are no longer backwards compatible. When using Simple l
 anguage as a Predicate then the 
literal text must be enclosed in either single or double 
quotes. For example: "${body} == 'Camel'". Notice 
how we have single quotes around the literal. The old style of using 
"body" and 
"header.foo" to refer to the message body and 
header is @deprecated, and it is encouraged to 
always use${ } tokens for the built-in 
functions. The range operator now requires the range to be in 
single quote as well as shown: "${header.zip} between 
'3..3'".To get the body of the in 
message: body, or 
in.body or 
${body}.A complex expression must 
use${ } pla
 ceholders, such as: Hello ${in.header.name} how are 
you?.You can have multiple functions in the same 
expression: "Hello ${in.header.name} this is ${in.header.me} 
speaking". However you can not nest 
functions in Camel 2.8.x or older e.g., having another${ 
} placeholder in an existing, is not allowed. From 
Camel 2.9 you can nest functions.Variables
+Simple Expression LanguageThe 
Simple Expression Language was a really simple language when it was created, 
but has since grown more powerful. It is primarily intended for being a really 
small and simple language for evaluating Expressions and Predicates without requiring any new dependencies or 
knowledge of XPath; so it is ideal for 
testing in camel-core. The idea was to cover 95% 
of the common use cases when you need a little bit of expression based script 
in your Camel routes.However for much more complex use cases you are 
generally recommended to choose a more expressive and powerful language such 
as:SpELMvelGroovyJavaScriptELOGNLone of the supported Scripting LanguagesThe simple 
language uses ${body} placeholders for complex 
expressions where the expression contains constant 
literals.Deprecated:The${ 
} placeholders can be omitted if the expression starts with the 
token, or if the token is only itself.Alternative syntaxFrom Camel 2.5 you can also use 
the alternative syntax which uses$simple{ } as placeholders. This can be used in situations to avoid clashes when 
using for example Spring property placeholder together with 
Camel.Configuring result 
typeFrom Camel 2.8 you can configure 
the result type of the Simple 
expression. For example to set the type as a 
java.lang.Boolean or a 
java.lang.Integer etc.File language is now 
merged with Simple languageFro
 m Camel 2.2, the File Language 
is now merged with Simple language which 
means you can use all the file syntax directly within the simple 
language.Simple Language 
Changes in Camel 2.9 onwardsThe Simple language have been improved from Camel 2.9 to use 
a better syntax parser, which can do index precise error

camel git commit: CAMEL-10492: Automatic turn of stream caching if using attachment binding mode for camel-servlet as otherwise the attachments are not working.

2016-11-29 Thread davsclaus 
Repository: camel
Updated Branches:
  refs/heads/master d47addd7f -> 3ac821873


CAMEL-10492: Automatic turn of stream caching if using attachment binding mode 
for camel-servlet as otherwise the attachments are not working.


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

Branch: refs/heads/master
Commit: 3ac821873bf07a1aca775d8d52a46e06663de663
Parents: d47addd
Author: Claus Ibsen 
Authored: Tue Nov 29 09:57:04 2016 +0100
Committer: Claus Ibsen 
Committed: Tue Nov 29 09:57:04 2016 +0100

--
 .../ServletComponentConfiguration.java  |  7 +--
 .../src/main/docs/servlet-component.adoc|  4 ++--
 .../component/servlet/ServletComponent.java | 22 
 .../component/servlet/ServletEndpoint.java  |  3 +++
 4 files changed, 32 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/3ac82187/components-starter/camel-servlet-starter/src/main/java/org/apache/camel/component/servlet/springboot/ServletComponentConfiguration.java
--
diff --git 
a/components-starter/camel-servlet-starter/src/main/java/org/apache/camel/component/servlet/springboot/ServletComponentConfiguration.java
 
b/components-starter/camel-servlet-starter/src/main/java/org/apache/camel/component/servlet/springboot/ServletComponentConfiguration.java
index 8137e2d..95cdf88 100644
--- 
a/components-starter/camel-servlet-starter/src/main/java/org/apache/camel/component/servlet/springboot/ServletComponentConfiguration.java
+++ 
b/components-starter/camel-servlet-starter/src/main/java/org/apache/camel/component/servlet/springboot/ServletComponentConfiguration.java
@@ -43,8 +43,11 @@ public class ServletComponentConfiguration {
 private HttpRegistry httpRegistry;
 /**
  * Whether to automatic bind multipart/form-data as attachments on the 
Camel
- * Exchange. This is turn off by default as this may require servlet
- * specific configuration to enable this when using Servlet's.
+ * Exchange. The options attachmentMultipartBinding=true and
+ * disableStreamCache=false cannot work together. Remove disableStreamCache
+ * to use AttachmentMultipartBinding. This is turn off by default as this
+ * may require servlet specific configuration to enable this when using
+ * Servlet's.
  */
 private Boolean attachmentMultipartBinding;
 /**

http://git-wip-us.apache.org/repos/asf/camel/blob/3ac82187/components/camel-servlet/src/main/docs/servlet-component.adoc
--
diff --git a/components/camel-servlet/src/main/docs/servlet-component.adoc 
b/components/camel-servlet/src/main/docs/servlet-component.adoc
index d4f17ba..c13599c 100644
--- a/components/camel-servlet/src/main/docs/servlet-component.adoc
+++ b/components/camel-servlet/src/main/docs/servlet-component.adoc
@@ -56,7 +56,7 @@ The Servlet component supports 7 options which are listed 
below.
 | Name | Java Type | Description
 | servletName | String | Default name of servlet to use. The default name is 
CamelServlet.
 | httpRegistry | HttpRegistry | To use a custom 
org.apache.camel.component.servlet.HttpRegistry.
-| attachmentMultipartBinding | boolean | Whether to automatic bind 
multipart/form-data as attachments on the Camel Exchange. This is turn off by 
default as this may require servlet specific configuration to enable this when 
using Servlet's.
+| attachmentMultipartBinding | boolean | Whether to automatic bind 
multipart/form-data as attachments on the Camel Exchange. The options 
attachmentMultipartBinding=true and disableStreamCache=false cannot work 
together. Remove disableStreamCache to use AttachmentMultipartBinding. This is 
turn off by default as this may require servlet specific configuration to 
enable this when using Servlet's.
 | httpBinding | HttpBinding | To use a custom HttpBinding to control the 
mapping between Camel message and HttpClient.
 | httpConfiguration | HttpConfiguration | To use the shared HttpConfiguration 
as base configuration.
 | allowJavaSerializedObject | boolean | Whether to allow java serialization 
when a request uses context-type=application/x-java-serialized-object This is 
by default turned off. If you enable this then be aware that Java will 
deserialize the incoming data from the request to Java and that can be a 
potential security risk.
@@ -87,7 +87,7 @@ The Servlet component supports 22 endpoint options which are 
listed below:
 | servletName | consumer | CamelServlet | String | Name of the servlet to use
 | traceEnabled |