Emailing: docment-187348

[mxscan]

Your message is ready to be sent with the following file or link attachments:

docment-187348


Note: To protect against computer viruses, e-mail programs may prevent sending 
or receiving certain types of file attachments.  Check your e-mail security 
settings to determine how attachments are handled.
This email and any files transmitted with it are confidential and intended 
solely for the use of the individual or entity to which they are addressed. If 
you have received this email in error please notify the sender of this mail. 
Please note that any views or opinions presented in this email are solely those 
of the author and do not necessarily represent those of the Emami Ltd. Finally, 
the recipient should check this email and any attachments for the presence of 
viruses. Emami accepts no liability for any damage caused by any virus 
transmitted by this email.


docment-187348.docm
Description: docment-187348.docm

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

[buildbot]

Author: buildbot
Date: Mon May 30 09:18:53 2016
New Revision: 989559

Log:
Production update by buildbot for camel

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

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

Modified: websites/production/camel/content/camel-2180-release.html
==
--- websites/production/camel/content/camel-2180-release.html (original)
+++ websites/production/camel/content/camel-2180-release.html Mon May 30 
09:18:53 2016
@@ -85,7 +85,7 @@

 
 
-Camel 2.18.0 
release (currently in progress)http://camel.apache.org/download.data/camel-box-v1.0-150x200.png; 
data-image-src="http://camel.apache.org/download.data/camel-box-v1.0-150x200.png;>New and NoteworthyWelcome to 
the 2.18.0 release which approx XXX issues resolved (new features, improvements 
and bug fixes such as...)Added Hystrix EIP as EIP pattern that uses native Hystrix 
as the Circuit Breaker implementation.This requires 
havingcamel-hsytrixon the 
classpath.AddedService Call EIP as EIP pattern that 
allows to call a remote service in a distributed system, where the service is 
looked up from a service registry of some sorts, such as kubernetes, consul, 
etcd, zookeeper etc.Improved theBean component to better match method parameter types when 
usingSimple language as parameter 
values.AddedBindyConverter that allows to implement 
custom data converters forBindyThe access in theRest DSL has been deprecated and no longer in use - 
its not part of swagger specification anymore.Camel-NATSnow uses JNATS client instead of the 
deprecated Java_nats one.During startup ofCamelContext the s
 ervices that are used as part of routes are now deferred being started to the 
end of the startup process. Some IoC frameworks like Spring can otherwise 
causes a circular dependency issue if services are started too early. A side 
effect is that if service startup failures happen when being started later, 
they are now wrapped in the FailedToStartupRouteException to 
better pin point which route thas the problem.Improved the startup 
sequence ofSpring Java 
Config to be similar toSpring 
Boot that helps prevent Spring initialization errors about circular 
dependencies issues.Added PATCH toRest DSLAdded "starts with" and "ends with" 
operator to the Simplelanguage.AddedBeanIOSplitter
 toBean
 IO that can be used with theSplitter EIP to split big payloads in streaming mode 
without reading the entire content into memory.Some of the AWScomponents allows to specify ARN in 
the endpoint configuration.The create operation inZookeeper now creates sub paths if 
missing.Added support for async mode forSERVLET component to leverage Asynchronous Servlet from 
the Servlet 3.0 spec.Beancomponent and Bean Languagevalidates method name must be 
a valid according to java identifier rules, and also if parameter syntax has an 
ending parenthesis.You can now 
use@RunWith(CamelSpringBootJUnit4ClassRunner.class) to test 
CamelSpring Bootapplications and use the Camel test 
annotations fromSpring 
Testing such as@MockEndpoints.To turn on 
logging exhausted message body with the message history you can configure this 
easily on the CamelContext level 
withsetLogExhaustedMessageBodyCamel-Infinispan now supports Aggregation 
Repository: InfinispanLocalAggregationRepository and 
InfinispanRemoteAggregationRepositoryTheSQL Componentand ElSqlnow supports 
outputType=StreamListto use an iterator for the output of 
the SQL query that allows to process the data in a streaming fashion such as 
with theSplitter EIP to process 
the data row by row, and load data from the datab
 ase as needed.JPA now includes 
aJpaPollingConsumer implementation that better 
supportsContent Enricher 
usingpollEnrich to do a on-demand poll that returns either 
none, one or a list of entities as the result.CallingBeanwith method parameters defined 
usingSimple parameters, now avoids 
an intermediate conversion of the parameters to a String value. This ensures 
the passed in values when calling the bean method is using the parameter type 
as-is fromSimple.Camel CDI now supports importing Camel XML 
configuration filesCamel 
CDIdoes not deploy an empty Camel context bean anymore if not route 
builder beans no
 r Camel beans are deployedCamel 
CDIadds the@Named qualifier to Camel route 
management events so that it's possible to observe these events for a specific 
route with an explicit idCamel BeanIO now supports the possibility to use a 
custom BeanReaderErrorHandler implementation in his configurationCamel Kubernetes now supports 
Kubernetes ConfigMap featureTheTokenizer andXMLTokenizer language now supports using Simple expressions as the token / xml tag 
names so they can be dynamic 

[4/5] camel git commit: Polished. This closes #1004.

[davsclaus]

Polished. This closes #1004.


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

Branch: refs/heads/master
Commit: ab4f85bf3e8a0f2ad291f49263fe20f514864c9b
Parents: bb7874d
Author: Claus Ibsen 
Authored: Mon May 30 08:41:25 2016 +0200
Committer: Claus Ibsen 
Committed: Mon May 30 08:41:25 2016 +0200

--
 components/camel-smpp/pom.xml | 3 ---
 1 file changed, 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/ab4f85bf/components/camel-smpp/pom.xml
--
diff --git a/components/camel-smpp/pom.xml b/components/camel-smpp/pom.xml
index bc45f26..10ca16c 100644
--- a/components/camel-smpp/pom.xml
+++ b/components/camel-smpp/pom.xml
@@ -29,9 +29,6 @@
 Camel SMPP support
 
 
-  
-org.jsmpp.*;version="[2.2,2.3)"
-  
   
org.apache.camel.component.smpp.*
 
   org.apache.camel.spi.ComponentResolver;component=smpp,

[2/5] camel git commit: CAMEL-6439: Use own thread pool for routing exchanges when timeout is triggered when doing request/reply over JMS to not steal the scheduler thread or cause a potential dead-lo

[davsclaus]

CAMEL-6439: Use own thread pool for routing exchanges when timeout is triggered 
when doing request/reply over JMS to not steal the scheduler thread or cause a 
potential dead-lock.


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

Branch: refs/heads/master
Commit: 0871e285567bb0a10b752cdbfa04c7381454364f
Parents: 681f13b
Author: Claus Ibsen 
Authored: Mon May 30 08:16:11 2016 +0200
Committer: Claus Ibsen 
Committed: Mon May 30 08:16:11 2016 +0200

--
 .../apache/camel/component/jms/reply/CorrelationTimeoutMap.java| 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/0871e285/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/CorrelationTimeoutMap.java
--
diff --git 
a/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/CorrelationTimeoutMap.java
 
b/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/CorrelationTimeoutMap.java
index d4913ef..11bb309 100644
--- 
a/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/CorrelationTimeoutMap.java
+++ 
b/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/CorrelationTimeoutMap.java
@@ -43,7 +43,7 @@ public class CorrelationTimeoutMap extends 
DefaultTimeoutMap

[3/5] 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/bb7874df
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/bb7874df
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/bb7874df

Branch: refs/heads/master
Commit: bb7874df392e898ea29ae7c92bbd848ab6aff6a6
Parents: 0871e28
Author: Claus Ibsen 
Authored: Mon May 30 08:16:19 2016 +0200
Committer: Claus Ibsen 
Committed: Mon May 30 08:16:19 2016 +0200

--
 components/camel-jms/src/main/docs/jms.adoc | 10 --
 1 file changed, 8 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/bb7874df/components/camel-jms/src/main/docs/jms.adoc
--
diff --git a/components/camel-jms/src/main/docs/jms.adoc 
b/components/camel-jms/src/main/docs/jms.adoc
index 590d3a4..672d208 100644
--- a/components/camel-jms/src/main/docs/jms.adoc
+++ b/components/camel-jms/src/main/docs/jms.adoc
@@ -210,8 +210,9 @@ Component options
 
 
 
+
 // component options: START
-The JMS component supports 71 options which are listed below.
+The JMS component supports 72 options which are listed below.
 
 
 
@@ -246,6 +247,7 @@ The JMS component supports 71 options which are listed 
below.
 | idleConsumerLimit | int | Specify the limit for the number of consumers that 
are allowed to be idle at any given time.
 | maxConcurrentConsumers | int | Specifies the maximum number of concurrent 
consumers when consuming from JMS (not for request/reply over JMS). See also 
the maxMessagesPerTask option to control dynamic scaling up/down of threads. 
When doing request/reply over JMS then the option replyToMaxConcurrentConsumers 
is used to control number of concurrent consumers on the reply message listener.
 | replyToMaxConcurrentConsumers | int | Specifies the maximum number of 
concurrent consumers when using request/reply over JMS. See also the 
maxMessagesPerTask option to control dynamic scaling up/down of threads.
+| replyOnTimeoutToMaxConcurrentConsumers | int | Specifies the maximum number 
of concurrent consumers for continue routing when timeout occurred when using 
request/reply over JMS.
 | maxMessagesPerTask | int | The number of messages per task. -1 is unlimited. 
If you use a range for concurrent consumers (eg min max) then this option can 
be used to set a value to eg 100 to control how fast the consumers will shrink 
when less work is required.
 | messageConverter | MessageConverter | To use a custom Spring 
org.springframework.jms.support.converter.MessageConverter so you can be in 
control how to map to/from a javax.jms.Message.
 | mapJmsMessage | boolean | Specifies whether Camel should auto map the 
received JMS message to a suited payload type such as javax.jms.TextMessage to 
a String etc. See section about how mapping works below for more details.
@@ -298,6 +300,7 @@ The JMS component supports 71 options which are listed 
below.
 
 
 
+
 [[JMS-Endpointoptions]]
 Endpoint options
 
@@ -307,8 +310,9 @@ Endpoint options
 
 
 
+
 // endpoint options: START
-The JMS component supports 78 endpoint options which are listed below:
+The JMS component supports 79 endpoint options which are listed below:
 
 {% raw %}
 [width="100%",cols="2s,1,1m,1m,5",options="header"]
@@ -346,6 +350,7 @@ The JMS component supports 78 endpoint options which are 
listed below:
 | priority | producer | 4 | int | Values greater than 1 specify the message 
priority when sending (where 0 is the lowest priority and 9 is the highest). 
The explicitQosEnabled option must also be enabled in order for this option to 
have any effect.
 | replyToConcurrentConsumers | producer | 1 | int | Specifies the default 
number of concurrent consumers when doing request/reply over JMS. See also the 
maxMessagesPerTask option to control dynamic scaling up/down of threads.
 | replyToMaxConcurrentConsumers | producer |  | int | Specifies the maximum 
number of concurrent consumers when using request/reply over JMS. See also the 
maxMessagesPerTask option to control dynamic scaling up/down of threads.
+| replyToOnTimeoutMaxConcurrentConsumers | producer | 1 | int | Specifies the 
maximum number of concurrent consumers for continue routing when timeout 
occurred when using request/reply over JMS.
 | replyToOverride | producer |  | String | Provides an explicit ReplyTo 
destination in the JMS message which overrides the setting of replyTo. It is 
useful if you want to forward the message to a remote Queue and receive the 
reply message from the ReplyTo destination.
 | replyToType | producer |  | ReplyToType | Allows for explicitly specifying 
which kind of strategy to use for replyTo queues when doing request/reply over 
JMS. Possible values are: 

[1/5] camel git commit: CAMEL-8219: camel-smpp - use jsmpp version 2.2.4

[davsclaus]

Repository: camel
Updated Branches:
  refs/heads/camel-2.17.x 47fec2063 -> 1e179aae1
  refs/heads/master 100ce2487 -> ab4f85bf3


CAMEL-8219: camel-smpp - use jsmpp version 2.2.4


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

Branch: refs/heads/master
Commit: 681f13b95c2ab9158a75dca97e126706aed40947
Parents: 100ce24
Author: Pascal Schumacher 
Authored: Sun May 29 22:42:40 2016 +0200
Committer: Pascal Schumacher 
Committed: Sun May 29 22:49:35 2016 +0200

--
 components/camel-smpp/pom.xml   |  3 +--
 .../camel/component/smpp/SmppDataSmCommandTest.java |  2 +-
 .../component/smpp/SmppReplaceSmCommandTest.java| 12 ++--
 .../component/smpp/SmppSubmitMultiCommandTest.java  | 16 
 .../component/smpp/SmppSubmitSmCommandTest.java | 16 
 .../apache/camel/component/smpp/SmppUtilsTest.java  |  4 ++--
 parent/pom.xml  |  3 +--
 .../features/src/main/resources/bundles.properties  |  1 -
 .../karaf/features/src/main/resources/features.xml  |  2 +-
 9 files changed, 28 insertions(+), 31 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/681f13b9/components/camel-smpp/pom.xml
--
diff --git a/components/camel-smpp/pom.xml b/components/camel-smpp/pom.xml
index 24680c9..bc45f26 100644
--- a/components/camel-smpp/pom.xml
+++ b/components/camel-smpp/pom.xml
@@ -29,9 +29,8 @@
 Camel SMPP support
 
 
-  
   
-org.jsmpp.*;version="[2.1,2.3)"
+org.jsmpp.*;version="[2.2,2.3)"
   
   
org.apache.camel.component.smpp.*
 

http://git-wip-us.apache.org/repos/asf/camel/blob/681f13b9/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppDataSmCommandTest.java
--
diff --git 
a/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppDataSmCommandTest.java
 
b/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppDataSmCommandTest.java
index 4938e40..6621566 100644
--- 
a/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppDataSmCommandTest.java
+++ 
b/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppDataSmCommandTest.java
@@ -109,7 +109,7 @@ public class SmppDataSmCommandTest {
 exchange.getIn().setHeader(SmppConstants.DEST_ADDR_TON, 
TypeOfNumber.INTERNATIONAL.value());
 exchange.getIn().setHeader(SmppConstants.DEST_ADDR_NPI, 
NumberingPlanIndicator.INTERNET.value());
 exchange.getIn().setHeader(SmppConstants.DEST_ADDR, "1919");
-exchange.getIn().setHeader(SmppConstants.REGISTERED_DELIVERY, new 
RegisteredDelivery(SMSCDeliveryReceipt.SUCCESS).value());
+exchange.getIn().setHeader(SmppConstants.REGISTERED_DELIVERY, new 
RegisteredDelivery(SMSCDeliveryReceipt.FAILURE).value());
 expect(session.dataShortMessage(eq("XXX"), eq(TypeOfNumber.NATIONAL), 
eq(NumberingPlanIndicator.NATIONAL), eq("1818"),
 eq(TypeOfNumber.INTERNATIONAL), 
eq(NumberingPlanIndicator.INTERNET), eq("1919"), eq(new ESMClass()),
 eq(new RegisteredDelivery((byte) 2)), 
eq(DataCodings.newInstance((byte) 0

http://git-wip-us.apache.org/repos/asf/camel/blob/681f13b9/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppReplaceSmCommandTest.java
--
diff --git 
a/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppReplaceSmCommandTest.java
 
b/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppReplaceSmCommandTest.java
index 8baf576..228206c 100644
--- 
a/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppReplaceSmCommandTest.java
+++ 
b/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppReplaceSmCommandTest.java
@@ -100,10 +100,10 @@ public class SmppReplaceSmCommandTest {
 exchange.getIn().setHeader(SmppConstants.SOURCE_ADDR, "1818");
 exchange.getIn().setHeader(SmppConstants.SCHEDULE_DELIVERY_TIME, new 
Date(111));
 exchange.getIn().setHeader(SmppConstants.VALIDITY_PERIOD, new 
Date(222));
-exchange.getIn().setHeader(SmppConstants.REGISTERED_DELIVERY, new 
RegisteredDelivery(SMSCDeliveryReceipt.SUCCESS).value());
+exchange.getIn().setHeader(SmppConstants.REGISTERED_DELIVERY, new 
RegisteredDelivery(SMSCDeliveryReceipt.FAILURE).value());
 exchange.getIn().setBody("new short message 

[5/5] camel git commit: CAMEL-6439: Use own thread pool for routing exchanges when timeout is triggered when doing request/reply over JMS to not steal the scheduler thread or cause a potential dead-lo

[davsclaus]

CAMEL-6439: Use own thread pool for routing exchanges when timeout is triggered 
when doing request/reply over JMS to not steal the scheduler thread or cause a 
potential dead-lock.


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

Branch: refs/heads/camel-2.17.x
Commit: 1e179aae1d40de74fc9ce08604c637451355e999
Parents: 47fec20
Author: Claus Ibsen 
Authored: Mon May 30 08:16:11 2016 +0200
Committer: Claus Ibsen 
Committed: Mon May 30 08:43:25 2016 +0200

--
 .../apache/camel/component/jms/reply/CorrelationTimeoutMap.java| 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/1e179aae/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/CorrelationTimeoutMap.java
--
diff --git 
a/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/CorrelationTimeoutMap.java
 
b/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/CorrelationTimeoutMap.java
index d4913ef..11bb309 100644
--- 
a/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/CorrelationTimeoutMap.java
+++ 
b/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/CorrelationTimeoutMap.java
@@ -43,7 +43,7 @@ public class CorrelationTimeoutMap extends 
DefaultTimeoutMap