camel git commit: CAMEL-9556: enableHangupSupport should be deprecated so old code can still compile.

[davsclaus]

Repository: camel
Updated Branches:
  refs/heads/master 35becd183 -> 7d781cce7


CAMEL-9556: enableHangupSupport should be deprecated so old code can still 
compile.


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

Branch: refs/heads/master
Commit: 7d781cce7cf84d736ee836672ffc5fa0141786cd
Parents: 35becd1
Author: Claus Ibsen 
Authored: Mon Feb 1 21:55:31 2016 +0100
Committer: Claus Ibsen 
Committed: Mon Feb 1 21:55:31 2016 +0100

--
 .../src/main/java/org/apache/camel/main/MainSupport.java  | 10 ++
 1 file changed, 10 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/7d781cce/camel-core/src/main/java/org/apache/camel/main/MainSupport.java
--
diff --git a/camel-core/src/main/java/org/apache/camel/main/MainSupport.java 
b/camel-core/src/main/java/org/apache/camel/main/MainSupport.java
index e015e55..74a22d4 100644
--- a/camel-core/src/main/java/org/apache/camel/main/MainSupport.java
+++ b/camel-core/src/main/java/org/apache/camel/main/MainSupport.java
@@ -159,6 +159,16 @@ public abstract class MainSupport extends ServiceSupport {
 }
 
 /**
+ * Hangup support is enabled by default.
+ *
+ * @deprecated is enabled by default now, so no longer need to call this 
method.
+ */
+@Deprecated
+public void enableHangupSupport() {
+hangupInterceptorEnabled = true;
+}
+
+/**
  * Adds a {@link org.apache.camel.main.MainListener} to receive callbacks 
when the main is started or stopping
  *
  * @param listener the listener

[2/5] camel git commit: CAMEL-9534: optimize attribute handling in StAX2SAXSource adapter

[dkulp]

CAMEL-9534: optimize attribute handling in StAX2SAXSource adapter

Creating a copy of all attribute data for each START_ELEMENT event is not
necessary and wastes time and memory.

Use a custom SAX Attributes implementation that just forwards all calls to
the respective StAX XMLStreamReader.getAttribute* methods.

Signed-off-by: Karsten Blees 


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

Branch: refs/heads/master
Commit: 7d90d5d14012b688af4038f9e38df218185a810a
Parents: 3ac8d9f
Author: Karsten Blees 
Authored: Sat Jan 30 14:04:51 2016 +0100
Committer: Daniel Kulp 
Committed: Mon Feb 1 16:06:24 2016 -0500

--
 .../camel/converter/jaxp/StAX2SAXSource.java| 154 ++-
 1 file changed, 112 insertions(+), 42 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/7d90d5d1/camel-core/src/main/java/org/apache/camel/converter/jaxp/StAX2SAXSource.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/converter/jaxp/StAX2SAXSource.java 
b/camel-core/src/main/java/org/apache/camel/converter/jaxp/StAX2SAXSource.java
index e4a68b6..957637b 100644
--- 
a/camel-core/src/main/java/org/apache/camel/converter/jaxp/StAX2SAXSource.java
+++ 
b/camel-core/src/main/java/org/apache/camel/converter/jaxp/StAX2SAXSource.java
@@ -33,7 +33,6 @@ import org.xml.sax.SAXNotSupportedException;
 import org.xml.sax.SAXParseException;
 import org.xml.sax.XMLReader;
 import org.xml.sax.ext.LexicalHandler;
-import org.xml.sax.helpers.AttributesImpl;
 
 /**
  * Adapter to turn a StAX {@link XMLStreamReader} into a {@link SAXSource}.
@@ -60,6 +59,7 @@ public class StAX2SAXSource extends SAXSource implements 
XMLReader {
 }
 
 protected void parse() throws SAXException {
+final StAX2SAXAttributes attributes = new StAX2SAXAttributes();
 try {
 while (true) {
 switch (streamReader.getEventType()) {
@@ -110,19 +110,14 @@ public class StAX2SAXSource extends SAXSource implements 
XMLReader {
 contentHandler.endDocument();
 return;
 case XMLStreamConstants.END_ELEMENT: {
-String uri = streamReader.getNamespaceURI();
+String uri = nullToEmpty(streamReader.getNamespaceURI());
 String localName = streamReader.getLocalName();
-String prefix = streamReader.getPrefix();
-String qname = prefix != null && prefix.length() > 0
-? prefix + ":" + localName : localName;
+String qname = getPrefixedName(streamReader.getPrefix(), 
localName);
 contentHandler.endElement(uri, localName, qname);
+
 // namespaces
 for (int i = 0; i < streamReader.getNamespaceCount(); i++) 
{
 String nsPrefix = streamReader.getNamespacePrefix(i);
-String nsUri = streamReader.getNamespaceURI(i);
-if (nsUri == null) {
-nsUri = "";
-}
 contentHandler.endPrefixMapping(nsPrefix);
 }
 break;
@@ -138,21 +133,19 @@ public class StAX2SAXSource extends SAXSource implements 
XMLReader {
 contentHandler.startDocument();
 break;
 case XMLStreamConstants.START_ELEMENT: {
-String uri = streamReader.getNamespaceURI();
-String localName = streamReader.getLocalName();
-String prefix = streamReader.getPrefix();
-String qname = prefix != null && prefix.length() > 0
-? prefix + ":" + localName : localName;
 // namespaces
 for (int i = 0; i < streamReader.getNamespaceCount(); i++) 
{
 String nsPrefix = streamReader.getNamespacePrefix(i);
-String nsUri = streamReader.getNamespaceURI(i);
-if (nsUri == null) {
-nsUri = "";
-}
+String nsUri = 
nullToEmpty(streamReader.getNamespaceURI(i));
 contentHandler.startPrefixMapping(nsPrefix, nsUri);
 }
-contentHandler.startElement(uri == null ? "" : uri, 
localName, qname, getAttributes());
+
+String uri = nullToEmpty(streamReader.getNamespaceURI());
+  

[1/5] camel git commit: CAMEL-9534: XmlConverter: use a pool of SAXParser / XMLReader instances

[dkulp]

Repository: camel
Updated Branches:
  refs/heads/master 7d781cce7 -> 070ed43e1


CAMEL-9534: XmlConverter: use a pool of SAXParser / XMLReader instances

Creating and configuring a new SAXParserFactory and SAXParser / XMLReader
for every SAXSource is very expensive.

A SAXParser / XMLReader instance can be used to parse many XML documents.

Add an XMLReaderPool helper to manage existing XMLReader instances (i.e.
hand out existing instances from the pool, reset properties / features and
return the instance to the pool after use).

Use pooled XMLReaders in XmlConverter.toSAXSource* (except if a specific
SAXParserFactory is configured on the Exchange).

Signed-off-by: Karsten Blees 


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

Branch: refs/heads/master
Commit: 3c8560f003e0a4534cef428664fd4811621aa03c
Parents: 7d90d5d
Author: Karsten Blees 
Authored: Wed Jan 27 19:10:22 2016 +0100
Committer: Daniel Kulp 
Committed: Mon Feb 1 16:06:24 2016 -0500

--
 .../camel/converter/jaxp/XMLReaderPool.java | 234 +++
 .../camel/converter/jaxp/XmlConverter.java  |  50 ++--
 2 files changed, 265 insertions(+), 19 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/3c8560f0/camel-core/src/main/java/org/apache/camel/converter/jaxp/XMLReaderPool.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/converter/jaxp/XMLReaderPool.java 
b/camel-core/src/main/java/org/apache/camel/converter/jaxp/XMLReaderPool.java
new file mode 100644
index 000..ec50920
--- /dev/null
+++ 
b/camel-core/src/main/java/org/apache/camel/converter/jaxp/XMLReaderPool.java
@@ -0,0 +1,234 @@
+/**
+ * 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.converter.jaxp;
+
+import java.io.IOException;
+import java.lang.ref.WeakReference;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Queue;
+import java.util.concurrent.ConcurrentLinkedQueue;
+
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.parsers.SAXParserFactory;
+
+import org.xml.sax.ContentHandler;
+import org.xml.sax.DTDHandler;
+import org.xml.sax.EntityResolver;
+import org.xml.sax.ErrorHandler;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+import org.xml.sax.SAXNotRecognizedException;
+import org.xml.sax.SAXNotSupportedException;
+import org.xml.sax.XMLReader;
+
+/**
+ * Manages a pool of XMLReader (and associated SAXParser) instances for reuse.
+ */
+public class XMLReaderPool {
+private final Queue pool = new 
ConcurrentLinkedQueue();
+private final SAXParserFactory saxParserFactory;
+
+/**
+ * Creates a new instance.
+ *
+ * @param saxParserFactory
+ *the SAXParserFactory used to create new SAXParser instances
+ */
+public XMLReaderPool(SAXParserFactory saxParserFactory) {
+this.saxParserFactory = saxParserFactory;
+}
+
+/**
+ * Returns an XMLReader that can be used exactly once. Calling one of the
+ * {@code parse} methods returns the reader to the pool. This is useful
+ * for e.g. SAXSource which bundles an XMLReader with an InputSource that
+ * can also be consumed just once.
+ *
+ * @return the XMLReader
+ * @throws SAXException
+ * see {@link SAXParserFactory#newSAXParser()}
+ * @throws ParserConfigurationException
+ * see {@link SAXParserFactory#newSAXParser()}
+ */
+public XMLReader createXMLReader() throws SAXException, 
ParserConfigurationException {
+XMLReader xmlReader = null;
+WeakReference ref;
+while ((ref = pool.poll()) != null) {
+if ((xmlReader = ref.get()) != null)
+break;
+}
+
+if (xmlReader == 

[3/5] camel git commit: CAMEL-9534: XsltBuilder: always convert StAXSource to SAXSource

[dkulp]

CAMEL-9534: XsltBuilder: always convert StAXSource to SAXSource

Some older TrAX implementations such as Xalan and Saxon-B do not support
StAXSource.

Using the Woodstox StAX parser with the default TrAX implementation (XSLTC)
doesn't handle CDATA sections correctly (Woodstox reports these as CDATA
events, which are ignored by XSLTC's StAXStream2SAX adapter).

Using StAXSource instead of SAXSource with the default TrAX implementation
(XSLTC) or Saxon results in a significant performance penalty.

Rename Camel's StaxSource adapter to StAX2SAXSource to better reflect what
it does. Use the adapter for all TrAX implementations (not just Xalan).

Signed-off-by: Karsten Blees 


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

Branch: refs/heads/master
Commit: fe0e85a92200662f441d71baafc5bfe40108894f
Parents: 7d781cc
Author: Karsten Blees 
Authored: Thu Jan 28 21:27:54 2016 +0100
Committer: Daniel Kulp 
Committed: Mon Feb 1 16:06:24 2016 -0500

--
 .../apache/camel/builder/xml/XsltBuilder.java   |  33 +--
 .../camel/converter/jaxp/StAX2SAXSource.java| 275 +++
 .../apache/camel/converter/jaxp/StaxSource.java | 275 ---
 .../builder/xml/XsltTestErrorListenerTest.java  |   2 +-
 .../converter/jaxp/StAX2SAXSourceTest.java  |  63 +
 .../camel/converter/jaxp/StaxSourceTest.java|  63 -
 6 files changed, 354 insertions(+), 357 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/fe0e85a9/camel-core/src/main/java/org/apache/camel/builder/xml/XsltBuilder.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/builder/xml/XsltBuilder.java 
b/camel-core/src/main/java/org/apache/camel/builder/xml/XsltBuilder.java
index 7a5a610..d9d65f4 100644
--- a/camel-core/src/main/java/org/apache/camel/builder/xml/XsltBuilder.java
+++ b/camel-core/src/main/java/org/apache/camel/builder/xml/XsltBuilder.java
@@ -27,7 +27,6 @@ import java.util.Set;
 import java.util.concurrent.ArrayBlockingQueue;
 import java.util.concurrent.BlockingQueue;
 import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.stream.XMLStreamReader;
 import javax.xml.transform.ErrorListener;
 import javax.xml.transform.Result;
 import javax.xml.transform.Source;
@@ -51,7 +50,7 @@ import org.apache.camel.Message;
 import org.apache.camel.Processor;
 import org.apache.camel.RuntimeTransformException;
 import org.apache.camel.TypeConverter;
-import org.apache.camel.converter.jaxp.StaxSource;
+import org.apache.camel.converter.jaxp.StAX2SAXSource;
 import org.apache.camel.converter.jaxp.XmlConverter;
 import org.apache.camel.support.ServiceSupport;
 import org.apache.camel.support.SynchronizationAdapter;
@@ -120,7 +119,6 @@ public class XsltBuilder extends ServiceSupport implements 
Processor, CamelConte
 
 ResultHandler resultHandler = 
resultHandlerFactory.createResult(exchange);
 Result result = resultHandler.getResult();
-exchange.setProperty("isXalanTransformer", 
isXalanTransformer(transformer));
 // let's copy the headers before we invoke the transform in case they 
modify them
 Message out = exchange.getOut();
 out.copyFrom(exchange.getIn());
@@ -137,6 +135,17 @@ public class XsltBuilder extends ServiceSupport implements 
Processor, CamelConte
 Object body = exchange.getIn().getBody();
 source = getSource(exchange, body);
 }
+
+if (source instanceof StAXSource) {
+// Always convert StAXSource to SAXSource.
+// * Xalan and Saxon-B don't support StAXSource.
+// * The JDK default implementation (XSLTC) doesn't handle 
CDATA events
+//   (see 
com.sun.org.apache.xalan.internal.xsltc.trax.StAXStream2SAX).
+// * Saxon-HE/PE/EE seem to support StAXSource, but don't 
advertise this
+//   officially (via 
TransformerFactory.getFeature(StAXSource.FEATURE))
+source = new StAX2SAXSource(((StAXSource) 
source).getXMLStreamReader());
+}
+
 LOG.trace("Using {} as source", source);
 transformer.transform(source, result);
 LOG.trace("Transform complete with result {}", result);
@@ -148,10 +157,6 @@ public class XsltBuilder extends ServiceSupport implements 
Processor, CamelConte
 }
 }
 
-boolean isXalanTransformer(Transformer transformer) {
-return 
transformer.getClass().getName().startsWith("org.apache.xalan.transformer");
-}
-
 boolean 

[4/5] camel git commit: CAMEL-9534: XsltComponent: fix support for Saxon-B and Saxon >= 9.6

[dkulp]

CAMEL-9534: XsltComponent: fix support for Saxon-B and Saxon >= 9.6

Using reflection and Saxon-specific APIs to configure Saxon's MessageWarner
class is flaky - the current implementation introduced with CAMEL-7753 only
works for Saxon-HE 9.3 - 9.5. Using XsltComponent with other Saxon versions
fails with IllegalStateException "Error pre-loading Saxon classes...".

Use TransformerFactory.setAttribute(FeatureKeys.MESSAGE_EMITTER_CLASS) to
install the MessageWarner class. Only log a warning on failure.

Make lazy-initialized factory variables volatile so that they only become
visible to other threads after the factory is fully initialized.

Note: The MessageWarner class in Saxon 9.6+ redirects  output
to the ErrorListener of the TransformerFactory rather than the Transformer
instance (see https://saxonica.plan.io/issues/2581). This cannot be easily
fixed on the Camel side, as setting a Transformer-specific ErrorListener on
the TransformerFactory would break multithreaded routes.

Signed-off-by: Karsten Blees 


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

Branch: refs/heads/master
Commit: 3ac8d9fd74ec00fa5a969eb790e1df496073d92b
Parents: fe0e85a
Author: Karsten Blees 
Authored: Mon Jan 25 22:27:16 2016 +0100
Committer: Daniel Kulp 
Committed: Mon Feb 1 16:06:24 2016 -0500

--
 .../apache/camel/builder/xml/XsltBuilder.java   | 62 +---
 .../camel/component/xslt/XsltEndpoint.java  |  5 --
 .../camel/converter/jaxp/XmlConverter.java  | 46 ++-
 .../util/toolbox/XsltAggregationStrategy.java   |  1 -
 .../camel/builder/xml/XsltBuilderTest.java  | 38 
 5 files changed, 47 insertions(+), 105 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/3ac8d9fd/camel-core/src/main/java/org/apache/camel/builder/xml/XsltBuilder.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/builder/xml/XsltBuilder.java 
b/camel-core/src/main/java/org/apache/camel/builder/xml/XsltBuilder.java
index d9d65f4..d5e73da 100644
--- a/camel-core/src/main/java/org/apache/camel/builder/xml/XsltBuilder.java
+++ b/camel-core/src/main/java/org/apache/camel/builder/xml/XsltBuilder.java
@@ -19,13 +19,13 @@ package org.apache.camel.builder.xml;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
-import java.lang.reflect.Method;
 import java.net.URL;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ArrayBlockingQueue;
 import java.util.concurrent.BlockingQueue;
+
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.transform.ErrorListener;
 import javax.xml.transform.Result;
@@ -42,8 +42,6 @@ import javax.xml.transform.stream.StreamSource;
 
 import org.w3c.dom.Node;
 
-import org.apache.camel.CamelContext;
-import org.apache.camel.CamelContextAware;
 import org.apache.camel.Exchange;
 import org.apache.camel.ExpectedBodyTypeException;
 import org.apache.camel.Message;
@@ -52,12 +50,10 @@ import org.apache.camel.RuntimeTransformException;
 import org.apache.camel.TypeConverter;
 import org.apache.camel.converter.jaxp.StAX2SAXSource;
 import org.apache.camel.converter.jaxp.XmlConverter;
-import org.apache.camel.support.ServiceSupport;
 import org.apache.camel.support.SynchronizationAdapter;
 import org.apache.camel.util.ExchangeHelper;
 import org.apache.camel.util.FileUtil;
 import org.apache.camel.util.IOHelper;
-import org.apache.camel.util.ObjectHelper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -76,9 +72,8 @@ import static org.apache.camel.util.ObjectHelper.notNull;
  *
  * @version 
  */
-public class XsltBuilder extends ServiceSupport implements Processor, 
CamelContextAware {
+public class XsltBuilder implements Processor {
 private static final Logger LOG = 
LoggerFactory.getLogger(XsltBuilder.class);
-private CamelContext camelContext;
 private Map parameters = new HashMap();
 private XmlConverter converter = new XmlConverter();
 private Templates template;
@@ -89,9 +84,6 @@ public class XsltBuilder extends ServiceSupport implements 
Processor, CamelConte
 private boolean deleteOutputFile;
 private ErrorListener errorListener;
 private boolean allowStAX = true;
-private volatile Method setMessageEmitterMethod;
-private volatile Class saxonReceiverClass;
-private volatile Class saxonWarnerClass;
 
 public XsltBuilder() {
 }
@@ -157,10 +149,6 @@ public class XsltBuilder extends ServiceSupport 

[5/5] camel git commit: Fix checkstyle issues with patch

[dkulp]

Fix checkstyle issues with patch


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

Branch: refs/heads/master
Commit: 070ed43e1808ab2db381eaddd9abf520b88ce7cf
Parents: 3c8560f
Author: Daniel Kulp 
Authored: Mon Feb 1 15:46:20 2016 -0500
Committer: Daniel Kulp 
Committed: Mon Feb 1 16:06:25 2016 -0500

--
 .../apache/camel/converter/jaxp/StAX2SAXSource.java  | 15 ++-
 .../apache/camel/converter/jaxp/XMLReaderPool.java   | 14 +-
 .../apache/camel/converter/jaxp/XmlConverter.java|  3 ++-
 3 files changed, 21 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/070ed43e/camel-core/src/main/java/org/apache/camel/converter/jaxp/StAX2SAXSource.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/converter/jaxp/StAX2SAXSource.java 
b/camel-core/src/main/java/org/apache/camel/converter/jaxp/StAX2SAXSource.java
index 957637b..89a17b0 100644
--- 
a/camel-core/src/main/java/org/apache/camel/converter/jaxp/StAX2SAXSource.java
+++ 
b/camel-core/src/main/java/org/apache/camel/converter/jaxp/StAX2SAXSource.java
@@ -204,22 +204,25 @@ public class StAX2SAXSource extends SAXSource implements 
XMLReader {
 
 @Override
 public String getURI(int index) {
-if (!checkIndex(index))
+if (!checkIndex(index)) {
 return null;
+}
 return nullToEmpty(streamReader.getAttributeNamespace(index));
 }
 
 @Override
 public String getLocalName(int index) {
-if (!checkIndex(index))
+if (!checkIndex(index)) {
 return null;
+}
 return streamReader.getAttributeLocalName(index);
 }
 
 @Override
 public String getQName(int index) {
-if (!checkIndex(index))
+if (!checkIndex(index)) {
 return null;
+}
 String localName = streamReader.getAttributeLocalName(index);
 String prefix = streamReader.getAttributePrefix(index);
 return getPrefixedName(prefix, localName);
@@ -227,15 +230,17 @@ public class StAX2SAXSource extends SAXSource implements 
XMLReader {
 
 @Override
 public String getType(int index) {
-if (!checkIndex(index))
+if (!checkIndex(index)) {
 return null;
+}
 return streamReader.getAttributeType(index);
 }
 
 @Override
 public String getValue(int index) {
-if (!checkIndex(index))
+if (!checkIndex(index)) {
 return null;
+}
 return nullToEmpty(streamReader.getAttributeType(index));
 }
 

http://git-wip-us.apache.org/repos/asf/camel/blob/070ed43e/camel-core/src/main/java/org/apache/camel/converter/jaxp/XMLReaderPool.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/converter/jaxp/XMLReaderPool.java 
b/camel-core/src/main/java/org/apache/camel/converter/jaxp/XMLReaderPool.java
index ec50920..658268c 100644
--- 
a/camel-core/src/main/java/org/apache/camel/converter/jaxp/XMLReaderPool.java
+++ 
b/camel-core/src/main/java/org/apache/camel/converter/jaxp/XMLReaderPool.java
@@ -69,8 +69,9 @@ public class XMLReaderPool {
 XMLReader xmlReader = null;
 WeakReference ref;
 while ((ref = pool.poll()) != null) {
-if ((xmlReader = ref.get()) != null)
+if ((xmlReader = ref.get()) != null) {
 break;
+}
 }
 
 if (xmlReader == null) {
@@ -83,7 +84,7 @@ public class XMLReaderPool {
 /**
  * Wraps another XMLReader for single use only.
  */
-private class OneTimeXMLReader implements XMLReader {
+private final class OneTimeXMLReader implements XMLReader {
 private XMLReader xmlReader;
 private final Map initFeatures = new HashMap();
 private final Map initProperties = new HashMap();
@@ -127,8 +128,9 @@ public class XMLReaderPool {
 }
 
 private void checkValid() {
-if (xmlReader == null)
+if (xmlReader == null) {
 throw new IllegalStateException("OneTimeXMLReader.parse() can 
only be used once!");
+}
 }
 
 @Override
@@ -142,8 +144,9 @@ public class XMLReaderPool {
 public void setFeature(String name, boolean value)
 

[1/3] camel git commit: CAMEL-9553: camel-twitter delay option should use the inherited option.

[davsclaus]

Repository: camel
Updated Branches:
  refs/heads/camel-2.16.x b1555bae4 -> 612ec99f8
  refs/heads/master 311ecf26d -> 3e94cdd3e


CAMEL-9553: camel-twitter delay option should use the inherited option.


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

Branch: refs/heads/master
Commit: a4390871d083054d63f585052dd0060efce885f6
Parents: 311ecf2
Author: Claus Ibsen 
Authored: Mon Feb 1 09:34:14 2016 +0100
Committer: Claus Ibsen 
Committed: Mon Feb 1 09:34:14 2016 +0100

--
 components/camel-twitter/src/main/docs/twitter.adoc  |  8 +++-
 .../component/twitter/TwitterConfiguration.java  | 13 -
 .../component/twitter/TwitterEndpointPolling.java| 15 ++-
 .../twitter/consumer/TwitterConsumerPolling.java | 11 ---
 .../camel/component/twitter/SearchPollingTest.java   |  2 +-
 5 files changed, 26 insertions(+), 23 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/a4390871/components/camel-twitter/src/main/docs/twitter.adoc
--
diff --git a/components/camel-twitter/src/main/docs/twitter.adoc 
b/components/camel-twitter/src/main/docs/twitter.adoc
index 927581a..6a056e6 100644
--- a/components/camel-twitter/src/main/docs/twitter.adoc
+++ b/components/camel-twitter/src/main/docs/twitter.adoc
@@ -128,6 +128,9 @@ Producer endpoints
 URI options
 ^^^
 
+
+
+
 // endpoint options: START
 The Twitter component supports 43 endpoint options which are listed below:
 
@@ -141,7 +144,6 @@ The Twitter component supports 43 endpoint options which 
are listed below:
 | consumerSecret | common |  | String | The consumer secret. Can also be 
configured on the TwitterComponent level instead.
 | user | common |  | String | Username used for user timeline consumption 
direct message production etc.
 | bridgeErrorHandler | consumer | false | boolean | Allows for bridging the 
consumer to the Camel routing Error Handler which mean any exceptions occurred 
while the consumer is trying to pickup incoming messages or the likes will now 
be processed as a message and handled by the routing Error Handler. By default 
the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with 
exceptions that will be logged at WARN/ERROR level and ignored.
-| delay | consumer | 60 | int | Delay in seconds between polling from twitter.
 | sendEmptyMessageWhenIdle | consumer | false | boolean | If the polling 
consumer did not poll any files you can enable this option to send an empty 
message (no body) instead.
 | type | consumer | direct | EndpointType | Endpoint type to use. Only 
streaming supports event type.
 | distanceMetric | consumer (advanced) | km | String | Used by the non-stream 
geography search to search by radius using the configured metrics. The unit can 
either be mi for miles or km for kilometers. You need to configure all the 
following options: longitude latitude radius and distanceMetric.
@@ -157,6 +159,7 @@ The Twitter component supports 43 endpoint options which 
are listed below:
 | backoffErrorThreshold | scheduler |  | int | The number of subsequent error 
polls (failed due some error) that should happen before the backoffMultipler 
should kick-in.
 | backoffIdleThreshold | scheduler |  | int | The number of subsequent idle 
polls that should happen before the backoffMultipler should kick-in.
 | backoffMultiplier | scheduler |  | int | To let the scheduled polling 
consumer backoff if there has been a number of subsequent idles/errors in a 
row. The multiplier is then the number of polls that will be skipped before the 
next actual attempt is happening again. When this option is in use then 
backoffIdleThreshold and/or backoffErrorThreshold must also be configured.
+| delay | scheduler | 6 | long | Milliseconds before the next poll.
 | greedy | scheduler | false | boolean | If greedy is enabled then the 
ScheduledPollConsumer will run immediately again if the previous run polled 1 
or more messages.
 | initialDelay | scheduler | 1000 | long | Milliseconds before the first poll 
starts.
 | runLoggingLevel | scheduler | TRACE | LoggingLevel | The consumer logs a 
start/complete log line when it polls. This option allows you to configure the 
logging level for that.
@@ -180,6 +183,9 @@ The Twitter component supports 43 endpoint options which 
are listed below:
 |===
 // endpoint options: END
 
+
+
+
 [[Twitter-Messageheaders]]
 Message headers
 ^^^

[3/3] camel git commit: Component docs polished

[davsclaus]

Component docs polished


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

Branch: refs/heads/camel-2.16.x
Commit: 612ec99f8783721fe9f4cec6bdfe8b37b19136f1
Parents: b1555ba
Author: Claus Ibsen 
Authored: Mon Feb 1 09:38:28 2016 +0100
Committer: Claus Ibsen 
Committed: Mon Feb 1 09:39:23 2016 +0100

--
 .../org/apache/camel/component/mail/MailEndpoint.java | 14 +-
 1 file changed, 13 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/612ec99f/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailEndpoint.java
--
diff --git 
a/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailEndpoint.java
 
b/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailEndpoint.java
index d4e5b74..62774ae 100644
--- 
a/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailEndpoint.java
+++ 
b/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailEndpoint.java
@@ -36,8 +36,11 @@ import org.apache.camel.spi.UriParam;
 syntax = "imap:host:port", alternativeSyntax = 
"imap:username:password@host:port",
 consumerClass = MailConsumer.class, label = "mail")
 public class MailEndpoint extends ScheduledPollEndpoint {
-@UriParam(defaultValue = "" + MailConsumer.DEFAULT_CONSUMER_DELAY, label = 
"consumer", description = "Milliseconds before the next poll.")
+
+@UriParam(optionalPrefix = "consumer.", defaultValue = "" + 
MailConsumer.DEFAULT_CONSUMER_DELAY, label = "consumer,scheduler",
+description = "Milliseconds before the next poll.")
 private long delay = MailConsumer.DEFAULT_CONSUMER_DELAY;
+
 @UriParam
 private MailConfiguration configuration;
 @UriParam(label = "advanced")
@@ -225,4 +228,13 @@ public class MailEndpoint extends ScheduledPollEndpoint {
 public void setPostProcessAction(MailBoxPostProcessAction 
postProcessAction) {
 this.postProcessAction = postProcessAction;
 }
+
+/**
+ * Milliseconds before the next poll.
+ */
+@Override
+public void setDelay(long delay) {
+super.setDelay(delay);
+this.delay = delay;
+}
 }

[2/3] camel git commit: Component docs polished

[davsclaus]

Component docs polished


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

Branch: refs/heads/master
Commit: 3e94cdd3e81fcaa4c59c94fd203c987ca3b36ef8
Parents: a439087
Author: Claus Ibsen 
Authored: Mon Feb 1 09:38:28 2016 +0100
Committer: Claus Ibsen 
Committed: Mon Feb 1 09:38:28 2016 +0100

--
 .../org/apache/camel/component/mail/MailEndpoint.java | 14 +-
 1 file changed, 13 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/3e94cdd3/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailEndpoint.java
--
diff --git 
a/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailEndpoint.java
 
b/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailEndpoint.java
index 4b3ca8c..493c2e9 100644
--- 
a/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailEndpoint.java
+++ 
b/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailEndpoint.java
@@ -36,8 +36,11 @@ import org.apache.camel.spi.UriParam;
 syntax = "imap:host:port", alternativeSyntax = 
"imap:username:password@host:port",
 consumerClass = MailConsumer.class, label = "mail")
 public class MailEndpoint extends ScheduledPollEndpoint {
-@UriParam(defaultValue = "" + MailConsumer.DEFAULT_CONSUMER_DELAY, label = 
"consumer", description = "Milliseconds before the next poll.")
+
+@UriParam(optionalPrefix = "consumer.", defaultValue = "" + 
MailConsumer.DEFAULT_CONSUMER_DELAY, label = "consumer,scheduler",
+description = "Milliseconds before the next poll.")
 private long delay = MailConsumer.DEFAULT_CONSUMER_DELAY;
+
 @UriParam
 private MailConfiguration configuration;
 @UriParam(label = "advanced")
@@ -225,4 +228,13 @@ public class MailEndpoint extends ScheduledPollEndpoint {
 public void setPostProcessAction(MailBoxPostProcessAction 
postProcessAction) {
 this.postProcessAction = postProcessAction;
 }
+
+/**
+ * Milliseconds before the next poll.
+ */
+@Override
+public void setDelay(long delay) {
+super.setDelay(delay);
+this.delay = delay;
+}
 }

Scanned image from cop...@camel.apache.org

[copier@]

Reply to: cop...@camel.apache.org 
Device Name: COPIER
Device Model: MX-2310U

File Format: DOC (Medium)
Resolution: 200dpi x 200dpi

Attached file is scanned document in DOC format.
Use Microsoft(R)Word(R) of Microsoft Systems Incorporated to view the document.


copier@camel.apache.org_20160129_084903.doc
Description: MS-Word document

buildbot failure in on camel-site-production

[buildbot]

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

Buildbot URL: https://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 compile

Sincerely,
 -The Buildbot

[2/2] camel git commit: OSGi CDI example

[davsclaus]

OSGi CDI example


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

Branch: refs/heads/master
Commit: 35becd1839f6a1bb6e77851ff7190703420ed430
Parents: d12c884
Author: Antonin Stefanutti 
Authored: Mon Feb 1 20:45:05 2016 +0100
Committer: Antonin Stefanutti 
Committed: Mon Feb 1 20:45:05 2016 +0100

--
 examples/camel-example-cdi-osgi/README.md   |  90 ++
 examples/camel-example-cdi-osgi/pom.xml | 303 +++
 .../apache/camel/example/cdi/osgi/Config.java   |  35 +++
 .../apache/camel/example/cdi/osgi/Consumer.java |  31 ++
 .../org/apache/camel/example/cdi/osgi/Jms.java  |  41 +++
 .../apache/camel/example/cdi/osgi/Producer.java |  30 ++
 .../src/main/resources/META-INF/LICENSE.txt | 203 +
 .../src/main/resources/META-INF/NOTICE.txt  |  11 +
 .../src/main/resources/META-INF/beans.xml   |  18 ++
 .../src/main/resources/jms.properties   |   1 +
 .../src/main/resources/log4j.properties |  27 ++
 .../camel/example/cdi/osgi/CdiOsgiIT.java   | 101 +++
 .../camel/example/cdi/osgi/PaxExamOptions.java  | 119 
 examples/pom.xml|   1 +
 parent/pom.xml  |   1 +
 15 files changed, 1012 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/35becd18/examples/camel-example-cdi-osgi/README.md
--
diff --git a/examples/camel-example-cdi-osgi/README.md 
b/examples/camel-example-cdi-osgi/README.md
new file mode 100644
index 000..0fc4370
--- /dev/null
+++ b/examples/camel-example-cdi-osgi/README.md
@@ -0,0 +1,90 @@
+# OSGi Example - CDI
+
+### Introduction
+
+This example illustrates a CDI application that can be executed inside an OSGi 
container
+using PAX CDI. This application can run unchanged as well in Java SE inside a 
standalone
+CDI container.
+
+The example starts an ActiveMQ in-memory broker and publishes a message when 
the Camel
+context has started.
+
+The example is implemented in Java with CDI dependency injection. It uses 
JBoss Weld
+as the minimal CDI container to run the application, though you can run the 
application
+in any CDI compliant container. In OSGi, PAX CDI is used to managed the 
lifecycle of
+the CDI container.
+
+The `camel-core` and `camel-sjms` components are used in this example.
+
+### Build
+
+You will need to build this example first:
+
+$ mvn install
+
+### Run
+
+ Java SE
+
+You can run this example using:
+
+$ mvn camel:run
+
+When the Camel application starts, you should see the following message being 
logged to the console, e.g.:
+```
+2016-02-01 20:13:46,922 [cdi.Main.main()] INFO  DefaultCamelContext - Apache 
Camel 2.17-SNAPSHOT (CamelContext: osgi-example) started in 0.769 seconds
+2016-02-01 20:13:47,008 [ Session Task-1] INFO  consumer-route  - Received 
message [Sample Message] from [Producer]
+```
+
+The Camel application can be stopped pressing ctrl+c in 
the shell.
+
+ OSGi / Karaf
+
+This example can be executed within Karaf. From the command line, in `bin` 
directory,
+start Karaf:
+
+$ ./karaf
+
+Then install the following pre-requisites:
+
+features:addUrl 
mvn:org.apache.camel.karaf/apache-camel/${version}/xml/features
+features:addUrl mvn:org.apache.activemq/activemq-karaf/5.12.1/xml/features
+features:install activemq-broker-noweb
+features:install pax-cdi-weld
+features:install camel-cdi
+features:install camel-sjms
+
+Finally install and start the example:
+
+osgi:install -s mvn:org.apache.camel/camel-example-cdi-osgi/${version}
+
+The following messages should be logged:
+
+```
+2016-02-01 20:28:43,446 | INFO  | nsole user karaf | DefaultCamelContext   
   | 58 - org.apache.camel.camel-core - 2.17.0.SNAPSHOT | Apache Camel 
2.17-SNAPSHOT (CamelContext: osgi-example) is starting
+2016-02-01 20:28:43,447 | INFO  | nsole user karaf | ManagedManagementStrategy 
   | 58 - org.apache.camel.camel-core - 2.17.0.SNAPSHOT | JMX is enabled
+2016-02-01 20:28:43,565 | INFO  | nsole user karaf | DefaultTypeConverter  
   | 58 - org.apache.camel.camel-core - 2.17.0.SNAPSHOT | Loaded 182 type 
converters
+2016-02-01 20:28:43,585 | INFO  | nsole user karaf | 
DefaultRuntimeEndpointRegistry   | 58 - org.apache.camel.camel-core - 
2.17.0.SNAPSHOT | Runtime endpoint registry is in extended mode gathering usage 
statistics of all incoming and outgoing endpoints (cache limit: 1000)
+2016-02-01 20:28:43,675 | INFO  | nsole user karaf | BrokerService 
   | 187 - 

[1/2] camel git commit: Add Camel OSGi to Camel CDI feature

[davsclaus]

Repository: camel
Updated Branches:
  refs/heads/master 3e94cdd3e -> 35becd183


Add Camel OSGi to Camel CDI feature


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

Branch: refs/heads/master
Commit: d12c884edaeb773581e704d90a433fd2cee20bfc
Parents: 3e94cdd
Author: Antonin Stefanutti 
Authored: Mon Feb 1 20:42:36 2016 +0100
Committer: Antonin Stefanutti 
Committed: Mon Feb 1 20:42:36 2016 +0100

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


http://git-wip-us.apache.org/repos/asf/camel/blob/d12c884e/platforms/karaf/features/src/main/resources/features.xml
--
diff --git a/platforms/karaf/features/src/main/resources/features.xml 
b/platforms/karaf/features/src/main/resources/features.xml
index 10ddd6e..a43c917 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -265,6 +265,7 @@

pax-cdi
 camel-core
+mvn:org.apache.camel/camel-core-osgi/${project.version}
 mvn:org.apache.camel/camel-cdi/${project.version}
   
   

buildbot success in on camel-site-production

[buildbot]

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

Buildbot URL: https://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

buildbot failure in on camel-site-production

[buildbot]

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

Buildbot URL: https://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 compile

Sincerely,
 -The Buildbot

buildbot success in on camel-site-production

[buildbot]

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

Buildbot URL: https://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: r979176 [1/3] - in /websites/production/camel/content: cache/main.pageCache camel-2170-release.html team.html twitter.html

[buildbot]

Author: buildbot
Date: Mon Feb  1 15:18:43 2016
New Revision: 979176

Log:
Production update by buildbot for camel

Modified:
websites/production/camel/content/cache/main.pageCache
websites/production/camel/content/camel-2170-release.html
websites/production/camel/content/team.html
websites/production/camel/content/twitter.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 Mon Feb  1 
15:18:43 2016
@@ -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...)The component documentation generated from 
the source code has been double checked to be up to date and include all the 
options the endpoints supports.Upgraded camel-hbase to Hadoop 2.x and 
HBase 1.1.xCamel commands forSpring 
 >BootMany improvements toCamelhref="kura.html">KuraAdded transacted option toshape="rect" href="sql-component.html">SQL Component when used as a 
 >consumer in a transacted route.Added support for UPDATE operation 
 >tohref="elasticsearch.html">ElasticSearch.Allow to reuse existing 
 >configured Elasticsearch Client on the href="elasticsearch.html">ElasticSearch component, instead of creating a 
 >client per endpoint.Theinclude 
 >andexclude options onhref="file2.html">File2 andFTP 
 >endpoints is now case in-sensitive out of the box.Resource based 
 >component such asXSLT,shape="rect" href="velocity.html">Velocity
 0;etc can load the resource file from theRegistryby usingref: as 
prefix.Upgraded camel-amqp to the latest qpid-jms-client (also 
AMQP  1.0 is not supported anymore).Many improvements 
to Camel AMQP 
component.TheMetrics Component allows to captureMessage History performance 
statistics with 
theMetricsMessageHistoryFactoryReduced 
the number of mbeans enlisted in the services tree, to only include mbeans that 
has value to be managed.TheElasticsearch Componentnow supports 
MultiGet operationTheThrottler has been improved to be more performant and 
use a
  rolling window for time periods which gives a better 
flow.ThesetHeader 
andsetExchangeProperty allows to use a dynamic header key 
using theSimplelanguage if 
the name of the key is aSimplelanguage expression.Add collate 
function toSimple language to make 
it easier to split a message body into sub lists of a specified size. The 
function is similar to the collate function from Groovy.TheCamel Run Maven Goal is able 
to auto detect if its a OSGi Blueprint or CDI project so end users no longer 
have to explicit configure this on the plugin.Camel-Elasticsearch now supports Multiget, 
Multisearch and exists operationCamel-Git no
 w supports Cherry-pick operationStopping theMain 
class from JMX will now trigger shutdown of the Main class/JVM also, as it does 
when hitting ctrl + c.Added option to skipFirst to theTokenizer language to make it easy to 
skip the very first element, when for example splitting a CSV file using 
theSplitter 
EIP.TheRest DSL now 
supports default values for query parametersExchange and Message only 
output id in their toString method to avoid outputting any message details such 
as sensitive details from message bodies.CamelError Handler no longer log message body/header 
details when logging the Message 
History. This avoids logging anysensitive details from message 
bodies.Cam
 elException Clause 
andError Handler now 
supports using a customProcessor to be invoked right after 
an exception was thrown using the newonExceptionOccurred 
option.RabbitMQ consumer more 
resilient to auto re-connect in case of connection failuresFixed 
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.FixedSpring 
Boot not starting Camel rout
 es if running in Spring Cloud.Fixed an issue withSwagger Java using api-docs could 
lead to api-doc route being added multiple timesFixed a few things 
missing in the generated swagger model when usingSwagger JavaFixed 
usingstatement.xxx options on theJDBC consumer would only be used in first 
poll.Fixed HTTPandHTTP4to keep trailing slash if provided in uri when 
calling remote HTTP service.FixedOnCompletion to keep any caught 

svn commit: r979176 [3/3] - in /websites/production/camel/content: cache/main.pageCache camel-2170-release.html team.html twitter.html

[buildbot]

Modified: websites/production/camel/content/twitter.html
==
--- websites/production/camel/content/twitter.html (original)
+++ websites/production/camel/content/twitter.html Mon Feb  1 15:18:43 2016
@@ -96,7 +96,7 @@
 URI format
 
-TwitterComponent:The 
twitter component can be configured with the Twitter account settings which is 
mandatory to configure before using. You can also configure 
these options directly in the endpoint.OptionDescriptionconsumerKeyThe consumer keyconsumerSecretThe consumer 
secretaccessTokenThe access tokenaccessTokenSecretThe access token 
secretConsumer Endpoints:Rather than the 
endpoints returning a List through one single route exchange, camel-twitter 
creates one route exchange per returned object. As an example, if 
"timeline/home" results in five statuses, the route will be executed five times 
(one for each Status).EndpointContextBody TypeNoticedirectmessagedirect, pollingtwitter4j.DirectMessagesearchdirect, pollingtwitter4j.Statusstreaming/filterevent, pollingtwitter4j.Statusstreaming/sampleevent, pollingtwitter4j.Statusstreaming/userevent, pollingtwitter4j.StatusCamel 2.16: To receive tweets 
from protected users and accounts.timeline/homedirect, pollingtwitter4j.Statustimeline/mentionsdirect, pollingtwitter4j.Statustimeline/publicdirect, pollingtwitter4j.Status@deprecated. Use timeline/home or 
direct/home instead. Removed from Camel 2.11 
onwards.timeline/retweetsofmedirect, pollingtwitter4j.Statustimeline/userdirect, pollingtwitter4j.Statustrends/dailyCamel 2.10.1: direct, 
pollingtwitter4j.Status@deprecated. Removed from Camel 2.11 
onwards.trends/weeklyCamel 2.10.1: direct, 
pollingtwitter4j.Status@deprecated. Removed from Camel 2.11 
onwards.Producer Endpoints:EndpointBody TypedirectmessageStringsearchListtwitter4j.Statustimeline/userStringURI OptionsNameDefault ValueDescriptiontypedirectdirect, event, or 
pollingdelay60in secondsconsumerKeynullConsumer Key. Can also be configured on the 
TwitterComponent level instead.consumerSecretnullConsumer Secret. Can also b
 e configured on the TwitterComponent level 
instead.accessTokennullAccess Token. Can also be configured on the 
TwitterComponent level instead.accessTokenSecretnullAccess Token Secret. Can also be configured 
on the TwitterComponent level instead.usernullUsername, used for user timeline 
consumption, direct message production, etc.
 locationsnull'lat,lon;lat,lon;...' Bounding 
boxes, created by pairs of lat/lons. Can be used for 
streaming/filterkeywordsnull'foo1,foo2,foo3...' Can be used for search and 
streaming/filter. See https://support.twitter.com/articles/71577-using-advanced-search; 
rel="nofollow">Advanced search for keywords syntax for searching with for 
example OR.userIdsnull'username,username...' Can be used for 
streaming/filterfilterOldtrueFilter out old tweets, that has previously been polled. 
This state is stored in memory only, and based on last tweet id. Since 
Camel 2.11.0 The search producer supports this 
optionsinceId1Camel 2.11.0: The last tweet id which 
will be used for pulling the tweets. It is useful when the camel route is 
restarted after a long running.langnull<
 /code>Camel 2.11.0: The lang string http://en.wikipedia.org/wiki/ISO_639-1; rel="nofollow">ISO_639-1 
which will be used for searchingcountnullCamel 2.11.0: Limiting number of 
results per page.numberOfPages1Camel 2.11.0: The number of pages 
result which you want camel-twitter to consume.httpProxyHostnullclass="confluenceTd">Camel 2.12.3: The http proxy host 
 >which can be used for the camel-twitter.rowspan="1" class="confluenceTd">httpProxyPortrowspan="1" class="confluenceTd">nullrowspan="1" class="confluenceTd">Camel 2.12.3: The http 
 >proxy port which can be used for the camel-twitter.colspan="1" rowspan="1" class="confluenceTd">httpProxyUsercolspan="1" rowspan="1" class="confluenceTd">nullcolspan="1" rowspan="1" class="confluenceTd">Camel 
 >2.12.3: The http proxy user which can be used for the 
 >camel-twitter.class="confluenceTd">httpProxyPasswordclass="confluenceTd">nullCamel 2.12.3: The http proxy 
password which can be used for the camel-twitter.latitudeCamel 2.16:Used by the 
non-stream geography search to search by latitude. You need to configure all 
the following options: longitude, latitude, radius, and 
distanceMetric.longitudeCamel 2.16:Used by the 
non-stream geography search to search by longitude. You need to configure all 
the following options: longitude, latitude, radius, and 
distanceMetric.radiusCamel 2.16:Used by the 
non-stream geography search to search by radius. You need to configure all the 
following options: longitude, latitude, radius, and 
distanceMetric.distanceMetrickmCamel 2.16: Used by the non-stream 
geography search, to search by radius using the configured metrics. The unit 
can either be mi for miles, or km for kilometers. You need to configure all the 

svn commit: r979176 [2/3] - in /websites/production/camel/content: cache/main.pageCache camel-2170-release.html team.html twitter.html

[buildbot]

Modified: websites/production/camel/content/team.html
==
--- websites/production/camel/content/team.html (original)
+++ websites/production/camel/content/team.html Mon Feb  1 15:18:43 2016
@@ -75,7 +75,7 @@

 
 
-This page lists who we are. By all 
means add yourself to the list - lets sort it in alphabetical orderCommittersNameIDOrganisationAaron Mulderammulderhttp://chariotsolutions.com; rel="nofollow">Chariot 
SolutionsAkitoshi Yoshidaayhttp://www.sap.com; 
rel="nofollow">SAPAndrea Cosentinoacosentinohttp://www.redhat.com; rel="nofollow">Red Hathttp://www.xing.com/profile/Babak_Vahdat; 
rel="nofollow">Babak Vahdatbvahdathttp://www.cyberlogic.ch; rel="nofollow">Cyberlogic Consulting 
GmbHhttp://www.consulting-notes.com; rel="nofollow">Ben O'Daybodayhttp://initekconsulting.com; rel="nofollow">Initek 
Consultinghttp://www.ofbizian.com; rel="nofollow">Bilgin Ibryam bibryamhttp://www.redhat.com/products/jbossenterprisemiddleware/fusesource/; 
rel="nofollow">Red Hathttp://bsnyderblog.blogspot.com/; rel="nofollow">Bruce 
Snyderbsnyderhttp://springsource.com/; 
rel="nofollow">SpringSourcehttp://cmoulliard.blogspot.com; rel="nofollow">Charles 
Moulliardcmoulliardhttp://www.redhat.com/products/jbossenterprisemiddleware/fusesource/; 
rel="nofollow">Red HatChristian Muellercmuellerhttp://www.atosworldline.com/index.htm; rel="nofollow">Atos 
Worldlinehttp://www.liquid-rea
 lity.de" rel="nofollow">Christian Schneidercschneiderhttp://www.talend.com; rel="nofollow">Talendhttp://davsclaus.blogspot.com/; 
rel="nofollow">Claus Ibsendavsclaushttp://www.redhat.com/products/jbossenterprisemiddleware/fusesource/; 
rel="nofollow">Red Hathttp://coheigea.blogspot.ie/; rel="nofollow">Colm O 
hEigeartaighcoheigeahttp://www.talend.com; rel="nofollow">TalendDavid Jencksdjenckshttp://www.ibm.com; rel="nofollow">IBMhttp://dankulp.com/blog/; rel="nofollow">Daniel 
Kulpdkulphttp://www.talend.com; rel="nofollow">TalendFranz Forsthoferforsthoferhttp://www.sap.com/; rel="nofollow">SAPhttp://freemanfang.blogspot.com/; rel="nofollow">Freeman 
Fangffanghttp://www.redhat.com/products/jbossenterprisemiddleware/fusesource/; 
rel="nofollow">Red HatGary Tullygtullyhttp://www.redhat.com/products/jbossenterprisemiddleware/fusesource/; 
rel="nofollow">Red HatGert Vanthienengertvhttp://www.redhat.com/products/jbossenterprisemiddleware/fusesource/; 
rel="nofollow">Red Hathttp://www.linkedin.com/in/gregorzurowski/; rel="nofollow">Gregor 
Zurowskigzurowskihttp://www.sothebys.com; 
rel="nofollow">Sotheby'shttp://gnodet.blogspot.com/; rel="nofollow">Guillaume 
Nodetgnodethttp://www.redhat.com/products/jbossenterprisemiddleware/fusesource/; 
rel="nofollow">Red Hathttp://camelbot.blogspot.com/; rel="nofollow">Hadrian 
Zbarceahadrianhttp://coders.talend.com/; rel="nofollow">Talendhttp://henryk-konsek.blogspot.com/; 
rel="nofollow">Henryk Konsekhekonsekhttp://www.redhat.com/products/jbossenterprisemiddleware/fusesource/; 
rel="nofollow">Red Hathttp://hiramchirino.com; rel="nofollow">Hiram 
Chirinochirinohttp://www.redhat.com/products/jbossenterprisemiddleware/fusesource/; 
rel="nofollow">Red Hathttp://iocanel.blogspot.com; rel="nofollow">Ioannis 
Canellosiocanelhttp://www.redhat.com/products/jbossenterprisemiddleware/fusesource/; 
rel="nofollow">Red Hathttp://www.JacekLaskow
 ski.pl" rel="nofollow">Jacek Laskowskijlaskowskihttp://www.nanthrax.net; rel="nofollow">Jean-Baptiste 
Onofrjbonofrehttp://www.talend.com; rel="nofollow">TalendJeff Genenderjgenenderhttp://www.savoirtech.com; rel="nofollow">Savoir 
TechnologiesJohan Edstromjoedhttp://savoirtech.com; rel="nofollow">Savoir 
Technologieshttp://janstey.blogspot.com/; rel="nofollow">Jonathan 
Ansteyjansteyhttp://www.redhat.com/products/jbossenterprisemiddleware/fusesource/; 
rel="nofollow">Red Hathttp://macstrac.blogspot.com/; rel="nofollow">James 
Strachanjstrachanhttp://www.redhat.com/products/jbossenterprisemiddleware/fusesource/; 
rel="nofollow">Red Hathttp://krasserm.blogspot.com; rel="nofollow">Martin 
KrasserkrassermNicky Sandhunsandhuhttp://raul.io; rel="nofollow">Raul KripalaniraulkRich Newcombrnewcombhttp://richardlog.com/; rel="nofollow">Richard Kettelerijrickettehttp://www.avisi.nl; rel="nofollow">Avisi 
BVhttp://rajdavies.blogspot.com/; 
rel="nofollow">Rob Daviesrajdavieshttp://www.redhat.com/products/jbossenterprisemiddleware/fusesource/; 
rel="nofo
 llow">Red HatRoman Kalukiewiczromkalhttp://sully6768.blogspot.com/; rel="nofollow">Scott 
England-Sullivansully6768http://www.redhat.com/products/jbossenterprisemiddleware/fusesource/; 
rel="nofollow">Red HatStan Lewisslewishttp://www.redhat.com/products/jbossenterprisemid
 dleware/fusesource/" rel="nofollow">Red HatTracy Snelltjsnellhttp://juicelabs.com; rel="nofollow">Juice Labshttp://willemjiang.blogspot.com/; 
rel="nofollow">Willem JiangningjiangWilliam Tamwtamhttp://progress.com; rel="nofollow">Progress