[1/2] camel git commit: [CAMEL-9139] Make reading parameter configurable via header in camel-facebook

2015-09-15 Thread acosentino 
Repository: camel
Updated Branches:
  refs/heads/master 1e8bb13a2 -> ea53dce2d


[CAMEL-9139] Make reading parameter configurable via header in camel-facebook


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

Branch: refs/heads/master
Commit: e05b103f42461f3c49a9f4053bc217880301dccc
Parents: 1e8bb13
Author: Manuel Holzleitner 
Authored: Tue Sep 15 11:22:30 2015 +0200
Committer: Andrea Cosentino 
Committed: Tue Sep 15 20:56:56 2015 +0200

--
 .../component/facebook/FacebookProducer.java| 15 +++-
 .../facebook/data/FacebookPropertiesHelper.java | 11 ++-
 .../component/facebook/data/ReadingBuilder.java | 14 
 .../FacebookComponentPageIdProducerTest.java| 76 
 4 files changed, 112 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/e05b103f/components/camel-facebook/src/main/java/org/apache/camel/component/facebook/FacebookProducer.java
--
diff --git 
a/components/camel-facebook/src/main/java/org/apache/camel/component/facebook/FacebookProducer.java
 
b/components/camel-facebook/src/main/java/org/apache/camel/component/facebook/FacebookProducer.java
index 14d37f2..800147f 100644
--- 
a/components/camel-facebook/src/main/java/org/apache/camel/component/facebook/FacebookProducer.java
+++ 
b/components/camel-facebook/src/main/java/org/apache/camel/component/facebook/FacebookProducer.java
@@ -23,6 +23,7 @@ import java.util.Set;
 import java.util.concurrent.ExecutorService;
 
 import facebook4j.Facebook;
+import facebook4j.Reading;
 import facebook4j.json.DataObjectFactory;
 import org.apache.camel.AsyncCallback;
 import org.apache.camel.CamelContext;
@@ -31,6 +32,7 @@ import org.apache.camel.RuntimeCamelException;
 import 
org.apache.camel.component.facebook.config.FacebookEndpointConfiguration;
 import org.apache.camel.component.facebook.data.FacebookMethodsType;
 import org.apache.camel.component.facebook.data.FacebookMethodsTypeHelper;
+import org.apache.camel.component.facebook.data.FacebookPropertiesHelper;
 import org.apache.camel.impl.DefaultAsyncProducer;
 import org.apache.camel.spi.ExecutorServiceManager;
 import org.apache.camel.spi.ThreadPoolProfile;
@@ -64,8 +66,10 @@ public class FacebookProducer extends DefaultAsyncProducer {
 public boolean process(final Exchange exchange, final AsyncCallback 
callback) {
 // properties for method arguments
 final Map properties = new HashMap();
-getEndpointProperties(endpoint.getConfiguration(), properties);
+
 getExchangeProperties(exchange, properties);
+
FacebookPropertiesHelper.configureReadingProperties(endpoint.getConfiguration(),
 properties);
+getEndpointProperties(endpoint.getConfiguration(), properties);
 
 // decide which method to invoke
 final FacebookMethodsType method = findMethod(exchange, properties);
@@ -123,6 +127,15 @@ public class FacebookProducer extends DefaultAsyncProducer 
{
 return false;
 }
 
+private boolean hasReadingParameters(Map properties) {
+for (String parameterName : properties.keySet()) {
+if (parameterName.startsWith(FacebookConstants.READING_PREFIX)) {
+return true;
+}
+}
+return false;
+}
+
 private FacebookMethodsType findMethod(Exchange exchange, Map properties) {
 
 FacebookMethodsType method = null;

http://git-wip-us.apache.org/repos/asf/camel/blob/e05b103f/components/camel-facebook/src/main/java/org/apache/camel/component/facebook/data/FacebookPropertiesHelper.java
--
diff --git 
a/components/camel-facebook/src/main/java/org/apache/camel/component/facebook/data/FacebookPropertiesHelper.java
 
b/components/camel-facebook/src/main/java/org/apache/camel/component/facebook/data/FacebookPropertiesHelper.java
index 39505a1..5911705 100644
--- 
a/components/camel-facebook/src/main/java/org/apache/camel/component/facebook/data/FacebookPropertiesHelper.java
+++ 
b/components/camel-facebook/src/main/java/org/apache/camel/component/facebook/data/FacebookPropertiesHelper.java
@@ -73,10 +73,15 @@ public final class FacebookPropertiesHelper {
 // add to an existing reading reference?
 // NOTE Reading class does not support overwriting 
properties!!!
 Reading reading = configuration.getReading();
-if (reading == null) {
-reading = new

[2/2] camel git commit: Fixed CS

2015-09-15 Thread acosentino 
Fixed CS


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

Branch: refs/heads/master
Commit: ea53dce2d072816bdf73607cb02184dad2d1fc6f
Parents: e05b103
Author: Andrea Cosentino 
Authored: Tue Sep 15 21:04:46 2015 +0200
Committer: Andrea Cosentino 
Committed: Tue Sep 15 21:04:46 2015 +0200

--
 .../facebook/FacebookComponentPageIdProducerTest.java | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/ea53dce2/components/camel-facebook/src/test/java/org/apache/camel/component/facebook/FacebookComponentPageIdProducerTest.java
--
diff --git 
a/components/camel-facebook/src/test/java/org/apache/camel/component/facebook/FacebookComponentPageIdProducerTest.java
 
b/components/camel-facebook/src/test/java/org/apache/camel/component/facebook/FacebookComponentPageIdProducerTest.java
index d099d90..4efa94b 100644
--- 
a/components/camel-facebook/src/test/java/org/apache/camel/component/facebook/FacebookComponentPageIdProducerTest.java
+++ 
b/components/camel-facebook/src/test/java/org/apache/camel/component/facebook/FacebookComponentPageIdProducerTest.java
@@ -5,9 +5,9 @@
  * 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
- * 
+ *
+ *  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.
@@ -27,11 +27,11 @@ import org.junit.Test;
 public class FacebookComponentPageIdProducerTest extends 
CamelFacebookTestSupport {
 public static final String APACHE_FOUNDATION_PAGE_ID = "6538157161";
 
+long lastTimestamp = -1;
+
 public FacebookComponentPageIdProducerTest() throws Exception {
 }
 
-long lastTimestamp = -1;
-
 @Test
 public void testProducers() throws Exception {
 MockEndpoint mock = getMockEndpoint("mock:page");

[3/3] camel git commit: Fixed CS

2015-09-15 Thread acosentino 
Fixed CS


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

Branch: refs/heads/master
Commit: cf5a4180e2749dcf9f8e2a8ff438d62d90dc
Parents: 36b7d01
Author: Andrea Cosentino 
Authored: Tue Sep 15 21:13:58 2015 +0200
Committer: Andrea Cosentino 
Committed: Tue Sep 15 21:13:58 2015 +0200

--
 .../facebook/FacebookComponentConsumerTest.java  | 11 +--
 .../facebook/FacebookComponentProducerTest.java  |  2 +-
 2 files changed, 10 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/cf5a/components/camel-facebook/src/test/java/org/apache/camel/component/facebook/FacebookComponentConsumerTest.java
--
diff --git 
a/components/camel-facebook/src/test/java/org/apache/camel/component/facebook/FacebookComponentConsumerTest.java
 
b/components/camel-facebook/src/test/java/org/apache/camel/component/facebook/FacebookComponentConsumerTest.java
index 1e78bc2..fc3dbdc 100644
--- 
a/components/camel-facebook/src/test/java/org/apache/camel/component/facebook/FacebookComponentConsumerTest.java
+++ 
b/components/camel-facebook/src/test/java/org/apache/camel/component/facebook/FacebookComponentConsumerTest.java
@@ -18,12 +18,19 @@ package org.apache.camel.component.facebook;
 
 import java.lang.reflect.Method;
 import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
 import facebook4j.FacebookException;
 import facebook4j.api.SearchMethods;
-import org.apache.camel.*;
+
+import org.apache.camel.Consumer;
+import org.apache.camel.Endpoint;
+import org.apache.camel.Route;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.impl.DefaultPollingConsumerPollStrategy;

http://git-wip-us.apache.org/repos/asf/camel/blob/cf5a/components/camel-facebook/src/test/java/org/apache/camel/component/facebook/FacebookComponentProducerTest.java
--
diff --git 
a/components/camel-facebook/src/test/java/org/apache/camel/component/facebook/FacebookComponentProducerTest.java
 
b/components/camel-facebook/src/test/java/org/apache/camel/component/facebook/FacebookComponentProducerTest.java
index 753f699..6d5c0e5 100644
--- 
a/components/camel-facebook/src/test/java/org/apache/camel/component/facebook/FacebookComponentProducerTest.java
+++ 
b/components/camel-facebook/src/test/java/org/apache/camel/component/facebook/FacebookComponentProducerTest.java
@@ -67,7 +67,7 @@ public class FacebookComponentProducerTest extends 
CamelFacebookTestSupport {
 readingExcludes.addAll(Arrays.asList("pictureURL", "permissions", 
"taggableFriends", "sSLPictureURL"));
 
 for (FacebookMethodsType types : FacebookMethodsType.values()) {
-if(types.getArgNames().contains("pageId")) {
+if (types.getArgNames().contains("pageId")) {
 idExcludes.add(getShortName(types.getName()));
 readingExcludes.add(getShortName(types.getName()));
 }

[2/3] camel git commit: [CAMEL-9140] Add missing configuration properties in camel-facebook

2015-09-15 Thread acosentino 
[CAMEL-9140] Add missing configuration properties in camel-facebook


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

Branch: refs/heads/master
Commit: 8f38e02ba8e465462a64e3ba52a69499b28759b8
Parents: ea53dce
Author: Manuel Holzleitner 
Authored: Tue Sep 15 14:05:17 2015 +0200
Committer: Andrea Cosentino 
Committed: Tue Sep 15 21:08:57 2015 +0200

--
 .../config/FacebookEndpointConfiguration.java   | 83 
 .../facebook/data/FacebookMethodsType.java  | 14 ++--
 .../facebook/data/FacebookMethodsTypeTest.java  |  2 +-
 3 files changed, 91 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/8f38e02b/components/camel-facebook/src/main/java/org/apache/camel/component/facebook/config/FacebookEndpointConfiguration.java
--
diff --git 
a/components/camel-facebook/src/main/java/org/apache/camel/component/facebook/config/FacebookEndpointConfiguration.java
 
b/components/camel-facebook/src/main/java/org/apache/camel/component/facebook/config/FacebookEndpointConfiguration.java
index a8375af..261ea8b 100644
--- 
a/components/camel-facebook/src/main/java/org/apache/camel/component/facebook/config/FacebookEndpointConfiguration.java
+++ 
b/components/camel-facebook/src/main/java/org/apache/camel/component/facebook/config/FacebookEndpointConfiguration.java
@@ -159,6 +159,22 @@ public class FacebookEndpointConfiguration extends 
FacebookConfiguration {
 private String userLocale;
 @UriParam
 private String videoId;
+@UriParam
+private Integer pictureId;
+@UriParam
+private Integer pictureId2;
+@UriParam
+private PictureSize pictureSize;
+@UriParam
+private String pageId;
+@UriParam
+private String tabId;
+@UriParam
+private Boolean isHidden;
+@UriParam
+private String offerId;
+@UriParam
+private String milestoneId;
 
 public URL getAchievementURL() {
 return achievementURL;
@@ -822,4 +838,71 @@ public class FacebookEndpointConfiguration extends 
FacebookConfiguration {
 this.videoId = videoId;
 }
 
+public Boolean getIncludeRead() {
+return includeRead;
+}
+
+public Integer getPictureId() {
+return pictureId;
+}
+
+public void setPictureId(Integer pictureId) {
+this.pictureId = pictureId;
+}
+
+public Integer getPictureId2() {
+return pictureId2;
+}
+
+public void setPictureId2(Integer pictureId2) {
+this.pictureId2 = pictureId2;
+}
+
+public PictureSize getPictureSize() {
+return pictureSize;
+}
+
+public void setPictureSize(PictureSize pictureSize) {
+this.pictureSize = pictureSize;
+}
+
+public String getPageId() {
+return pageId;
+}
+
+public void setPageId(String pageId) {
+this.pageId = pageId;
+}
+
+public String getTabId() {
+return tabId;
+}
+
+public void setTabId(String tabId) {
+this.tabId = tabId;
+}
+
+public Boolean isHidden() {
+return isHidden;
+}
+
+public void setIsHidden(Boolean isHidden) {
+this.isHidden = isHidden;
+}
+
+public String getOfferId() {
+return offerId;
+}
+
+public void setOfferId(String offerId) {
+this.offerId = offerId;
+}
+
+public String getMilestoneId() {
+return milestoneId;
+}
+
+public void setMilestoneId(String milestoneId) {
+this.milestoneId = milestoneId;
+}
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/8f38e02b/components/camel-facebook/src/main/java/org/apache/camel/component/facebook/data/FacebookMethodsType.java
--
diff --git 
a/components/camel-facebook/src/main/java/org/apache/camel/component/facebook/data/FacebookMethodsType.java
 
b/components/camel-facebook/src/main/java/org/apache/camel/component/facebook/data/FacebookMethodsType.java
index f46bed6..b5f3dd5 100644
--- 
a/components/camel-facebook/src/main/java/org/apache/camel/component/facebook/data/FacebookMethodsType.java
+++ 
b/components/camel-facebook/src/main/java/org/apache/camel/component/facebook/data/FacebookMethodsType.java
@@ -201,9 +201,9 @@ public enum FacebookMethodsType {
 GETGAMES_WITH_ID(ResponseList.class, "getGames", String.class, "userId"),
 GETGAMES_WITH_ID_OPTIONS(ResponseList.class, "getGames", String.class, 
"userId", Reading.class, FacebookConstants.READING_PPROPERTY),
 GETINTERESTS(ResponseList.class, "getInterests"),
-

[1/3] camel git commit: Fix facebook tests to support newly created tokens

2015-09-15 Thread acosentino 
Repository: camel
Updated Branches:
  refs/heads/master ea53dce2d -> cf5a4


Fix facebook tests to support newly created tokens

With new facebook application tokens some API methods are deprecated and
cause the tests to fail. These deprecation errors need to be ignored
in the tests


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

Branch: refs/heads/master
Commit: 36b7d018d1023e8f34ba76d7d8189edb22e9ecb0
Parents: 8f38e02
Author: Manuel Holzleitner 
Authored: Tue Sep 15 14:06:11 2015 +0200
Committer: Andrea Cosentino 
Committed: Tue Sep 15 21:08:57 2015 +0200

--
 .../facebook/FacebookComponentConsumerTest.java | 50 +---
 .../facebook/FacebookComponentProducerTest.java | 80 +---
 2 files changed, 110 insertions(+), 20 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/36b7d018/components/camel-facebook/src/test/java/org/apache/camel/component/facebook/FacebookComponentConsumerTest.java
--
diff --git 
a/components/camel-facebook/src/test/java/org/apache/camel/component/facebook/FacebookComponentConsumerTest.java
 
b/components/camel-facebook/src/test/java/org/apache/camel/component/facebook/FacebookComponentConsumerTest.java
index 2bb84db..1e78bc2 100644
--- 
a/components/camel-facebook/src/test/java/org/apache/camel/component/facebook/FacebookComponentConsumerTest.java
+++ 
b/components/camel-facebook/src/test/java/org/apache/camel/component/facebook/FacebookComponentConsumerTest.java
@@ -18,19 +18,20 @@ package org.apache.camel.component.facebook;
 
 import java.lang.reflect.Method;
 import java.text.SimpleDateFormat;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 import java.util.concurrent.TimeUnit;
 
+import facebook4j.FacebookException;
 import facebook4j.api.SearchMethods;
+import org.apache.camel.*;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.impl.DefaultPollingConsumerPollStrategy;
+import org.apache.camel.impl.ScheduledPollConsumer;
 import org.junit.Test;
 
 public class FacebookComponentConsumerTest extends CamelFacebookTestSupport {
+public static final String APACHE_FOUNDATION_PAGE_ID = "6538157161";
 
 private final Set searchNames = new HashSet();
 private List excludedNames;
@@ -44,7 +45,7 @@ public class FacebookComponentConsumerTest extends 
CamelFacebookTestSupport {
 }
 }
 
-excludedNames = Arrays.asList("places", "users", "search");
+excludedNames = Arrays.asList("places", "users", "search", "pages", 
"searchPosts");
 }
 
 @Test
@@ -75,17 +76,44 @@ public class FacebookComponentConsumerTest extends 
CamelFacebookTestSupport {
 }
 
 @Test
-public void testGetPosts() throws Exception {
-final MockEndpoint mock = getMockEndpoint("mock:testGetPosts");
+public void testPage() throws Exception {
+final MockEndpoint mock = getMockEndpoint("mock:testPage");
 mock.expectedMinimumMessageCount(1);
 mock.assertIsSatisfied();
 }
 
 @Override
+protected void doPostSetup() throws Exception {
+ignoreDeprecatedApiError();
+}
+
+private void ignoreDeprecatedApiError() {
+for (final Route route : context().getRoutes()) {
+((ScheduledPollConsumer)route.getConsumer()).setPollStrategy(new 
DefaultPollingConsumerPollStrategy() {
+@Override
+public boolean rollback(Consumer consumer, Endpoint endpoint, 
int retryCounter, Exception e) throws Exception {
+if (e.getCause() instanceof FacebookException) {
+FacebookException facebookException = 
(FacebookException) e.getCause();
+if (facebookException.getErrorCode() == 11 || 
facebookException.getErrorCode() == 12 || facebookException.getErrorCode() == 
1) {
+context().stopRoute(route.getId());
+String method = ((FacebookEndpoint) 
route.getEndpoint()).getMethod();
+MockEndpoint mock = 
getMockEndpoint("mock:consumeQueryResult" + method);
+mock.expectedMinimumMessageCount(0);
+MockEndpoint mock2 = 
getMockEndpoint("mock:consumeResult" + method);
+mock2.expectedMinimumMessageCount(0);
+log.warn("Ignoring failed Facebook deprecated API 
call",

svn commit: r965491 - in /websites/production/camel/content: apns.html cache/main.pageCache

2015-09-15 Thread buildbot 
Author: buildbot
Date: Tue Sep 15 09:19:49 2015
New Revision: 965491

Log:
Production update by buildbot for camel

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

Modified: websites/production/camel/content/apns.html
==
--- websites/production/camel/content/apns.html (original)
+++ websites/production/camel/content/apns.html Tue Sep 15 09:19:49 2015
@@ -86,120 +86,131 @@
 
 
 Apns 
ComponentAvailable as of Camel 2.8The 
apns component is used for sending notifications to iOS 
devices. The apns components use https://github.com/notnoop/java-apns; rel="nofollow">javapns 
library. The component supports sending notifications to Apple 
Push Notification Servers (APNS) and consuming feedback from the 
servers.The consumer is configured with 3600 seconds for polling by 
default because it is a best practice to consume feedback stream from Apple 
Push Notification Servers only from time to time. For example: every 1 hour to 
avoid flooding the servers.The feedback stream gives informations about 
inactive devices. You only need to get this informations every some hours if 
your mobile application is not a heavily used one.Maven users will need 
to add the following dependency
  to their pom.xml for this component:
-dependency
+
+]]>
 URI formatTo send 
notifications:
-apns:notify[?options]
-
+
 To consume feedback:
-apns:consumer[?options]
-
-OptionsProducerPropertyDefaultDescriptiontokensEmpty by default. Configure this property in case you 
want to statically declare tokens related to devices you want to notify. Tokens 
are separated by comma.ConsumerPropertyDefault
 Descriptiondelay3600Delay in seconds between each 
poll.initialDelay10Seconds before polling 
starts.timeUnitSECONDSTime Unit for 
polling.userFixedDelay
 trueIf true, use fixed delay between pools, 
otherwise fixed rate is used. See http://java.sun.com/j2se/1.5.0/docs/api/java/util/concurrent/ScheduledExecutorService.html;
 rel="nofollow">ScheduledExecutorService in JDK for 
details.You can append query options to 
the URI in the following format, 
?option=valueoption=value...ComponentThe ApnsComponent must be 
configured with a com.notnoop.apns.ApnsService. The service can be 
created and configured using the 
org.apache.camel.component.apns.factory.ApnsServiceFactory. See 
further below for an example. And as well in the https://svn.apache.org/repos/asf/camel/trunk/components/camel-apns/;>test 
source code.Exchange data formatWhen Camel will fetch feedback 
data corresponding to inactive devices, it will retrieve a List of 
InactiveDevice objects. Each InactiveDevice object of the retrieved list will 
be setted as the In body, and then processed by the consumer endpoint.Message HeadersCamel Apns uses these 
headers.PropertyDefaultDescriptionCamelApnsTokensEmpty by default.CamelApnsMessageTypeSTRING, 
PAYLOAD, APNS_NOTIFICATIONIn case you choose PAYLOAD for the message type, then 
the message will be considered as a APNS payload and sent as is. In case you 
choose STRING, message will be converted as a APNS payload. From Camel 
2.16 onwards APNS_NOTIFICATION is used for sending message body as 
com.notnoop.apns.ApnsNotification types.SamplesCamel Xml 
route
-beans 
xmlns="http://www.springframework.org/schema/beans;
-   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
-   xmlns:camel="http://camel.apache.org/schema/spring;
-   xsi:schemaLocation="
+
+OptionsProducerPropertyDefaultDescriptiontokensEmpty by default. Configure this property in case you 
want to statically declare tokens related to devices you want to notify. Tokens 
are separated by comma.ConsumerPropertyDefault
 Descriptiondelay3600Delay in seconds between each 
poll.initialDelay10Seconds before polling 
starts.timeUnitSECONDSTime Unit for 
polling.userFixedDelay
 trueIf true, use fixed delay between pools, 
otherwise fixed rate is used. See http://java.sun.com/j2se/1.5.0/docs/api/java/util/concurrent/ScheduledExecutorService.html;
 rel="nofollow">ScheduledExecutorService in JDK for 
details.You can append query options to 
the URI in the following format, 
?option=valueoption=value...ComponentThe ApnsComponent must be 
configured with a com.notnoop.apns.ApnsService. The service can be 
created and configured using the 
org.apache.camel.component.apns.factory.ApnsServiceFactory. See 
further below for an example. And as well in the https://svn.apache.org/repos/asf/camel/trunk/components/camel-apns/;>test 
source code.Exchange data formatWhen Camel will fetch feedback

camel git commit: Upgrade Mongo Java Driver to version 3.0.4

2015-09-15 Thread acosentino 
Repository: camel
Updated Branches:
  refs/heads/master a900a68d5 -> 1e8bb13a2


Upgrade Mongo Java Driver to version 3.0.4


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

Branch: refs/heads/master
Commit: 1e8bb13a2c012a5134ef0e5a0bfcd909b9f7c936
Parents: a900a68
Author: Andrea Cosentino 
Authored: Tue Sep 15 17:12:42 2015 +0200
Committer: Andrea Cosentino 
Committed: Tue Sep 15 17:12:42 2015 +0200

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


http://git-wip-us.apache.org/repos/asf/camel/blob/1e8bb13a/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 985085d..5e6f705 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -365,7 +365,7 @@
 0.9.4
 1.9
 1.9.5
-3.0.3
+3.0.4
 1.11
 2013.6.1
 0.8.16

camel git commit: [CAMEL-9080] Upgraded Elasticsearch to 1.7.1. Also upgraded Lucene and Solr to 4.10.4

2015-09-15 Thread acosentino 
Repository: camel
Updated Branches:
  refs/heads/master cf5a4 -> d11f34297


[CAMEL-9080] Upgraded Elasticsearch to 1.7.1. Also upgraded Lucene and Solr to 
4.10.4


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

Branch: refs/heads/master
Commit: d11f34297125f2535df94946775ee9bf51868dbf
Parents: cf5a333
Author: James Netherton 
Authored: Fri Aug 14 14:30:43 2015 +0100
Committer: Andrea Cosentino 
Committed: Tue Sep 15 21:20:54 2015 +0200

--
 .../component/lucene/LuceneConfiguration.java   |  2 +-
 .../camel/component/lucene/LuceneConstants.java | 23 
 .../camel/component/lucene/LuceneIndexer.java   |  3 +--
 .../camel/component/lucene/LuceneSearcher.java  |  2 +-
 .../solr/conf/collection1/solrconfig.xml|  2 +-
 parent/pom.xml  | 12 +-
 6 files changed, 33 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/d11f3429/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneConfiguration.java
--
diff --git 
a/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneConfiguration.java
 
b/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneConfiguration.java
index b2a5bea..dd96a3a 100644
--- 
a/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneConfiguration.java
+++ 
b/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneConfiguration.java
@@ -33,7 +33,7 @@ import org.apache.lucene.util.Version;
 public class LuceneConfiguration {
 private URI uri;
 private String authority;
-private Version luceneVersion = Version.LUCENE_4_10_3;
+private Version luceneVersion = LuceneConstants.LUCENE_VERSION;
 
 @UriPath @Metadata(required = "true")
 private String host;

http://git-wip-us.apache.org/repos/asf/camel/blob/d11f3429/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneConstants.java
--
diff --git 
a/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneConstants.java
 
b/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneConstants.java
new file mode 100644
index 000..c4cb57e
--- /dev/null
+++ 
b/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneConstants.java
@@ -0,0 +1,23 @@
+/**
+ * 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.lucene;
+
+import org.apache.lucene.util.Version;
+
+public interface LuceneConstants {
+Version LUCENE_VERSION = Version.LUCENE_4_10_4;
+}

http://git-wip-us.apache.org/repos/asf/camel/blob/d11f3429/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneIndexer.java
--
diff --git 
a/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneIndexer.java
 
b/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneIndexer.java
index 49a6ee8..98ed88d 100644
--- 
a/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneIndexer.java
+++ 
b/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneIndexer.java
@@ -31,7 +31,6 @@ import org.apache.lucene.index.IndexWriter;
 import org.apache.lucene.index.IndexWriterConfig;
 import org.apache.lucene.index.IndexWriterConfig.OpenMode;
 import org.apache.lucene.store.NIOFSDirectory;
-import org.apache.lucene.util.Version;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -144,7 +143,7 @@ public class LuceneIndexer {
 private void openIndexWriter() throws IOException {
 IndexWriterConfig

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

2015-09-15 Thread buildbot 
Author: buildbot
Date: Tue Sep 15 20:18:35 2015
New Revision: 965577

Log:
Production update by buildbot for camel

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

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

Modified: websites/production/camel/content/camel-2160-release.html
==
--- websites/production/camel/content/camel-2160-release.html (original)
+++ websites/production/camel/content/camel-2160-release.html Tue Sep 15 
20:18:35 2015
@@ -84,7 +84,7 @@

 
 
-Camel 
2.16.0release (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.16.0 release which approx XXX issues resolved (new features, improvements 
and bug fixes such as...)Noteworthy improvements:The route 
models (definition classes) preserve property placeholders, which allows round 
trip editing, and also prevents showing potential sensitive 
informationAdded onPrepareFailure option toDead Letter Channel to allow a 
custom processor to prepare the Exchange before sending to the dead letter 
queue.MongoDB tailable 
consumers now allow setting the readPreference 
option.Using setFaultBody / setFaultHeader behaves similar to setBody 
/ setHeader to preserve existing headers/attachments by setting on existing IN 
or OUT message.Java DSL using choice with end vs endChoice now 
validates you use them as intended. Any misconfiguration now throws an 
exception explaining the problem.POJO Producing andPOJO Consuming lifecycle is now in sync with CamelContextwhich ensures it 
works as similar to CamelRoutes 
does. Also the created producer/consumer is stopped 
 whenCamelContextis 
stopping to cleanup properly.JMScomponent now allows configuring 
concurrentConsumers/maxConcurrentConsumers separately between from(jms) vs 
to(jms) using request/reply over JMShttps://issues.apache.org/jira/browse/CAMEL-8506;>Added SEARCH 
operation to Elasticsearch componentTheProperties component (property 
placeholder) now supports an encoding option to allow reading the .properties 
files using a specific charset such as UTF-8. By default ISO-8859-1 is used 
(latin1)AddedreceviveBufferSize option 
to the FTPcomponent to make download 
faster. The size is by default 32kb buffer.The
 Aggregator2 EIP now allows an external source using 
aAggregateController to control the aggregator, such as for 
forcing completing a group or all groups, or query runtime information from the 
aggregator. A default controller is provided out of the box if none has been 
configured.TheAggregator2 now enlists in JMX using 
aManagedAggregateProcessorMBean which has more information, 
and also allows using the aggregate controller to control 
it.TheAggregator2 now includes more runtime statistics 
which can be accessed from Java and JMX about number of incoming and completed 
exchanges, and per different completion 
triggers.TheAggregator2 now supports pre-completion mode if the 
aggregation strategy implementsPreCompletionAwareAg
 gregationStrategy. This supports the use-case where an incoming 
Exchange are used to determine if the current aggregated group is completed or 
not. If completed the group is emitted as-is, and the new incoming Exchange is 
used to start a new group from scratch.Added options 
toMail consumer so it can skip or 
handle a mail message that cannot be read from the mail server in the batch; 
and then move on to read the next message. This ensures the consumer can deal 
with mail boxes that has problematic mails that otherwise will cause no mails 
to be retrieve by the consumer in the batch.The runtime route 
processors and their corresponding model definition are now linked by their id 
using HasId, so its easier to obtain the processor or model 
definition from the getProcessor(id)and 
getProcessorDefintion(id)api on 
CamelContext.CamelContext now also
  includes a getManagedProcessor API to easily get the mbean client api for the 
processor, so you can access the runtime JMX statistics from Java 
code.Spring 
Boot applications now https://issues.apache.org/jira/browse/CAMEL-8532;>block the main thread 
of the executionSpring Boot automagically https://issues.apache.org/jira/browse/CAMEL-8523;>loads XML routes 
definitions from 
classpathAddedMainListener to make it 
easier for Camel Boot / Standalone Camel to implement custom logic to trigger 
during the starting and stopping of the 
application.Camel Jackson now provides https://issues.apache.org/jira/browse/CAMEL-8554;>Map to 
Object converterAbility to refer to existing 
hazelcast instance by id, usingHazelcast ComponentDirect andDirect-VM now supports