[camel] branch camel-2.21.x updated: CAMEL-12451 Make sure the camel-cxf component release UoW in oneway invocation

2018-04-19 Thread ningjiang 
This is an automated email from the ASF dual-hosted git repository.

ningjiang pushed a commit to branch camel-2.21.x
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/camel-2.21.x by this push:
 new 9114dcc  CAMEL-12451 Make sure the camel-cxf component release UoW in 
oneway invocation
9114dcc is described below

commit 9114dccdabdfd070f93413bf7c92fc281c37252f
Author: Willem Jiang 
AuthorDate: Fri Apr 20 08:52:45 2018 +0800

CAMEL-12451 Make sure the camel-cxf component release UoW in oneway 
invocation
---
 .../apache/camel/component/cxf/CxfConsumer.java| 35 +---
 .../interceptors/UnitOfWorkCloserInterceptor.java  | 47 ++
 .../camel/component/cxf/jaxrs/CxfRsConsumer.java   | 37 +++--
 .../apache/camel/component/cxf/util/CxfUtils.java  | 14 ++-
 .../camel/component/cxf/CxfOneWayRouteTest.java| 19 -
 .../camel/component/cxf/CxfOneWayRouteBeans.xml|  6 ++-
 6 files changed, 98 insertions(+), 60 deletions(-)

diff --git 
a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfConsumer.java
 
b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfConsumer.java
index 799f5d5..24003cb 100644
--- 
a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfConsumer.java
+++ 
b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfConsumer.java
@@ -21,6 +21,9 @@ import java.util.HashMap;
 import java.util.Map;
 
 import javax.xml.ws.WebFault;
+
+import org.apache.camel.component.cxf.interceptors.UnitOfWorkCloserInterceptor;
+import org.apache.camel.component.cxf.util.CxfUtils;
 import org.w3c.dom.Element;
 
 import org.apache.camel.AsyncCallback;
@@ -39,7 +42,6 @@ import org.apache.cxf.interceptor.Fault;
 import org.apache.cxf.message.Exchange;
 import org.apache.cxf.message.FaultMode;
 import org.apache.cxf.message.Message;
-import org.apache.cxf.phase.AbstractPhaseInterceptor;
 import org.apache.cxf.phase.Phase;
 import org.apache.cxf.service.invoker.Invoker;
 import org.apache.cxf.service.model.BindingOperationInfo;
@@ -83,38 +85,18 @@ public class CxfConsumer extends DefaultConsumer {
 
 final MessageObserver originalOutFaultObserver = 
server.getEndpoint().getOutFaultObserver();
 server.getEndpoint().setOutFaultObserver(message -> {
-Exchange cxfExchange = null;
-if ((cxfExchange = message.getExchange()) != null) {
-org.apache.camel.Exchange exchange = 
cxfExchange.get(org.apache.camel.Exchange.class);
-if (exchange != null) {
-doneUoW(exchange);
-}
-}
 originalOutFaultObserver.onMessage(message);
+CxfUtils.closeCamelUnitOfWork(message);
 });
 
+// setup the UnitOfWorkCloserInterceptor for OneWayMessageProcessor
+server.getEndpoint().getInInterceptors().add(new 
UnitOfWorkCloserInterceptor(Phase.POST_INVOKE, true));
+// close the UnitOfWork normally
 server.getEndpoint().getOutInterceptors().add(new 
UnitOfWorkCloserInterceptor());
 
 return server;
 }
 
-//closes UnitOfWork in good case
-private class UnitOfWorkCloserInterceptor extends 
AbstractPhaseInterceptor {
-public UnitOfWorkCloserInterceptor() {
-super(Phase.POST_LOGICAL_ENDING);
-}
-
-@Override
-public void handleMessage(Message message) throws Fault {
-Exchange cxfExchange = null;
-if ((cxfExchange = message.getExchange()) != null) {
-org.apache.camel.Exchange exchange = 
cxfExchange.get(org.apache.camel.Exchange.class);
-if (exchange != null) {
-doneUoW(exchange);
-}
-}
-}
-}
 
 public Server getServer() {
 return server;
@@ -162,8 +144,9 @@ public class CxfConsumer extends DefaultConsumer {
 // we assume it should support AsyncInvocation out of box
 return true;
 }
-
+
 private class CxfConsumerInvoker implements Invoker {
+
 private final CxfEndpoint endpoint;
 
 CxfConsumerInvoker(CxfEndpoint endpoint) {
diff --git 
a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/interceptors/UnitOfWorkCloserInterceptor.java
 
b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/interceptors/UnitOfWorkCloserInterceptor.java
new file mode 100644
index 000..8825403
--- /dev/null
+++ 
b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/interceptors/UnitOfWorkCloserInterceptor.java
@@ -0,0 +1,47 @@
+package org.apache.camel.component.cxf.interceptors;
+
+import org.apache.camel.component.cxf.util.CxfUtils;
+import org.apache.cxf.interceptor.Fault;
+import org.apache.cxf.interceptor.OutgoingChainInterceptor;
+import org.apache.cxf.message.Exchange;
+import

[camel] branch master updated: CAMEL-12451 Make sure the camel-cxf component release UoW in oneway invocation

2018-04-19 Thread ningjiang 
This is an automated email from the ASF dual-hosted git repository.

ningjiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/master by this push:
 new be5547d  CAMEL-12451 Make sure the camel-cxf component release UoW in 
oneway invocation
be5547d is described below

commit be5547db680da0358aa5af2fb7f4650e072534f8
Author: Willem Jiang 
AuthorDate: Fri Apr 20 08:52:45 2018 +0800

CAMEL-12451 Make sure the camel-cxf component release UoW in oneway 
invocation
---
 .../apache/camel/component/cxf/CxfConsumer.java| 34 
 .../interceptors/UnitOfWorkCloserInterceptor.java  | 47 ++
 .../camel/component/cxf/jaxrs/CxfRsConsumer.java   | 35 +++-
 .../apache/camel/component/cxf/util/CxfUtils.java  | 14 ++-
 .../camel/component/cxf/CxfOneWayRouteTest.java| 19 -
 .../camel/component/cxf/CxfOneWayRouteBeans.xml|  6 ++-
 6 files changed, 97 insertions(+), 58 deletions(-)

diff --git 
a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfConsumer.java
 
b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfConsumer.java
index ef5b4ec..7181933 100644
--- 
a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfConsumer.java
+++ 
b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfConsumer.java
@@ -21,6 +21,9 @@ import java.util.HashMap;
 import java.util.Map;
 
 import javax.xml.ws.WebFault;
+
+import org.apache.camel.component.cxf.interceptors.UnitOfWorkCloserInterceptor;
+import org.apache.camel.component.cxf.util.CxfUtils;
 import org.w3c.dom.Element;
 
 import org.apache.camel.AsyncCallback;
@@ -39,7 +42,6 @@ import org.apache.cxf.interceptor.Fault;
 import org.apache.cxf.message.Exchange;
 import org.apache.cxf.message.FaultMode;
 import org.apache.cxf.message.Message;
-import org.apache.cxf.phase.AbstractPhaseInterceptor;
 import org.apache.cxf.phase.Phase;
 import org.apache.cxf.service.invoker.Invoker;
 import org.apache.cxf.service.model.BindingOperationInfo;
@@ -83,38 +85,18 @@ public class CxfConsumer extends DefaultConsumer {
 
 final MessageObserver originalOutFaultObserver = 
server.getEndpoint().getOutFaultObserver();
 server.getEndpoint().setOutFaultObserver(message -> {
-Exchange cxfExchange = null;
-if ((cxfExchange = message.getExchange()) != null) {
-org.apache.camel.Exchange exchange = 
cxfExchange.get(org.apache.camel.Exchange.class);
-if (exchange != null) {
-doneUoW(exchange);
-}
-}
 originalOutFaultObserver.onMessage(message);
+CxfUtils.closeCamelUnitOfWork(message);
 });
 
+// setup the UnitOfWorkCloserInterceptor for OneWayMessageProcessor
+server.getEndpoint().getInInterceptors().add(new 
UnitOfWorkCloserInterceptor(Phase.POST_INVOKE, true));
+// close the UnitOfWork normally
 server.getEndpoint().getOutInterceptors().add(new 
UnitOfWorkCloserInterceptor());
 
 return server;
 }
 
-//closes UnitOfWork in good case
-private class UnitOfWorkCloserInterceptor extends 
AbstractPhaseInterceptor {
-public UnitOfWorkCloserInterceptor() {
-super(Phase.POST_LOGICAL_ENDING);
-}
-
-@Override
-public void handleMessage(Message message) throws Fault {
-Exchange cxfExchange = null;
-if ((cxfExchange = message.getExchange()) != null) {
-org.apache.camel.Exchange exchange = 
cxfExchange.get(org.apache.camel.Exchange.class);
-if (exchange != null) {
-doneUoW(exchange);
-}
-}
-}
-}
 
 public Server getServer() {
 return server;
@@ -162,8 +144,8 @@ public class CxfConsumer extends DefaultConsumer {
 // we assume it should support AsyncInvocation out of box
 return true;
 }
-
 private class CxfConsumerInvoker implements Invoker {
+
 private final CxfEndpoint endpoint;
 
 CxfConsumerInvoker(CxfEndpoint endpoint) {
diff --git 
a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/interceptors/UnitOfWorkCloserInterceptor.java
 
b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/interceptors/UnitOfWorkCloserInterceptor.java
new file mode 100644
index 000..8825403
--- /dev/null
+++ 
b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/interceptors/UnitOfWorkCloserInterceptor.java
@@ -0,0 +1,47 @@
+package org.apache.camel.component.cxf.interceptors;
+
+import org.apache.camel.component.cxf.util.CxfUtils;
+import org.apache.cxf.interceptor.Fault;
+import org.apache.cxf.interceptor.OutgoingChainInterceptor;
+import org.apache.cxf.message.Exchange;
+import org.apache.cxf.message.Message;
+import

[camel] branch master updated: polish (the last commit by this round)

2018-04-19 Thread bvahdat 
This is an automated email from the ASF dual-hosted git repository.

bvahdat pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/master by this push:
 new fddd28e  polish (the last commit by this round)
fddd28e is described below

commit fddd28e48a8a3254893164d5b3ff22ef957d9ee5
Author: Babak Vahdat 
AuthorDate: Thu Apr 19 22:04:19 2018 +0200

polish (the last commit by this round)
---
 .../component/cassandra/CassandraComponentProducerTest.java  |  6 ++
 .../camel/component/git/producer/GitRemoteProducerTest.java  |  1 -
 .../java/org/apache/camel/component/hl7/HL721Converter.java  |  1 -
 .../java/org/apache/camel/component/hl7/HL722Converter.java  |  1 -
 .../java/org/apache/camel/component/hl7/HL7231Converter.java |  1 -
 .../java/org/apache/camel/component/hl7/HL723Converter.java  |  1 -
 .../java/org/apache/camel/component/hl7/HL724Converter.java  |  1 -
 .../java/org/apache/camel/component/hl7/HL7251Converter.java |  1 -
 .../java/org/apache/camel/component/hl7/HL725Converter.java  |  1 -
 .../java/org/apache/camel/component/hl7/HL726Converter.java  |  1 -
 .../java/org/apache/camel/component/hl7/HL7Converter.java|  1 -
 .../camel/component/hl7/HL7GenericMessageConverter.java  |  1 -
 .../camel/component/mail/MailMimeDecodeHeadersTest.java  |  1 -
 .../idempotent/MongoDbIdempotentRepositoryTest.java  |  2 --
 .../apache/camel/spring/CircularComponentCreationTest.java   |  1 -
 .../sql/stored/template/generated/ParseException.java| 12 ++--
 .../component/sql/stored/template/generated/SSPTParser.java  |  3 +--
 .../src/main/java/org/apache/camel/test/blueprint/Main.java  |  3 ---
 .../camel/component/thrift/ThriftProducerSecurityTest.java   |  1 -
 .../component/thrift/ThriftProducerZlibCompressionTest.java  |  2 --
 .../component/thrift/local/ThriftThreadPoolServerTest.java   |  1 -
 21 files changed, 9 insertions(+), 34 deletions(-)

diff --git 
a/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/CassandraComponentProducerTest.java
 
b/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/CassandraComponentProducerTest.java
index 9afee87..d2a5015 100644
--- 
a/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/CassandraComponentProducerTest.java
+++ 
b/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/CassandraComponentProducerTest.java
@@ -202,8 +202,7 @@ public class CassandraComponentProducerTest extends 
BaseCassandraTest {
 Update.Where updateFirstName = update("camel_user")
 .with(set("first_name", bindMarker()))
 .where(eq("login", bindMarker()));
-@SuppressWarnings("unused")
-Object response1 = 
producerTemplateNoEndpointCql.requestBodyAndHeader(new Object[]{"Claus 2", 
"c_ibsen"},
+producerTemplateNoEndpointCql.sendBodyAndHeader(new Object[]{"Claus 
2", "c_ibsen"},
 CassandraConstants.CQL_QUERY, updateFirstName);
 
 Cluster cluster = CassandraUnitUtils.cassandraCluster();
@@ -217,8 +216,7 @@ public class CassandraComponentProducerTest extends 
BaseCassandraTest {
 Update.Where updateLastName = update("camel_user")
 .with(set("last_name", bindMarker()))
 .where(eq("login", bindMarker()));
-@SuppressWarnings("unused")
-Object response2 = 
producerTemplateNoEndpointCql.requestBodyAndHeader(new Object[]{"Ibsen 2", 
"c_ibsen"},
+producerTemplateNoEndpointCql.sendBodyAndHeader(new Object[]{"Ibsen 
2", "c_ibsen"},
 CassandraConstants.CQL_QUERY, updateLastName);
 
 ResultSet resultSet2 = session.execute("select login, first_name, 
last_name from camel_user where login = ?", "c_ibsen");
diff --git 
a/components/camel-git/src/test/java/org/apache/camel/component/git/producer/GitRemoteProducerTest.java
 
b/components/camel-git/src/test/java/org/apache/camel/component/git/producer/GitRemoteProducerTest.java
index b1fced3..9806307 100644
--- 
a/components/camel-git/src/test/java/org/apache/camel/component/git/producer/GitRemoteProducerTest.java
+++ 
b/components/camel-git/src/test/java/org/apache/camel/component/git/producer/GitRemoteProducerTest.java
@@ -26,7 +26,6 @@ import org.apache.camel.component.git.GitTestSupport;
 import org.eclipse.jgit.api.Git;
 import org.eclipse.jgit.api.Status;
 import org.eclipse.jgit.lib.Repository;
-import org.eclipse.jgit.transport.PushResult;
 import org.junit.Ignore;
 import org.junit.Test;
 
diff --git 
a/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL721Converter.java
 
b/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL721Converter.java
index 1110399..27578a6 100644
--- 
a/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL721Converter.java
+++

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

2018-04-19 Thread buildbot 
Author: buildbot
Date: Thu Apr 19 08:18:57 2018
New Revision: 1028645

Log:
Production update by buildbot for camel

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

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

Modified: websites/production/camel/content/camel-2220-release.html
==
--- websites/production/camel/content/camel-2220-release.html (original)
+++ websites/production/camel/content/camel-2220-release.html Thu Apr 19 
08:18:57 2018
@@ -94,7 +94,7 @@
 
 
 
-New and NoteworthyWelcome 
to the 2.22.0 release which approx XXX issues resolved (new features, 
improvements and bug fixes such as...)This release supports only 
Spring Boot 2. Spring Boot v1 is no longer 
supported.Camel has upgraded from 
Spring Boot v1 to v2 and therefore v1 is no longer 
supported.Upgraded to Spring Framework 5. Camel should work with 
Spring 4.3.x as well, but going forward Spring 5.x will be the minimum Spring 
version in future releases.Upgraded to Karaf 4.2. You may run 
Camel on Karaf 4.1 but we only officially support Karaf 4.2 in this 
release.TheFile2 consumer with read-lock idempotent/idempotent-changed can now be configured 
 > to delay the release tasks to expand the window when a file is regarded as 
 > in-process, which is usable in active/active cluster settings with a shared 
 > idempotent repository to ensure other nodes dont too quickly see a processed 
 > file as a file they can process (only needed if you have 
 > readLockRemoveOnCommit=true).Allow to plugin a custom request/reply 
 > correlation id manager implementation on href="netty4.html">Netty4 producer in request/reply 
 > mode.And these important fixes:Fixed a CXF 
 > continuation timeout issue with camel-cxfconsumer could cause the 
 > consumer to return a response with data instead of triggering a timeout to 
 > the calling SOAP client.Fixed using href="advicewith.html">AdviceWith and using weave methods 
 > ononExceptionetc. not 
 > working.FixedSplitter in parallel processing and streaming mode 
may block, while iterating message body when the iterator throws exception in 
first invoked next() method call.FixedKafka consumer to not auto commit if 
autoCommitEnable=false.Fixed file consumer was using markerFile as 
read-lock by default, which should have been none.New Enterprise Integration 
PatternsNew Componentscamel-mybatis - Now has a 
mybatis-bean component that supports using MyBatis annotations on POJO beans to 
specify the SQL queries and mappings.New DSLNew AnnotationsNew Data FormatsNew 
LanguagesNew ExamplesNew TutorialsAPI breakingKnown IssuesImportant 
changes to consider when upgradingCamel has upgraded from Spring 
Boot v1 to v2 and therefore v1 is no longer supported. Migrating from SB1 to 
SB2 may require changes, see the Spring Boot v1 to v2 migration documentation 
for details.Upgraded to Spring Framework v5 as default. Support for 
Spring Framework v4.3 is deprecated and not recommended to be 
used.Upgraded to Karaf 4.2. You may run Camel on Karaf 4.1 but we only 
officially support Karaf 4.2 in th
 is release.The camel-jms Maven pom.xml file now exclude 
spring-messaging dependency as this JAR is not used.Unit testing Camel 
with Spring Boot and extending the base 
classesCamelTestSupport 
orCamelSpringTestSupport is now throwing an exception as 
this has never been intended/support. Instead use the CamelSpringBootRunner 
JUnit runner, and do not extend a base class.The file consumer has 
changed to use readLock=none as default instead of readLock=markerFile. 
Documentation already indicated that readLock=none was the 
default.Getting the 
DistributionsBinary 
DistributionsDescriptionDownload LinkPGP Signature file of 
downloadWindows Distributionhttp://www.apache.org/dyn/closer.cgi/camel/apache-camel/x.y.x/apache-camel-x.y.x.zip;>apache-camel-x.y.x.ziphttp://www.apache.org/dist/camel/apache-camel/x.y.x/apache-camel-x.y.x.zip.asc;>apache-camel-x.y.x.zip.ascUnix/Linux/Cygwin 
Distributionhttp://www.apache.org/dyn/closer.cgi/camel/apache-camel/x.y.x/apache-camel-x.y.x.tar.gz;>apache-camel-x.y.x.tar.gzhttp://www.apache.org/dist/camel/apache-camel/x.y.x/apache-camel-x.y.x.tar.gz.asc;>apache-camel-x.y.x.tar.gz.ascThe above URLs use 
redirectionThe above URLs use the Apache 
Mirror system to redirect you to a suitable mirror for your download. Some 
users have experienced issues with some versions of browsers (e.g. some Safari 
browsers). If the download doesn't seem to work for you from the above URL then 
try using http://www.mozilla.com/en-US/firefox/; 
rel="nofollow">FireFoxSource Distributions<
 tr>DescriptionDownload LinkPGP Signature file of 
downloadSource

[camel] 02/02: Upgrade Chronicle Queue to version 4.6.92

2018-04-19 Thread acosentino 
This is an automated email from the ASF dual-hosted git repository.

acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git

commit 2f066c2802c73568648a33dbf5188fa75a96ae01
Author: Andrea Cosentino 
AuthorDate: Thu Apr 19 09:55:50 2018 +0200

Upgrade Chronicle Queue to version 4.6.92
---
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/parent/pom.xml b/parent/pom.xml
index 79626de..e56a967 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -124,7 +124,7 @@
 1.13.27
 2.4.17
 1.12.0
-4.6.91
+4.6.92
 1.11.2
 1.12.1
 3.3.1

-- 
To stop receiving notification emails like this one, please contact
acosent...@apache.org.

[camel] 01/02: Upgrade Chronicle Network to version 1.12.0

2018-04-19 Thread acosentino 
This is an automated email from the ASF dual-hosted git repository.

acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git

commit 957a87a948e5346ef7aef7126bc3e4ff19555ffa
Author: Andrea Cosentino 
AuthorDate: Thu Apr 19 09:55:23 2018 +0200

Upgrade Chronicle Network to version 1.12.0
---
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/parent/pom.xml b/parent/pom.xml
index d585d8c..79626de 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -123,7 +123,7 @@
 1.11.8
 1.13.27
 2.4.17
-1.11.7
+1.12.0
 4.6.91
 1.11.2
 1.12.1

-- 
To stop receiving notification emails like this one, please contact
acosent...@apache.org.

[camel] branch master updated (f56bff9 -> 2f066c2)

2018-04-19 Thread acosentino 
This is an automated email from the ASF dual-hosted git repository.

acosentino pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.


from f56bff9  CAMEL-11257: Add camel-as2-starter
 new 957a87a  Upgrade Chronicle Network to version 1.12.0
 new 2f066c2  Upgrade Chronicle Queue to version 4.6.92

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 parent/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
acosent...@apache.org.

[camel] branch camel-2.21.x updated: CAMEL-12448 - camel-consul: filter health checks by service id (#2296)

2018-04-19 Thread davsclaus 
This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch camel-2.21.x
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/camel-2.21.x by this push:
 new 30461ca  CAMEL-12448  - camel-consul: filter health checks by service 
id (#2296)
30461ca is described below

commit 30461ca1858d853f5fcd2eb211b310cedae9d2b9
Author: player13 <8365723+playe...@users.noreply.github.com>
AuthorDate: Mon Apr 16 16:18:02 2018 +0300

CAMEL-12448  - camel-consul: filter health checks by service id (#2296)

CAMEL-12448  - camel-consul - service health state calculated from all 
services with same name
---
 .../camel/component/consul/cloud/ConsulServiceDiscovery.java |  6 +-
 .../component/consul/cloud/ConsulServiceDiscoveryTest.java   | 12 ++--
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git 
a/components/camel-consul/src/main/java/org/apache/camel/component/consul/cloud/ConsulServiceDiscovery.java
 
b/components/camel-consul/src/main/java/org/apache/camel/component/consul/cloud/ConsulServiceDiscovery.java
index e7cfd5f..74b7c00 100644
--- 
a/components/camel-consul/src/main/java/org/apache/camel/component/consul/cloud/ConsulServiceDiscovery.java
+++ 
b/components/camel-consul/src/main/java/org/apache/camel/component/consul/cloud/ConsulServiceDiscovery.java
@@ -99,7 +99,11 @@ public final class ConsulServiceDiscovery extends 
DefaultServiceDiscovery {
 service.getServiceAddress(),
 service.getServicePort(),
 meta,
-new 
DefaultServiceHealth(serviceHealthList.stream().allMatch(this::isHealthy))
+new DefaultServiceHealth(
+serviceHealthList.stream()
+.filter(h -> 
ObjectHelper.equal(h.getService().getId(), service.getServiceId()))
+.allMatch(this::isHealthy)
+)
 );
 }
 }
diff --git 
a/components/camel-consul/src/test/java/org/apache/camel/component/consul/cloud/ConsulServiceDiscoveryTest.java
 
b/components/camel-consul/src/test/java/org/apache/camel/component/consul/cloud/ConsulServiceDiscoveryTest.java
index 2523ad7..119e85b 100644
--- 
a/components/camel-consul/src/test/java/org/apache/camel/component/consul/cloud/ConsulServiceDiscoveryTest.java
+++ 
b/components/camel-consul/src/test/java/org/apache/camel/component/consul/cloud/ConsulServiceDiscoveryTest.java
@@ -21,6 +21,7 @@ import java.util.List;
 
 import com.orbitz.consul.AgentClient;
 import com.orbitz.consul.Consul;
+import com.orbitz.consul.model.agent.ImmutableRegCheck;
 import com.orbitz.consul.model.agent.ImmutableRegistration;
 import com.orbitz.consul.model.agent.Registration;
 import org.apache.camel.cloud.ServiceDefinition;
@@ -44,7 +45,12 @@ public class ConsulServiceDiscoveryTest {
 client = Consul.builder().build().agentClient();
 registrations = new ArrayList<>(3);
 
-for (int i = 0; i < 3; i++) {
+for (int i = 0; i < 6; i++) {
+Registration.RegCheck c = ImmutableRegCheck.builder()
+.ttl("1m")
+.status(i < 3 ? "passing" : "critical")
+.build();
+
 Registration r = ImmutableRegistration.builder()
 .id("service-" + i)
 .name("my-service")
@@ -53,6 +59,7 @@ public class ConsulServiceDiscoveryTest {
 .addTags("key1=value1")
 .addTags("key2=value2")
 .port(9000 + i)
+.check(c)
 .build();
 
 client.register(r);
@@ -76,7 +83,7 @@ public class ConsulServiceDiscoveryTest {
 
 List services = discovery.getServices("my-service");
 assertNotNull(services);
-assertEquals(3, services.size());
+assertEquals(6, services.size());
 
 for (ServiceDefinition service : services) {
 assertFalse(service.getMetadata().isEmpty());
@@ -85,6 +92,7 @@ public class ConsulServiceDiscoveryTest {
 assertTrue(service.getMetadata().containsKey("a-tag"));
 assertTrue(service.getMetadata().containsKey("key1"));
 assertTrue(service.getMetadata().containsKey("key2"));
+assertTrue(service.getPort() < 9003 ? 
service.getHealth().isHealthy() : !service.getHealth().isHealthy());
 }
 }
 }

-- 
To stop receiving notification emails like this one, please contact
davscl...@apache.org.

[camel] branch master updated: CAMEL-11257: Add camel-as2-starter

2018-04-19 Thread davsclaus 
This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/master by this push:
 new f56bff9  CAMEL-11257: Add camel-as2-starter
f56bff9 is described below

commit f56bff9f853fe8335ce249192078bd2ef45e0fdc
Author: Claus Ibsen 
AuthorDate: Thu Apr 19 09:30:18 2018 +0200

CAMEL-11257: Add camel-as2-starter
---
 .../components-starter/camel-as2-starter/pom.xml   |  69 +
 .../springboot/AS2ComponentAutoConfiguration.java  | 128 
 .../as2/springboot/AS2ComponentConfiguration.java  | 339 +
 .../src/main/resources/META-INF/LICENSE.txt| 203 
 .../src/main/resources/META-INF/NOTICE.txt |  11 +
 .../src/main/resources/META-INF/spring.factories   |  19 ++
 .../src/main/resources/META-INF/spring.provides|  17 ++
 7 files changed, 786 insertions(+)

diff --git a/platforms/spring-boot/components-starter/camel-as2-starter/pom.xml 
b/platforms/spring-boot/components-starter/camel-as2-starter/pom.xml
new file mode 100644
index 000..243065b
--- /dev/null
+++ b/platforms/spring-boot/components-starter/camel-as2-starter/pom.xml
@@ -0,0 +1,69 @@
+
+
+http://maven.apache.org/POM/4.0.0; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd;>
+  4.0.0
+  
+org.apache.camel
+components-starter
+2.22.0-SNAPSHOT
+  
+  camel-as2-starter
+  jar
+  Spring-Boot Starter :: Camel :: AS2 :: Component
+  Spring-Boot Starter for Camel AS2 component
+  
+
+  org.springframework.boot
+  spring-boot-starter
+  ${spring-boot-version}
+
+
+  org.apache.camel
+  camel-as2
+  ${project.version}
+  
+  
+
+  commons-logging
+  commons-logging
+
+
+  org.apache.logging.log4j
+  log4j-core
+
+
+  org.apache.logging.log4j
+  log4j-slf4j-impl
+
+  
+  
+
+
+
+  org.apache.camel
+  camel-core-starter
+
+
+  org.apache.camel
+  camel-spring-boot-starter
+
+
+  
+
diff --git 
a/platforms/spring-boot/components-starter/camel-as2-starter/src/main/java/org/apache/camel/component/as2/springboot/AS2ComponentAutoConfiguration.java
 
b/platforms/spring-boot/components-starter/camel-as2-starter/src/main/java/org/apache/camel/component/as2/springboot/AS2ComponentAutoConfiguration.java
new file mode 100644
index 000..82fed0c
--- /dev/null
+++ 
b/platforms/spring-boot/components-starter/camel-as2-starter/src/main/java/org/apache/camel/component/as2/springboot/AS2ComponentAutoConfiguration.java
@@ -0,0 +1,128 @@
+/**
+ * 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.as2.springboot;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import javax.annotation.Generated;
+import org.apache.camel.CamelContext;
+import org.apache.camel.component.as2.AS2Component;
+import org.apache.camel.spi.ComponentCustomizer;
+import org.apache.camel.spi.HasId;
+import org.apache.camel.spring.boot.CamelAutoConfiguration;
+import org.apache.camel.spring.boot.ComponentConfigurationProperties;
+import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
+import 
org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
+import org.apache.camel.spring.boot.util.GroupCondition;
+import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
+import org.apache.camel.util.IntrospectionSupport;
+import org.apache.camel.util.ObjectHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
+import 
org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import 
org.springframework.boot.context.properties.EnableConfigurationProperties;
+import

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

2018-04-19 Thread buildbot 
Author: buildbot
Date: Thu Apr 19 07:20:34 2018
New Revision: 1028643

Log:
Production update by buildbot for camel

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

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

Modified: websites/production/camel/content/camel-2220-release.html
==
--- websites/production/camel/content/camel-2220-release.html (original)
+++ websites/production/camel/content/camel-2220-release.html Thu Apr 19 
07:20:34 2018
@@ -94,7 +94,7 @@
 
 
 
-New and NoteworthyWelcome 
to the 2.22.0 release which approx XXX issues resolved (new features, 
improvements and bug fixes such as...)This release supports only 
Spring Boot 2. Spring Boot v1 is no longer 
supported.Camel has upgraded from 
Spring Boot v1 to v2 and therefore v1 is no longer 
supported.Upgraded to Spring Framework 5. Camel should work with 
Spring 4.3.x as well, but going forward Spring 5.x will be the minimum Spring 
version in future releases.Upgraded to Karaf 4.2. You may run 
Camel on Karaf 4.1 but we only officially support Karaf 4.2 in this 
release.TheFile2 consumer with read-lock idempotent/idempotent-changed can now be configured 
 > to delay the release tasks to expand the window when a file is regarded as 
 > in-process, which is usable in active/active cluster settings with a shared 
 > idempotent repository to ensure other nodes dont too quickly see a processed 
 > file as a file they can process (only needed if you have 
 > readLockRemoveOnCommit=true).Allow to plugin a custom request/reply 
 > correlation id manager implementation on href="netty4.html">Netty4 producer in request/reply 
 > mode.And these important fixes:Fixed a CXF 
 > continuation timeout issue with camel-cxfconsumer could cause the 
 > consumer to return a response with data instead of triggering a timeout to 
 > the calling SOAP client.Fixed using href="advicewith.html">AdviceWith and using weave methods 
 > ononExceptionetc. not 
 > working.FixedSplitter in parallel processing and streaming mode 
may block, while iterating message body when the iterator throws exception in 
first invoked next() method call.FixedKafka consumer to not auto commit if 
autoCommitEnable=false.New Enterprise Integration 
PatternsNew Componentscamel-mybatis - Now has a 
mybatis-bean component that supports using MyBatis annotations on POJO beans to 
specify the SQL queries and mappings.New DSLNew AnnotationsNew Data FormatsNew LanguagesNew ExamplesNew TutorialsAPI breakingKnown IssuesImportant 
changes to consider when upgradingCamel has upgraded from Spring 
Boot v1 to v2 and therefore v1 is no longer supported. Migrating from SB1 to 
SB2 may require changes, see the Spring Boot v1 to v2 migration documentation 
for details.Upgraded to Spring Framework v5 as default. Support for 
Spring Framework v4.3 is deprecated and not recommended to be 
used.Upgraded to Karaf 4.2. You may run Camel on Karaf 4.1 but we only 
officially support Karaf 4.2 in this release.The camel-jms Maven 
pom.xml file now exclude spring-messaging dependency as this JA
 R is not used.Unit testing Camel with Spring Boot and extending the 
base classesCamelTestSupport 
orCamelSpringTestSupport is now throwing an exception as 
this has never been intended/support. Instead use the CamelSpringBootRunner 
JUnit runner, and do not extend a base class.Getting the 
DistributionsBinary 
DistributionsDescriptionDownload LinkPGP Signature file of downloadWindows 
Distributionapache-camel-x.y.x.ziphttp://www.apache.org/dist/camel/apache-camel/x.y.x/apache-camel-x.y.x.zip.asc;>apache-camel-x.y.x.zip.ascUnix/Linux/Cygwin 
Distributionhttp://www.apache.org/dyn/closer.cgi/camel/apache-camel/x.y.x/apache-camel-x.y.x.tar.gz;>apache-camel-x.y.x.tar.gzhttp://www.apache.org/dist/camel/apache-camel/x.y.x/apache-camel-x.y.x.tar.gz.asc;>apache-camel-x.y.x.tar.gz.ascThe above URLs use redirectionThe above URLs use the Apache 
Mirror system to redirect you to a suitable mirror for your download. Some 
users have experienced issues with some versions of browsers (e.g. some Safari 
browsers). If the download doesn't seem to work for you from the above URL then 
try using http://www.mozilla.com/en-US/firefox/; 
rel="nofollow">FireFoxSource DistributionsDescriptionDownload LinkPGP Signature file of 
downloadSource (zip)http://www.apache.org/dyn/closer.cgi/camel/apache-camel/x.y.x/apache-camel-x.y.x-src.zip;>apache-camel-x.y.x-src.ziphttp://www.apache.org/dist/camel/apache-camel/x.y.x/apache-camel-x.y.x-src.zip.asc;>apache-camel-x.y.x-src.zip.ascGetting the Binaries 
using Maven 2To use this release in your maven project, the proper 
dependency configuration that you should use in your

[camel] 02/02: CAMEL-12458: camel-twitter - Should support extended mode by default

2018-04-19 Thread davsclaus 
This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch camel-2.21.x
in repository https://gitbox.apache.org/repos/asf/camel.git

commit a8ec1c9bb9cc1630cccb4d0ae651827d679160ab
Author: Claus Ibsen 
AuthorDate: Thu Apr 19 09:23:18 2018 +0200

CAMEL-12458: camel-twitter - Should support extended mode by default
---
 .../camel-twitter/src/main/docs/twitter-component.adoc|  3 ++-
 .../src/main/docs/twitter-directmessage-component.adoc|  3 ++-
 .../src/main/docs/twitter-search-component.adoc   |  3 ++-
 .../src/main/docs/twitter-streaming-component.adoc|  3 ++-
 .../src/main/docs/twitter-timeline-component.adoc |  3 ++-
 .../camel/component/twitter/TwitterConfiguration.java | 15 ++-
 6 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/components/camel-twitter/src/main/docs/twitter-component.adoc 
b/components/camel-twitter/src/main/docs/twitter-component.adoc
index 414bf5c..cd77832 100644
--- a/components/camel-twitter/src/main/docs/twitter-component.adoc
+++ b/components/camel-twitter/src/main/docs/twitter-component.adoc
@@ -160,7 +160,7 @@ with the following path and query parameters:
 |===
 
 
- Query Parameters (43 parameters):
+ Query Parameters (44 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -173,6 +173,7 @@ with the following path and query parameters:
 | *distanceMetric* (consumer) | Used by the non-stream geography search, to 
search by radius using the configured metrics. The unit can either be mi for 
miles, or km for kilometers. You need to configure all the following options: 
longitude, latitude, radius, and distanceMetric. | km | String
 | *exceptionHandler* (consumer) | 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 or ERROR level and ignored. |  | ExceptionHandler
 | *exchangePattern* (consumer) | Sets the exchange pattern when the consumer 
creates an exchange. |  | ExchangePattern
+| *extendedMode* (consumer) | Used for enabling full text from twitter (eg 
receive tweets that contains more than 140 characters). | true | boolean
 | *latitude* (consumer) | Used by the non-stream geography search to search by 
latitude. You need to configure all the following options: longitude, latitude, 
radius, and distanceMetric. |  | Double
 | *locations* (consumer) | Bounding boxes, created by pairs of lat/lons. Can 
be used for streaming/filter. A pair is defined as lat,lon. And multiple paris 
can be separated by semi colon. |  | String
 | *longitude* (consumer) | Used by the non-stream geography search to search 
by longitude. You need to configure all the following options: longitude, 
latitude, radius, and distanceMetric. |  | Double
diff --git 
a/components/camel-twitter/src/main/docs/twitter-directmessage-component.adoc 
b/components/camel-twitter/src/main/docs/twitter-directmessage-component.adoc
index 20e783f..51f75b0 100644
--- 
a/components/camel-twitter/src/main/docs/twitter-directmessage-component.adoc
+++ 
b/components/camel-twitter/src/main/docs/twitter-directmessage-component.adoc
@@ -49,7 +49,7 @@ with the following path and query parameters:
 |===
 
 
- Query Parameters (41 parameters):
+ Query Parameters (42 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -61,6 +61,7 @@ with the following path and query parameters:
 | *distanceMetric* (consumer) | Used by the non-stream geography search, to 
search by radius using the configured metrics. The unit can either be mi for 
miles, or km for kilometers. You need to configure all the following options: 
longitude, latitude, radius, and distanceMetric. | km | String
 | *exceptionHandler* (consumer) | 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 or ERROR level and ignored. |  | ExceptionHandler
 | *exchangePattern* (consumer) | Sets the exchange pattern when the consumer 
creates an exchange. |  | ExchangePattern
+| *extendedMode* (consumer) | Used for enabling full text from twitter (eg 
receive tweets that contains more than 140 characters). | true | boolean
 | *latitude* (consumer) | Used by the non-stream geography search to search by 
latitude. You need to configure all the following options: longitude, latitude, 
radius, and distanceMetric. |  | Double
 | *locations* (consumer) | Bounding boxes, created by pairs of lat/lons. Can 
be used for streaming/filter. A pair is defined as lat,lon. And multiple paris 
can be separated by semi colon. |  | String
 | *longitude* (consumer) | Used by the non-stream geography search to search 
by longitude. You need to configure all the following options: longitude,

[camel] 01/02: Add support for Extended mode for full text (#2292)

2018-04-19 Thread davsclaus 
This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch camel-2.21.x
in repository https://gitbox.apache.org/repos/asf/camel.git

commit 5fb63d6bfc3f5c12d9bd90f75cbc3bdc3cdb948d
Author: Akhilesh Singh 
AuthorDate: Thu Apr 19 17:19:13 2018 +1000

Add support for Extended mode for full text (#2292)
---
 .../camel/component/twitter/TwitterConfiguration.java   | 17 +
 1 file changed, 17 insertions(+)

diff --git 
a/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/TwitterConfiguration.java
 
b/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/TwitterConfiguration.java
index f4a32bb..3c5266a 100644
--- 
a/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/TwitterConfiguration.java
+++ 
b/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/TwitterConfiguration.java
@@ -74,6 +74,8 @@ public class TwitterConfiguration {
 private Double radius;
 @UriParam(label = "consumer,advanced", defaultValue = "km", enums = 
"km,mi")
 private String distanceMetric;
+@UriParam(label = "consumer,advanced")
+private Boolean extendedMode;
 
 /**
  * Singleton, on demand instances of Twitter4J's Twitter & TwitterStream.
@@ -109,6 +111,7 @@ public class TwitterConfiguration {
 confBuilder.setOAuthConsumerSecret(consumerSecret);
 confBuilder.setOAuthAccessToken(accessToken);
 confBuilder.setOAuthAccessTokenSecret(accessTokenSecret);
+confBuilder.setTweetModeExtended(getExtendedMode());
 if (getHttpProxyHost() != null) {
 confBuilder.setHttpProxyHost(getHttpProxyHost());
 }
@@ -395,5 +398,19 @@ public class TwitterConfiguration {
 public void setDistanceMetric(String distanceMetric) {
 this.distanceMetric = distanceMetric;
 }
+
+/**
+ * Used for enabling full text from twitter.
+ * 
+ */
+public void setExtendedMode(Boolean extendedMode) {
+this.radius = radius;
+}
+
+public Boolean getExtendedMode() {
+return extendedMode;
+}
+
+
 
 }

-- 
To stop receiving notification emails like this one, please contact
davscl...@apache.org.

[camel] branch camel-2.21.x updated (d871b34 -> a8ec1c9)

2018-04-19 Thread davsclaus 
This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a change to branch camel-2.21.x
in repository https://gitbox.apache.org/repos/asf/camel.git.


from d871b34  CAMEL-12457: file consumer - Should not use readlock by 
default
 new 5fb63d6  Add support for Extended mode for full text (#2292)
 new a8ec1c9  CAMEL-12458: camel-twitter - Should support extended mode by 
default

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../camel-twitter/src/main/docs/twitter-component.adoc |  3 ++-
 .../src/main/docs/twitter-directmessage-component.adoc |  3 ++-
 .../src/main/docs/twitter-search-component.adoc|  3 ++-
 .../src/main/docs/twitter-streaming-component.adoc |  3 ++-
 .../src/main/docs/twitter-timeline-component.adoc  |  3 ++-
 .../camel/component/twitter/TwitterConfiguration.java  | 14 ++
 6 files changed, 24 insertions(+), 5 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
davscl...@apache.org.

[camel] branch master updated: Add support for Extended mode for full text (#2292)

2018-04-19 Thread davsclaus 
This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/master by this push:
 new 178cb74  Add support for Extended mode for full text (#2292)
178cb74 is described below

commit 178cb7419386f11390ff8e9211a5b80c0cef92dd
Author: Akhilesh Singh 
AuthorDate: Thu Apr 19 17:19:13 2018 +1000

Add support for Extended mode for full text (#2292)
---
 .../camel/component/twitter/TwitterConfiguration.java   | 17 +
 1 file changed, 17 insertions(+)

diff --git 
a/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/TwitterConfiguration.java
 
b/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/TwitterConfiguration.java
index 9f46012..a93fecc 100644
--- 
a/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/TwitterConfiguration.java
+++ 
b/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/TwitterConfiguration.java
@@ -72,6 +72,8 @@ public class TwitterConfiguration {
 private Double radius;
 @UriParam(label = "consumer,advanced", defaultValue = "km", enums = 
"km,mi")
 private String distanceMetric;
+@UriParam(label = "consumer,advanced")
+private Boolean extendedMode;
 
 /**
  * Singleton, on demand instances of Twitter4J's Twitter & TwitterStream.
@@ -107,6 +109,7 @@ public class TwitterConfiguration {
 confBuilder.setOAuthConsumerSecret(consumerSecret);
 confBuilder.setOAuthAccessToken(accessToken);
 confBuilder.setOAuthAccessTokenSecret(accessTokenSecret);
+confBuilder.setTweetModeExtended(getExtendedMode());
 if (getHttpProxyHost() != null) {
 confBuilder.setHttpProxyHost(getHttpProxyHost());
 }
@@ -393,5 +396,19 @@ public class TwitterConfiguration {
 public void setDistanceMetric(String distanceMetric) {
 this.distanceMetric = distanceMetric;
 }
+
+/**
+ * Used for enabling full text from twitter.
+ * 
+ */
+public void setExtendedMode(Boolean extendedMode) {
+this.radius = radius;
+}
+
+public Boolean getExtendedMode() {
+return extendedMode;
+}
+
+
 
 }

-- 
To stop receiving notification emails like this one, please contact
davscl...@apache.org.