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

[buildbot]

Author: buildbot
Date: Fri Dec 16 22:19:32 2016
New Revision: 1002956

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 Fri Dec 16 
22:19:32 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...)The Camel Maven Plugin now provides the 
camel:validate goal to parse your Java and XML source code for any 
Camel routes and report invalid Camel endpoint uri and simple expression 
errors. You can run this at code time (not run
 time). Introduced a 
new camel-catalog-rest artifact which is a tiny 
standalone REST API of the CamelCatalog using JAX-RS and Swagger 
Annotations.Added camel-catalog-rest-app as a 
standalone application which used Apache CXF with Jetty to host the Catalog 
REST API with embedded Swagger 
UIReturning null from Bean should work similar to 
how setBody and transform works 
when they set a null body.The Camel Spring Boot 
starter components now have their auto configuration depends 
on org.apache.camel.springboot.CamelAutoConfiguration which 
makes it easier writing unit tests where you can 
exclude org.apache.camel.springboot.CamelAutoConfiguration to 
turn off Camel Spring Boot auto configuration completely.Camel now 
supports OWASP d
 ependency check maven pluginCamel-Nats component now supports 
TLSCamel-Nats component now supports explicit flushing (with timeout) 
of the connectionCamel-Metrics component now supports Gauge 
typeFile consumer 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-springboot.The https://cwiki.apache.org/confluence/display/WW/bean";>bean component 
will when calling a method that returned an instance of 
Callable now call that callable to obtain the chained result. 
This allows to call Groovy functions/closures etc.Failover Load Balancer with inheritErrorHandler=false, 
now allows Camel's Error 
Handler to react after the load balancer is exhausted.Salesforce component now supports 
limits, recent items, approvals and composite APIDumping Camel routes 
as XML now includes custom namespaces which are at xpath expressions etc. 
Likewise updating Camel routes from XML can now include namespaces which will 
be associated on xpath 
expressions.Added RouteIdFactory which can auto 
assign route ids based on the consumer endpoints to use more sensitible names, 
instead of route1, route2, etc.Add skip function 
to Simple 
languageRouteBuilder auto-configuration can now be 
disabled in Camel CDIFixed 
these issues
 Fixed starting Camel on Oracle JDK 1.8.0_19 or lower, which would 
throw an UnsupportedOperationExceptionFixed running mvn 
camel:run when using OSGi BlueprintFixed Hystrix 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 before these routes would "hang 
around". Now only succesful started routes are added.Adding or 
removing routes that starts from Undertow 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 using Rest DSL with SERVLET could cause a java.io.IOException: Stream 
closed exception when using Bean in 
the route. Fixed an issue when using pipeline 
in Java DSL not setting up the EIP correctly which could lead to runtime route 
not as intended.Fixed Dropbox to use Stream caching to avoid reading entire file into 
memory so Camel can process big filesFixed toD issue 
with splitting uris when RAW values had + signFixed Netty double 
buffer release leak in Netty4 
and Netty4 HTTPNew Enterprise Integration 
PatternsNew Componentscamel-bonita - allow you 
to communicate with a remote Bonita engine.camel-google-pubsub - allow 
you communicate with Google Cloud Pub/SubNew DSLNew AnnotationsNew Da

[3/6] camel git commit: CAMEL-10511: Updated MllpTcpClientProducer and MllpTcpServerConsumer to consume all available data on socket - backport to 2.17

[davsclaus]

http://git-wip-us.apache.org/repos/asf/camel/blob/a53540da/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerConnectionTest.java
--
diff --git 
a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerConnectionTest.java
 
b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerConnectionTest.java
index 99667b2..f4d46cb 100644
--- 
a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerConnectionTest.java
+++ 
b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerConnectionTest.java
@@ -16,9 +16,7 @@
  */
 package org.apache.camel.component.mllp;
 
-import java.net.InetSocketAddress;
-import java.net.Socket;
-import java.net.SocketAddress;
+import java.net.SocketException;
 import java.util.concurrent.TimeUnit;
 
 import org.apache.camel.EndpointInject;
@@ -26,25 +24,45 @@ import org.apache.camel.LoggingLevel;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.test.AvailablePortFinder;
+import org.apache.camel.test.junit.rule.mllp.MllpClientResource;
+import org.apache.camel.test.junit.rule.mllp.MllpJUnitResourceException;
 import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Rule;
 import org.junit.Test;
 
+import static 
org.apache.camel.component.mllp.MllpTcpServerConsumer.SOCKET_STARTUP_TEST_READ_TIMEOUT;
+import static 
org.apache.camel.component.mllp.MllpTcpServerConsumer.SOCKET_STARTUP_TEST_WAIT;
+
 public class MllpTcpServerConsumerConnectionTest extends CamelTestSupport {
-String mllpHost = "localhost";
-int mllpPort = AvailablePortFinder.getNextAvailable();
+static final int RECEIVE_TIMEOUT = 500;
+
+@Rule
+public MllpClientResource mllpClient = new MllpClientResource();
+
 
 @EndpointInject(uri = "mock://result")
 MockEndpoint result;
 
 @Override
-protected RouteBuilder createRouteBuilder() throws Exception {
-mllpPort = AvailablePortFinder.getNextAvailable();
+protected void doPreSetup() throws Exception {
+mllpClient.setMllpHost("localhost");
+mllpClient.setMllpPort(AvailablePortFinder.getNextAvailable());
 
+super.doPreSetup();
+}
+
+@Override
+public boolean isUseRouteBuilder() {
+return false;
+}
+
+@Override
+protected RouteBuilder createRouteBuilder() throws Exception {
 return new RouteBuilder() {
 String routeId = "mllp-receiver";
 
 public void configure() {
-fromF("mllp://%s:%d?autoAck=false", mllpHost, mllpPort)
+fromF("mllp://%s:%d?autoAck=false", mllpClient.getMllpHost(), 
mllpClient.getMllpPort())
 .log(LoggingLevel.INFO, routeId, "Receiving: ${body}")
 .to(result);
 }
@@ -68,34 +86,96 @@ public class MllpTcpServerConsumerConnectionTest extends 
CamelTestSupport {
  * @throws Exception
  */
 @Test
-public void testConnectWithoutData() throws Exception {
+public void testConnectThenCloseWithoutData() throws Exception {
+int connectionCount = 10;
+long connectionMillis = 200;
+
 result.setExpectedCount(0);
+result.setAssertPeriod(SOCKET_STARTUP_TEST_WAIT + 
SOCKET_STARTUP_TEST_READ_TIMEOUT);
+
+addTestRoute(-1);
+
+for (int i = 1; i <= connectionCount; ++i) {
+mllpClient.connect();
+Thread.sleep(connectionMillis);
+mllpClient.close();
+}
+
+// Connect one more time and allow a client thread to start
+mllpClient.connect();
+Thread.sleep(SOCKET_STARTUP_TEST_WAIT + 
SOCKET_STARTUP_TEST_READ_TIMEOUT + 1000);
+mllpClient.close();
+
+assertMockEndpointsSatisfied(15, TimeUnit.SECONDS);
+}
+
+@Test
+public void testConnectThenResetWithoutData() throws Exception {
 int connectionCount = 10;
+long connectionMillis = 200;
+
+result.setExpectedCount(0);
+result.setAssertPeriod(SOCKET_STARTUP_TEST_WAIT + 
SOCKET_STARTUP_TEST_READ_TIMEOUT);
+
+addTestRoute(-1);
+
+for (int i = 1; i <= connectionCount; ++i) {
+mllpClient.connect();
+Thread.sleep(connectionMillis);
+mllpClient.reset();
+}
+
+// Connect one more time and allow a client thread to start
+mllpClient.connect();
+Thread.sleep(SOCKET_STARTUP_TEST_WAIT + 
SOCKET_STARTUP_TEST_READ_TIMEOUT + 1000);
+mllpClient.reset();
+
+assertMockEndpointsSatisfied(15, TimeUnit.SECONDS);
+}
+
+/**
+ * Simulate an Idle Client
+ *
+ * @throws Exception
+ */
+@Test
+public void testIdleConnection() throws Exception {
+final int maxReceiveTimeouts = 3;
+String t

[4/6] camel git commit: CAMEL-10511: Updated MllpTcpClientProducer and MllpTcpServerConsumer to consume all available data on socket - backport to 2.17

[davsclaus]

http://git-wip-us.apache.org/repos/asf/camel/blob/a53540da/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/impl/MllpUtil.java
--
diff --git 
a/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/impl/MllpUtil.java
 
b/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/impl/MllpUtil.java
deleted file mode 100644
index 2aab0a8..000
--- 
a/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/impl/MllpUtil.java
+++ /dev/null
@@ -1,381 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.mllp.impl;
-
-import java.io.BufferedOutputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.Socket;
-import java.net.SocketException;
-import java.net.SocketTimeoutException;
-
-import org.apache.camel.component.mllp.MllpComponent;
-import org.apache.camel.component.mllp.MllpCorruptFrameException;
-import org.apache.camel.component.mllp.MllpException;
-import org.apache.camel.component.mllp.MllpTimeoutException;
-import org.apache.camel.component.mllp.MllpWriteException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import static org.apache.camel.component.mllp.MllpEndpoint.END_OF_BLOCK;
-import static org.apache.camel.component.mllp.MllpEndpoint.END_OF_DATA;
-import static org.apache.camel.component.mllp.MllpEndpoint.END_OF_STREAM;
-import static org.apache.camel.component.mllp.MllpEndpoint.START_OF_BLOCK;
-
-/**
- * Supplies methods to read and write messages in a MLLP Frame.
- * 
- * Although the methods in the class are intended to handle HL7 v2 formatted 
messages, the methods do not
- * depend on that format - any byte[]can be written to the Socket.  Also, any 
byte[] can be read from the socket
- * provided it has the proper MLLP Enveloping - 
payload>.
- * 
- * NOTE: MLLP payloads are not logged unless the logging level is set to DEBUG 
or TRACE to avoid introducing PHI
- * into the log files.  Logging of PHI can be globally disabled by setting the 
org.apache.camel.mllp.logPHI system
- * property.  The property is evaluated using Boolean.parseBoolean.
- * 
- */
-public final class MllpUtil {
-private static final Logger LOG = LoggerFactory.getLogger(MllpUtil.class);
-
-private MllpUtil() {
-}
-
-/**
- * Open the MLLP frame by reading from the Socket until the begging of the 
frame is found.
- * 
- * If any errors occur (including MLLP frame errors) while opening the 
frame, the socket will be closed and an
- * Exception will be thrown.
- *
- * @param socket the Socket to read
- * @throws SocketTimeoutExceptionthrown if a timeout occurs while 
looking for the beginning of the MLLP frame, but
- *   nothing is yet available - this is 
NOT an error condition
- * @throws MllpCorruptFrameException if the MLLP Frame is corrupted in 
some way
- * @throws MllpException for other unexpected error conditions
- */
-public static boolean openFrame(Socket socket) throws 
SocketTimeoutException, MllpCorruptFrameException, MllpException {
-if (socket.isConnected() && !socket.isClosed()) {
-InputStream socketInputStream = MllpUtil.getInputStream(socket);
-
-int readByte = -1;
-try {
-readByte = socketInputStream.read();
-switch (readByte) {
-case START_OF_BLOCK:
-return true;
-case END_OF_STREAM:
-resetConnection(socket);
-return false;
-default:
-// Continue on and process the out-of-frame data
-}
-} catch (SocketTimeoutException normaTimeoutEx) {
-// Just pass this on - the caller will wrap it in a 
MllpTimeoutException
-throw normaTimeoutEx;
-} catch (SocketException socketEx) {
-if (socket.isClosed()) {
-LOG.debug("Socket closed while opening MLLP frame - 
ignoring e

camel git commit: CAMEL-10608 Karaf endpoint-list command to support wildcard expressions

[davsclaus]

Repository: camel
Updated Branches:
  refs/heads/master 490951460 -> be5895d5d


CAMEL-10608 Karaf endpoint-list command to support wildcard expressions


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

Branch: refs/heads/master
Commit: be5895d5db1683ea29de15add7023e231dcd1267
Parents: 4909514
Author: jpoth 
Authored: Fri Dec 16 16:23:28 2016 +0100
Committer: Claus Ibsen 
Committed: Fri Dec 16 23:00:18 2016 +0100

--
 .../camel/commands/EndpointListCommand.java | 73 +---
 .../camel/karaf/commands/EndpointList.java  |  2 +-
 2 files changed, 50 insertions(+), 25 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/be5895d5/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/EndpointListCommand.java
--
diff --git 
a/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/EndpointListCommand.java
 
b/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/EndpointListCommand.java
index 80bd6ca..c3cc8e1 100644
--- 
a/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/EndpointListCommand.java
+++ 
b/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/EndpointListCommand.java
@@ -18,6 +18,7 @@ package org.apache.camel.commands;
 
 import java.io.PrintStream;
 import java.net.URLDecoder;
+import java.util.HashMap;
 import java.util.Hashtable;
 import java.util.List;
 import java.util.Map;
@@ -29,10 +30,11 @@ import org.apache.camel.util.URISupport;
 /**
  * List the Camel endpoints available in the JVM.
  */
-public class EndpointListCommand extends AbstractContextCommand {
+public class EndpointListCommand extends AbstractCamelCommand {
 
 private static final String URI_COLUMN_LABEL = "Uri";
 private static final String STATUS_COLUMN_LABEL = "Status";
+private static final String CONTEXT_NAME_COLUMN_LABEL = "Context";
 
 private static final int DEFAULT_COLUMN_WIDTH_INCREMENT = 0;
 private static final String DEFAULT_FIELD_PREAMBLE = " ";
@@ -47,25 +49,39 @@ public class EndpointListCommand extends 
AbstractContextCommand {
 boolean decode = true;
 boolean verbose;
 boolean explain;
+private final String context;
 
 public EndpointListCommand(String context, boolean decode, boolean 
verbose, boolean explain) {
-super(context);
 this.decode = decode;
 this.verbose = verbose;
 this.explain = explain;
+this.context = context;
 }
 
 @Override
-protected Object performContextCommand(CamelController camelController, 
String contextName, PrintStream out, PrintStream err) throws Exception {
-List> endpoints = 
camelController.getEndpoints(contextName);
+public Object execute(CamelController camelController, PrintStream out, 
PrintStream err) throws Exception {
+final List> camelContextInfos = 
camelController.getCamelContexts(this.context);
+final Map>> contextsToEndpoints = new 
HashMap<>();
+
+for (Map camelContextInfo : camelContextInfos) {
+String camelContextName = camelContextInfo.get("name");
+final List> endpoints = 
camelController.getEndpoints(camelContextName);
+if (endpoints.isEmpty()) {
+continue;
+}
+contextsToEndpoints.put(camelContextName, endpoints);
+}
 
-final Map columnWidths = 
computeColumnWidths(endpoints);
+final Map columnWidths = 
computeColumnWidths(contextsToEndpoints);
 final String headerFormat = buildFormatString(columnWidths, true);
 final String rowFormat = buildFormatString(columnWidths, false);
 
-if (endpoints.size() > 0) {
-out.println(String.format(headerFormat, URI_COLUMN_LABEL, 
STATUS_COLUMN_LABEL));
-out.println(String.format(headerFormat, "---", "--"));
+for (Map.Entry>> stringListEntry : 
contextsToEndpoints.entrySet()) {
+final String camelContextName = stringListEntry.getKey();
+final List> endpoints = 
stringListEntry.getValue();
+
+out.println(String.format(headerFormat, CONTEXT_NAME_COLUMN_LABEL, 
URI_COLUMN_LABEL, STATUS_COLUMN_LABEL));
+out.println(String.format(headerFormat, "---", "---", 
"--"));
 for (Map row : endpoints) {
 String uri = row.get("uri");
 if (decode) {
@@ -75,11 +91,11 @@ public class EndpointListCommand extends 
AbstractContextCommand {
 // sanitize and mask uri so we dont see passwords
 

[5/6] camel git commit: CAMEL-10511: Updated MllpTcpClientProducer and MllpTcpServerConsumer to consume all available data on socket - backport to 2.17

[davsclaus]

http://git-wip-us.apache.org/repos/asf/camel/blob/a53540da/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpTcpServerConsumer.java
--
diff --git 
a/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpTcpServerConsumer.java
 
b/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpTcpServerConsumer.java
index f1fa9b7..0ec8564 100644
--- 
a/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpTcpServerConsumer.java
+++ 
b/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpTcpServerConsumer.java
@@ -15,7 +15,6 @@
  * limitations under the License.
  */
 package org.apache.camel.component.mllp;
-
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.BindException;
@@ -29,19 +28,28 @@ import java.util.ArrayList;
 import java.util.LinkedList;
 import java.util.List;
 
+
 import org.apache.camel.Exchange;
 import org.apache.camel.ExchangePattern;
 import org.apache.camel.Message;
 import org.apache.camel.Processor;
-import org.apache.camel.component.mllp.impl.MllpUtil;
+import org.apache.camel.component.mllp.impl.Hl7Util;
+import org.apache.camel.component.mllp.impl.MllpBufferedSocketWriter;
+import org.apache.camel.component.mllp.impl.MllpSocketReader;
+import org.apache.camel.component.mllp.impl.MllpSocketUtil;
+import org.apache.camel.component.mllp.impl.MllpSocketWriter;
 import org.apache.camel.converter.IOConverter;
 import org.apache.camel.impl.DefaultConsumer;
 import org.apache.camel.processor.mllp.Hl7AcknowledgementGenerationException;
 import org.apache.camel.processor.mllp.Hl7AcknowledgementGenerator;
 import org.apache.camel.util.IOHelper;
+import org.slf4j.MDC;
 
 import static 
org.apache.camel.component.mllp.MllpConstants.MLLP_ACKNOWLEDGEMENT;
+import static 
org.apache.camel.component.mllp.MllpConstants.MLLP_ACKNOWLEDGEMENT_EXCEPTION;
+import static 
org.apache.camel.component.mllp.MllpConstants.MLLP_ACKNOWLEDGEMENT_STRING;
 import static 
org.apache.camel.component.mllp.MllpConstants.MLLP_ACKNOWLEDGEMENT_TYPE;
+import static 
org.apache.camel.component.mllp.MllpConstants.MLLP_AUTO_ACKNOWLEDGE;
 import static org.apache.camel.component.mllp.MllpConstants.MLLP_CHARSET;
 import static 
org.apache.camel.component.mllp.MllpConstants.MLLP_CLOSE_CONNECTION_AFTER_SEND;
 import static 
org.apache.camel.component.mllp.MllpConstants.MLLP_CLOSE_CONNECTION_BEFORE_SEND;
@@ -62,16 +70,19 @@ import static 
org.apache.camel.component.mllp.MllpConstants.MLLP_TIMESTAMP;
 import static org.apache.camel.component.mllp.MllpConstants.MLLP_TRIGGER_EVENT;
 import static org.apache.camel.component.mllp.MllpConstants.MLLP_VERSION_ID;
 import static org.apache.camel.component.mllp.MllpEndpoint.SEGMENT_DELIMITER;
-import static org.apache.camel.component.mllp.MllpEndpoint.START_OF_BLOCK;
 
 /**
  * The MLLP consumer.
  */
 public class MllpTcpServerConsumer extends DefaultConsumer {
+public static final int SOCKET_STARTUP_TEST_WAIT = 100;
+public static final int SOCKET_STARTUP_TEST_READ_TIMEOUT = 250;
 ServerSocketThread serverSocketThread;
 
 List clientThreads = new LinkedList<>();
 
+Hl7AcknowledgementGenerator acknowledgementGenerator = new 
Hl7AcknowledgementGenerator();
+
 private final MllpEndpoint endpoint;
 
 public MllpTcpServerConsumer(MllpEndpoint endpoint, Processor processor) {
@@ -197,11 +208,10 @@ public class MllpTcpServerConsumer extends 
DefaultConsumer {
  * short.
  */
 public void run() {
-log.debug("Starting acceptor thread");
+MDC.put("camel.contextId", endpoint.getCamelContext().getName());
 
 try {
 while (!isInterrupted()  &&  null != serverSocket && 
serverSocket.isBound()  &&  !serverSocket.isClosed()) {
-// TODO: Need to check maxConnections and figure out what 
to do when exceeded
 Socket socket = null;
 try {
 socket = serverSocket.accept();
@@ -235,16 +245,15 @@ public class MllpTcpServerConsumer extends 
DefaultConsumer {
 /* Wait a bit and then check and see if the socket is 
really there - it could be a load balancer
  pinging the port
   */
-Thread.sleep(100);
 if (socket.isConnected() && !socket.isClosed()) {
-log.debug("Socket appears to be there - check for 
available data");
+log.debug("Socket appears to be there - checking 
for available data in {} milliseconds", SOCKET_STARTUP_TEST_WAIT);
+Thread.sleep(SOCKET_STARTUP_TEST_WAIT);
+
 InputStream inputStream;
 try {
 inputStream = socket.getInputStream();
 } ca

[1/6] camel git commit: CAMEL-10511: Updated MllpTcpClientProducer and MllpTcpServerConsumer to consume all available data on socket - backport to 2.17

[davsclaus]

Repository: camel
Updated Branches:
  refs/heads/camel-2.17.x 55c621f99 -> a53540da1


http://git-wip-us.apache.org/repos/asf/camel/blob/a53540da/components/camel-mllp/src/test/java/org/apache/camel/test/junit/rule/mllp/MllpServerResource.java
--
diff --git 
a/components/camel-mllp/src/test/java/org/apache/camel/test/junit/rule/mllp/MllpServerResource.java
 
b/components/camel-mllp/src/test/java/org/apache/camel/test/junit/rule/mllp/MllpServerResource.java
index 252e228..4191468 100644
--- 
a/components/camel-mllp/src/test/java/org/apache/camel/test/junit/rule/mllp/MllpServerResource.java
+++ 
b/components/camel-mllp/src/test/java/org/apache/camel/test/junit/rule/mllp/MllpServerResource.java
@@ -19,6 +19,7 @@ package org.apache.camel.test.junit.rule.mllp;
 import java.io.BufferedOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.OutputStream;
 import java.net.BindException;
 import java.net.InetSocketAddress;
 import java.net.ServerSocket;
@@ -45,8 +46,6 @@ import static 
org.apache.camel.component.mllp.MllpEndpoint.START_OF_BLOCK;
  *
  * The server can be configured to simulate a large number
  * of error conditions.
- *
- * TODO:  This needs to be looked at - it may be orphaning threads
  */
 public class MllpServerResource extends ExternalResource {
 Logger log = LoggerFactory.getLogger(this.getClass());
@@ -59,6 +58,12 @@ public class MllpServerResource extends ExternalResource {
 
 boolean active = true;
 
+int delayBeforeStartOfBlock;
+int delayBeforeAcknowledgement;
+int delayDuringAcknowledgement;
+int delayAfterAcknowledgement;
+int delayAfterEndOfBlock;
+
 int excludeStartOfBlockModulus;
 int excludeEndOfBlockModulus;
 int excludeEndOfDataModulus;
@@ -67,8 +72,11 @@ public class MllpServerResource extends ExternalResource {
 
 int sendOutOfBandDataModulus;
 
-int disconnectBeforeAcknowledgementModulus;
-int disconnectAfterAcknowledgementModulus;
+int closeSocketBeforeAcknowledgementModulus;
+int closeSocketAfterAcknowledgementModulus;
+
+int resetSocketBeforeAcknowledgementModulus;
+int resetSocketAfterAcknowledgementModulus;
 
 int sendApplicationRejectAcknowledgementModulus;
 int sendApplicationErrorAcknowledgementModulus;
@@ -76,6 +84,8 @@ public class MllpServerResource extends ExternalResource {
 Pattern sendApplicationRejectAcknowledgementPattern;
 Pattern sendApplicationErrorAcknowledgementPattern;
 
+String acknowledgementString;
+
 ServerSocketThread serverSocketThread;
 
 public MllpServerResource() {
@@ -166,12 +176,52 @@ public class MllpServerResource extends ExternalResource {
 serverSocketThread.interrupt();
 }
 
+public int getDelayBeforeStartOfBlock() {
+return delayBeforeStartOfBlock;
+}
+
+public void setDelayBeforeStartOfBlock(int delayBeforeStartOfBlock) {
+this.delayBeforeStartOfBlock = delayBeforeStartOfBlock;
+}
+
+public int getDelayBeforeAcknowledgement() {
+return delayBeforeAcknowledgement;
+}
+
+public void setDelayBeforeAcknowledgement(int delayBeforeAcknowledgement) {
+this.delayBeforeAcknowledgement = delayBeforeAcknowledgement;
+}
+
+public int getDelayDuringAcknowledgement() {
+return delayDuringAcknowledgement;
+}
+
+public void setDelayDuringAcknowledgement(int delayDuringAcknowledgement) {
+this.delayDuringAcknowledgement = delayDuringAcknowledgement;
+}
+
+public int getDelayAfterAcknowledgement() {
+return delayAfterAcknowledgement;
+}
+
+public void setDelayAfterAcknowledgement(int delayAfterAcknowledgement) {
+this.delayAfterAcknowledgement = delayAfterAcknowledgement;
+}
+
+public int getDelayAfterEndOfBlock() {
+return delayAfterEndOfBlock;
+}
+
+public void setDelayAfterEndOfBlock(int delayAfterEndOfBlock) {
+this.delayAfterEndOfBlock = delayAfterEndOfBlock;
+}
+
 public boolean sendApplicationRejectAcknowledgement(String hl7Message) {
-return evaluatePatten(hl7Message, 
this.sendApplicationErrorAcknowledgementPattern);
+return evaluatePattern(hl7Message, 
this.sendApplicationErrorAcknowledgementPattern);
 }
 
 public boolean sendApplicationErrorAcknowledgement(String hl7Message) {
-return evaluatePatten(hl7Message, 
this.sendApplicationRejectAcknowledgementPattern);
+return evaluatePattern(hl7Message, 
this.sendApplicationRejectAcknowledgementPattern);
 }
 
 public boolean sendApplicationRejectAcknowledgement(int messageCount) {
@@ -198,12 +248,20 @@ public class MllpServerResource extends ExternalResource {
 return evaluateModulus(messageCount, excludeEndOfDataModulus);
 }
 
-public boolean disconnectBeforeAcknowledgement(int messageCount) {
-return evaluateModulus(messageCount, 
disconnectBeforeAcknowledgemen

[2/6] camel git commit: CAMEL-10511: Updated MllpTcpClientProducer and MllpTcpServerConsumer to consume all available data on socket - backport to 2.17

[davsclaus]

http://git-wip-us.apache.org/repos/asf/camel/blob/a53540da/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/impl/MllpSocketAcknowledgementWriterTest.java
--
diff --git 
a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/impl/MllpSocketAcknowledgementWriterTest.java
 
b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/impl/MllpSocketAcknowledgementWriterTest.java
new file mode 100644
index 000..9c218a7
--- /dev/null
+++ 
b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/impl/MllpSocketAcknowledgementWriterTest.java
@@ -0,0 +1,150 @@
+/**
+ * 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.mllp.impl;
+
+import org.apache.camel.component.mllp.MllpAcknowledgementDeliveryException;
+import org.apache.camel.test.util.PayloadBuilder;
+import org.junit.Before;
+import org.junit.Test;
+
+import static org.apache.camel.component.mllp.MllpEndpoint.END_OF_BLOCK;
+import static org.apache.camel.component.mllp.MllpEndpoint.END_OF_DATA;
+import static org.apache.camel.component.mllp.MllpEndpoint.START_OF_BLOCK;
+import static 
org.apache.camel.component.mllp.impl.MllpSocketWriter.PAYLOAD_TERMINATOR;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertNotNull;
+
+public class MllpSocketAcknowledgementWriterTest extends 
MllpSocketWriterTestSupport {
+MllpSocketWriter mllpSocketWriter;
+
+@Before
+public void setUp() throws Exception {
+mllpSocketWriter = new MllpSocketWriter(fakeSocket, true);
+}
+
+@Test
+public void testWriteAcknowledgement() throws Exception {
+byte[] expected = PayloadBuilder.build(START_OF_BLOCK, 
TEST_ACKNOWLEDGEMENT, END_OF_BLOCK, END_OF_DATA);
+
+mllpSocketWriter.writeEnvelopedPayload(TEST_MESSAGE.getBytes(), 
TEST_ACKNOWLEDGEMENT.getBytes());
+
+assertArrayEquals(expected, fakeSocket.payload());
+}
+
+@Test
+public void testWriteNullAcknowledgement() throws Exception {
+byte[] acknowledgement = null;
+
+byte[] expected = PayloadBuilder.build(START_OF_BLOCK, END_OF_BLOCK, 
END_OF_DATA);
+
+mllpSocketWriter.writeEnvelopedPayload(TEST_MESSAGE.getBytes(), 
acknowledgement);
+
+assertArrayEquals(expected, fakeSocket.payload());
+}
+
+@Test
+public void testWriteEmptyAcknowledgement() throws Exception {
+byte[] acknowledgement = new byte[0];
+
+byte[] expected = PayloadBuilder.build(START_OF_BLOCK, END_OF_BLOCK, 
END_OF_DATA);
+
+mllpSocketWriter.writeEnvelopedPayload(TEST_MESSAGE.getBytes(), 
acknowledgement);
+
+assertArrayEquals(expected, fakeSocket.payload());
+}
+
+@Test(expected = MllpAcknowledgementDeliveryException.class)
+public void testGetOutputStreamFailure() throws Exception {
+fakeSocket.fakeSocketOutputStream = null;
+
+try {
+mllpSocketWriter.writeEnvelopedPayload(TEST_MESSAGE.getBytes(), 
TEST_ACKNOWLEDGEMENT.getBytes());
+} catch (MllpAcknowledgementDeliveryException expectedEx) {
+verifyException(expectedEx);
+throw expectedEx;
+}
+}
+
+@Test(expected = MllpAcknowledgementDeliveryException.class)
+public void testWriteToUnconnectedSocket() throws Exception {
+fakeSocket.connected = false;
+
+try {
+mllpSocketWriter.writeEnvelopedPayload(TEST_MESSAGE.getBytes(), 
TEST_ACKNOWLEDGEMENT.getBytes());
+} catch (MllpAcknowledgementDeliveryException expectedEx) {
+verifyException(expectedEx);
+throw expectedEx;
+}
+}
+
+@Test(expected = MllpAcknowledgementDeliveryException.class)
+public void testWriteToClosedSocket() throws Exception {
+fakeSocket.closed = true;
+
+try {
+mllpSocketWriter.writeEnvelopedPayload(TEST_MESSAGE.getBytes(), 
TEST_ACKNOWLEDGEMENT.getBytes());
+} catch (MllpAcknowledgementDeliveryException expectedEx) {
+verifyException(expectedEx);
+throw expectedEx;
+}
+}
+
+@Test(expected = MllpAcknowledgementDeliveryException.c

[6/6] camel git commit: CAMEL-10511: Updated MllpTcpClientProducer and MllpTcpServerConsumer to consume all available data on socket - backport to 2.17

[davsclaus]

CAMEL-10511:  Updated MllpTcpClientProducer and MllpTcpServerConsumer to 
consume all available data on socket - backport to 2.17


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

Branch: refs/heads/camel-2.17.x
Commit: a53540da1e5b7550355c68dc9e98c5e6e77c109a
Parents: 55c621f
Author: Quinn Stevenson 
Authored: Fri Dec 16 13:41:12 2016 -0700
Committer: Quinn Stevenson 
Committed: Fri Dec 16 13:41:12 2016 -0700

--
 components/camel-mllp/pom.xml   |  16 +
 .../MllpAcknowledgementDeliveryException.java   |  40 ++
 .../mllp/MllpAcknowledgementException.java  |  17 +-
 .../MllpAcknowledgementTimeoutException.java|  69 +++
 .../MllpAcknowledgementTimoutException.java |  38 --
 ...pplicationErrorAcknowledgementException.java |  19 +-
 ...plicationRejectAcknowledgementException.java |  19 +-
 ...MllpCommitErrorAcknowledgementException.java |  19 +-
 ...llpCommitRejectAcknowledgementException.java |  19 +-
 .../camel/component/mllp/MllpComponent.java |  40 +-
 .../camel/component/mllp/MllpConstants.java |   3 +
 .../mllp/MllpCorruptFrameException.java |  40 --
 .../camel/component/mllp/MllpEndpoint.java  | 122 -
 .../camel/component/mllp/MllpException.java |  74 ++-
 .../component/mllp/MllpFrameException.java  |  41 ++
 .../MllpInvalidAcknowledgementException.java|  16 +-
 .../mllp/MllpInvalidMessageException.java   |  30 ++
 .../MllpNegativeAcknowledgementException.java   |  32 ++
 .../MllpReceiveAcknowledgementException.java|  57 ++
 .../component/mllp/MllpReceiveException.java|  46 ++
 .../component/mllp/MllpTcpClientProducer.java   | 209 
 .../component/mllp/MllpTcpServerConsumer.java   | 398 --
 .../component/mllp/MllpTimeoutException.java|  40 +-
 .../component/mllp/MllpWriteException.java  |  17 +-
 .../camel/component/mllp/impl/Hl7Util.java  |  90 
 .../mllp/impl/MllpBufferedSocketWriter.java | 123 +
 .../component/mllp/impl/MllpSocketReader.java   | 290 ++
 .../component/mllp/impl/MllpSocketUtil.java | 230 
 .../component/mllp/impl/MllpSocketWriter.java   | 143 +
 .../camel/component/mllp/impl/MllpUtil.java | 381 -
 .../mllp/Hl7AcknowledgementGenerator.java   |   9 +-
 .../camel/component/mllp/MllpExceptionTest.java | 114 
 .../mllp/MllpProducerConsumerLoopbackTest.java  |  24 +-
 .../MllpTcpClientConsumerBlueprintTest.java |  36 --
 ...llpTcpClientProducerAcknowledgementTest.java | 207 ++-
 ...ntProducerAcknowledgementValidationTest.java | 283 ++
 .../MllpTcpClientProducerBlueprintTest.java |  14 +-
 ...llpTcpClientProducerConnectionErrorTest.java | 165 ++
 .../mllp/MllpTcpClientProducerTest.java |  86 ++-
 ...llpTcpServerConsumerAcknowledgementTest.java |  98 +++-
 .../MllpTcpServerConsumerConnectionTest.java| 136 -
 ...MllpTcpServerConsumerMessageHeadersTest.java | 158 ++
 ...pTcpServerConsumerMessageValidationTest.java | 317 +++
 .../mllp/MllpTcpServerConsumerTest.java | 130 -
 .../MllpTcpServerConsumerTransactionTest.java   | 142 +
 .../MllpTcpServerProducerBlueprintTest.java |  35 --
 .../camel/component/mllp/impl/Hl7UtilTest.java  | 126 +
 ...BufferedSocketAcknowledgementWriterTest.java | 125 +
 .../MllpBufferedSocketMessageWriterTest.java| 126 +
 .../MllpSocketAcknowledgementReaderTest.java| 533 +++
 .../MllpSocketAcknowledgementWriterTest.java| 150 ++
 .../mllp/impl/MllpSocketMessageReaderTest.java  | 527 ++
 .../mllp/impl/MllpSocketMessageWriterTest.java  | 150 ++
 .../mllp/impl/MllpSocketReaderTestSupport.java  | 342 
 .../MllpSocketUtilExceptionHandlingTest.java| 133 +
 .../impl/MllpSocketUtilFindXxxOfBlockTest.java  | 241 +
 .../mllp/impl/MllpSocketUtilSocketTest.java | 288 ++
 .../mllp/impl/MllpSocketWriterTestSupport.java  | 132 +
 .../junit/rule/mllp/MllpClientResource.java |  51 +-
 .../junit/rule/mllp/MllpServerResource.java | 511 --
 .../apache/camel/test/util/PayloadBuilder.java  | 211 
 .../blueprint/mllp-tcp-client-producer-test.xml |   2 +-
 62 files changed, 7080 insertions(+), 1200 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/a53540da/components/camel-mllp/pom.xml
--
diff --git a/components/camel-mllp/pom.xml b/components/camel-mllp/pom.xml
index c9ca671..a56c363 100644
--- a/components/camel-mllp/pom.xml
+++ b/components/camel-mllp/pom.xml
@@ -56,6 +56,22 @@
   camel-test-b

[camel] Git Push Summary

[davsclaus]

Repository: camel
Updated Branches:
  refs/heads/jetty93 [deleted] 642843b88

[02/12] camel git commit: Upgrade netty 4.0

[davsclaus]

Upgrade netty 4.0


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

Branch: refs/heads/master
Commit: fe9ffc260d7532eaf8e7a4287db0728f6b174169
Parents: e88bd99
Author: Claus Ibsen 
Authored: Fri Dec 16 21:00:37 2016 +0100
Committer: Claus Ibsen 
Committed: Fri Dec 16 22:07:03 2016 +0100

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


http://git-wip-us.apache.org/repos/asf/camel/blob/fe9ffc26/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index a88b632..b36a134 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -452,7 +452,7 @@
 3.0.1
 3.10.6.Final
 4.1.6.Final
-4.0.41.Final
+4.0.42.Final
 0.5_1
 
 1.2.7

[12/12] camel git commit: camel-test-karaf feature cannot install

[davsclaus]

camel-test-karaf feature cannot install


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

Branch: refs/heads/master
Commit: 4909514603d7fc9892f07b109d442dfc57c68063
Parents: 4ffcc30
Author: Claus Ibsen 
Authored: Fri Dec 16 22:45:06 2016 +0100
Committer: Claus Ibsen 
Committed: Fri Dec 16 22:45:06 2016 +0100

--
 components/camel-test-karaf/pom.xml  | 8 
 platforms/karaf/features/src/main/resources/features.xml | 3 ++-
 2 files changed, 2 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/49095146/components/camel-test-karaf/pom.xml
--
diff --git a/components/camel-test-karaf/pom.xml 
b/components/camel-test-karaf/pom.xml
index 83abab2..ca6f649 100644
--- a/components/camel-test-karaf/pom.xml
+++ b/components/camel-test-karaf/pom.xml
@@ -217,14 +217,6 @@
   
 
 
-
-
-  karaf3
-  
-${karaf3-version}
-  
-
-
   
 
 

http://git-wip-us.apache.org/repos/asf/camel/blob/49095146/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 ffbb5fa..ab63b73 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -1839,12 +1839,13 @@
 mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.junit/${junit-bundle-version}
 mvn:org.apache.camel/camel-test/${project.version}
   
+  
   
 camel-spring
 spring-test

[06/12] camel git commit: CAMEL-9945: Upgrade to Jetty 9.3

[davsclaus]

CAMEL-9945: Upgrade to Jetty 9.3


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

Branch: refs/heads/master
Commit: 28ed8432b8f23740da9e461cda04357a84d9c31f
Parents: d2b702d
Author: Claus Ibsen 
Authored: Fri Dec 16 20:15:59 2016 +0100
Committer: Claus Ibsen 
Committed: Fri Dec 16 22:07:03 2016 +0100

--
 ...entClientConfigSslContextParametersTest.java |  2 ++
 .../AhcProduceSSLContextParametersGetTest.java  |  2 ++
 .../component/jetty9/JettyHttpComponent9.java   | 34 
 3 files changed, 4 insertions(+), 34 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/28ed8432/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcComponentClientConfigSslContextParametersTest.java
--
diff --git 
a/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcComponentClientConfigSslContextParametersTest.java
 
b/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcComponentClientConfigSslContextParametersTest.java
index cce907c..5b99635 100644
--- 
a/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcComponentClientConfigSslContextParametersTest.java
+++ 
b/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcComponentClientConfigSslContextParametersTest.java
@@ -17,7 +17,9 @@
 package org.apache.camel.component.ahc;
 
 import org.apache.camel.util.jsse.SSLContextParameters;
+import org.junit.Ignore;
 
+@Ignore("TODO: Does not work with Jetty 9.3.x")
 public class AhcComponentClientConfigSslContextParametersTest extends 
AhcComponentClientConfigTest {
 
 public void configureComponent() {

http://git-wip-us.apache.org/repos/asf/camel/blob/28ed8432/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcProduceSSLContextParametersGetTest.java
--
diff --git 
a/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcProduceSSLContextParametersGetTest.java
 
b/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcProduceSSLContextParametersGetTest.java
index 1e31b83..624e60e 100644
--- 
a/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcProduceSSLContextParametersGetTest.java
+++ 
b/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcProduceSSLContextParametersGetTest.java
@@ -16,7 +16,9 @@
  */
 package org.apache.camel.component.ahc;
 
+import org.junit.Ignore;
 
+@Ignore("TODO: Does not work with Jetty 9.3.x")
 public class AhcProduceSSLContextParametersGetTest extends AhcProduceGetTest {
 
 protected String getTestServerEndpointUri() {

http://git-wip-us.apache.org/repos/asf/camel/blob/28ed8432/components/camel-jetty9/src/main/java/org/apache/camel/component/jetty9/JettyHttpComponent9.java
--
diff --git 
a/components/camel-jetty9/src/main/java/org/apache/camel/component/jetty9/JettyHttpComponent9.java
 
b/components/camel-jetty9/src/main/java/org/apache/camel/component/jetty9/JettyHttpComponent9.java
index 159da1f..5ba4d02 100644
--- 
a/components/camel-jetty9/src/main/java/org/apache/camel/component/jetty9/JettyHttpComponent9.java
+++ 
b/components/camel-jetty9/src/main/java/org/apache/camel/component/jetty9/JettyHttpComponent9.java
@@ -30,7 +30,6 @@ import org.apache.camel.util.ObjectHelper;
 import org.eclipse.jetty.client.HttpClientTransport;
 import org.eclipse.jetty.server.AbstractConnector;
 import org.eclipse.jetty.server.ConnectionFactory;
-import org.eclipse.jetty.server.Connector;
 import org.eclipse.jetty.server.ForwardedRequestCustomizer;
 import org.eclipse.jetty.server.HttpConnectionFactory;
 import org.eclipse.jetty.server.Server;
@@ -48,27 +47,6 @@ public class JettyHttpComponent9 extends JettyHttpComponent {
 return new JettyHttpEndpoint9(this, endpointUri.toString(), httpUri);
 }
 
-protected Connector getSslSocketConnector(Server server, JettyHttpEndpoint 
endpoint) {
-Connector answer = null;
-/*
-if (sslSocketConnectors != null) {
-SslContextFactory con = 
sslSocketConnectors.get(endpoint.getPort());
-if (con != null) {
-SslConnectionFactory sslConnectionFactory = new 
SslConnectionFactory(con, null);
-@SuppressWarnings("resource")
-ServerConnector sc = new ServerConnector(server, 
sslConnectionFactory);
-sc.setPort(endpoint.getPort());
-sc.setHost(endpoint.getHttpUri().getHost());
-answer = sc;
-  

[08/12] camel git commit: Upgrade AHC

[davsclaus]

Upgrade AHC


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

Branch: refs/heads/master
Commit: d2b702d3f5756b3b144703cc763507aff18afdc0
Parents: b1d38d5
Author: Claus Ibsen 
Authored: Fri Dec 16 20:08:11 2016 +0100
Committer: Claus Ibsen 
Committed: Fri Dec 16 22:07:03 2016 +0100

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


http://git-wip-us.apache.org/repos/asf/camel/blob/d2b702d3/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index b50a049..addf472 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -37,7 +37,7 @@
 
 5.14.2
 1.0.2.v20150114
-2.0.15
+2.0.24
 1.7.0_6
 3.5.2_1
 3.5.2_1

[01/12] camel git commit: Fixed Karaf feature not working

[davsclaus]

Repository: camel
Updated Branches:
  refs/heads/master 190c893c2 -> 490951460


Fixed Karaf feature not working


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

Branch: refs/heads/master
Commit: 765b581bebc0efdb3de29ca4bd66631b774050c0
Parents: efc4cf9
Author: Claus Ibsen 
Authored: Fri Dec 16 22:06:51 2016 +0100
Committer: Claus Ibsen 
Committed: Fri Dec 16 22:07:03 2016 +0100

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


http://git-wip-us.apache.org/repos/asf/camel/blob/765b581b/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index b36a134..c3b5c88 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -656,6 +656,7 @@
 2.2.0
 0.2.3
 3.4.9
+16.0
 3.3.0
 3.3.0_1
 

http://git-wip-us.apache.org/repos/asf/camel/blob/765b581b/platforms/karaf/features/pom.xml
--
diff --git a/platforms/karaf/features/pom.xml b/platforms/karaf/features/pom.xml
index 73251a9..785e96f7 100644
--- a/platforms/karaf/features/pom.xml
+++ b/platforms/karaf/features/pom.xml
@@ -184,8 +184,7 @@
 
 
 
-
-
camel|camel-(?!(blueprint|cdi|cxf|ignite|guice|leveldb|zipkin))*
+
camel|camel-(?!(blueprint|cdi|cxf|ignite|guice|leveldb))*
   

file://${project.build.directory}/classes/config.properties
 
@@ -202,7 +201,7 @@
   
 org.apache.maven.wagon
 wagon-http-lightweight
-2.8
+2.10
   
 
   

http://git-wip-us.apache.org/repos/asf/camel/blob/765b581b/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 64cebb6..e832155 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -2002,6 +2002,10 @@
   
 camel-core
 mvn:org.apache.zookeeper/zookeeper/${zookeeper-version}
+mvn:org.apache.curator/curator-framework/${curator-version}
+mvn:org.apache.curator/curator-client/${curator-version}
+mvn:org.apache.curator/curator-recipes/${curator-version}
+mvn:com.google.guava/guava/${zookeeper-guava-version}
 mvn:org.apache.camel/camel-zookeeper/${project.version}
   
 

[10/12] camel git commit: Fixed camel-ahc feature

[davsclaus]

Fixed camel-ahc feature


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

Branch: refs/heads/master
Commit: c72ccecb137f7dca585937ef246f94ea38726bcd
Parents: 765b581
Author: Claus Ibsen 
Authored: Fri Dec 16 22:34:02 2016 +0100
Committer: Claus Ibsen 
Committed: Fri Dec 16 22:34:02 2016 +0100

--
 .../karaf/features/src/main/resources/features.xml   | 15 ---
 1 file changed, 8 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/c72ccecb/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 e832155..ffbb5fa 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -86,13 +86,14 @@
 
   
 camel-core
-wrap:mvn:org.asynchttpclient/async-http-client/${ahc-version}
-mvn:io.netty/netty-common/${netty40-version}
-mvn:io.netty/netty-buffer/${netty40-version}
-mvn:io.netty/netty-transport/${netty40-version}
-mvn:io.netty/netty-handler/${netty40-version}
-mvn:io.netty/netty-transport-native-epoll/${netty40-version}
-mvn:io.netty/netty-codec/${netty40-version}
+wrap:mvn:org.asynchttpclient/async-http-client/${ahc-version}$Export-Package=org.asynchttpclient.*;version=${ahc-version}
+mvn:io.netty/netty-resolver/${netty-version}
+mvn:io.netty/netty-common/${netty-version}
+mvn:io.netty/netty-buffer/${netty-version}
+mvn:io.netty/netty-transport/${netty-version}
+mvn:io.netty/netty-handler/${netty-version}
+mvn:io.netty/netty-transport-native-epoll/${netty-version}
+mvn:io.netty/netty-codec/${netty-version}
 mvn:io.netty/netty-codec-http/${netty40-version}
 mvn:javax.servlet/javax.servlet-api/${javax.servlet-api-version}
 mvn:org.apache.camel/camel-http-common/${project.version}

[11/12] camel git commit: Fix more karaf validate features

[davsclaus]

Fix more karaf validate features


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

Branch: refs/heads/master
Commit: 4ffcc30339eed0b2f100cf8aff8b7a8d04a7ae14
Parents: c72ccec
Author: Claus Ibsen 
Authored: Fri Dec 16 22:42:08 2016 +0100
Committer: Claus Ibsen 
Committed: Fri Dec 16 22:42:08 2016 +0100

--
 platforms/karaf/features/pom.xml  | 3 ++-
 platforms/karaf/features/src/main/resources/config.properties | 5 -
 2 files changed, 6 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/4ffcc303/platforms/karaf/features/pom.xml
--
diff --git a/platforms/karaf/features/pom.xml b/platforms/karaf/features/pom.xml
index 785e96f7..dc41ce7 100644
--- a/platforms/karaf/features/pom.xml
+++ b/platforms/karaf/features/pom.xml
@@ -184,7 +184,8 @@
 
 
 
-
camel|camel-(?!(blueprint|cdi|cxf|ignite|guice|leveldb))*
+
+
camel|camel-(?!(blueprint|cdi|cxf|ignite|guice|leveldb|spring-dm))*
   

file://${project.build.directory}/classes/config.properties
 

http://git-wip-us.apache.org/repos/asf/camel/blob/4ffcc303/platforms/karaf/features/src/main/resources/config.properties
--
diff --git a/platforms/karaf/features/src/main/resources/config.properties 
b/platforms/karaf/features/src/main/resources/config.properties
index 7a78ebc..a9563c3 100755
--- a/platforms/karaf/features/src/main/resources/config.properties
+++ b/platforms/karaf/features/src/main/resources/config.properties
@@ -407,6 +407,7 @@ jre-1.7= \
  sun.misc
 
 jre-1.8= \
+ com.sun.nio.file, \
  com.sun.tools.xjc, \
  javax.accessibility, \
  javax.activation;version="1.1", \
@@ -567,4 +568,6 @@ jre-1.8= \
  org.xml.sax, \
  org.xml.sax.ext, \
  org.xml.sax.helpers, \
- sun.misc
+ sun.misc, \
+ sun.nio.ch, \
+ sun.reflect

[03/12] camel git commit: Fixed Karaf feature not working

[davsclaus]

Fixed Karaf feature not working


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

Branch: refs/heads/master
Commit: e88bd99a524068f4724258ff43035aed59912117
Parents: 9ad6806
Author: Claus Ibsen 
Authored: Fri Dec 16 20:54:55 2016 +0100
Committer: Claus Ibsen 
Committed: Fri Dec 16 22:07:03 2016 +0100

--
 platforms/karaf/features/src/main/resources/features.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/e88bd99a/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 be0c115..206fde0 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -666,7 +666,9 @@
 wrap:mvn:com.google.oauth-client/google-oauth-client-java6/${google-api-client-version}
 wrap:mvn:com.google.oauth-client/google-oauth-client-jetty/${google-api-client-version}
 mvn:com.fasterxml.jackson.core/jackson-core/${jackson2-version}
-mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-httpclient/${commons-httpclient-bundle-version}
+mvn:org.apache.httpcomponents/httpcore-osgi/${httpcore4-version}
+mvn:org.apache.httpcomponents/httpclient-osgi/${httpclient4-version}
+mvn:javax.servlet/javax.servlet-api/${javax.servlet-api-version}
 mvn:com.google.guava/guava/${google-guava-version}
 
mvn:org.apache.camel/camel-google-pubsub/${project.version}
   

[07/12] camel git commit: Sort A..Z

[davsclaus]

Sort A..Z


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

Branch: refs/heads/master
Commit: efc4cf984f5867745afe5a1d7a71774630d32838
Parents: fe9ffc2
Author: Claus Ibsen 
Authored: Fri Dec 16 21:05:37 2016 +0100
Committer: Claus Ibsen 
Committed: Fri Dec 16 22:07:03 2016 +0100

--
 .../karaf/features/src/main/resources/features.xml  | 16 
 1 file changed, 8 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/efc4cf98/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 206fde0..64cebb6 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -846,6 +846,14 @@
 mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ibatis-sqlmap/${ibatis-bundle-version}
 mvn:org.apache.camel/camel-ibatis/${project.version}
   
+  
+camel-core
+mvn:commons-lang/commons-lang/${commons-lang-version}
+mvn:commons-codec/commons-codec/${commons-codec-version}
+wrap:mvn:backport-util-concurrent/backport-util-concurrent/${backport-util-concurrent-version}$Bundle-SymbolicName=backport-util-concurrent.backport-util-concurrent&Bundle-Version=${backport-util-concurrent-version}
+mvn:org.mnode.ical4j/ical4j/${ical4j-version}
+mvn:org.apache.camel/camel-ical/${project.version}
+  
   
 
 

[04/12] camel git commit: CAMEL-9945 Upgrade to Jetty 9.3

[davsclaus]

CAMEL-9945 Upgrade to Jetty 9.3

In Jetty 9.3 API signature changed from:
List getProtocolHandler()
to:
ProtocolHandlers getProtocolHandler()

This commit adds reflection bridge to keep the compatibility with Jetty
9.2 and Jetty 9.3.

Tested with Jetty versions: 9.2.19.v20160908, 9.3.8.v20160314,
9.4.0.v20161208

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

Branch: refs/heads/master
Commit: 35c2a64b44944dd794da5fd3535cb48f3e742a47
Parents: 190c893
Author: Zoran Regvart 
Authored: Fri Dec 16 15:36:02 2016 +0100
Committer: Claus Ibsen 
Committed: Fri Dec 16 22:07:03 2016 +0100

--
 .../salesforce/SalesforceHttpClient.java| 34 ++--
 .../client/SalesforceSecurityHandler.java   |  5 +++
 2 files changed, 36 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/35c2a64b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceHttpClient.java
--
diff --git 
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceHttpClient.java
 
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceHttpClient.java
index 6bca3f8..95095aa 100644
--- 
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceHttpClient.java
+++ 
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceHttpClient.java
@@ -16,8 +16,11 @@
  */
 package org.apache.camel.component.salesforce;
 
+import java.lang.reflect.Method;
 import java.net.URI;
+import java.util.List;
 import java.util.concurrent.TimeUnit;
+import static java.util.Optional.ofNullable;
 
 import org.apache.camel.component.salesforce.internal.SalesforceSession;
 import 
org.apache.camel.component.salesforce.internal.client.SalesforceHttpRequest;
@@ -26,7 +29,9 @@ import org.eclipse.jetty.client.HttpClient;
 import org.eclipse.jetty.client.HttpClientTransport;
 import org.eclipse.jetty.client.HttpConversation;
 import org.eclipse.jetty.client.HttpRequest;
+import org.eclipse.jetty.client.ProtocolHandler;
 import org.eclipse.jetty.client.api.Request;
+import org.eclipse.jetty.client.http.HttpClientTransportOverHTTP;
 import org.eclipse.jetty.util.ssl.SslContextFactory;
 
 /**
@@ -45,15 +50,34 @@ public class SalesforceHttpClient extends HttpClient {
 private int maxContentLength = DEFAULT_MAX_CONTENT_LENGTH;
 private long timeout = DEFAULT_TIMEOUT;
 
+private final Method addSecuirtyHandlerMethod;
+
 public SalesforceHttpClient() {
+this(null);
 }
 
 public SalesforceHttpClient(SslContextFactory sslContextFactory) {
-super(sslContextFactory);
+this(null, sslContextFactory);
 }
 
 public SalesforceHttpClient(HttpClientTransport transport, 
SslContextFactory sslContextFactory) {
-super(transport, sslContextFactory);
+super(ofNullable(transport).orElse(new HttpClientTransportOverHTTP()), 
sslContextFactory);
+
+// Jetty 9.3, as opposed to 9.2 the way to add ProtocolHandler to
+// HttpClient changed in 9.2 HttpClient::getProtocolHandlers returned
+// List= 9.2)
+try {
+final Class getProtocolHandlersType = 
HttpClient.class.getMethod("getProtocolHandlers").getReturnType();
+final boolean isJetty92 = 
List.class.equals(getProtocolHandlersType);
+if (isJetty92) {
+addSecuirtyHandlerMethod = List.class.getMethod("add", 
Object.class);
+} else {
+addSecuirtyHandlerMethod = 
getProtocolHandlersType.getMethod("put", ProtocolHandler.class);
+}
+} catch (NoSuchMethodException e) {
+throw new IllegalStateException("Found no method of adding 
SalesforceSecurityHandler as ProtocolHandler to Jetty HttpClient. You need 
Jetty 9.2 or newer on the classpath.");
+}
 }
 
 @Override
@@ -73,7 +97,11 @@ public class SalesforceHttpClient extends HttpClient {
 if (getSession() == null) {
 throw new IllegalStateException("Missing SalesforceSession in 
property session!");
 }
-getProtocolHandlers().add(new SalesforceSecurityHandler(this));
+
+// compensate for Jetty 9.2 vs 9.3 API change
+final Object protocolHandlers = getProtocolHandlers();
+addSecuirtyHandlerMethod.invoke(protocolHandlers, new 
SalesforceSecurityHandler(this));
+
 super.doStar

[09/12] camel git commit: CAMEL-9945: camel-ahc requires jetty 9.2 for testing

[davsclaus]

CAMEL-9945: camel-ahc requires jetty 9.2 for testing


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

Branch: refs/heads/master
Commit: 9ad6806672f69651bfa6cf7563b2c7383e2f9a7c
Parents: 28ed843
Author: Claus Ibsen 
Authored: Fri Dec 16 20:22:59 2016 +0100
Committer: Claus Ibsen 
Committed: Fri Dec 16 22:07:03 2016 +0100

--
 components/camel-ahc/pom.xml| 78 +++-
 ...entClientConfigSslContextParametersTest.java |  2 -
 .../AhcProduceSSLContextParametersGetTest.java  |  3 -
 parent/pom.xml  |  1 +
 4 files changed, 78 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/9ad68066/components/camel-ahc/pom.xml
--
diff --git a/components/camel-ahc/pom.xml b/components/camel-ahc/pom.xml
index b0e4a52..0398ad3 100644
--- a/components/camel-ahc/pom.xml
+++ b/components/camel-ahc/pom.xml
@@ -15,7 +15,8 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd";>
+http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd";>
   4.0.0
 
   
@@ -70,7 +71,82 @@
   org.apache.camel
   camel-jetty9
   test
+  
+
+  org.eclipse.jetty
+  jetty-server
+
+
+  org.eclipse.jetty
+  jetty-servlet
+
+
+  org.eclipse.jetty
+  jetty-security
+
+
+  org.eclipse.jetty
+  jetty-servlets
+
+
+  org.eclipse.jetty
+  jetty-client
+
+
+  org.eclipse.jetty
+  jetty-jmx
+
+
+  org.eclipse.jetty
+  jetty-util
+
+  
 
+
+
+
+  org.eclipse.jetty
+  jetty-server
+  ${jetty92-version}
+  test
+
+
+  org.eclipse.jetty
+  jetty-servlet
+  ${jetty92-version}
+  test
+
+
+  org.eclipse.jetty
+  jetty-security
+  ${jetty92-version}
+  test
+
+
+  org.eclipse.jetty
+  jetty-servlets
+  ${jetty92-version}
+  test
+
+
+  org.eclipse.jetty
+  jetty-client
+  ${jetty92-version}
+  test
+
+
+  org.eclipse.jetty
+  jetty-jmx
+  ${jetty92-version}
+  test
+
+
+  org.eclipse.jetty
+  jetty-util
+  ${jetty92-version}
+  test
+
+
 
   junit
   junit

http://git-wip-us.apache.org/repos/asf/camel/blob/9ad68066/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcComponentClientConfigSslContextParametersTest.java
--
diff --git 
a/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcComponentClientConfigSslContextParametersTest.java
 
b/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcComponentClientConfigSslContextParametersTest.java
index 5b99635..cce907c 100644
--- 
a/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcComponentClientConfigSslContextParametersTest.java
+++ 
b/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcComponentClientConfigSslContextParametersTest.java
@@ -17,9 +17,7 @@
 package org.apache.camel.component.ahc;
 
 import org.apache.camel.util.jsse.SSLContextParameters;
-import org.junit.Ignore;
 
-@Ignore("TODO: Does not work with Jetty 9.3.x")
 public class AhcComponentClientConfigSslContextParametersTest extends 
AhcComponentClientConfigTest {
 
 public void configureComponent() {

http://git-wip-us.apache.org/repos/asf/camel/blob/9ad68066/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcProduceSSLContextParametersGetTest.java
--
diff --git 
a/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcProduceSSLContextParametersGetTest.java
 
b/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcProduceSSLContextParametersGetTest.java
index 624e60e..a5ed453 100644
--- 
a/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcProduceSSLContextParametersGetTest.java
+++ 
b/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcProduceSSL

[05/12] camel git commit: CAMEL-9945: Upgrade to Jetty 9.3

[davsclaus]

CAMEL-9945: Upgrade to Jetty 9.3


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

Branch: refs/heads/master
Commit: b1d38d5d800d216dd822218c216d423cc24af481
Parents: 35c2a64
Author: Claus Ibsen 
Authored: Fri Dec 16 20:05:42 2016 +0100
Committer: Claus Ibsen 
Committed: Fri Dec 16 22:07:03 2016 +0100

--
 components/camel-cometd/pom.xml |  2 +-
 components/camel-cxf/pom.xml| 99 +---
 components/camel-jetty9/pom.xml |  5 +
 .../jetty/JettyHttpContentTypeTest.java |  2 +-
 parent/pom.xml  | 36 +--
 5 files changed, 75 insertions(+), 69 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/b1d38d5d/components/camel-cometd/pom.xml
--
diff --git a/components/camel-cometd/pom.xml b/components/camel-cometd/pom.xml
index 35ff182..583f2ec 100644
--- a/components/camel-cometd/pom.xml
+++ b/components/camel-cometd/pom.xml
@@ -33,7 +33,7 @@
 
org.apache.camel.component.cometd.*
 
 !org.apache.camel.component.cometd.*,
-org.eclipse.jetty.util.ssl;version="[9,9.5)";resolution:=optional,
+org.eclipse.jetty.util.ssl;version="[9.2,10)";resolution:=optional,
 ${camel.osgi.import.defaults},
 *
 

http://git-wip-us.apache.org/repos/asf/camel/blob/b1d38d5d/components/camel-cxf/pom.xml
--
diff --git a/components/camel-cxf/pom.xml b/components/camel-cxf/pom.xml
index 5cd9cc4..88ef884 100644
--- a/components/camel-cxf/pom.xml
+++ b/components/camel-cxf/pom.xml
@@ -15,7 +15,8 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd";>
+http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd";>
   4.0.0
 
   
@@ -113,9 +114,9 @@
   ${cxf-version}
 
 
-org.apache.cxf
-cxf-rt-rs-security-oauth
-${cxf-version}
+  org.apache.cxf
+  cxf-rt-rs-security-oauth
+  ${cxf-version}
 
 
 
@@ -161,12 +162,12 @@
   camel-core-xml
   test
 
-
+
 
 
-   org.apache.camel
-   camel-jaxb
-   test
+  org.apache.camel
+  camel-jaxb
+  test
 
 
 
@@ -184,25 +185,25 @@
 
 
 
-   org.apache.activemq
-   activemq-broker
-   test
+  org.apache.activemq
+  activemq-broker
+  test
 
-
+
 
-   
-   org.apache.cxf
-   cxf-rt-features-clustering
-   ${cxf-version}
-test
-   
-
 
-org.apache.activemq
-activemq-kahadb-store
-test
+  org.apache.cxf
+  cxf-rt-features-clustering
+  ${cxf-version}
+  test
+
+
+
+  org.apache.activemq
+  activemq-kahadb-store
+  test
 
-
+
 
   org.apache.cxf
   cxf-rt-transports-jms
@@ -215,8 +216,40 @@
   cxf-rt-transports-http-jetty
   ${cxf-version}
   test
+  
+
+  org.eclipse.jetty
+  jetty-server
+
+
+  org.eclipse.jetty
+  jetty-util
+
+
+  org.eclipse.jetty
+  jetty-io
+
+
+  org.eclipse.jetty
+  jetty-security
+
+
+  org.eclipse.jetty
+  jetty-continuation
+
+
+  org.eclipse.jetty
+  jetty-http
+
+  
 
 
+  org.apache.camel
+  camel-jetty9
+  test
+
+
+
   org.apache.cxf
   cxf-rt-bindings-soap
   ${cxf-version}
@@ -233,13 +266,13 @@
   httpclient
   test
 
-
+
 
-   org.apache.httpcomponents
-   httpmime
-   test
+  org.apache.httpcomponents
+  httpmime
+  test
 
-
+
 
   org.apache.logging.log4j
   log4j-api
@@ -262,7 +295,7 @@
   ${cxf-version}
   test
 
-
+
 
 
   org.apache.cxf
@@ -270,7 +303,7 @@
   ${cxf-version}
   test
 
-
+
 
   org.apache.cxf
   cxf-rt-ws-security
@@ -307,7 +340,7 @@
   cxf-rt-rs-extension-providers
   ${cxf-version}
   test
-  
+
 
   org.codehau

camel git commit: remove the eclipse compiler dependency

[bvahdat]

Repository: camel
Updated Branches:
  refs/heads/master 950586152 -> 190c893c2


remove the eclipse compiler dependency


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

Branch: refs/heads/master
Commit: 190c893c2ed99bfe5a2aa1eabe097508ce0a2b26
Parents: 9505861
Author: Babak Vahdat 
Authored: Fri Dec 16 21:02:46 2016 +0100
Committer: Babak Vahdat 
Committed: Fri Dec 16 21:02:46 2016 +0100

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


http://git-wip-us.apache.org/repos/asf/camel/blob/190c893c/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 1fcc5e0..4182c70 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -164,7 +164,6 @@
 6.5.0.Final
 1.8.2
 3.4
-4.2.2
 
3.3.0-v20070426
 2.1.5
 2.1.5_1

http://git-wip-us.apache.org/repos/asf/camel/blob/190c893c/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 db2fd33..be0c115 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -1365,9 +1365,6 @@
 mvn:org.drools/drools-compiler/${drools-version}
 mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.reflections/${reflections-bundle-version}
 mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jaxb-xjc/${jaxb-bundle-version}
-
-
-wrap:mvn:org.eclipse.jdt.core.compiler/ecj/${eclipse-compiler-version}
 mvn:org.mvel/mvel2/${mvel-version}
 mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xstream/${xstream-bundle-version}
 mvn:com.google.protobuf/protobuf-java/${protobuf-version}

camel git commit: Upgrade Univocity Parsers to version 2.3.0

[acosentino]

Repository: camel
Updated Branches:
  refs/heads/master ddcbd0f94 -> 950586152


Upgrade Univocity Parsers to version 2.3.0


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

Branch: refs/heads/master
Commit: 95058615223553c661283154f9e7d0826d22a4a7
Parents: ddcbd0f
Author: Andrea Cosentino 
Authored: Fri Dec 16 17:32:35 2016 +0100
Committer: Andrea Cosentino 
Committed: Fri Dec 16 17:32:35 2016 +0100

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


http://git-wip-us.apache.org/repos/asf/camel/blob/95058615/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index dee9988..1fcc5e0 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -606,7 +606,7 @@
 4.0.5_1
 4.0.5
 1.4.7.Final
-2.2.3
+2.3.0
 
2015-01-27T15-02-14
 
1.0.0
 4.0.4

[2/3] camel git commit: [maven-release-plugin] prepare for next development iteration

[dkulp]

http://git-wip-us.apache.org/repos/asf/camel/blob/4ad8bb40/components/camel-jxpath/pom.xml
--
diff --git a/components/camel-jxpath/pom.xml b/components/camel-jxpath/pom.xml
index 95234b7..add4b49 100644
--- a/components/camel-jxpath/pom.xml
+++ b/components/camel-jxpath/pom.xml
@@ -21,7 +21,7 @@
   
 org.apache.camel
 components
-2.16.5
+2.16.6-SNAPSHOT
   
 
   camel-jxpath

http://git-wip-us.apache.org/repos/asf/camel/blob/4ad8bb40/components/camel-kafka/pom.xml
--
diff --git a/components/camel-kafka/pom.xml b/components/camel-kafka/pom.xml
index 2059859..2db344b 100644
--- a/components/camel-kafka/pom.xml
+++ b/components/camel-kafka/pom.xml
@@ -21,7 +21,7 @@
   
 org.apache.camel
 components
-2.16.5
+2.16.6-SNAPSHOT
   
 
   camel-kafka

http://git-wip-us.apache.org/repos/asf/camel/blob/4ad8bb40/components/camel-kestrel/pom.xml
--
diff --git a/components/camel-kestrel/pom.xml b/components/camel-kestrel/pom.xml
index 2b8d09a..79a22ba 100644
--- a/components/camel-kestrel/pom.xml
+++ b/components/camel-kestrel/pom.xml
@@ -21,7 +21,7 @@
 
 org.apache.camel
 components
-2.16.5
+2.16.6-SNAPSHOT
 
 
 camel-kestrel

http://git-wip-us.apache.org/repos/asf/camel/blob/4ad8bb40/components/camel-krati/pom.xml
--
diff --git a/components/camel-krati/pom.xml b/components/camel-krati/pom.xml
index b75c5b0..8172e46 100644
--- a/components/camel-krati/pom.xml
+++ b/components/camel-krati/pom.xml
@@ -21,7 +21,7 @@
 
 org.apache.camel
 components
-2.16.5
+2.16.6-SNAPSHOT
 
 
 camel-krati

http://git-wip-us.apache.org/repos/asf/camel/blob/4ad8bb40/components/camel-kura/pom.xml
--
diff --git a/components/camel-kura/pom.xml b/components/camel-kura/pom.xml
index 15f28fd..b4a45fd 100644
--- a/components/camel-kura/pom.xml
+++ b/components/camel-kura/pom.xml
@@ -24,7 +24,7 @@
 
 org.apache.camel
 components
-2.16.5
+2.16.6-SNAPSHOT
 
 
 camel-kura

http://git-wip-us.apache.org/repos/asf/camel/blob/4ad8bb40/components/camel-ldap/pom.xml
--
diff --git a/components/camel-ldap/pom.xml b/components/camel-ldap/pom.xml
index a108bf9..8336c5c 100644
--- a/components/camel-ldap/pom.xml
+++ b/components/camel-ldap/pom.xml
@@ -23,7 +23,7 @@
 
 org.apache.camel
 components
-2.16.5
+2.16.6-SNAPSHOT
 
 
 camel-ldap

http://git-wip-us.apache.org/repos/asf/camel/blob/4ad8bb40/components/camel-leveldb/pom.xml
--
diff --git a/components/camel-leveldb/pom.xml b/components/camel-leveldb/pom.xml
index f395973..25ca9e9 100644
--- a/components/camel-leveldb/pom.xml
+++ b/components/camel-leveldb/pom.xml
@@ -21,7 +21,7 @@
 
 org.apache.camel
 components
-2.16.5
+2.16.6-SNAPSHOT
 
 
 camel-leveldb

http://git-wip-us.apache.org/repos/asf/camel/blob/4ad8bb40/components/camel-linkedin/camel-linkedin-api/pom.xml
--
diff --git a/components/camel-linkedin/camel-linkedin-api/pom.xml 
b/components/camel-linkedin/camel-linkedin-api/pom.xml
index 4c1e466..b617c75 100644
--- a/components/camel-linkedin/camel-linkedin-api/pom.xml
+++ b/components/camel-linkedin/camel-linkedin-api/pom.xml
@@ -22,7 +22,7 @@
   
 org.apache.camel
 camel-linkedin-parent
-2.16.5
+2.16.6-SNAPSHOT
   
 
   camel-linkedin-api

http://git-wip-us.apache.org/repos/asf/camel/blob/4ad8bb40/components/camel-linkedin/camel-linkedin-component/pom.xml
--
diff --git a/components/camel-linkedin/camel-linkedin-component/pom.xml 
b/components/camel-linkedin/camel-linkedin-component/pom.xml
index 6d7bef8..07b0e8d 100644
--- a/components/camel-linkedin/camel-linkedin-component/pom.xml
+++ b/components/camel-linkedin/camel-linkedin-component/pom.xml
@@ -22,7 +22,7 @@
   
 org.apache.camel
 camel-linkedin-parent
-2.16.5
+2.16.6-SNAPSHOT
   
 
   camel-linkedin

http://git-wip-us.apache.org/repos/asf/camel/blob/4ad8bb40/components/camel-linkedin/pom.xml
--
diff --git a/components/camel-linkedin/pom.xml 
b/components/camel-linkedin/pom.xml
index 8dfe10d..7e72841 100644
--- a/components/camel-linkedin/pom.xml
+++ b/components/camel-linkedin/pom.xml
@@ -22,7 +22,7 @@
   
 components
 org.apache.camel
-2.16.5
+2.16.6-SNAPSHOT
   
 
   camel-linkedin

[2/3] camel git commit: [maven-release-plugin] prepare release camel-2.16.5

[dkulp]

http://git-wip-us.apache.org/repos/asf/camel/blob/589dadb6/components/camel-jxpath/pom.xml
--
diff --git a/components/camel-jxpath/pom.xml b/components/camel-jxpath/pom.xml
index 8050631..95234b7 100644
--- a/components/camel-jxpath/pom.xml
+++ b/components/camel-jxpath/pom.xml
@@ -21,7 +21,7 @@
   
 org.apache.camel
 components
-2.16.5-SNAPSHOT
+2.16.5
   
 
   camel-jxpath

http://git-wip-us.apache.org/repos/asf/camel/blob/589dadb6/components/camel-kafka/pom.xml
--
diff --git a/components/camel-kafka/pom.xml b/components/camel-kafka/pom.xml
index 850277a..2059859 100644
--- a/components/camel-kafka/pom.xml
+++ b/components/camel-kafka/pom.xml
@@ -21,7 +21,7 @@
   
 org.apache.camel
 components
-2.16.5-SNAPSHOT
+2.16.5
   
 
   camel-kafka

http://git-wip-us.apache.org/repos/asf/camel/blob/589dadb6/components/camel-kestrel/pom.xml
--
diff --git a/components/camel-kestrel/pom.xml b/components/camel-kestrel/pom.xml
index 717c9b6..2b8d09a 100644
--- a/components/camel-kestrel/pom.xml
+++ b/components/camel-kestrel/pom.xml
@@ -21,7 +21,7 @@
 
 org.apache.camel
 components
-2.16.5-SNAPSHOT
+2.16.5
 
 
 camel-kestrel

http://git-wip-us.apache.org/repos/asf/camel/blob/589dadb6/components/camel-krati/pom.xml
--
diff --git a/components/camel-krati/pom.xml b/components/camel-krati/pom.xml
index ce09cdc..b75c5b0 100644
--- a/components/camel-krati/pom.xml
+++ b/components/camel-krati/pom.xml
@@ -21,7 +21,7 @@
 
 org.apache.camel
 components
-2.16.5-SNAPSHOT
+2.16.5
 
 
 camel-krati

http://git-wip-us.apache.org/repos/asf/camel/blob/589dadb6/components/camel-kura/pom.xml
--
diff --git a/components/camel-kura/pom.xml b/components/camel-kura/pom.xml
index 39d53ac..15f28fd 100644
--- a/components/camel-kura/pom.xml
+++ b/components/camel-kura/pom.xml
@@ -24,7 +24,7 @@
 
 org.apache.camel
 components
-2.16.5-SNAPSHOT
+2.16.5
 
 
 camel-kura

http://git-wip-us.apache.org/repos/asf/camel/blob/589dadb6/components/camel-ldap/pom.xml
--
diff --git a/components/camel-ldap/pom.xml b/components/camel-ldap/pom.xml
index 185f3ee..a108bf9 100644
--- a/components/camel-ldap/pom.xml
+++ b/components/camel-ldap/pom.xml
@@ -23,7 +23,7 @@
 
 org.apache.camel
 components
-2.16.5-SNAPSHOT
+2.16.5
 
 
 camel-ldap

http://git-wip-us.apache.org/repos/asf/camel/blob/589dadb6/components/camel-leveldb/pom.xml
--
diff --git a/components/camel-leveldb/pom.xml b/components/camel-leveldb/pom.xml
index 88f4d04..f395973 100644
--- a/components/camel-leveldb/pom.xml
+++ b/components/camel-leveldb/pom.xml
@@ -21,7 +21,7 @@
 
 org.apache.camel
 components
-2.16.5-SNAPSHOT
+2.16.5
 
 
 camel-leveldb

http://git-wip-us.apache.org/repos/asf/camel/blob/589dadb6/components/camel-linkedin/camel-linkedin-api/pom.xml
--
diff --git a/components/camel-linkedin/camel-linkedin-api/pom.xml 
b/components/camel-linkedin/camel-linkedin-api/pom.xml
index 145b72a..4c1e466 100644
--- a/components/camel-linkedin/camel-linkedin-api/pom.xml
+++ b/components/camel-linkedin/camel-linkedin-api/pom.xml
@@ -22,7 +22,7 @@
   
 org.apache.camel
 camel-linkedin-parent
-2.16.5-SNAPSHOT
+2.16.5
   
 
   camel-linkedin-api

http://git-wip-us.apache.org/repos/asf/camel/blob/589dadb6/components/camel-linkedin/camel-linkedin-component/pom.xml
--
diff --git a/components/camel-linkedin/camel-linkedin-component/pom.xml 
b/components/camel-linkedin/camel-linkedin-component/pom.xml
index af0702c..6d7bef8 100644
--- a/components/camel-linkedin/camel-linkedin-component/pom.xml
+++ b/components/camel-linkedin/camel-linkedin-component/pom.xml
@@ -22,7 +22,7 @@
   
 org.apache.camel
 camel-linkedin-parent
-2.16.5-SNAPSHOT
+2.16.5
   
 
   camel-linkedin

http://git-wip-us.apache.org/repos/asf/camel/blob/589dadb6/components/camel-linkedin/pom.xml
--
diff --git a/components/camel-linkedin/pom.xml 
b/components/camel-linkedin/pom.xml
index a70b5e4..8dfe10d 100644
--- a/components/camel-linkedin/pom.xml
+++ b/components/camel-linkedin/pom.xml
@@ -22,7 +22,7 @@
   
 components
 org.apache.camel
-2.16.5-SNAPSHOT
+2.16.5
   
 
   camel-linkedin

[1/3] camel git commit: [maven-release-plugin] prepare release camel-2.16.5

[dkulp]

Repository: camel
Updated Branches:
  refs/heads/camel-2.16.x ccf149c76 -> 589dadb6b


http://git-wip-us.apache.org/repos/asf/camel/blob/589dadb6/examples/camel-example-reportincident/pom.xml
--
diff --git a/examples/camel-example-reportincident/pom.xml 
b/examples/camel-example-reportincident/pom.xml
index 2644df3..b126989 100755
--- a/examples/camel-example-reportincident/pom.xml
+++ b/examples/camel-example-reportincident/pom.xml
@@ -22,7 +22,7 @@
 
 org.apache.camel
 examples
-2.16.5-SNAPSHOT
+2.16.5
 
 
 camel-example-reportincident

http://git-wip-us.apache.org/repos/asf/camel/blob/589dadb6/examples/camel-example-restlet-jdbc/pom.xml
--
diff --git a/examples/camel-example-restlet-jdbc/pom.xml 
b/examples/camel-example-restlet-jdbc/pom.xml
index e9e83cb..a266edd 100755
--- a/examples/camel-example-restlet-jdbc/pom.xml
+++ b/examples/camel-example-restlet-jdbc/pom.xml
@@ -22,7 +22,7 @@
 
 org.apache.camel
 examples
-2.16.5-SNAPSHOT
+2.16.5
 
 
 camel-example-restlet-jdbc

http://git-wip-us.apache.org/repos/asf/camel/blob/589dadb6/examples/camel-example-route-throttling/pom.xml
--
diff --git a/examples/camel-example-route-throttling/pom.xml 
b/examples/camel-example-route-throttling/pom.xml
index 65a1a7022..ce007f7 100644
--- a/examples/camel-example-route-throttling/pom.xml
+++ b/examples/camel-example-route-throttling/pom.xml
@@ -22,7 +22,7 @@
 
 org.apache.camel
 examples
-2.16.5-SNAPSHOT
+2.16.5
 
 
 camel-example-route-throttling

http://git-wip-us.apache.org/repos/asf/camel/blob/589dadb6/examples/camel-example-servlet-rest-blueprint/pom.xml
--
diff --git a/examples/camel-example-servlet-rest-blueprint/pom.xml 
b/examples/camel-example-servlet-rest-blueprint/pom.xml
index 41c8493..c1a3590 100755
--- a/examples/camel-example-servlet-rest-blueprint/pom.xml
+++ b/examples/camel-example-servlet-rest-blueprint/pom.xml
@@ -22,7 +22,7 @@
   
 org.apache.camel
 examples
-2.16.5-SNAPSHOT
+2.16.5
   
 
   camel-example-servlet-rest-blueprint

http://git-wip-us.apache.org/repos/asf/camel/blob/589dadb6/examples/camel-example-servlet-tomcat-no-spring/pom.xml
--
diff --git a/examples/camel-example-servlet-tomcat-no-spring/pom.xml 
b/examples/camel-example-servlet-tomcat-no-spring/pom.xml
index 01f6f61..3bb3106 100755
--- a/examples/camel-example-servlet-tomcat-no-spring/pom.xml
+++ b/examples/camel-example-servlet-tomcat-no-spring/pom.xml
@@ -22,7 +22,7 @@
 
 org.apache.camel
 examples
-2.16.5-SNAPSHOT
+2.16.5
 
 
 camel-example-servlet-tomcat-no-spring

http://git-wip-us.apache.org/repos/asf/camel/blob/589dadb6/examples/camel-example-servlet-tomcat/pom.xml
--
diff --git a/examples/camel-example-servlet-tomcat/pom.xml 
b/examples/camel-example-servlet-tomcat/pom.xml
index a14c437..f4c77d7 100755
--- a/examples/camel-example-servlet-tomcat/pom.xml
+++ b/examples/camel-example-servlet-tomcat/pom.xml
@@ -22,7 +22,7 @@
 
 org.apache.camel
 examples
-2.16.5-SNAPSHOT
+2.16.5
 
 
 camel-example-servlet-tomcat

http://git-wip-us.apache.org/repos/asf/camel/blob/589dadb6/examples/camel-example-simplejirabot/javadsl/pom.xml
--
diff --git a/examples/camel-example-simplejirabot/javadsl/pom.xml 
b/examples/camel-example-simplejirabot/javadsl/pom.xml
index 5705f95..c456143 100644
--- a/examples/camel-example-simplejirabot/javadsl/pom.xml
+++ b/examples/camel-example-simplejirabot/javadsl/pom.xml
@@ -19,7 +19,7 @@
 
 camel-example-simplejirabot
 org.apache.camel
-2.16.5-SNAPSHOT
+2.16.5
 
 4.0.0
 

http://git-wip-us.apache.org/repos/asf/camel/blob/589dadb6/examples/camel-example-simplejirabot/pom.xml
--
diff --git a/examples/camel-example-simplejirabot/pom.xml 
b/examples/camel-example-simplejirabot/pom.xml
index f341875..03296ca 100644
--- a/examples/camel-example-simplejirabot/pom.xml
+++ b/examples/camel-example-simplejirabot/pom.xml
@@ -21,7 +21,7 @@
 
 org.apache.camel
 examples
-2.16.5-SNAPSHOT
+2.16.5
 
 
 camel-example-simplejirabot

http://git-wip-us.apache.org/repos/asf/camel/blob/589dadb6/examples/camel-example-simplejirabot/xmlconf/pom.xml
--
diff --git a/examples/camel-example-simplejirabot/xmlcon

[3/3] camel git commit: [maven-release-plugin] prepare for next development iteration

[dkulp]

[maven-release-plugin] prepare for next development iteration


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

Branch: refs/heads/camel-2.16.x
Commit: 4ad8bb40a932f852adf81d1112dc044fe221
Parents: 589dadb
Author: Daniel Kulp 
Authored: Fri Dec 16 10:57:53 2016 -0500
Committer: Daniel Kulp 
Committed: Fri Dec 16 10:57:53 2016 -0500

--
 apache-camel/pom.xml | 2 +-
 buildingtools/pom.xml| 2 +-
 camel-core/pom.xml   | 2 +-
 components/camel-ahc-ws/pom.xml  | 2 +-
 components/camel-ahc/pom.xml | 2 +-
 components/camel-amqp/pom.xml| 2 +-
 components/camel-apns/pom.xml| 2 +-
 components/camel-atmos/pom.xml   | 2 +-
 components/camel-atmosphere-websocket/pom.xml| 2 +-
 components/camel-atom/pom.xml| 2 +-
 components/camel-avro/pom.xml| 2 +-
 components/camel-aws/pom.xml | 2 +-
 components/camel-bam/pom.xml | 2 +-
 components/camel-barcode/pom.xml | 2 +-
 components/camel-base64/pom.xml  | 2 +-
 components/camel-bean-validator/pom.xml  | 2 +-
 components/camel-beanio/pom.xml  | 2 +-
 components/camel-beanstalk/pom.xml   | 2 +-
 components/camel-bindy/pom.xml   | 2 +-
 components/camel-blueprint/pom.xml   | 2 +-
 components/camel-boon/pom.xml| 2 +-
 components/camel-box/pom.xml | 2 +-
 components/camel-cache/pom.xml   | 2 +-
 components/camel-cassandraql/pom.xml | 2 +-
 components/camel-castor/pom.xml  | 2 +-
 components/camel-cdi/pom.xml | 2 +-
 components/camel-chunk/pom.xml   | 2 +-
 components/camel-cmis/pom.xml| 2 +-
 components/camel-coap/pom.xml| 2 +-
 components/camel-cometd/pom.xml  | 2 +-
 components/camel-context/pom.xml | 2 +-
 components/camel-core-osgi/pom.xml   | 2 +-
 components/camel-core-xml/pom.xml| 2 +-
 components/camel-couchdb/pom.xml | 2 +-
 components/camel-crypto/pom.xml  | 2 +-
 components/camel-csv/pom.xml | 2 +-
 components/camel-cxf-transport/pom.xml   | 2 +-
 components/camel-cxf/pom.xml | 2 +-
 components/camel-disruptor/pom.xml   | 2 +-
 components/camel-dns/pom.xml | 2 +-
 components/camel-docker/pom.xml  | 2 +-
 components/camel-dozer/pom.xml   | 2 +-
 components/camel-dropbox/pom.xml | 2 +-
 components/camel-eclipse/pom.xml | 2 +-
 components/camel-ejb/pom.xml | 2 +-
 components/camel-elasticsearch/pom.xml   | 2 +-
 components/camel-elsql/pom.xml   | 2 +-
 components/camel-eventadmin/pom.xml  | 2 +-
 components/camel-exec/pom.xml| 2 +-
 components/camel-facebook/pom.xml| 2 +-
 components/camel-flatpack/pom.xml| 2 +-
 components/camel-fop/pom.xml | 2 +-
 components/camel-freemarker/pom.xml  | 2 +-
 components/camel-ftp/pom.xml | 2 +-
 components/camel-gae/pom.xml | 2 +-
 components/camel-ganglia/pom.xml | 2 +-
 components/camel-geocoder/pom.xml| 2 +-
 components/camel-git/pom.xml | 2 +-
 components/camel-github/pom.xml  | 2 +-
 components/camel-google-calendar/pom.xml | 2 +

[camel] Git Push Summary

[dkulp]

Repository: camel
Updated Tags:  refs/tags/camel-2.16.5 [created] 0f4562325

[1/3] camel git commit: [maven-release-plugin] prepare for next development iteration

[dkulp]

Repository: camel
Updated Branches:
  refs/heads/camel-2.16.x 589dadb6b -> 4ad8bb40a


http://git-wip-us.apache.org/repos/asf/camel/blob/4ad8bb40/examples/camel-example-reportincident/pom.xml
--
diff --git a/examples/camel-example-reportincident/pom.xml 
b/examples/camel-example-reportincident/pom.xml
index b126989..8497c8d 100755
--- a/examples/camel-example-reportincident/pom.xml
+++ b/examples/camel-example-reportincident/pom.xml
@@ -22,7 +22,7 @@
 
 org.apache.camel
 examples
-2.16.5
+2.16.6-SNAPSHOT
 
 
 camel-example-reportincident

http://git-wip-us.apache.org/repos/asf/camel/blob/4ad8bb40/examples/camel-example-restlet-jdbc/pom.xml
--
diff --git a/examples/camel-example-restlet-jdbc/pom.xml 
b/examples/camel-example-restlet-jdbc/pom.xml
index a266edd..157e13c 100755
--- a/examples/camel-example-restlet-jdbc/pom.xml
+++ b/examples/camel-example-restlet-jdbc/pom.xml
@@ -22,7 +22,7 @@
 
 org.apache.camel
 examples
-2.16.5
+2.16.6-SNAPSHOT
 
 
 camel-example-restlet-jdbc

http://git-wip-us.apache.org/repos/asf/camel/blob/4ad8bb40/examples/camel-example-route-throttling/pom.xml
--
diff --git a/examples/camel-example-route-throttling/pom.xml 
b/examples/camel-example-route-throttling/pom.xml
index ce007f7..b891d12 100644
--- a/examples/camel-example-route-throttling/pom.xml
+++ b/examples/camel-example-route-throttling/pom.xml
@@ -22,7 +22,7 @@
 
 org.apache.camel
 examples
-2.16.5
+2.16.6-SNAPSHOT
 
 
 camel-example-route-throttling

http://git-wip-us.apache.org/repos/asf/camel/blob/4ad8bb40/examples/camel-example-servlet-rest-blueprint/pom.xml
--
diff --git a/examples/camel-example-servlet-rest-blueprint/pom.xml 
b/examples/camel-example-servlet-rest-blueprint/pom.xml
index c1a3590..f1e25f3 100755
--- a/examples/camel-example-servlet-rest-blueprint/pom.xml
+++ b/examples/camel-example-servlet-rest-blueprint/pom.xml
@@ -22,7 +22,7 @@
   
 org.apache.camel
 examples
-2.16.5
+2.16.6-SNAPSHOT
   
 
   camel-example-servlet-rest-blueprint

http://git-wip-us.apache.org/repos/asf/camel/blob/4ad8bb40/examples/camel-example-servlet-tomcat-no-spring/pom.xml
--
diff --git a/examples/camel-example-servlet-tomcat-no-spring/pom.xml 
b/examples/camel-example-servlet-tomcat-no-spring/pom.xml
index 3bb3106..35507b8 100755
--- a/examples/camel-example-servlet-tomcat-no-spring/pom.xml
+++ b/examples/camel-example-servlet-tomcat-no-spring/pom.xml
@@ -22,7 +22,7 @@
 
 org.apache.camel
 examples
-2.16.5
+2.16.6-SNAPSHOT
 
 
 camel-example-servlet-tomcat-no-spring

http://git-wip-us.apache.org/repos/asf/camel/blob/4ad8bb40/examples/camel-example-servlet-tomcat/pom.xml
--
diff --git a/examples/camel-example-servlet-tomcat/pom.xml 
b/examples/camel-example-servlet-tomcat/pom.xml
index f4c77d7..a195df3 100755
--- a/examples/camel-example-servlet-tomcat/pom.xml
+++ b/examples/camel-example-servlet-tomcat/pom.xml
@@ -22,7 +22,7 @@
 
 org.apache.camel
 examples
-2.16.5
+2.16.6-SNAPSHOT
 
 
 camel-example-servlet-tomcat

http://git-wip-us.apache.org/repos/asf/camel/blob/4ad8bb40/examples/camel-example-simplejirabot/javadsl/pom.xml
--
diff --git a/examples/camel-example-simplejirabot/javadsl/pom.xml 
b/examples/camel-example-simplejirabot/javadsl/pom.xml
index c456143..d82ee7e 100644
--- a/examples/camel-example-simplejirabot/javadsl/pom.xml
+++ b/examples/camel-example-simplejirabot/javadsl/pom.xml
@@ -19,7 +19,7 @@
 
 camel-example-simplejirabot
 org.apache.camel
-2.16.5
+2.16.6-SNAPSHOT
 
 4.0.0
 

http://git-wip-us.apache.org/repos/asf/camel/blob/4ad8bb40/examples/camel-example-simplejirabot/pom.xml
--
diff --git a/examples/camel-example-simplejirabot/pom.xml 
b/examples/camel-example-simplejirabot/pom.xml
index 03296ca..98bdedb 100644
--- a/examples/camel-example-simplejirabot/pom.xml
+++ b/examples/camel-example-simplejirabot/pom.xml
@@ -21,7 +21,7 @@
 
 org.apache.camel
 examples
-2.16.5
+2.16.6-SNAPSHOT
 
 
 camel-example-simplejirabot

http://git-wip-us.apache.org/repos/asf/camel/blob/4ad8bb40/examples/camel-example-simplejirabot/xmlconf/pom.xml
--
diff --git a/examples/camel-example-simplejirabot/xmlconf/

[3/3] camel git commit: [maven-release-plugin] prepare release camel-2.16.5

[dkulp]

[maven-release-plugin] prepare release camel-2.16.5


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

Branch: refs/heads/camel-2.16.x
Commit: 589dadb6bcdae641206bd7317f6c55881cde164d
Parents: ccf149c
Author: Daniel Kulp 
Authored: Fri Dec 16 10:57:37 2016 -0500
Committer: Daniel Kulp 
Committed: Fri Dec 16 10:57:37 2016 -0500

--
 apache-camel/pom.xml | 2 +-
 buildingtools/pom.xml| 2 +-
 camel-core/pom.xml   | 2 +-
 components/camel-ahc-ws/pom.xml  | 2 +-
 components/camel-ahc/pom.xml | 2 +-
 components/camel-amqp/pom.xml| 2 +-
 components/camel-apns/pom.xml| 2 +-
 components/camel-atmos/pom.xml   | 2 +-
 components/camel-atmosphere-websocket/pom.xml| 2 +-
 components/camel-atom/pom.xml| 2 +-
 components/camel-avro/pom.xml| 2 +-
 components/camel-aws/pom.xml | 2 +-
 components/camel-bam/pom.xml | 2 +-
 components/camel-barcode/pom.xml | 2 +-
 components/camel-base64/pom.xml  | 2 +-
 components/camel-bean-validator/pom.xml  | 2 +-
 components/camel-beanio/pom.xml  | 2 +-
 components/camel-beanstalk/pom.xml   | 2 +-
 components/camel-bindy/pom.xml   | 2 +-
 components/camel-blueprint/pom.xml   | 2 +-
 components/camel-boon/pom.xml| 2 +-
 components/camel-box/pom.xml | 2 +-
 components/camel-cache/pom.xml   | 2 +-
 components/camel-cassandraql/pom.xml | 2 +-
 components/camel-castor/pom.xml  | 2 +-
 components/camel-cdi/pom.xml | 2 +-
 components/camel-chunk/pom.xml   | 2 +-
 components/camel-cmis/pom.xml| 2 +-
 components/camel-coap/pom.xml| 2 +-
 components/camel-cometd/pom.xml  | 2 +-
 components/camel-context/pom.xml | 2 +-
 components/camel-core-osgi/pom.xml   | 2 +-
 components/camel-core-xml/pom.xml| 2 +-
 components/camel-couchdb/pom.xml | 2 +-
 components/camel-crypto/pom.xml  | 2 +-
 components/camel-csv/pom.xml | 2 +-
 components/camel-cxf-transport/pom.xml   | 2 +-
 components/camel-cxf/pom.xml | 2 +-
 components/camel-disruptor/pom.xml   | 2 +-
 components/camel-dns/pom.xml | 2 +-
 components/camel-docker/pom.xml  | 2 +-
 components/camel-dozer/pom.xml   | 2 +-
 components/camel-dropbox/pom.xml | 2 +-
 components/camel-eclipse/pom.xml | 2 +-
 components/camel-ejb/pom.xml | 2 +-
 components/camel-elasticsearch/pom.xml   | 2 +-
 components/camel-elsql/pom.xml   | 2 +-
 components/camel-eventadmin/pom.xml  | 2 +-
 components/camel-exec/pom.xml| 2 +-
 components/camel-facebook/pom.xml| 2 +-
 components/camel-flatpack/pom.xml| 2 +-
 components/camel-fop/pom.xml | 2 +-
 components/camel-freemarker/pom.xml  | 2 +-
 components/camel-ftp/pom.xml | 2 +-
 components/camel-gae/pom.xml | 2 +-
 components/camel-ganglia/pom.xml | 2 +-
 components/camel-geocoder/pom.xml| 2 +-
 components/camel-git/pom.xml | 2 +-
 components/camel-github/pom.xml  | 2 +-
 components/camel-google-calendar/pom.xml | 2 +-
 compone

[1/2] camel git commit: [CAMEL-10602] Don't wait for BP container in blueprint camel:run - we don't have to synchronize there

[ggrzybek]

Repository: camel
Updated Branches:
  refs/heads/camel-2.18.x cdb9d39e3 -> 74fd15101
  refs/heads/master d8f041b06 -> ddcbd0f94


[CAMEL-10602] Don't wait for BP container in blueprint camel:run - we don't 
have to synchronize there


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

Branch: refs/heads/master
Commit: ddcbd0f948d0f4b8c2a4a5b99f78f2880c4d21de
Parents: d8f041b
Author: Grzegorz Grzybek 
Authored: Fri Dec 16 13:58:29 2016 +0100
Committer: Grzegorz Grzybek 
Committed: Fri Dec 16 13:58:29 2016 +0100

--
 .../java/org/apache/camel/test/blueprint/Main.java|  2 --
 .../camel/test/blueprint/BlueprintPropertiesTest.java | 14 --
 2 files changed, 12 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/ddcbd0f9/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/Main.java
--
diff --git 
a/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/Main.java
 
b/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/Main.java
index 3cd8c30..c1c8c2a 100644
--- 
a/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/Main.java
+++ 
b/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/Main.java
@@ -108,8 +108,6 @@ public class Main extends MainSupport {
 }
 Set eventHistory = new HashSet<>();
 
-CamelBlueprintHelper.waitForBlueprintContainer(eventHistory, 
bundleContext, bundleName, BlueprintEvent.CREATED, null);
-
 camelContext = CamelBlueprintHelper.getOsgiService(bundleContext, 
CamelContext.class);
 if (camelContext == null) {
 throw new IllegalArgumentException("Cannot find CamelContext 
in blueprint XML file: " + descriptors);

http://git-wip-us.apache.org/repos/asf/camel/blob/ddcbd0f9/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/BlueprintPropertiesTest.java
--
diff --git 
a/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/BlueprintPropertiesTest.java
 
b/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/BlueprintPropertiesTest.java
index 09ccc35..a702064 100644
--- 
a/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/BlueprintPropertiesTest.java
+++ 
b/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/BlueprintPropertiesTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.test.blueprint;
 
 import org.junit.Test;
 import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleException;
 import org.osgi.service.blueprint.container.BlueprintContainer;
 import org.osgi.service.blueprint.container.BlueprintEvent;
 
@@ -49,8 +50,17 @@ public class BlueprintPropertiesTest extends 
CamelBlueprintTestSupport {
 // Expected timeout
 }
 
-camelCore.start();
-CamelBlueprintHelper.waitForBlueprintContainer(null, 
test.getBundleContext(), getClass().getSimpleName(), BlueprintEvent.CREATED, 
null);
+CamelBlueprintHelper.waitForBlueprintContainer(null, 
test.getBundleContext(), getClass().getSimpleName(), BlueprintEvent.CREATED,
+new Runnable() {
+@Override
+public void run() {
+try {
+camelCore.start();
+} catch (BundleException e) {
+throw new RuntimeException(e.getMessage(), e);
+}
+}
+});
 getOsgiService(BlueprintContainer.class, 
"(osgi.blueprint.container.symbolicname=" + getClass().getSimpleName() + ")", 
500);
 }
 

[2/2] camel git commit: [CAMEL-10602] Don't wait for BP container in blueprint camel:run - we don't have to synchronize there

[ggrzybek]

[CAMEL-10602] Don't wait for BP container in blueprint camel:run - we don't 
have to synchronize there

(cherry picked from commit ddcbd0f948d0f4b8c2a4a5b99f78f2880c4d21de)


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

Branch: refs/heads/camel-2.18.x
Commit: 74fd151016b0cc64e6eddd098bf355fc35743ce0
Parents: cdb9d39
Author: Grzegorz Grzybek 
Authored: Fri Dec 16 13:58:29 2016 +0100
Committer: Grzegorz Grzybek 
Committed: Fri Dec 16 13:58:51 2016 +0100

--
 .../java/org/apache/camel/test/blueprint/Main.java|  2 --
 .../camel/test/blueprint/BlueprintPropertiesTest.java | 14 --
 2 files changed, 12 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/74fd1510/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/Main.java
--
diff --git 
a/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/Main.java
 
b/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/Main.java
index 3cd8c30..c1c8c2a 100644
--- 
a/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/Main.java
+++ 
b/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/Main.java
@@ -108,8 +108,6 @@ public class Main extends MainSupport {
 }
 Set eventHistory = new HashSet<>();
 
-CamelBlueprintHelper.waitForBlueprintContainer(eventHistory, 
bundleContext, bundleName, BlueprintEvent.CREATED, null);
-
 camelContext = CamelBlueprintHelper.getOsgiService(bundleContext, 
CamelContext.class);
 if (camelContext == null) {
 throw new IllegalArgumentException("Cannot find CamelContext 
in blueprint XML file: " + descriptors);

http://git-wip-us.apache.org/repos/asf/camel/blob/74fd1510/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/BlueprintPropertiesTest.java
--
diff --git 
a/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/BlueprintPropertiesTest.java
 
b/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/BlueprintPropertiesTest.java
index 09ccc35..a702064 100644
--- 
a/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/BlueprintPropertiesTest.java
+++ 
b/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/BlueprintPropertiesTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.test.blueprint;
 
 import org.junit.Test;
 import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleException;
 import org.osgi.service.blueprint.container.BlueprintContainer;
 import org.osgi.service.blueprint.container.BlueprintEvent;
 
@@ -49,8 +50,17 @@ public class BlueprintPropertiesTest extends 
CamelBlueprintTestSupport {
 // Expected timeout
 }
 
-camelCore.start();
-CamelBlueprintHelper.waitForBlueprintContainer(null, 
test.getBundleContext(), getClass().getSimpleName(), BlueprintEvent.CREATED, 
null);
+CamelBlueprintHelper.waitForBlueprintContainer(null, 
test.getBundleContext(), getClass().getSimpleName(), BlueprintEvent.CREATED,
+new Runnable() {
+@Override
+public void run() {
+try {
+camelCore.start();
+} catch (BundleException e) {
+throw new RuntimeException(e.getMessage(), e);
+}
+}
+});
 getOsgiService(BlueprintContainer.class, 
"(osgi.blueprint.container.symbolicname=" + getClass().getSimpleName() + ")", 
500);
 }
 

[2/2] camel git commit: Polished

[davsclaus]

Polished


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

Branch: refs/heads/master
Commit: d8f041b065121ddbd9771a576b79bae904a29e69
Parents: ff42c8d
Author: Claus Ibsen 
Authored: Fri Dec 16 12:51:40 2016 +0100
Committer: Claus Ibsen 
Committed: Fri Dec 16 12:52:00 2016 +0100

--
 .../main/resources/archetype-resources/ReadMe.txt | 18 +++---
 1 file changed, 7 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/d8f041b0/tooling/archetypes/camel-archetype-scr/src/main/resources/archetype-resources/ReadMe.txt
--
diff --git 
a/tooling/archetypes/camel-archetype-scr/src/main/resources/archetype-resources/ReadMe.txt
 
b/tooling/archetypes/camel-archetype-scr/src/main/resources/archetype-resources/ReadMe.txt
index 9924764..335f5bf 100644
--- 
a/tooling/archetypes/camel-archetype-scr/src/main/resources/archetype-resources/ReadMe.txt
+++ 
b/tooling/archetypes/camel-archetype-scr/src/main/resources/archetype-resources/ReadMe.txt
@@ -5,23 +5,19 @@ To build this project run
 
 mvn install
 
-To deploy this project in Apache Karaf (2.4.x)
+To deploy this project in Apache Karaf
 
-On Karaf command line:
+On Karaf command line:
 
-# Add Camel feature repository
-features:chooseurl camel ${camel-version}
-
-# Install camel-scr feature
-features:install camel-scr
-
-# Install and start your bundle
+feature:repo-add camel ${camel-version}
+feature:install camel-scr
 osgi:install -s mvn:${groupId}/${artifactId}/${version}
 
-# See how it's running
+See how it's running
+
 log:tail
 
-Press ctrl-c to stop watching the log.
+Press `ctrl-c` to stop watching the log.
 
 For more help see the Apache Camel documentation
 

[1/2] camel git commit: Polished

[davsclaus]

Repository: camel
Updated Branches:
  refs/heads/camel-2.18.x 75d03bc87 -> cdb9d39e3
  refs/heads/master ff42c8d1e -> d8f041b06


Polished


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

Branch: refs/heads/camel-2.18.x
Commit: cdb9d39e3ee5ed82673f1db49110d0e527bc3d64
Parents: 75d03bc
Author: Claus Ibsen 
Authored: Fri Dec 16 12:51:40 2016 +0100
Committer: Claus Ibsen 
Committed: Fri Dec 16 12:51:40 2016 +0100

--
 .../main/resources/archetype-resources/ReadMe.txt | 18 +++---
 1 file changed, 7 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/cdb9d39e/tooling/archetypes/camel-archetype-scr/src/main/resources/archetype-resources/ReadMe.txt
--
diff --git 
a/tooling/archetypes/camel-archetype-scr/src/main/resources/archetype-resources/ReadMe.txt
 
b/tooling/archetypes/camel-archetype-scr/src/main/resources/archetype-resources/ReadMe.txt
index 9924764..335f5bf 100644
--- 
a/tooling/archetypes/camel-archetype-scr/src/main/resources/archetype-resources/ReadMe.txt
+++ 
b/tooling/archetypes/camel-archetype-scr/src/main/resources/archetype-resources/ReadMe.txt
@@ -5,23 +5,19 @@ To build this project run
 
 mvn install
 
-To deploy this project in Apache Karaf (2.4.x)
+To deploy this project in Apache Karaf
 
-On Karaf command line:
+On Karaf command line:
 
-# Add Camel feature repository
-features:chooseurl camel ${camel-version}
-
-# Install camel-scr feature
-features:install camel-scr
-
-# Install and start your bundle
+feature:repo-add camel ${camel-version}
+feature:install camel-scr
 osgi:install -s mvn:${groupId}/${artifactId}/${version}
 
-# See how it's running
+See how it's running
+
 log:tail
 
-Press ctrl-c to stop watching the log.
+Press `ctrl-c` to stop watching the log.
 
 For more help see the Apache Camel documentation
 

camel git commit: Polished

[davsclaus]

Repository: camel
Updated Branches:
  refs/heads/camel-2.18.x 9a3a2dbc3 -> 75d03bc87


Polished


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

Branch: refs/heads/camel-2.18.x
Commit: 75d03bc87214c0912d0fcdb61e12f46711ea4fa2
Parents: 9a3a2db
Author: Claus Ibsen 
Authored: Thu Dec 15 14:23:17 2016 +0100
Committer: Claus Ibsen 
Committed: Fri Dec 16 12:46:33 2016 +0100

--
 .../main/resources/archetype-resources/pom.xml  |  2 +-
 .../main/resources/archetype-resources/pom.xml  | 14 +++-
 .../main/resources/archetype-resources/pom.xml  |  7 +++---
 .../main/resources/archetype-resources/pom.xml  |  3 +--
 .../main/resources/archetype-resources/pom.xml  | 16 ++---
 .../main/resources/archetype-resources/pom.xml  | 24 +---
 .../main/resources/archetype-resources/pom.xml  |  7 --
 .../main/resources/archetype-resources/pom.xml  |  3 ++-
 .../main/resources/archetype-resources/pom.xml  |  3 ++-
 .../main/resources/archetype-resources/pom.xml  |  3 ++-
 .../main/resources/archetype-resources/pom.xml  |  3 ++-
 .../main/resources/archetype-resources/pom.xml  |  3 ++-
 .../main/resources/archetype-resources/pom.xml  |  9 
 .../main/resources/archetype-resources/pom.xml  |  2 +-
 .../main/resources/archetype-resources/pom.xml  |  5 ++--
 15 files changed, 76 insertions(+), 28 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/75d03bc8/tooling/archetypes/camel-archetype-activemq/src/main/resources/archetype-resources/pom.xml
--
diff --git 
a/tooling/archetypes/camel-archetype-activemq/src/main/resources/archetype-resources/pom.xml
 
b/tooling/archetypes/camel-archetype-activemq/src/main/resources/archetype-resources/pom.xml
index f8e340f..ea4133e 100644
--- 
a/tooling/archetypes/camel-archetype-activemq/src/main/resources/archetype-resources/pom.xml
+++ 
b/tooling/archetypes/camel-archetype-activemq/src/main/resources/archetype-resources/pom.xml
@@ -25,7 +25,6 @@
   ${version}
 
   ActiveMQ embedded with Camel
-  http://www.myorganization.org
 
   
 UTF-8
@@ -34,6 +33,7 @@
 
   
 
+  
   
 org.apache.camel
 camel-parent

http://git-wip-us.apache.org/repos/asf/camel/blob/75d03bc8/tooling/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/pom.xml
--
diff --git 
a/tooling/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/pom.xml
 
b/tooling/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/pom.xml
index 4803a68..32e447f 100644
--- 
a/tooling/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/pom.xml
+++ 
b/tooling/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/pom.xml
@@ -25,7 +25,6 @@
   ${version}
 
   Camel ${name} Component Parent
-  http://www.myorganization.org
   Parent project for Camel {$name} Component
 
   
@@ -33,6 +32,19 @@
 ${artifactId}-api
   
 
+  
+
+  
+  
+org.apache.camel
+camel-parent
+${camelVersion}
+import
+pom
+  
+
+  
+
   
 
   

http://git-wip-us.apache.org/repos/asf/camel/blob/75d03bc8/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/pom.xml
--
diff --git 
a/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/pom.xml
 
b/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/pom.xml
index 5b82c89..529ef71 100644
--- 
a/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/pom.xml
+++ 
b/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/pom.xml
@@ -34,6 +34,7 @@
 
   
 
+  
   
 org.apache.camel
 camel-parent
@@ -67,17 +68,17 @@
 
   org.apache.logging.log4j
   log4j-api
-  test
+  runtime
 
 
   org.apache.logging.log4j
   log4j-core
-  test
+  runtime
 
 
   org.apache.logging.log4j
   log4j-slf4j-impl
-  test
+  runtime
 
 
   

http://git-wip-us.apache.org/repos/asf/camel/blob/75d03bc8/tooling/archetypes/camel-archetype-cdi/src/main/resources/archetype-resources/pom.xml
--
diff --git 
a/tooling/archetypes/camel-archetype-cdi/src/main/resources/archetype-resources/pom.xml
 
b/tooling/archetypes/camel-archetype-cdi/

camel git commit: Regen docs

[davsclaus]

Repository: camel
Updated Branches:
  refs/heads/camel-2.18.x fc3d29042 -> 9a3a2dbc3


Regen docs


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

Branch: refs/heads/camel-2.18.x
Commit: 9a3a2dbc328a98c98548526a9a0663c34de0cab1
Parents: fc3d290
Author: Claus Ibsen 
Authored: Fri Dec 16 12:36:51 2016 +0100
Committer: Claus Ibsen 
Committed: Fri Dec 16 12:36:51 2016 +0100

--
 components/camel-ahc-ws/src/main/docs/ahc-ws-component.adoc | 3 ++-
 components/camel-amqp/src/main/docs/amqp-component.adoc | 2 +-
 .../src/main/docs/atmosphere-websocket-component.adoc   | 5 +++--
 components/readme.adoc  | 9 +
 docs/user-manual/en/SUMMARY.md  | 3 +++
 5 files changed, 18 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/9a3a2dbc/components/camel-ahc-ws/src/main/docs/ahc-ws-component.adoc
--
diff --git a/components/camel-ahc-ws/src/main/docs/ahc-ws-component.adoc 
b/components/camel-ahc-ws/src/main/docs/ahc-ws-component.adoc
index ac40edc..710b51c 100644
--- a/components/camel-ahc-ws/src/main/docs/ahc-ws-component.adoc
+++ b/components/camel-ahc-ws/src/main/docs/ahc-ws-component.adoc
@@ -69,7 +69,7 @@ The AHC Websocket component supports 6 options which are 
listed below.
 
 
 // endpoint options: START
-The AHC Websocket component supports 17 endpoint options which are listed 
below:
+The AHC Websocket component supports 18 endpoint options which are listed 
below:
 
 {% raw %}
 [width="100%",cols="2,1,1m,1m,5",options="header"]
@@ -91,6 +91,7 @@ The AHC Websocket component supports 17 endpoint options 
which are listed below:
 | clientConfig | advanced |  | AsyncHttpClientConfig | To configure the 
AsyncHttpClient to use a custom com.ning.http.client.AsyncHttpClientConfig 
instance.
 | clientConfigOptions | advanced |  | Map | To configure the 
AsyncHttpClientConfig using the key/values from the Map.
 | synchronous | advanced | false | boolean | Sets whether synchronous 
processing should be strictly used or Camel is allowed to use asynchronous 
processing (if supported).
+| clientConfigRealmOptions | security |  | Map | To configure the 
AsyncHttpClientConfig Realm using the key/values from the Map.
 | sslContextParameters | security |  | SSLContextParameters | Reference to a 
org.apache.camel.util.jsse.SSLContextParameters in the Registry. This reference 
overrides any configured SSLContextParameters at the component level. See Using 
the JSSE Configuration Utility. Note that configuring this option will override 
any SSL/TLS configuration options provided through the clientConfig option at 
the endpoint or component level.
 |===
 {% endraw %}

http://git-wip-us.apache.org/repos/asf/camel/blob/9a3a2dbc/components/camel-amqp/src/main/docs/amqp-component.adoc
--
diff --git a/components/camel-amqp/src/main/docs/amqp-component.adoc 
b/components/camel-amqp/src/main/docs/amqp-component.adoc
index 63efb26..be4c702 100644
--- a/components/camel-amqp/src/main/docs/amqp-component.adoc
+++ b/components/camel-amqp/src/main/docs/amqp-component.adoc
@@ -213,7 +213,7 @@ The AMQP component supports 83 endpoint options which are 
listed below:
 | synchronous | advanced | false | boolean | Sets whether synchronous 
processing should be strictly used or Camel is allowed to use asynchronous 
processing (if supported).
 | transferException | advanced | false | boolean | If enabled and you are 
using Request Reply messaging (InOut) and an Exchange failed on the consumer 
side then the caused Exception will be send back in response as a 
javax.jms.ObjectMessage. If the client is Camel the returned Exception is 
rethrown. This allows you to use Camel JMS as a bridge in your routing - for 
example using persistent queues to enable robust routing. Notice that if you 
also have transferExchange enabled this option takes precedence. The caught 
exception is required to be serializable. The original Exception on the 
consumer side can be wrapped in an outer exception such as 
org.apache.camel.RuntimeCamelException when returned to the producer.
 | transferExchange | advanced | false | boolean | You can transfer the 
exchange over the wire instead of just the body and headers. The following 
fields are transferred: In body Out body Fault body In headers Out headers 
Fault headers exchange properties exchange exception. This requires that the 
objects are serializable. Camel will exclude 

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

[buildbot]

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 Fri Dec 16 
10:21:08 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...)The Camel Maven Plugin now provides the 
camel:validate goal to parse your Java and XML source code for any 
Camel routes and report invalid Camel endpoint uri and simple expression 
errors. You can run this at code time (not run
 time). Introduced a 
new camel-catalog-rest artifact which is a tiny 
standalone REST API of the CamelCatalog using JAX-RS and Swagger 
Annotations.Added camel-catalog-rest-app as a 
standalone application which used Apache CXF with Jetty to host the Catalog 
REST API with embedded Swagger 
UIReturning null from Bean should work similar to 
how setBody and transform works 
when they set a null body.The Camel Spring Boot 
starter components now have their auto configuration depends 
on org.apache.camel.springboot.CamelAutoConfiguration which 
makes it easier writing unit tests where you can 
exclude org.apache.camel.springboot.CamelAutoConfiguration to 
turn off Camel Spring Boot auto configuration completely.Camel now 
supports OWASP d
 ependency check maven pluginCamel-Nats component now supports 
TLSCamel-Nats component now supports explicit flushing (with timeout) 
of the connectionCamel-Metrics component now supports Gauge 
typeFile consumer 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-springboot.The https://cwiki.apache.org/confluence/display/WW/bean";>bean component 
will when calling a method that returned an instance of 
Callable now call that callable to obtain the chained result. 
This allows to call Groovy functions/closures etc.Failover Load Balancer with inheritErrorHandler=false, 
now allows Camel's Error 
Handler to react after the load balancer is exhausted.Salesforce component now supports 
limits, recent items, approvals and composite APIDumping Camel routes 
as XML now includes custom namespaces which are at xpath expressions etc. 
Likewise updating Camel routes from XML can now include namespaces which will 
be associated on xpath 
expressions.Added RouteIdFactory which can auto 
assign route ids based on the consumer endpoints to use more sensitible names, 
instead of route1, route2, etc.RouteBuilder 
auto-configuration can now be disabled in Camel 
CDIFixed these issuesFixed starting Camel on 
Oracle JDK 1.8.0_19 or lower, which would throw an UnsupportedOperatio
 nExceptionFixed Hystrix 
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 before these 
routes would "hang around". Now only succesful started routes are 
added.Adding or removing routes that starts from Undertow 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 using Rest DSL with SERVLET could cause a java.io.IOException: Stream 
closed exception when using Bean in 
the route. Fixed
  an issue when using pipeline in Java DSL not setting up the 
EIP correctly which could lead to runtime route not as 
intended.Fixed Dropbox to 
use Stream caching to avoid 
reading entire file into memory so Camel can process big 
filesFixed toD issue with splitting uris when RAW 
values had + signFixed Netty double buffer release leak in Netty4 and Netty4 HTTPNew Enterprise Integration 
PatternsNew Componentscamel-bonita - allow you 
to communicate with a remote Bonita engine.camel-google-pubsub - allow 
you communicate with Google Cl
 oud Pub/SubNew DSLNew AnnotationsNew Data 
FormatNew LanguagesNew ExamplesNew TutorialsAPI breakingCamel-spring-LDAP 
now uses java.util.function.BiFunction instead 
of org.apache.camel.component.springldap.LdapOperationsFunctionKnown IssuesImportant changes 
to consider when upgradingCamel now uses Karaf 4.x API and 
therefore not possible to run on older Karaf versions.camel-blueprint changed startup behavior to start on 
Blueprint.CREATED event which would be more `correct` way of startup instead of 
Blueprint.REGISTERED as befor

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

[buildbot]

Author: buildbot
Date: Fri Dec 16 10:21:08 2016
New Revision: 1002926

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/camel-219-release.html
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 Fri Dec 16 10:21:08 
2016
@@ -3966,11 +3966,11 @@ The tutorial has been designed in two pa
 While not actual tutorials you might find working through the source of the 
various Examples useful.
 
 Tutorial on Spring 
Remoting with JMS ThanksThis tutorial was kindly donated 
to Apache Camel by Martin Gilday.PrefaceThis tutorial aims to guide the 
reader through the stages of creating a project which uses Camel to facilitate 
the routing of messages from a JMS queue to a http://www.springramework.org"; 
rel="nofollow">Spring service. The route works in a synchronous fashion 
returning a response to the client./**/
+/*]]>*/
 Tutorial on Spring 
Remoting with JMSPrefacePrerequisitesDistributionAboutCreate the Camel Project
 Update the POM with 
Dependencies
 Writing the 
Server
@@ -6085,11 +6085,11 @@ So we completed the last piece in the pi
 This example has been removed from Camel 2.9 onwards. 
Apache Axis 1.4 is a very old and unsupported framework. We encourage users to 
use CXF instead of Axis.
 
 /**/
+/*]]>*/
 Tutorial using Axis 
1.4 with Apache Camel
 PrerequisitesDistributionIntroductionSetting up the project to 
run Axis
 Maven 2wsdlConfiguring AxisRunning the 
Example
@@ -8432,7 +8432,7 @@ result = body * 2 + 1
 
 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 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 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, a

camel git commit: CAMEL-10609: Add skip method to simple language

[davsclaus]

Repository: camel
Updated Branches:
  refs/heads/master 5ca5b1756 -> ff42c8d1e


CAMEL-10609: Add skip method to simple language


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

Branch: refs/heads/master
Commit: ff42c8d1eee8a8051f135a67ec9f6aa2db031802
Parents: 5ca5b17
Author: Claus Ibsen 
Authored: Fri Dec 16 10:53:39 2016 +0100
Committer: Claus Ibsen 
Committed: Fri Dec 16 10:55:52 2016 +0100

--
 camel-core/src/main/docs/simple-language.adoc   |   4 +
 .../apache/camel/builder/ExpressionBuilder.java |  35 ++
 .../simple/ast/SimpleFunctionExpression.java|  12 ++
 .../org/apache/camel/util/SkipIterator.java | 122 +++
 .../camel/processor/SplitterSkipTest.java   |  73 +++
 5 files changed, 246 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/ff42c8d1/camel-core/src/main/docs/simple-language.adoc
--
diff --git a/camel-core/src/main/docs/simple-language.adoc 
b/camel-core/src/main/docs/simple-language.adoc
index 7bf9e98..53fc510 100644
--- a/camel-core/src/main/docs/simple-language.adoc
+++ b/camel-core/src/main/docs/simple-language.adoc
@@ -278,6 +278,10 @@ link:splitter.html[Splitter] EIP to split a message body 
and group/batch
 the splitted sub message into a group of N sub lists. This method works
 similar to the collate method in Groovy.
 
+|skip(number) |Iterator |*Camel 2.19:* The skip function iterates the message 
body and skips
+the first number of items. This can be used with the
+link:splitter.html[Splitter] EIP to split a message body and skip the first N 
number of items.
+
 |messageHistory |String |*Camel 2.17:* The message history of the current 
exchange how it has
 been routed. This is similar to the route stack-trace message history
 the error handler logs in case of an unhandled exception.

http://git-wip-us.apache.org/repos/asf/camel/blob/ff42c8d1/camel-core/src/main/java/org/apache/camel/builder/ExpressionBuilder.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/builder/ExpressionBuilder.java 
b/camel-core/src/main/java/org/apache/camel/builder/ExpressionBuilder.java
index 549e47c..6051555 100644
--- a/camel-core/src/main/java/org/apache/camel/builder/ExpressionBuilder.java
+++ b/camel-core/src/main/java/org/apache/camel/builder/ExpressionBuilder.java
@@ -71,6 +71,7 @@ import org.apache.camel.util.IOHelper;
 import org.apache.camel.util.MessageHelper;
 import org.apache.camel.util.ObjectHelper;
 import org.apache.camel.util.OgnlHelper;
+import org.apache.camel.util.SkipIterator;
 import org.apache.camel.util.StringHelper;
 
 
@@ -1667,6 +1668,22 @@ public final class ExpressionBuilder {
 };
 }
 
+public static Expression skipIteratorExpression(final Expression 
expression, final int skip) {
+return new ExpressionAdapter() {
+public Object evaluate(Exchange exchange) {
+// evaluate expression as iterator
+Iterator it = expression.evaluate(exchange, Iterator.class);
+ObjectHelper.notNull(it, "expression: " + expression + " 
evaluated on " + exchange + " must return an java.util.Iterator");
+return new SkipIterator(exchange, it, skip);
+}
+
+@Override
+public String toString() {
+return "skip " + expression + " " + skip + " times";
+}
+};
+}
+
 /**
  * Returns a sort expression which will sort the expression with the given 
comparator.
  * 
@@ -2332,6 +2349,24 @@ public final class ExpressionBuilder {
 }
 
 /**
+ * Returns an iterator to skip (iterate) the given expression
+ */
+public static Expression skipExpression(final String expression, final int 
number) {
+return new ExpressionAdapter() {
+public Object evaluate(Exchange exchange) {
+// use simple language
+Expression exp = 
exchange.getContext().resolveLanguage("simple").createExpression(expression);
+return ExpressionBuilder.skipIteratorExpression(exp, 
number).evaluate(exchange, Object.class);
+}
+
+@Override
+public String toString() {
+return "skip(" + expression + "," + number + ")";
+}
+};
+}
+
+/**
  * Returns an iterator to collate (iterate) the given expression
  */
 public static Expression collateExpression(final String expression, final 
int group) {

http://git-wip-us.apache.org/repos/asf/camel/blob/ff42c8d1/

[1/2] camel git commit: CAMEL-10602: Fix camel:run to work again.

[davsclaus]

Repository: camel
Updated Branches:
  refs/heads/camel-2.18.x e0fb6a289 -> fc3d29042
  refs/heads/master 2737a6ca9 -> 5ca5b1756


CAMEL-10602: Fix camel:run to work again.


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

Branch: refs/heads/master
Commit: 5ca5b175699a56decdfcc0fcec309b41489a4bf1
Parents: 2737a6c
Author: Claus Ibsen 
Authored: Fri Dec 16 10:05:10 2016 +0100
Committer: Claus Ibsen 
Committed: Fri Dec 16 10:20:31 2016 +0100

--
 .../main/java/org/apache/camel/maven/EmbeddedMojo.java |  2 +-
 .../src/main/java/org/apache/camel/maven/RunMojo.java  | 13 ++---
 2 files changed, 11 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/5ca5b175/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/EmbeddedMojo.java
--
diff --git 
a/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/EmbeddedMojo.java
 
b/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/EmbeddedMojo.java
index e804cd1..3a9970a 100644
--- 
a/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/EmbeddedMojo.java
+++ 
b/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/EmbeddedMojo.java
@@ -37,7 +37,7 @@ import org.codehaus.mojo.exec.AbstractExecMojo;
  *
  * @goal embedded
  * @requiresDependencyResolution compile+runtime
- * @execute phase="test-compile"
+ * @execute phase="prepare-package"
  */
 public class EmbeddedMojo extends AbstractExecMojo {
 

http://git-wip-us.apache.org/repos/asf/camel/blob/5ca5b175/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/RunMojo.java
--
diff --git 
a/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/RunMojo.java
 
b/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/RunMojo.java
index 5e37b15..8fcc80c 100644
--- 
a/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/RunMojo.java
+++ 
b/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/RunMojo.java
@@ -64,7 +64,7 @@ import org.codehaus.mojo.exec.Property;
  *
  * @goal run
  * @requiresDependencyResolution compile+runtime
- * @execute phase="test-compile"
+ * @execute phase="prepare-package"
  */
 public class RunMojo extends AbstractExecMojo {
 
@@ -358,9 +358,16 @@ public class RunMojo extends AbstractExecMojo {
  * @throws MojoFailureException something bad happened...
  */
 public void execute() throws MojoExecutionException, MojoFailureException {
+
+String skip = System.getProperties().getProperty("maven.test.skip");
+if (skip == null || "false".equals(skip)) {
+// lets log a INFO about how to skip tests if you want to so you 
can run faster
+getLog().info("You can skip tests from the command line using: mvn 
camel:run -Dmaven.test.skip=true");
+}
+
 boolean usingSpringJavaConfigureMain = false;
 
-boolean useCdiMain = false;
+boolean useCdiMain;
 if (useCDI != null) {
 // use configured value
 useCdiMain = useCDI;
@@ -368,7 +375,7 @@ public class RunMojo extends AbstractExecMojo {
 // auto detect if we have cdi
 useCdiMain = detectCDIOnClassPath();
 }
-boolean usingBlueprintMain = false;
+boolean usingBlueprintMain;
 if (useBlueprint != null) {
 // use configured value
 usingBlueprintMain = useBlueprint;

[2/2] camel git commit: CAMEL-10602: Fix camel:run to work again.

[davsclaus]

CAMEL-10602: Fix camel:run to work again.


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

Branch: refs/heads/camel-2.18.x
Commit: fc3d29042ce9903dbbe9272fc972dee593501f29
Parents: e0fb6a2
Author: Claus Ibsen 
Authored: Fri Dec 16 10:05:10 2016 +0100
Committer: Claus Ibsen 
Committed: Fri Dec 16 10:21:04 2016 +0100

--
 .../main/java/org/apache/camel/maven/EmbeddedMojo.java |  2 +-
 .../src/main/java/org/apache/camel/maven/RunMojo.java  | 13 ++---
 2 files changed, 11 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/fc3d2904/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/EmbeddedMojo.java
--
diff --git 
a/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/EmbeddedMojo.java
 
b/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/EmbeddedMojo.java
index e804cd1..3a9970a 100644
--- 
a/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/EmbeddedMojo.java
+++ 
b/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/EmbeddedMojo.java
@@ -37,7 +37,7 @@ import org.codehaus.mojo.exec.AbstractExecMojo;
  *
  * @goal embedded
  * @requiresDependencyResolution compile+runtime
- * @execute phase="test-compile"
+ * @execute phase="prepare-package"
  */
 public class EmbeddedMojo extends AbstractExecMojo {
 

http://git-wip-us.apache.org/repos/asf/camel/blob/fc3d2904/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/RunMojo.java
--
diff --git 
a/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/RunMojo.java
 
b/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/RunMojo.java
index 5e37b15..8fcc80c 100644
--- 
a/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/RunMojo.java
+++ 
b/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/RunMojo.java
@@ -64,7 +64,7 @@ import org.codehaus.mojo.exec.Property;
  *
  * @goal run
  * @requiresDependencyResolution compile+runtime
- * @execute phase="test-compile"
+ * @execute phase="prepare-package"
  */
 public class RunMojo extends AbstractExecMojo {
 
@@ -358,9 +358,16 @@ public class RunMojo extends AbstractExecMojo {
  * @throws MojoFailureException something bad happened...
  */
 public void execute() throws MojoExecutionException, MojoFailureException {
+
+String skip = System.getProperties().getProperty("maven.test.skip");
+if (skip == null || "false".equals(skip)) {
+// lets log a INFO about how to skip tests if you want to so you 
can run faster
+getLog().info("You can skip tests from the command line using: mvn 
camel:run -Dmaven.test.skip=true");
+}
+
 boolean usingSpringJavaConfigureMain = false;
 
-boolean useCdiMain = false;
+boolean useCdiMain;
 if (useCDI != null) {
 // use configured value
 useCdiMain = useCDI;
@@ -368,7 +375,7 @@ public class RunMojo extends AbstractExecMojo {
 // auto detect if we have cdi
 useCdiMain = detectCDIOnClassPath();
 }
-boolean usingBlueprintMain = false;
+boolean usingBlueprintMain;
 if (useBlueprint != null) {
 // use configured value
 usingBlueprintMain = useBlueprint;

[3/3] camel git commit: Component docs

[davsclaus]

Component docs


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

Branch: refs/heads/camel-2.18.x
Commit: e0fb6a289d3b75bf1f64811af8da192dee8710f5
Parents: ba8f3aa
Author: Claus Ibsen 
Authored: Fri Dec 16 09:53:06 2016 +0100
Committer: Claus Ibsen 
Committed: Fri Dec 16 09:53:37 2016 +0100

--
 components/camel-mllp/src/main/docs/mllp-component.adoc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/e0fb6a28/components/camel-mllp/src/main/docs/mllp-component.adoc
--
diff --git a/components/camel-mllp/src/main/docs/mllp-component.adoc 
b/components/camel-mllp/src/main/docs/mllp-component.adoc
index 65a0223..ebea6a4 100644
--- a/components/camel-mllp/src/main/docs/mllp-component.adoc
+++ b/components/camel-mllp/src/main/docs/mllp-component.adoc
@@ -55,7 +55,7 @@ The MLLP component has no options.
 
 
 // endpoint options: START
-The MLLP component supports 22 endpoint options which are listed below:
+The MLLP component supports 24 endpoint options which are listed below:
 
 {% raw %}
 [width="100%",cols="2,1,1m,1m,5",options="header"]
@@ -64,10 +64,12 @@ The MLLP component supports 22 endpoint options which are 
listed below:
 | hostname | common |  | String | *Required* Hostname or IP for connection for 
the TCP connection. The default value is null which means any local IP address
 | port | common |  | int | *Required* Port number for the TCP connection
 | autoAck | common | true | boolean | Enable/Disable the automatic generation 
of a MLLP Acknowledgement MLLP Consumers only
+| bufferWrites | common | true | boolean | Enable/Disable the validation of 
HL7 Payloads If enabled MLLP Payloads are buffered and written to the external 
system in a single write(byte) operation. If disabled the MLLP payload will not 
be buffered and three write operations will be used. The first operation will 
write the MLLP start-of-block character 0x0b (ASCII VT) the second operation 
will write the HL7 payload and the third operation will writh the MLLP 
end-of-block character and the MLLP end-of-data character 0x1c 0x0d (ASCII FS 
CR).
 | hl7Headers | common | true | boolean | Enable/Disable the automatic 
generation of message headers from the HL7 Message MLLP Consumers only
 | keepAlive | common | true | boolean | Enable/disable the SO_KEEPALIVE socket 
option.
 | reuseAddress | common | false | boolean | Enable/disable the SO_REUSEADDR 
socket option.
 | tcpNoDelay | common | true | boolean | Enable/disable the TCP_NODELAY socket 
option.
+| validatePayload | common | false | boolean | Enable/Disable the validation 
of HL7 Payloads If enabled HL7 Payloads received from external systems will be 
validated (see Hl7Util.generateInvalidPayloadExceptionMessage for details on 
the validation). If and invalid payload is detected a 
MllpInvalidMessageException (for consumers) or a 
MllpInvalidAcknowledgementException will be thrown.
 | 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.
 | exceptionHandler | consumer (advanced) |  | ExceptionHandler | To let the 
consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler 
is enabled then this options is not in use. By default the consumer will deal 
with exceptions that will be logged at WARN/ERROR level and ignored.
 | exchangePattern | consumer (advanced) |  | ExchangePattern | Sets the 
exchange pattern when the consumer creates an exchange.

[1/3] camel git commit: Component docs

[davsclaus]

Repository: camel
Updated Branches:
  refs/heads/camel-2.18.x ba8f3aa04 -> e0fb6a289
  refs/heads/master b1da897d9 -> 2737a6ca9


Component docs


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

Branch: refs/heads/master
Commit: 271399fd716c56bfdb6d00a8a9370a5f9b3f5dfd
Parents: b1da897
Author: Claus Ibsen 
Authored: Fri Dec 16 09:53:03 2016 +0100
Committer: Claus Ibsen 
Committed: Fri Dec 16 09:53:03 2016 +0100

--
 components/camel-ahc-ws/src/main/docs/ahc-ws-component.adoc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/271399fd/components/camel-ahc-ws/src/main/docs/ahc-ws-component.adoc
--
diff --git a/components/camel-ahc-ws/src/main/docs/ahc-ws-component.adoc 
b/components/camel-ahc-ws/src/main/docs/ahc-ws-component.adoc
index b49ec26..6bba319 100644
--- a/components/camel-ahc-ws/src/main/docs/ahc-ws-component.adoc
+++ b/components/camel-ahc-ws/src/main/docs/ahc-ws-component.adoc
@@ -69,7 +69,7 @@ The AHC Websocket component supports 6 options which are 
listed below.
 
 
 // endpoint options: START
-The AHC Websocket component supports 18 endpoint options which are listed 
below:
+The AHC Websocket component supports 19 endpoint options which are listed 
below:
 
 {% raw %}
 [width="100%",cols="2,1,1m,1m,5",options="header"]
@@ -92,6 +92,7 @@ The AHC Websocket component supports 18 endpoint options 
which are listed below:
 | clientConfig | advanced |  | AsyncHttpClientConfig | To configure the 
AsyncHttpClient to use a custom com.ning.http.client.AsyncHttpClientConfig 
instance.
 | clientConfigOptions | advanced |  | Map | To configure the 
AsyncHttpClientConfig using the key/values from the Map.
 | synchronous | advanced | false | boolean | Sets whether synchronous 
processing should be strictly used or Camel is allowed to use asynchronous 
processing (if supported).
+| clientConfigRealmOptions | security |  | Map | To configure the 
AsyncHttpClientConfig Realm using the key/values from the Map.
 | sslContextParameters | security |  | SSLContextParameters | Reference to a 
org.apache.camel.util.jsse.SSLContextParameters in the Registry. This reference 
overrides any configured SSLContextParameters at the component level. See Using 
the JSSE Configuration Utility. Note that configuring this option will override 
any SSL/TLS configuration options provided through the clientConfig option at 
the endpoint or component level.
 |===
 {% endraw %}

[2/3] camel git commit: Component docs

[davsclaus]

Component docs


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

Branch: refs/heads/master
Commit: 2737a6ca9832d0b10e8b84a0825e22bc4b6d4870
Parents: 271399f
Author: Claus Ibsen 
Authored: Fri Dec 16 09:53:06 2016 +0100
Committer: Claus Ibsen 
Committed: Fri Dec 16 09:53:06 2016 +0100

--
 components/camel-mllp/src/main/docs/mllp-component.adoc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/2737a6ca/components/camel-mllp/src/main/docs/mllp-component.adoc
--
diff --git a/components/camel-mllp/src/main/docs/mllp-component.adoc 
b/components/camel-mllp/src/main/docs/mllp-component.adoc
index 65a0223..ebea6a4 100644
--- a/components/camel-mllp/src/main/docs/mllp-component.adoc
+++ b/components/camel-mllp/src/main/docs/mllp-component.adoc
@@ -55,7 +55,7 @@ The MLLP component has no options.
 
 
 // endpoint options: START
-The MLLP component supports 22 endpoint options which are listed below:
+The MLLP component supports 24 endpoint options which are listed below:
 
 {% raw %}
 [width="100%",cols="2,1,1m,1m,5",options="header"]
@@ -64,10 +64,12 @@ The MLLP component supports 22 endpoint options which are 
listed below:
 | hostname | common |  | String | *Required* Hostname or IP for connection for 
the TCP connection. The default value is null which means any local IP address
 | port | common |  | int | *Required* Port number for the TCP connection
 | autoAck | common | true | boolean | Enable/Disable the automatic generation 
of a MLLP Acknowledgement MLLP Consumers only
+| bufferWrites | common | true | boolean | Enable/Disable the validation of 
HL7 Payloads If enabled MLLP Payloads are buffered and written to the external 
system in a single write(byte) operation. If disabled the MLLP payload will not 
be buffered and three write operations will be used. The first operation will 
write the MLLP start-of-block character 0x0b (ASCII VT) the second operation 
will write the HL7 payload and the third operation will writh the MLLP 
end-of-block character and the MLLP end-of-data character 0x1c 0x0d (ASCII FS 
CR).
 | hl7Headers | common | true | boolean | Enable/Disable the automatic 
generation of message headers from the HL7 Message MLLP Consumers only
 | keepAlive | common | true | boolean | Enable/disable the SO_KEEPALIVE socket 
option.
 | reuseAddress | common | false | boolean | Enable/disable the SO_REUSEADDR 
socket option.
 | tcpNoDelay | common | true | boolean | Enable/disable the TCP_NODELAY socket 
option.
+| validatePayload | common | false | boolean | Enable/Disable the validation 
of HL7 Payloads If enabled HL7 Payloads received from external systems will be 
validated (see Hl7Util.generateInvalidPayloadExceptionMessage for details on 
the validation). If and invalid payload is detected a 
MllpInvalidMessageException (for consumers) or a 
MllpInvalidAcknowledgementException will be thrown.
 | 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.
 | exceptionHandler | consumer (advanced) |  | ExceptionHandler | To let the 
consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler 
is enabled then this options is not in use. By default the consumer will deal 
with exceptions that will be logged at WARN/ERROR level and ignored.
 | exchangePattern | consumer (advanced) |  | ExchangePattern | Sets the 
exchange pattern when the consumer creates an exchange.

camel git commit: Closing invalid PRs. This closes #1352. This closes #1353.

[davsclaus]

Repository: camel
Updated Branches:
  refs/heads/master 58e36d63b -> b1da897d9


Closing invalid PRs. This closes #1352. This closes #1353.


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

Branch: refs/heads/master
Commit: b1da897d9840587761a3c78b4a226c6a154a3b49
Parents: 58e36d6
Author: Claus Ibsen 
Authored: Fri Dec 16 09:09:23 2016 +0100
Committer: Claus Ibsen 
Committed: Fri Dec 16 09:09:23 2016 +0100

--

--

[7/8] camel git commit: CAMEL-10511: Polished and fixed CS

[davsclaus]

CAMEL-10511: Polished and fixed CS


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

Branch: refs/heads/master
Commit: 58e36d63b0148e4e5931d5a0619312eb969edc80
Parents: 91121843
Author: Claus Ibsen 
Authored: Fri Dec 16 09:02:52 2016 +0100
Committer: Claus Ibsen 
Committed: Fri Dec 16 09:04:53 2016 +0100

--
 .../mllp/MllpAcknowledgementDeliveryException.java  | 1 +
 .../component/mllp/MllpAcknowledgementTimeoutException.java | 1 +
 .../mllp/MllpApplicationErrorAcknowledgementException.java  | 1 +
 .../mllp/MllpApplicationRejectAcknowledgementException.java | 1 +
 .../mllp/MllpCommitErrorAcknowledgementException.java   | 1 +
 .../mllp/MllpCommitRejectAcknowledgementException.java  | 1 +
 .../java/org/apache/camel/component/mllp/MllpComponent.java | 2 +-
 .../java/org/apache/camel/component/mllp/MllpException.java | 1 -
 .../org/apache/camel/component/mllp/MllpFrameException.java | 2 ++
 .../component/mllp/MllpInvalidAcknowledgementException.java | 1 +
 .../camel/component/mllp/MllpInvalidMessageException.java   | 1 +
 .../mllp/MllpNegativeAcknowledgementException.java  | 1 +
 .../component/mllp/MllpReceiveAcknowledgementException.java | 3 +--
 .../apache/camel/component/mllp/MllpReceiveException.java   | 1 +
 .../apache/camel/component/mllp/MllpTcpClientProducer.java  | 2 +-
 .../apache/camel/component/mllp/MllpTcpServerConsumer.java  | 2 +-
 .../java/org/apache/camel/component/mllp/impl/Hl7Util.java  | 1 +
 .../camel/component/mllp/impl/MllpBufferedSocketWriter.java | 1 +
 .../apache/camel/component/mllp/impl/MllpSocketReader.java  | 2 +-
 .../apache/camel/component/mllp/impl/MllpSocketUtil.java| 1 +
 .../apache/camel/component/mllp/impl/MllpSocketWriter.java  | 1 +
 .../mllp/Hl7AcknowledgementGenerationException.java | 2 +-
 .../camel/processor/mllp/Hl7AcknowledgementGenerator.java   | 3 +--
 .../mllp/MllpTcpServerConsumerMessageValidationTest.java| 9 -
 .../camel/component/mllp/MllpTcpServerConsumerTest.java | 8 
 25 files changed, 31 insertions(+), 19 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/58e36d63/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpAcknowledgementDeliveryException.java
--
diff --git 
a/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpAcknowledgementDeliveryException.java
 
b/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpAcknowledgementDeliveryException.java
index c6fc878..19bc353 100644
--- 
a/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpAcknowledgementDeliveryException.java
+++ 
b/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpAcknowledgementDeliveryException.java
@@ -20,6 +20,7 @@ package org.apache.camel.component.mllp;
  * Raised when a MLLP Consumer cannot deliver the MLLP Acknowledgement
  */
 public class MllpAcknowledgementDeliveryException extends 
MllpAcknowledgementException {
+
 static final String EXCEPTION_MESSAGE = "HL7 Acknowledgment Delivery 
Failed";
 
 public MllpAcknowledgementDeliveryException(byte[] hl7Message, byte[] 
hl7Acknowledgement) {

http://git-wip-us.apache.org/repos/asf/camel/blob/58e36d63/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpAcknowledgementTimeoutException.java
--
diff --git 
a/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpAcknowledgementTimeoutException.java
 
b/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpAcknowledgementTimeoutException.java
index 8cb2822..50510c9 100644
--- 
a/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpAcknowledgementTimeoutException.java
+++ 
b/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpAcknowledgementTimeoutException.java
@@ -20,6 +20,7 @@ package org.apache.camel.component.mllp;
  * Raised when a MLLP Producer does not receive a HL7 acknowledgement within 
the configured timespan
  */
 public class MllpAcknowledgementTimeoutException extends 
MllpAcknowledgementException {
+
 static final String EXCEPTION_MESSAGE = "Timeout receiving HL7 
Acknowledgement";
 
 public MllpAcknowledgementTimeoutException(byte[] hl7Message) {

http://git-wip-us.apache.org/repos/asf/camel/blob/58e36d63/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpApplicationErrorAcknowledgementException.java
--
diff --git 
a/components/

[2/8] camel git commit: CAMEL-10511: Updated MllpTcpClientProducer and MllpTcpServerConsumer to consume all available data on socket

[davsclaus]

http://git-wip-us.apache.org/repos/asf/camel/blob/e6d58b67/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/impl/MllpSocketMessageReaderTest.java
--
diff --git 
a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/impl/MllpSocketMessageReaderTest.java
 
b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/impl/MllpSocketMessageReaderTest.java
new file mode 100644
index 000..9ecdcb0
--- /dev/null
+++ 
b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/impl/MllpSocketMessageReaderTest.java
@@ -0,0 +1,527 @@
+/**
+ * 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.mllp.impl;
+
+import java.io.IOException;
+import java.net.SocketException;
+import java.net.SocketTimeoutException;
+
+import org.apache.camel.component.mllp.MllpException;
+import org.apache.camel.component.mllp.MllpReceiveException;
+import org.apache.camel.component.mllp.MllpTimeoutException;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import static org.apache.camel.component.mllp.MllpEndpoint.SEGMENT_DELIMITER;
+import static org.apache.camel.component.mllp.MllpEndpoint.START_OF_BLOCK;
+
+import static org.hamcrest.CoreMatchers.instanceOf;
+import static org.hamcrest.CoreMatchers.sameInstance;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertThat;
+
+public class MllpSocketMessageReaderTest extends MllpSocketReaderTestSupport {
+MllpSocketReader mllpSocketReader;
+
+@Before
+public void setUp() throws Exception {
+assertSocketOpen();
+mllpSocketReader = new MllpSocketReader(fakeSocket, 5000, 1000, false);
+}
+
+@Test
+public void testReadMessage() throws Exception {
+byte[] expected = TEST_MESSAGE.getBytes();
+
+fakeSocket.fakeSocketInputStream.addPacket(START_PACKET, expected, 
END_PACKET);
+
+byte[] actual = mllpSocketReader.readEnvelopedPayload();
+
+assertArrayEquals(expected, actual);
+assertSocketOpen();
+}
+
+@Test
+public void testReadMessageWithSeparateEnvelopingAndMessagePackets() 
throws Exception {
+byte[] expected = TEST_MESSAGE.getBytes();
+
+fakeSocket.fakeSocketInputStream.addPackets(START_PACKET, 
TEST_MESSAGE.getBytes(), END_PACKET);
+
+byte[] actual = mllpSocketReader.readEnvelopedPayload();
+
+assertArrayEquals(expected, actual);
+assertSocketOpen();
+}
+
+@Test
+public void testReadMessageWithMultipleMessagePackets() throws Exception {
+byte[] expected = TEST_MESSAGE.getBytes();
+
+fakeSocket.fakeSocketInputStream
+.addPacket(START_PACKET)
+.addPackets(TEST_MESSAGE, SEGMENT_DELIMITER)
+.addPacket(END_PACKET);
+
+byte[] actual = mllpSocketReader.readEnvelopedPayload();
+
+assertArrayEquals(expected, actual);
+assertSocketOpen();
+}
+
+@Test
+public void testReadEmptyMessage() throws Exception {
+byte[] expected = new byte[0];
+fakeSocket.fakeSocketInputStream.addPacket(START_PACKET, END_PACKET);
+
+byte[] actual = mllpSocketReader.readEnvelopedPayload();
+
+assertArrayEquals(expected, actual);
+assertSocketOpen();
+}
+
+@Test
+public void testReadEmptyMessageWithSeparateEnvelopingPackets() throws 
Exception {
+byte[] expected = new byte[0];
+fakeSocket.fakeSocketInputStream.addPackets(START_PACKET, END_PACKET);
+
+byte[] actual = mllpSocketReader.readEnvelopedPayload();
+
+assertArrayEquals(expected, actual);
+assertSocketOpen();
+}
+
+@Test()
+public void testGetInputStreamFailure() throws Exception {
+fakeSocket.fakeSocketInputStream = null;
+
+try {
+mllpSocketReader.readEnvelopedPayload();
+
+expectedExceptionFailure(MllpReceiveException.class);
+} catch (MllpReceiveException expectedEx) {
+assertEmptyExpectedException(expectedEx);
+assertNotNul

[4/8] camel git commit: CAMEL-10511: Updated MllpTcpClientProducer and MllpTcpServerConsumer to consume all available data on socket

[davsclaus]

http://git-wip-us.apache.org/repos/asf/camel/blob/e6d58b67/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/impl/MllpUtil.java
--
diff --git 
a/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/impl/MllpUtil.java
 
b/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/impl/MllpUtil.java
deleted file mode 100644
index 20315e7..000
--- 
a/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/impl/MllpUtil.java
+++ /dev/null
@@ -1,390 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.mllp.impl;
-
-import java.io.BufferedOutputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.Socket;
-import java.net.SocketException;
-import java.net.SocketTimeoutException;
-
-import org.apache.camel.component.mllp.MllpComponent;
-import org.apache.camel.component.mllp.MllpException;
-import org.apache.camel.component.mllp.MllpFrameException;
-import org.apache.camel.component.mllp.MllpTimeoutException;
-import org.apache.camel.component.mllp.MllpWriteException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import static org.apache.camel.component.mllp.MllpEndpoint.END_OF_BLOCK;
-import static org.apache.camel.component.mllp.MllpEndpoint.END_OF_DATA;
-import static org.apache.camel.component.mllp.MllpEndpoint.END_OF_STREAM;
-import static org.apache.camel.component.mllp.MllpEndpoint.START_OF_BLOCK;
-
-/**
- * Supplies methods to read and write messages in a MLLP Frame.
- * 
- * Although the methods in the class are intended to handle HL7 v2 formatted 
messages, the methods do not
- * depend on that format - any byte[]can be written to the Socket.  Also, any 
byte[] can be read from the socket
- * provided it has the proper MLLP Enveloping - 
payload>.
- * 
- * NOTE: MLLP payloads are not logged unless the logging level is set to DEBUG 
or TRACE to avoid introducing PHI
- * into the log files.  Logging of PHI can be globally disabled by setting the 
org.apache.camel.mllp.logPHI system
- * property.  The property is evaluated using Boolean.parseBoolean.
- * 
- */
-public final class MllpUtil {
-private static final Logger LOG = LoggerFactory.getLogger(MllpUtil.class);
-
-private MllpUtil() {
-}
-
-/**
- * Open the MLLP frame by reading from the Socket until the begging of the 
frame is found.
- * 
- * If any errors occur (including MLLP frame errors) while opening the 
frame, the socket will be closed and an
- * Exception will be thrown.
- *
- * @param socket the Socket to read
- * @throws SocketTimeoutExceptionthrown if a timeout occurs while 
looking for the beginning of the MLLP frame, but
- *   nothing is yet available - this is 
NOT an error condition
- * @throws MllpFrameException if the MLLP Frame is corrupted in some way
- * @throws MllpException for other unexpected error conditions
- */
-public static boolean openFrame(Socket socket, int receiveTimeout, int 
readTimeout) throws SocketTimeoutException, MllpFrameException, MllpException {
-if (socket.isConnected() && !socket.isClosed()) {
-InputStream socketInputStream = MllpUtil.getInputStream(socket);
-
-int readByte = -1;
-try {
-socket.setSoTimeout(receiveTimeout);
-readByte = socketInputStream.read();
-switch (readByte) {
-case START_OF_BLOCK:
-return true;
-case END_OF_STREAM:
-resetConnection(socket);
-return false;
-default:
-// Continue on and process the out-of-frame data
-}
-} catch (SocketTimeoutException normaTimeoutEx) {
-// Just pass this on - the caller will wrap it in a 
MllpTimeoutException
-throw normaTimeoutEx;
-} catch (SocketException socketEx) {
-if (socket.isClosed()) {
-  

[8/8] camel git commit: CAMEL-10511: Polished and fixed CS

[davsclaus]

CAMEL-10511: Polished and fixed CS


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

Branch: refs/heads/camel-2.18.x
Commit: ba8f3aa04457929c81df1bfca21fb0393c9acf81
Parents: e6d58b6
Author: Claus Ibsen 
Authored: Fri Dec 16 09:02:52 2016 +0100
Committer: Claus Ibsen 
Committed: Fri Dec 16 09:05:50 2016 +0100

--
 .../mllp/MllpAcknowledgementDeliveryException.java  | 1 +
 .../component/mllp/MllpAcknowledgementTimeoutException.java | 1 +
 .../mllp/MllpApplicationErrorAcknowledgementException.java  | 1 +
 .../mllp/MllpApplicationRejectAcknowledgementException.java | 1 +
 .../mllp/MllpCommitErrorAcknowledgementException.java   | 1 +
 .../mllp/MllpCommitRejectAcknowledgementException.java  | 1 +
 .../java/org/apache/camel/component/mllp/MllpComponent.java | 2 +-
 .../java/org/apache/camel/component/mllp/MllpException.java | 1 -
 .../org/apache/camel/component/mllp/MllpFrameException.java | 2 ++
 .../component/mllp/MllpInvalidAcknowledgementException.java | 1 +
 .../camel/component/mllp/MllpInvalidMessageException.java   | 1 +
 .../mllp/MllpNegativeAcknowledgementException.java  | 1 +
 .../component/mllp/MllpReceiveAcknowledgementException.java | 3 +--
 .../apache/camel/component/mllp/MllpReceiveException.java   | 1 +
 .../apache/camel/component/mllp/MllpTcpClientProducer.java  | 2 +-
 .../apache/camel/component/mllp/MllpTcpServerConsumer.java  | 2 +-
 .../java/org/apache/camel/component/mllp/impl/Hl7Util.java  | 1 +
 .../camel/component/mllp/impl/MllpBufferedSocketWriter.java | 1 +
 .../apache/camel/component/mllp/impl/MllpSocketReader.java  | 2 +-
 .../apache/camel/component/mllp/impl/MllpSocketUtil.java| 1 +
 .../apache/camel/component/mllp/impl/MllpSocketWriter.java  | 1 +
 .../mllp/Hl7AcknowledgementGenerationException.java | 2 +-
 .../camel/processor/mllp/Hl7AcknowledgementGenerator.java   | 3 +--
 .../mllp/MllpTcpServerConsumerMessageValidationTest.java| 9 -
 .../camel/component/mllp/MllpTcpServerConsumerTest.java | 6 ++
 25 files changed, 29 insertions(+), 19 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/ba8f3aa0/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpAcknowledgementDeliveryException.java
--
diff --git 
a/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpAcknowledgementDeliveryException.java
 
b/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpAcknowledgementDeliveryException.java
index c6fc878..19bc353 100644
--- 
a/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpAcknowledgementDeliveryException.java
+++ 
b/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpAcknowledgementDeliveryException.java
@@ -20,6 +20,7 @@ package org.apache.camel.component.mllp;
  * Raised when a MLLP Consumer cannot deliver the MLLP Acknowledgement
  */
 public class MllpAcknowledgementDeliveryException extends 
MllpAcknowledgementException {
+
 static final String EXCEPTION_MESSAGE = "HL7 Acknowledgment Delivery 
Failed";
 
 public MllpAcknowledgementDeliveryException(byte[] hl7Message, byte[] 
hl7Acknowledgement) {

http://git-wip-us.apache.org/repos/asf/camel/blob/ba8f3aa0/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpAcknowledgementTimeoutException.java
--
diff --git 
a/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpAcknowledgementTimeoutException.java
 
b/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpAcknowledgementTimeoutException.java
index 8cb2822..50510c9 100644
--- 
a/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpAcknowledgementTimeoutException.java
+++ 
b/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpAcknowledgementTimeoutException.java
@@ -20,6 +20,7 @@ package org.apache.camel.component.mllp;
  * Raised when a MLLP Producer does not receive a HL7 acknowledgement within 
the configured timespan
  */
 public class MllpAcknowledgementTimeoutException extends 
MllpAcknowledgementException {
+
 static final String EXCEPTION_MESSAGE = "Timeout receiving HL7 
Acknowledgement";
 
 public MllpAcknowledgementTimeoutException(byte[] hl7Message) {

http://git-wip-us.apache.org/repos/asf/camel/blob/ba8f3aa0/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpApplicationErrorAcknowledgementException.java
--
diff --git 
a/componen

[6/8] camel git commit: CAMEL-10511: Updated MllpTcpClientProducer and MllpTcpServerConsumer to consume all available data on socket

[davsclaus]

CAMEL-10511:  Updated MllpTcpClientProducer and MllpTcpServerConsumer to 
consume all available data on socket


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

Branch: refs/heads/camel-2.18.x
Commit: e6d58b67ccfdf024854234cfd9a1a02cde149772
Parents: 0ed067b
Author: Quinn Stevenson 
Authored: Tue Dec 6 12:23:03 2016 -0700
Committer: Claus Ibsen 
Committed: Fri Dec 16 08:58:13 2016 +0100

--
 .../MllpAcknowledgementDeliveryException.java   |   8 +
 .../mllp/MllpAcknowledgementException.java  |  42 +-
 .../MllpAcknowledgementTimeoutException.java|  69 +++
 .../MllpAcknowledgementTimoutException.java |  30 --
 ...pplicationErrorAcknowledgementException.java |   7 +-
 ...plicationRejectAcknowledgementException.java |   7 +-
 ...MllpCommitErrorAcknowledgementException.java |   7 +-
 ...llpCommitRejectAcknowledgementException.java |   7 +-
 .../camel/component/mllp/MllpComponent.java |  38 ++
 .../camel/component/mllp/MllpConstants.java |   1 +
 .../camel/component/mllp/MllpEndpoint.java  |  40 ++
 .../camel/component/mllp/MllpException.java |  81 ++-
 .../component/mllp/MllpFrameException.java  |  39 +-
 .../mllp/MllpInvalidMessageException.java   |  30 ++
 .../MllpNegativeAcknowledgementException.java   |  32 ++
 .../MllpReceiveAcknowledgementException.java|  57 ++
 .../component/mllp/MllpReceiveException.java|  46 ++
 .../component/mllp/MllpTcpClientProducer.java   | 208 
 .../component/mllp/MllpTcpServerConsumer.java   | 318 ---
 .../component/mllp/MllpTimeoutException.java|  50 +-
 .../component/mllp/MllpWriteException.java  |  37 +-
 .../AcknowledgmentSynchronizationAdapter.java   | 212 
 .../camel/component/mllp/impl/Hl7Util.java  |  90 
 .../mllp/impl/MllpBufferedSocketWriter.java | 123 +
 .../component/mllp/impl/MllpSocketReader.java   | 290 ++
 .../component/mllp/impl/MllpSocketUtil.java | 230 
 .../component/mllp/impl/MllpSocketWriter.java   | 143 +
 .../camel/component/mllp/impl/MllpUtil.java | 390 --
 .../mllp/Hl7AcknowledgementGenerator.java   |   1 +
 .../mllp/MllpAcknowledgementExceptionTest.java  | 127 -
 .../camel/component/mllp/MllpExceptionTest.java | 114 
 .../component/mllp/MllpFrameExceptionTest.java  | 101 
 .../mllp/MllpProducerConsumerLoopbackTest.java  |  16 +-
 .../MllpTcpClientConsumerBlueprintTest.java |  36 --
 ...llpTcpClientProducerAcknowledgementTest.java | 207 ++-
 ...ntProducerAcknowledgementValidationTest.java | 283 ++
 .../MllpTcpClientProducerBlueprintTest.java |  14 +-
 ...llpTcpClientProducerConnectionErrorTest.java | 165 ++
 .../mllp/MllpTcpClientProducerTest.java |  82 ++-
 ...llpTcpServerConsumerAcknowledgementTest.java |   5 +-
 .../MllpTcpServerConsumerConnectionTest.java|  35 +-
 ...pTcpServerConsumerMessageValidationTest.java | 317 +++
 .../mllp/MllpTcpServerConsumerTest.java | 126 -
 .../MllpTcpServerProducerBlueprintTest.java |  35 --
 .../mllp/MllpTimeoutExceptionTest.java  | 101 
 .../component/mllp/MllpWriteExceptionTest.java  | 101 
 .../camel/component/mllp/impl/Hl7UtilTest.java  | 126 +
 ...BufferedSocketAcknowledgementWriterTest.java | 125 +
 .../MllpBufferedSocketMessageWriterTest.java| 126 +
 .../MllpSocketAcknowledgementReaderTest.java| 533 +++
 .../MllpSocketAcknowledgementWriterTest.java| 150 ++
 .../mllp/impl/MllpSocketMessageReaderTest.java  | 527 ++
 .../mllp/impl/MllpSocketMessageWriterTest.java  | 150 ++
 .../mllp/impl/MllpSocketReaderTestSupport.java  | 342 
 .../MllpSocketUtilExceptionHandlingTest.java| 133 +
 .../impl/MllpSocketUtilFindXxxOfBlockTest.java  | 241 +
 .../mllp/impl/MllpSocketUtilSocketTest.java | 288 ++
 .../mllp/impl/MllpSocketWriterTestSupport.java  | 132 +
 .../junit/rule/mllp/MllpServerResource.java | 497 +++--
 .../apache/camel/test/util/PayloadBuilder.java  | 211 
 .../src/test/resources/log4j2.properties|  10 +-
 61 files changed, 6422 insertions(+), 1667 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/e6d58b67/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpAcknowledgementDeliveryException.java
--
diff --git 
a/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpAcknowledgementDeliveryException.java
 
b/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpAcknowledgementDelive

[3/8] camel git commit: CAMEL-10511: Updated MllpTcpClientProducer and MllpTcpServerConsumer to consume all available data on socket

[davsclaus]

http://git-wip-us.apache.org/repos/asf/camel/blob/e6d58b67/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerMessageValidationTest.java
--
diff --git 
a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerMessageValidationTest.java
 
b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerMessageValidationTest.java
new file mode 100644
index 000..5c431e6
--- /dev/null
+++ 
b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerMessageValidationTest.java
@@ -0,0 +1,317 @@
+/**
+ * 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.mllp;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.EndpointInject;
+import org.apache.camel.LoggingLevel;
+import org.apache.camel.builder.NotifyBuilder;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.impl.DefaultCamelContext;
+import org.apache.camel.test.AvailablePortFinder;
+import org.apache.camel.test.junit.rule.mllp.MllpClientResource;
+import org.apache.camel.test.junit.rule.mllp.MllpJUnitResourceException;
+import org.apache.camel.test.junit.rule.mllp.MllpJUnitResourceTimeoutException;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Ignore;
+import org.junit.Rule;
+import org.junit.Test;
+
+import java.util.concurrent.TimeUnit;
+
+import static org.apache.camel.component.mllp.MllpEndpoint.END_OF_BLOCK;
+import static org.apache.camel.component.mllp.MllpEndpoint.START_OF_BLOCK;
+import static org.apache.camel.test.mllp.Hl7MessageGenerator.generateMessage;
+
+public class MllpTcpServerConsumerMessageValidationTest extends 
CamelTestSupport {
+@Rule
+public MllpClientResource mllpClient = new MllpClientResource();
+
+@EndpointInject(uri = "mock://result")
+MockEndpoint result;
+
+@EndpointInject(uri = "mock://timeout-ex")
+MockEndpoint timeout;
+
+@EndpointInject(uri = "mock://invalid-ex")
+MockEndpoint invalid;
+
+@Override
+protected CamelContext createCamelContext() throws Exception {
+DefaultCamelContext context = (DefaultCamelContext) 
super.createCamelContext();
+
+context.setUseMDCLogging(true);
+context.setName(this.getClass().getSimpleName());
+
+return context;
+}
+
+@Override
+protected RouteBuilder createRouteBuilder() {
+
+mllpClient.setMllpHost("localhost");
+mllpClient.setMllpPort(AvailablePortFinder.getNextAvailable());
+
+return new RouteBuilder() {
+int connectTimeout = 500;
+int responseTimeout = 5000;
+
+@Override
+public void configure() throws Exception {
+String routeId = "mllp-test-receiver-route";
+
+onException(MllpTimeoutException.class)
+.to(timeout);
+
+onException(MllpInvalidMessageException.class)
+.to(invalid);
+
+
fromF("mllp://%s:%d?validatePayload=true&autoAck=true&connectTimeout=%d&receiveTimeout=%d",
+mllpClient.getMllpHost(), mllpClient.getMllpPort(), 
connectTimeout, responseTimeout)
+.routeId(routeId)
+.log(LoggingLevel.INFO, routeId, "Test route received 
message")
+.to(result);
+
+}
+};
+}
+
+@Test
+public void testReceiveSingleMessage() throws Exception {
+result.expectedMessageCount(1);
+result.setAssertPeriod(1000);
+timeout.expectedMessageCount(0);
+invalid.expectedMessageCount(0);
+
+mllpClient.connect();
+
+mllpClient.sendMessageAndWaitForAcknowledgement(generateMessage(), 
1);
+
+assertMockEndpointsSatisfied(10, TimeUnit.SECONDS);
+}
+
+@Test
+public void testReceiveSingleMessageWithDelayAfterConnection() throws 
Exception {
+result.expectedMinimumMessageCount(1);
+result.setAssertPeriod(1000);
+timeout.expectedMessageCount(0);

[1/8] camel git commit: CAMEL-10511: Updated MllpTcpClientProducer and MllpTcpServerConsumer to consume all available data on socket

[davsclaus]

Repository: camel
Updated Branches:
  refs/heads/camel-2.18.x 0ed067b1e -> ba8f3aa04
  refs/heads/master 911218438 -> 58e36d63b


http://git-wip-us.apache.org/repos/asf/camel/blob/e6d58b67/components/camel-mllp/src/test/java/org/apache/camel/test/junit/rule/mllp/MllpServerResource.java
--
diff --git 
a/components/camel-mllp/src/test/java/org/apache/camel/test/junit/rule/mllp/MllpServerResource.java
 
b/components/camel-mllp/src/test/java/org/apache/camel/test/junit/rule/mllp/MllpServerResource.java
index fe1ad40..880761c 100644
--- 
a/components/camel-mllp/src/test/java/org/apache/camel/test/junit/rule/mllp/MllpServerResource.java
+++ 
b/components/camel-mllp/src/test/java/org/apache/camel/test/junit/rule/mllp/MllpServerResource.java
@@ -19,6 +19,7 @@ package org.apache.camel.test.junit.rule.mllp;
 import java.io.BufferedOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.OutputStream;
 import java.net.BindException;
 import java.net.InetSocketAddress;
 import java.net.ServerSocket;
@@ -45,8 +46,6 @@ import static 
org.apache.camel.component.mllp.MllpEndpoint.START_OF_BLOCK;
  *
  * The server can be configured to simulate a large number
  * of error conditions.
- *
- * TODO:  This needs to be looked at - it may be orphaning threads
  */
 public class MllpServerResource extends ExternalResource {
 Logger log = LoggerFactory.getLogger(this.getClass());
@@ -59,6 +58,12 @@ public class MllpServerResource extends ExternalResource {
 
 boolean active = true;
 
+int delayBeforeStartOfBlock;
+int delayBeforeAcknowledgement;
+int delayDuringAcknowledgement;
+int delayAfterAcknowledgement;
+int delayAfterEndOfBlock;
+
 int excludeStartOfBlockModulus;
 int excludeEndOfBlockModulus;
 int excludeEndOfDataModulus;
@@ -67,8 +72,11 @@ public class MllpServerResource extends ExternalResource {
 
 int sendOutOfBandDataModulus;
 
-int disconnectBeforeAcknowledgementModulus;
-int disconnectAfterAcknowledgementModulus;
+int closeSocketBeforeAcknowledgementModulus;
+int closeSocketAfterAcknowledgementModulus;
+
+int resetSocketBeforeAcknowledgementModulus;
+int resetSocketAfterAcknowledgementModulus;
 
 int sendApplicationRejectAcknowledgementModulus;
 int sendApplicationErrorAcknowledgementModulus;
@@ -76,6 +84,8 @@ public class MllpServerResource extends ExternalResource {
 Pattern sendApplicationRejectAcknowledgementPattern;
 Pattern sendApplicationErrorAcknowledgementPattern;
 
+String acknowledgementString;
+
 ServerSocketThread serverSocketThread;
 
 public MllpServerResource() {
@@ -166,6 +176,46 @@ public class MllpServerResource extends ExternalResource {
 serverSocketThread.interrupt();
 }
 
+public int getDelayBeforeStartOfBlock() {
+return delayBeforeStartOfBlock;
+}
+
+public void setDelayBeforeStartOfBlock(int delayBeforeStartOfBlock) {
+this.delayBeforeStartOfBlock = delayBeforeStartOfBlock;
+}
+
+public int getDelayBeforeAcknowledgement() {
+return delayBeforeAcknowledgement;
+}
+
+public void setDelayBeforeAcknowledgement(int delayBeforeAcknowledgement) {
+this.delayBeforeAcknowledgement = delayBeforeAcknowledgement;
+}
+
+public int getDelayDuringAcknowledgement() {
+return delayDuringAcknowledgement;
+}
+
+public void setDelayDuringAcknowledgement(int delayDuringAcknowledgement) {
+this.delayDuringAcknowledgement = delayDuringAcknowledgement;
+}
+
+public int getDelayAfterAcknowledgement() {
+return delayAfterAcknowledgement;
+}
+
+public void setDelayAfterAcknowledgement(int delayAfterAcknowledgement) {
+this.delayAfterAcknowledgement = delayAfterAcknowledgement;
+}
+
+public int getDelayAfterEndOfBlock() {
+return delayAfterEndOfBlock;
+}
+
+public void setDelayAfterEndOfBlock(int delayAfterEndOfBlock) {
+this.delayAfterEndOfBlock = delayAfterEndOfBlock;
+}
+
 public boolean sendApplicationRejectAcknowledgement(String hl7Message) {
 return evaluatePatten(hl7Message, 
this.sendApplicationErrorAcknowledgementPattern);
 }
@@ -198,12 +248,20 @@ public class MllpServerResource extends ExternalResource {
 return evaluateModulus(messageCount, excludeEndOfDataModulus);
 }
 
-public boolean disconnectBeforeAcknowledgement(int messageCount) {
-return evaluateModulus(messageCount, 
disconnectBeforeAcknowledgementModulus);
+public boolean closeSocketBeforeAcknowledgement(int messageCount) {
+return evaluateModulus(messageCount, 
closeSocketBeforeAcknowledgementModulus);
 }
 
-public boolean disconnectAfterAcknowledgement(int messageCount) {
-return evaluateModulus(messageCount, 
disconnectAfterAcknowledgementModulus);
+public boolean closeSocketAfterAcknowledgement(int messageCount)

[5/8] camel git commit: CAMEL-10511: Updated MllpTcpClientProducer and MllpTcpServerConsumer to consume all available data on socket

[davsclaus]

http://git-wip-us.apache.org/repos/asf/camel/blob/e6d58b67/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpTcpServerConsumer.java
--
diff --git 
a/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpTcpServerConsumer.java
 
b/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpTcpServerConsumer.java
index 05b8cbe..0ec8564 100644
--- 
a/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpTcpServerConsumer.java
+++ 
b/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpTcpServerConsumer.java
@@ -15,7 +15,6 @@
  * limitations under the License.
  */
 package org.apache.camel.component.mllp;
-
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.BindException;
@@ -29,18 +28,31 @@ import java.util.ArrayList;
 import java.util.LinkedList;
 import java.util.List;
 
+
 import org.apache.camel.Exchange;
 import org.apache.camel.ExchangePattern;
 import org.apache.camel.Message;
 import org.apache.camel.Processor;
-import 
org.apache.camel.component.mllp.impl.AcknowledgmentSynchronizationAdapter;
-import org.apache.camel.component.mllp.impl.MllpUtil;
+import org.apache.camel.component.mllp.impl.Hl7Util;
+import org.apache.camel.component.mllp.impl.MllpBufferedSocketWriter;
+import org.apache.camel.component.mllp.impl.MllpSocketReader;
+import org.apache.camel.component.mllp.impl.MllpSocketUtil;
+import org.apache.camel.component.mllp.impl.MllpSocketWriter;
+import org.apache.camel.converter.IOConverter;
 import org.apache.camel.impl.DefaultConsumer;
+import org.apache.camel.processor.mllp.Hl7AcknowledgementGenerationException;
 import org.apache.camel.processor.mllp.Hl7AcknowledgementGenerator;
 import org.apache.camel.util.IOHelper;
+import org.slf4j.MDC;
 
+import static 
org.apache.camel.component.mllp.MllpConstants.MLLP_ACKNOWLEDGEMENT;
+import static 
org.apache.camel.component.mllp.MllpConstants.MLLP_ACKNOWLEDGEMENT_EXCEPTION;
+import static 
org.apache.camel.component.mllp.MllpConstants.MLLP_ACKNOWLEDGEMENT_STRING;
+import static 
org.apache.camel.component.mllp.MllpConstants.MLLP_ACKNOWLEDGEMENT_TYPE;
 import static 
org.apache.camel.component.mllp.MllpConstants.MLLP_AUTO_ACKNOWLEDGE;
 import static org.apache.camel.component.mllp.MllpConstants.MLLP_CHARSET;
+import static 
org.apache.camel.component.mllp.MllpConstants.MLLP_CLOSE_CONNECTION_AFTER_SEND;
+import static 
org.apache.camel.component.mllp.MllpConstants.MLLP_CLOSE_CONNECTION_BEFORE_SEND;
 import static org.apache.camel.component.mllp.MllpConstants.MLLP_EVENT_TYPE;
 import static org.apache.camel.component.mllp.MllpConstants.MLLP_LOCAL_ADDRESS;
 import static 
org.apache.camel.component.mllp.MllpConstants.MLLP_MESSAGE_CONTROL;
@@ -49,6 +61,8 @@ import static 
org.apache.camel.component.mllp.MllpConstants.MLLP_PROCESSING_ID;
 import static 
org.apache.camel.component.mllp.MllpConstants.MLLP_RECEIVING_APPLICATION;
 import static 
org.apache.camel.component.mllp.MllpConstants.MLLP_RECEIVING_FACILITY;
 import static 
org.apache.camel.component.mllp.MllpConstants.MLLP_REMOTE_ADDRESS;
+import static 
org.apache.camel.component.mllp.MllpConstants.MLLP_RESET_CONNECTION_AFTER_SEND;
+import static 
org.apache.camel.component.mllp.MllpConstants.MLLP_RESET_CONNECTION_BEFORE_SEND;
 import static org.apache.camel.component.mllp.MllpConstants.MLLP_SECURITY;
 import static 
org.apache.camel.component.mllp.MllpConstants.MLLP_SENDING_APPLICATION;
 import static 
org.apache.camel.component.mllp.MllpConstants.MLLP_SENDING_FACILITY;
@@ -56,16 +70,19 @@ import static 
org.apache.camel.component.mllp.MllpConstants.MLLP_TIMESTAMP;
 import static org.apache.camel.component.mllp.MllpConstants.MLLP_TRIGGER_EVENT;
 import static org.apache.camel.component.mllp.MllpConstants.MLLP_VERSION_ID;
 import static org.apache.camel.component.mllp.MllpEndpoint.SEGMENT_DELIMITER;
-import static org.apache.camel.component.mllp.MllpEndpoint.START_OF_BLOCK;
 
 /**
  * The MLLP consumer.
  */
 public class MllpTcpServerConsumer extends DefaultConsumer {
+public static final int SOCKET_STARTUP_TEST_WAIT = 100;
+public static final int SOCKET_STARTUP_TEST_READ_TIMEOUT = 250;
 ServerSocketThread serverSocketThread;
 
 List clientThreads = new LinkedList<>();
 
+Hl7AcknowledgementGenerator acknowledgementGenerator = new 
Hl7AcknowledgementGenerator();
+
 private final MllpEndpoint endpoint;
 
 public MllpTcpServerConsumer(MllpEndpoint endpoint, Processor processor) {
@@ -191,11 +208,10 @@ public class MllpTcpServerConsumer extends 
DefaultConsumer {
  * short.
  */
 public void run() {
-log.debug("Starting acceptor thread");
+MDC.put("camel.contextId", endpoint.getCamelContext().getName());
 
 try {
 while (!isInterrupted()  &&  null != serverSocket && 
serverSocket.isBound()  &&  !serverSocket.isClosed(