buildbot success in on camel-site-production

[buildbot]

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

Buildbot URL: https://ci.apache.org/

Buildslave for this Build: bb-cms-slave

Build Reason: The Nightly scheduler named 'camel-site-production' triggered 
this build
Build Source Stamp: [branch camel/website] HEAD
Blamelist: 

Build succeeded!

Sincerely,
 -The Buildbot

buildbot failure in on camel-site-production

[buildbot]

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

Buildbot URL: https://ci.apache.org/

Buildslave for this Build: bb-cms-slave

Build Reason: The Nightly scheduler named 'camel-site-production' triggered 
this build
Build Source Stamp: [branch camel/website] HEAD
Blamelist: 

BUILD FAILED: failed compile

Sincerely,
 -The Buildbot

[3/5] camel git commit: CAMEL-10381 - fix NPE from calendar component configuration

[janstey]

CAMEL-10381 - fix NPE from calendar component configuration


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

Branch: refs/heads/camel-2.17.x
Commit: 37c1da9552b9b526358b93ad25980b60f4506641
Parents: 65cb2c3
Author: Jonathan Anstey 
Authored: Tue Oct 11 23:32:37 2016 -0230
Committer: Jonathan Anstey 
Committed: Tue Oct 11 23:47:30 2016 -0230

--
 .../calendar/GoogleCalendarComponent.java   | 15 +++--
 .../google/calendar/GoogleCalendarEndpoint.java |  2 +-
 .../calendar/CalendarConfigurationTest.java | 66 
 3 files changed, 76 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/37c1da95/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/GoogleCalendarComponent.java
--
diff --git 
a/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/GoogleCalendarComponent.java
 
b/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/GoogleCalendarComponent.java
index d140ee4..84e3092 100644
--- 
a/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/GoogleCalendarComponent.java
+++ 
b/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/GoogleCalendarComponent.java
@@ -44,13 +44,13 @@ public class GoogleCalendarComponent extends 
AbstractApiComponenthttp://git-wip-us.apache.org/repos/asf/camel/blob/37c1da95/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/GoogleCalendarEndpoint.java
--
diff --git 
a/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/GoogleCalendarEndpoint.java
 
b/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/GoogleCalendarEndpoint.java
index e955f6c..7ad7f9d 100644
--- 
a/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/GoogleCalendarEndpoint.java
+++ 
b/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/GoogleCalendarEndpoint.java
@@ -111,7 +111,7 @@ public class GoogleCalendarEndpoint extends 
AbstractApiEndpointhttp://git-wip-us.apache.org/repos/asf/camel/blob/37c1da95/components/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/CalendarConfigurationTest.java
--
diff --git 
a/components/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/CalendarConfigurationTest.java
 
b/components/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/CalendarConfigurationTest.java
new file mode 100644
index 000..a70934e
--- /dev/null
+++ 
b/components/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/CalendarConfigurationTest.java
@@ -0,0 +1,66 @@
+/**
+ * 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.google.calendar;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.builder.RouteBuilder;
+import 
org.apache.camel.component.google.calendar.internal.CalendarCalendarsApiMethod;
+import 
org.apache.camel.component.google.calendar.internal.GoogleCalendarApiCollection;
+import org.apache.camel.impl.DefaultCamelContext;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class CalendarConfigurationTest extends 
AbstractGoogleCalendarTestSupport {
+
+private static final Logger LOG = 
LoggerFactory.getLogger(CalendarConfigurationTest.class);
+private static final String PATH_PREFIX = 

[2/5] camel git commit: add missed test case

[janstey]

add missed test case


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

Branch: refs/heads/camel-2.17.x
Commit: 65cb2c3d5ab6cfdaed2038ce94035a1e7486b793
Parents: 4f39c68
Author: Jonathan Anstey 
Authored: Tue Oct 11 19:47:58 2016 -0230
Committer: Jonathan Anstey 
Committed: Tue Oct 11 23:47:24 2016 -0230

--
 .../google/drive/DriveConfigurationTest.java| 66 
 1 file changed, 66 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/65cb2c3d/components/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/DriveConfigurationTest.java
--
diff --git 
a/components/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/DriveConfigurationTest.java
 
b/components/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/DriveConfigurationTest.java
new file mode 100644
index 000..3d113d3
--- /dev/null
+++ 
b/components/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/DriveConfigurationTest.java
@@ -0,0 +1,66 @@
+/**
+ * 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.google.drive;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.google.drive.internal.DriveFilesApiMethod;
+import 
org.apache.camel.component.google.drive.internal.GoogleDriveApiCollection;
+import org.apache.camel.impl.DefaultCamelContext;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class DriveConfigurationTest extends AbstractGoogleDriveTestSupport {
+
+private static final Logger LOG = 
LoggerFactory.getLogger(DriveConfigurationTest.class);
+private static final String PATH_PREFIX = 
GoogleDriveApiCollection.getCollection().getApiName(DriveFilesApiMethod.class).getName();
+private static final String TEST_URI = "google-drive://" + PATH_PREFIX + 
"/copy?clientId=a=b=c=d=e";
+
+@Override
+protected CamelContext createCamelContext() throws Exception {
+final CamelContext context = new DefaultCamelContext(createRegistry());
+
+// add GoogleDriveComponent to Camel context but don't set up 
configuration
+final GoogleDriveComponent component = new 
GoogleDriveComponent(context);
+context.addComponent("google-drive", component);
+
+return context;
+}
+
+@Test
+public void testConfiguration() throws Exception {
+GoogleDriveEndpoint endpoint = getMandatoryEndpoint(TEST_URI, 
GoogleDriveEndpoint.class);
+GoogleDriveConfiguration configuration = endpoint.getConfiguration();
+assertNotNull(configuration);
+assertEquals("a", configuration.getClientId());
+assertEquals("b", configuration.getClientSecret());
+assertEquals("c", configuration.getApplicationName());
+assertEquals("d", configuration.getAccessToken());
+assertEquals("e", configuration.getRefreshToken());
+}
+
+@Override
+protected RouteBuilder createRouteBuilder() throws Exception {
+return new RouteBuilder() {
+@Override
+public void configure() {
+from("direct://COPY").to(TEST_URI);
+}
+};
+}
+}

[1/5] camel git commit: CAMEL-10381 - fix NPE from component configuration

[janstey]

Repository: camel
Updated Branches:
  refs/heads/camel-2.17.x 592e7cf7d -> 95a3166d8


CAMEL-10381 - fix NPE from component configuration


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

Branch: refs/heads/camel-2.17.x
Commit: 4f39c68f2840423141ae0b23cba55c2a92df8755
Parents: 592e7cf
Author: Jonathan Anstey 
Authored: Tue Oct 11 19:47:27 2016 -0230
Committer: Jonathan Anstey 
Committed: Tue Oct 11 23:47:15 2016 -0230

--
 .../component/google/drive/GoogleDriveComponent.java  | 10 +++---
 .../camel/component/google/drive/GoogleDriveEndpoint.java |  2 +-
 .../component/google/drive/GoogleDriveFilesConverter.java |  3 ++-
 3 files changed, 10 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/4f39c68f/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveComponent.java
--
diff --git 
a/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveComponent.java
 
b/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveComponent.java
index 2554d0e..84dc9e2 100644
--- 
a/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveComponent.java
+++ 
b/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveComponent.java
@@ -44,10 +44,11 @@ public class GoogleDriveComponent extends 
AbstractApiComponenthttp://git-wip-us.apache.org/repos/asf/camel/blob/4f39c68f/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveEndpoint.java
--
diff --git 
a/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveEndpoint.java
 
b/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveEndpoint.java
index ede52d5..b80a2df 100644
--- 
a/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveEndpoint.java
+++ 
b/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveEndpoint.java
@@ -124,7 +124,7 @@ public class GoogleDriveEndpoint extends 
AbstractApiEndpoint

[4/5] camel git commit: fix test error

[janstey]

fix test error


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

Branch: refs/heads/camel-2.17.x
Commit: a4d32c07c2b4dccd85fb861b1c667dd5c91ddc91
Parents: 37c1da9
Author: Jonathan Anstey 
Authored: Tue Oct 11 23:36:18 2016 -0230
Committer: Jonathan Anstey 
Committed: Tue Oct 11 23:47:36 2016 -0230

--
 .../calendar/CalendarConfigurationTest.java   | 18 +-
 1 file changed, 17 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/a4d32c07/components/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/CalendarConfigurationTest.java
--
diff --git 
a/components/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/CalendarConfigurationTest.java
 
b/components/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/CalendarConfigurationTest.java
index a70934e..c22915f 100644
--- 
a/components/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/CalendarConfigurationTest.java
+++ 
b/components/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/CalendarConfigurationTest.java
@@ -16,28 +16,44 @@
  */
 package org.apache.camel.component.google.calendar;
 
+import java.util.Random;
+
 import org.apache.camel.CamelContext;
 import org.apache.camel.builder.RouteBuilder;
 import 
org.apache.camel.component.google.calendar.internal.CalendarCalendarsApiMethod;
 import 
org.apache.camel.component.google.calendar.internal.GoogleCalendarApiCollection;
 import org.apache.camel.impl.DefaultCamelContext;
+import org.junit.After;
+import org.junit.Before;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.google.api.services.calendar.model.Calendar;
+
 public class CalendarConfigurationTest extends 
AbstractGoogleCalendarTestSupport {
 
 private static final Logger LOG = 
LoggerFactory.getLogger(CalendarConfigurationTest.class);
 private static final String PATH_PREFIX = 
GoogleCalendarApiCollection.getCollection().getApiName(CalendarCalendarsApiMethod.class).getName();
 private static final String TEST_URI = "google-calendar://" + PATH_PREFIX 
+ 
"/get?clientId=a=b=c=d=e";
 
+@Before
+@Override
+public void createTestCalendar() {
+}
+
+@After
+@Override
+public void deleteTestCalendar() {
+}
+
 @Override
 protected CamelContext createCamelContext() throws Exception {
 final CamelContext context = new DefaultCamelContext(createRegistry());
 
 // add GoogleCalendarComponent to Camel context but don't set up 
configuration
 final GoogleCalendarComponent component = new 
GoogleCalendarComponent(context);
-context.addComponent("google-drive", component);
+context.addComponent("google-calendar", component);
 
 return context;
 }

[10/12] camel git commit: CAMEL-10381 - fix NPE from calendar component configuration

[janstey]

CAMEL-10381 - fix NPE from calendar component configuration


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

Branch: refs/heads/camel-2.18.x
Commit: 6d663971259650b626303ca30e77004abcdd3b0a
Parents: fbcaded
Author: Jonathan Anstey 
Authored: Tue Oct 11 23:32:37 2016 -0230
Committer: Jonathan Anstey 
Committed: Tue Oct 11 23:44:21 2016 -0230

--
 .../calendar/GoogleCalendarComponent.java   | 15 +++--
 .../google/calendar/GoogleCalendarEndpoint.java |  2 +-
 .../calendar/CalendarConfigurationTest.java | 66 
 3 files changed, 76 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/6d663971/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/GoogleCalendarComponent.java
--
diff --git 
a/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/GoogleCalendarComponent.java
 
b/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/GoogleCalendarComponent.java
index d140ee4..84e3092 100644
--- 
a/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/GoogleCalendarComponent.java
+++ 
b/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/GoogleCalendarComponent.java
@@ -44,13 +44,13 @@ public class GoogleCalendarComponent extends 
AbstractApiComponenthttp://git-wip-us.apache.org/repos/asf/camel/blob/6d663971/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/GoogleCalendarEndpoint.java
--
diff --git 
a/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/GoogleCalendarEndpoint.java
 
b/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/GoogleCalendarEndpoint.java
index e955f6c..7ad7f9d 100644
--- 
a/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/GoogleCalendarEndpoint.java
+++ 
b/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/GoogleCalendarEndpoint.java
@@ -111,7 +111,7 @@ public class GoogleCalendarEndpoint extends 
AbstractApiEndpointhttp://git-wip-us.apache.org/repos/asf/camel/blob/6d663971/components/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/CalendarConfigurationTest.java
--
diff --git 
a/components/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/CalendarConfigurationTest.java
 
b/components/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/CalendarConfigurationTest.java
new file mode 100644
index 000..a70934e
--- /dev/null
+++ 
b/components/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/CalendarConfigurationTest.java
@@ -0,0 +1,66 @@
+/**
+ * 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.google.calendar;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.builder.RouteBuilder;
+import 
org.apache.camel.component.google.calendar.internal.CalendarCalendarsApiMethod;
+import 
org.apache.camel.component.google.calendar.internal.GoogleCalendarApiCollection;
+import org.apache.camel.impl.DefaultCamelContext;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class CalendarConfigurationTest extends 
AbstractGoogleCalendarTestSupport {
+
+private static final Logger LOG = 
LoggerFactory.getLogger(CalendarConfigurationTest.class);
+private static final String PATH_PREFIX = 

[01/12] camel git commit: remove non spring boot compatible starters

[janstey]

Repository: camel
Updated Branches:
  refs/heads/camel-2.18.x 37a12df6a -> b15c2f5d6
  refs/heads/master 5d79ddc35 -> 471e25a31


remove non spring boot compatible starters


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

Branch: refs/heads/master
Commit: 404ecc5625b34dd011f5257206cda4d60341bfac
Parents: 5d79ddc
Author: Jonathan Anstey 
Authored: Tue Oct 11 19:25:12 2016 -0230
Committer: Jonathan Anstey 
Committed: Tue Oct 11 19:25:12 2016 -0230

--
 components-starter/pom.xml | 9 -
 1 file changed, 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/404ecc56/components-starter/pom.xml
--
diff --git a/components-starter/pom.xml b/components-starter/pom.xml
index 4aca1b4..72bf37a 100644
--- a/components-starter/pom.xml
+++ b/components-starter/pom.xml
@@ -77,14 +77,12 @@
 camel-beanio-starter
 camel-beanstalk-starter
 camel-bindy-starter
-camel-blueprint-starter
 camel-boon-starter
 camel-box-starter
 camel-braintree-starter
 camel-cache-starter
 camel-cassandraql-starter
 camel-castor-starter
-camel-cdi-starter
 camel-chronicle-starter
 camel-chunk-starter
 camel-cm-sms-starter
@@ -107,7 +105,6 @@
 camel-dropbox-starter
 camel-eclipse-starter
 camel-ehcache-starter
-camel-ejb-starter
 camel-elasticsearch-starter
 camel-elsql-starter
 camel-etcd-starter
@@ -143,7 +140,6 @@
 camel-http-starter
 camel-http4-starter
 camel-hystrix-starter
-camel-ibatis-starter
 camel-ical-starter
 camel-ignite-starter
 camel-infinispan-starter
@@ -157,7 +153,6 @@
 camel-jaxb-starter
 camel-jbpm-starter
 camel-jcache-starter
-camel-jclouds-starter
 camel-jcr-starter
 camel-jdbc-starter
 camel-jetty-common-starter
@@ -215,7 +210,6 @@
 camel-pgevent-starter
 camel-printer-starter
 camel-protobuf-starter
-camel-quartz-starter
 camel-quartz2-starter
 camel-quickfix-starter
 camel-rabbitmq-starter
@@ -245,7 +239,6 @@
 camel-snmp-starter
 camel-soap-starter
 camel-solr-starter
-camel-spark-rest-starter
 camel-spark-starter
 camel-splunk-starter
 camel-spring-batch-starter
@@ -269,8 +262,6 @@
 camel-tagsoup-starter
 camel-tarfile-starter
 camel-telegram-starter
-camel-test-starter
-camel-testng-starter
 camel-twitter-starter
 camel-undertow-starter
 camel-univocity-parsers-starter

[12/12] camel git commit: fix CS

[janstey]

fix CS


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

Branch: refs/heads/camel-2.18.x
Commit: b15c2f5d62eb0285c5d48b9e9199e48abce365aa
Parents: 8de429e
Author: Jonathan Anstey 
Authored: Tue Oct 11 23:37:48 2016 -0230
Committer: Jonathan Anstey 
Committed: Tue Oct 11 23:44:21 2016 -0230

--
 .../component/google/calendar/CalendarConfigurationTest.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/b15c2f5d/components/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/CalendarConfigurationTest.java
--
diff --git 
a/components/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/CalendarConfigurationTest.java
 
b/components/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/CalendarConfigurationTest.java
index c22915f..6777434 100644
--- 
a/components/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/CalendarConfigurationTest.java
+++ 
b/components/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/CalendarConfigurationTest.java
@@ -18,6 +18,8 @@ package org.apache.camel.component.google.calendar;
 
 import java.util.Random;
 
+import com.google.api.services.calendar.model.Calendar;
+
 import org.apache.camel.CamelContext;
 import org.apache.camel.builder.RouteBuilder;
 import 
org.apache.camel.component.google.calendar.internal.CalendarCalendarsApiMethod;
@@ -29,8 +31,6 @@ import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.api.services.calendar.model.Calendar;
-
 public class CalendarConfigurationTest extends 
AbstractGoogleCalendarTestSupport {
 
 private static final Logger LOG = 
LoggerFactory.getLogger(CalendarConfigurationTest.class);

[05/12] camel git commit: fix test error

[janstey]

fix test error


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

Branch: refs/heads/master
Commit: 329aca67f5d2fc0d4eaa8226a346c7c4c10ed871
Parents: d843200
Author: Jonathan Anstey 
Authored: Tue Oct 11 23:36:18 2016 -0230
Committer: Jonathan Anstey 
Committed: Tue Oct 11 23:36:18 2016 -0230

--
 .../calendar/CalendarConfigurationTest.java   | 18 +-
 1 file changed, 17 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/329aca67/components/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/CalendarConfigurationTest.java
--
diff --git 
a/components/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/CalendarConfigurationTest.java
 
b/components/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/CalendarConfigurationTest.java
index a70934e..c22915f 100644
--- 
a/components/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/CalendarConfigurationTest.java
+++ 
b/components/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/CalendarConfigurationTest.java
@@ -16,28 +16,44 @@
  */
 package org.apache.camel.component.google.calendar;
 
+import java.util.Random;
+
 import org.apache.camel.CamelContext;
 import org.apache.camel.builder.RouteBuilder;
 import 
org.apache.camel.component.google.calendar.internal.CalendarCalendarsApiMethod;
 import 
org.apache.camel.component.google.calendar.internal.GoogleCalendarApiCollection;
 import org.apache.camel.impl.DefaultCamelContext;
+import org.junit.After;
+import org.junit.Before;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.google.api.services.calendar.model.Calendar;
+
 public class CalendarConfigurationTest extends 
AbstractGoogleCalendarTestSupport {
 
 private static final Logger LOG = 
LoggerFactory.getLogger(CalendarConfigurationTest.class);
 private static final String PATH_PREFIX = 
GoogleCalendarApiCollection.getCollection().getApiName(CalendarCalendarsApiMethod.class).getName();
 private static final String TEST_URI = "google-calendar://" + PATH_PREFIX 
+ 
"/get?clientId=a=b=c=d=e";
 
+@Before
+@Override
+public void createTestCalendar() {
+}
+
+@After
+@Override
+public void deleteTestCalendar() {
+}
+
 @Override
 protected CamelContext createCamelContext() throws Exception {
 final CamelContext context = new DefaultCamelContext(createRegistry());
 
 // add GoogleCalendarComponent to Camel context but don't set up 
configuration
 final GoogleCalendarComponent component = new 
GoogleCalendarComponent(context);
-context.addComponent("google-drive", component);
+context.addComponent("google-calendar", component);
 
 return context;
 }

[03/12] camel git commit: add missed test case

[janstey]

add missed test case


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

Branch: refs/heads/master
Commit: d0af43db34f10c4a3c1bd6efacd668b398e9ca4d
Parents: fab550a
Author: Jonathan Anstey 
Authored: Tue Oct 11 19:47:58 2016 -0230
Committer: Jonathan Anstey 
Committed: Tue Oct 11 19:47:58 2016 -0230

--
 .../google/drive/DriveConfigurationTest.java| 66 
 1 file changed, 66 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/d0af43db/components/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/DriveConfigurationTest.java
--
diff --git 
a/components/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/DriveConfigurationTest.java
 
b/components/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/DriveConfigurationTest.java
new file mode 100644
index 000..3d113d3
--- /dev/null
+++ 
b/components/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/DriveConfigurationTest.java
@@ -0,0 +1,66 @@
+/**
+ * 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.google.drive;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.google.drive.internal.DriveFilesApiMethod;
+import 
org.apache.camel.component.google.drive.internal.GoogleDriveApiCollection;
+import org.apache.camel.impl.DefaultCamelContext;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class DriveConfigurationTest extends AbstractGoogleDriveTestSupport {
+
+private static final Logger LOG = 
LoggerFactory.getLogger(DriveConfigurationTest.class);
+private static final String PATH_PREFIX = 
GoogleDriveApiCollection.getCollection().getApiName(DriveFilesApiMethod.class).getName();
+private static final String TEST_URI = "google-drive://" + PATH_PREFIX + 
"/copy?clientId=a=b=c=d=e";
+
+@Override
+protected CamelContext createCamelContext() throws Exception {
+final CamelContext context = new DefaultCamelContext(createRegistry());
+
+// add GoogleDriveComponent to Camel context but don't set up 
configuration
+final GoogleDriveComponent component = new 
GoogleDriveComponent(context);
+context.addComponent("google-drive", component);
+
+return context;
+}
+
+@Test
+public void testConfiguration() throws Exception {
+GoogleDriveEndpoint endpoint = getMandatoryEndpoint(TEST_URI, 
GoogleDriveEndpoint.class);
+GoogleDriveConfiguration configuration = endpoint.getConfiguration();
+assertNotNull(configuration);
+assertEquals("a", configuration.getClientId());
+assertEquals("b", configuration.getClientSecret());
+assertEquals("c", configuration.getApplicationName());
+assertEquals("d", configuration.getAccessToken());
+assertEquals("e", configuration.getRefreshToken());
+}
+
+@Override
+protected RouteBuilder createRouteBuilder() throws Exception {
+return new RouteBuilder() {
+@Override
+public void configure() {
+from("direct://COPY").to(TEST_URI);
+}
+};
+}
+}

[08/12] camel git commit: add missed test case

[janstey]

add missed test case


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

Branch: refs/heads/camel-2.18.x
Commit: fbcaded8349754e574d6900dca863bbdec71b6c9
Parents: 645d024
Author: Jonathan Anstey 
Authored: Tue Oct 11 19:47:58 2016 -0230
Committer: Jonathan Anstey 
Committed: Tue Oct 11 23:44:20 2016 -0230

--
 .../google/drive/DriveConfigurationTest.java| 66 
 1 file changed, 66 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/fbcaded8/components/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/DriveConfigurationTest.java
--
diff --git 
a/components/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/DriveConfigurationTest.java
 
b/components/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/DriveConfigurationTest.java
new file mode 100644
index 000..3d113d3
--- /dev/null
+++ 
b/components/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/DriveConfigurationTest.java
@@ -0,0 +1,66 @@
+/**
+ * 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.google.drive;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.google.drive.internal.DriveFilesApiMethod;
+import 
org.apache.camel.component.google.drive.internal.GoogleDriveApiCollection;
+import org.apache.camel.impl.DefaultCamelContext;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class DriveConfigurationTest extends AbstractGoogleDriveTestSupport {
+
+private static final Logger LOG = 
LoggerFactory.getLogger(DriveConfigurationTest.class);
+private static final String PATH_PREFIX = 
GoogleDriveApiCollection.getCollection().getApiName(DriveFilesApiMethod.class).getName();
+private static final String TEST_URI = "google-drive://" + PATH_PREFIX + 
"/copy?clientId=a=b=c=d=e";
+
+@Override
+protected CamelContext createCamelContext() throws Exception {
+final CamelContext context = new DefaultCamelContext(createRegistry());
+
+// add GoogleDriveComponent to Camel context but don't set up 
configuration
+final GoogleDriveComponent component = new 
GoogleDriveComponent(context);
+context.addComponent("google-drive", component);
+
+return context;
+}
+
+@Test
+public void testConfiguration() throws Exception {
+GoogleDriveEndpoint endpoint = getMandatoryEndpoint(TEST_URI, 
GoogleDriveEndpoint.class);
+GoogleDriveConfiguration configuration = endpoint.getConfiguration();
+assertNotNull(configuration);
+assertEquals("a", configuration.getClientId());
+assertEquals("b", configuration.getClientSecret());
+assertEquals("c", configuration.getApplicationName());
+assertEquals("d", configuration.getAccessToken());
+assertEquals("e", configuration.getRefreshToken());
+}
+
+@Override
+protected RouteBuilder createRouteBuilder() throws Exception {
+return new RouteBuilder() {
+@Override
+public void configure() {
+from("direct://COPY").to(TEST_URI);
+}
+};
+}
+}

[06/12] camel git commit: fix CS

[janstey]

fix CS


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

Branch: refs/heads/master
Commit: 471e25a31c95aabc9718430f2c1fed6a88677c1c
Parents: 329aca6
Author: Jonathan Anstey 
Authored: Tue Oct 11 23:37:48 2016 -0230
Committer: Jonathan Anstey 
Committed: Tue Oct 11 23:37:48 2016 -0230

--
 .../component/google/calendar/CalendarConfigurationTest.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/471e25a3/components/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/CalendarConfigurationTest.java
--
diff --git 
a/components/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/CalendarConfigurationTest.java
 
b/components/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/CalendarConfigurationTest.java
index c22915f..6777434 100644
--- 
a/components/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/CalendarConfigurationTest.java
+++ 
b/components/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/CalendarConfigurationTest.java
@@ -18,6 +18,8 @@ package org.apache.camel.component.google.calendar;
 
 import java.util.Random;
 
+import com.google.api.services.calendar.model.Calendar;
+
 import org.apache.camel.CamelContext;
 import org.apache.camel.builder.RouteBuilder;
 import 
org.apache.camel.component.google.calendar.internal.CalendarCalendarsApiMethod;
@@ -29,8 +31,6 @@ import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.api.services.calendar.model.Calendar;
-
 public class CalendarConfigurationTest extends 
AbstractGoogleCalendarTestSupport {
 
 private static final Logger LOG = 
LoggerFactory.getLogger(CalendarConfigurationTest.class);

[04/12] camel git commit: CAMEL-10381 - fix NPE from calendar component configuration

[janstey]

CAMEL-10381 - fix NPE from calendar component configuration


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

Branch: refs/heads/master
Commit: d84320047b3070e99a48e5d478fd9fecd7174b07
Parents: d0af43d
Author: Jonathan Anstey 
Authored: Tue Oct 11 23:32:37 2016 -0230
Committer: Jonathan Anstey 
Committed: Tue Oct 11 23:32:37 2016 -0230

--
 .../calendar/GoogleCalendarComponent.java   | 15 +++--
 .../google/calendar/GoogleCalendarEndpoint.java |  2 +-
 .../calendar/CalendarConfigurationTest.java | 66 
 3 files changed, 76 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/d8432004/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/GoogleCalendarComponent.java
--
diff --git 
a/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/GoogleCalendarComponent.java
 
b/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/GoogleCalendarComponent.java
index d140ee4..84e3092 100644
--- 
a/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/GoogleCalendarComponent.java
+++ 
b/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/GoogleCalendarComponent.java
@@ -44,13 +44,13 @@ public class GoogleCalendarComponent extends 
AbstractApiComponenthttp://git-wip-us.apache.org/repos/asf/camel/blob/d8432004/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/GoogleCalendarEndpoint.java
--
diff --git 
a/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/GoogleCalendarEndpoint.java
 
b/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/GoogleCalendarEndpoint.java
index e955f6c..7ad7f9d 100644
--- 
a/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/GoogleCalendarEndpoint.java
+++ 
b/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/GoogleCalendarEndpoint.java
@@ -111,7 +111,7 @@ public class GoogleCalendarEndpoint extends 
AbstractApiEndpointhttp://git-wip-us.apache.org/repos/asf/camel/blob/d8432004/components/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/CalendarConfigurationTest.java
--
diff --git 
a/components/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/CalendarConfigurationTest.java
 
b/components/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/CalendarConfigurationTest.java
new file mode 100644
index 000..a70934e
--- /dev/null
+++ 
b/components/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/CalendarConfigurationTest.java
@@ -0,0 +1,66 @@
+/**
+ * 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.google.calendar;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.builder.RouteBuilder;
+import 
org.apache.camel.component.google.calendar.internal.CalendarCalendarsApiMethod;
+import 
org.apache.camel.component.google.calendar.internal.GoogleCalendarApiCollection;
+import org.apache.camel.impl.DefaultCamelContext;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class CalendarConfigurationTest extends 
AbstractGoogleCalendarTestSupport {
+
+private static final Logger LOG = 
LoggerFactory.getLogger(CalendarConfigurationTest.class);
+private static final String PATH_PREFIX = 

[09/12] camel git commit: CAMEL-10381 - fix NPE from component configuration

[janstey]

CAMEL-10381 - fix NPE from component configuration


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

Branch: refs/heads/camel-2.18.x
Commit: 645d024b442bb130eaebbff41a494ac313bc6868
Parents: 7a1ee6b
Author: Jonathan Anstey 
Authored: Tue Oct 11 19:47:27 2016 -0230
Committer: Jonathan Anstey 
Committed: Tue Oct 11 23:44:20 2016 -0230

--
 .../component/google/drive/GoogleDriveComponent.java  | 10 +++---
 .../camel/component/google/drive/GoogleDriveEndpoint.java |  2 +-
 .../component/google/drive/GoogleDriveFilesConverter.java |  3 ++-
 3 files changed, 10 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/645d024b/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveComponent.java
--
diff --git 
a/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveComponent.java
 
b/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveComponent.java
index 2554d0e..84dc9e2 100644
--- 
a/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveComponent.java
+++ 
b/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveComponent.java
@@ -44,10 +44,11 @@ public class GoogleDriveComponent extends 
AbstractApiComponenthttp://git-wip-us.apache.org/repos/asf/camel/blob/645d024b/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveEndpoint.java
--
diff --git 
a/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveEndpoint.java
 
b/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveEndpoint.java
index ede52d5..b80a2df 100644
--- 
a/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveEndpoint.java
+++ 
b/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveEndpoint.java
@@ -124,7 +124,7 @@ public class GoogleDriveEndpoint extends 
AbstractApiEndpoint

[11/12] camel git commit: fix test error

[janstey]

fix test error


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

Branch: refs/heads/camel-2.18.x
Commit: 8de429e1236f1f2fb24098a924eb651ede85adc8
Parents: 6d66397
Author: Jonathan Anstey 
Authored: Tue Oct 11 23:36:18 2016 -0230
Committer: Jonathan Anstey 
Committed: Tue Oct 11 23:44:21 2016 -0230

--
 .../calendar/CalendarConfigurationTest.java   | 18 +-
 1 file changed, 17 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/8de429e1/components/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/CalendarConfigurationTest.java
--
diff --git 
a/components/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/CalendarConfigurationTest.java
 
b/components/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/CalendarConfigurationTest.java
index a70934e..c22915f 100644
--- 
a/components/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/CalendarConfigurationTest.java
+++ 
b/components/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/CalendarConfigurationTest.java
@@ -16,28 +16,44 @@
  */
 package org.apache.camel.component.google.calendar;
 
+import java.util.Random;
+
 import org.apache.camel.CamelContext;
 import org.apache.camel.builder.RouteBuilder;
 import 
org.apache.camel.component.google.calendar.internal.CalendarCalendarsApiMethod;
 import 
org.apache.camel.component.google.calendar.internal.GoogleCalendarApiCollection;
 import org.apache.camel.impl.DefaultCamelContext;
+import org.junit.After;
+import org.junit.Before;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.google.api.services.calendar.model.Calendar;
+
 public class CalendarConfigurationTest extends 
AbstractGoogleCalendarTestSupport {
 
 private static final Logger LOG = 
LoggerFactory.getLogger(CalendarConfigurationTest.class);
 private static final String PATH_PREFIX = 
GoogleCalendarApiCollection.getCollection().getApiName(CalendarCalendarsApiMethod.class).getName();
 private static final String TEST_URI = "google-calendar://" + PATH_PREFIX 
+ 
"/get?clientId=a=b=c=d=e";
 
+@Before
+@Override
+public void createTestCalendar() {
+}
+
+@After
+@Override
+public void deleteTestCalendar() {
+}
+
 @Override
 protected CamelContext createCamelContext() throws Exception {
 final CamelContext context = new DefaultCamelContext(createRegistry());
 
 // add GoogleCalendarComponent to Camel context but don't set up 
configuration
 final GoogleCalendarComponent component = new 
GoogleCalendarComponent(context);
-context.addComponent("google-drive", component);
+context.addComponent("google-calendar", component);
 
 return context;
 }

[07/12] camel git commit: remove non spring boot compatible starters

[janstey]

remove non spring boot compatible starters


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

Branch: refs/heads/camel-2.18.x
Commit: 7a1ee6bedc1c3572e7abdb0262f08d3435e5d293
Parents: 37a12df
Author: Jonathan Anstey 
Authored: Tue Oct 11 19:25:12 2016 -0230
Committer: Jonathan Anstey 
Committed: Tue Oct 11 23:44:20 2016 -0230

--
 components-starter/pom.xml | 9 -
 1 file changed, 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/7a1ee6be/components-starter/pom.xml
--
diff --git a/components-starter/pom.xml b/components-starter/pom.xml
index e8a168a..c284305 100644
--- a/components-starter/pom.xml
+++ b/components-starter/pom.xml
@@ -77,14 +77,12 @@
 camel-beanio-starter
 camel-beanstalk-starter
 camel-bindy-starter
-camel-blueprint-starter
 camel-boon-starter
 camel-box-starter
 camel-braintree-starter
 camel-cache-starter
 camel-cassandraql-starter
 camel-castor-starter
-camel-cdi-starter
 camel-chronicle-starter
 camel-chunk-starter
 camel-cm-sms-starter
@@ -107,7 +105,6 @@
 camel-dropbox-starter
 camel-eclipse-starter
 camel-ehcache-starter
-camel-ejb-starter
 camel-elasticsearch-starter
 camel-elsql-starter
 camel-etcd-starter
@@ -143,7 +140,6 @@
 camel-http-starter
 camel-http4-starter
 camel-hystrix-starter
-camel-ibatis-starter
 camel-ical-starter
 camel-ignite-starter
 camel-infinispan-starter
@@ -157,7 +153,6 @@
 camel-jaxb-starter
 camel-jbpm-starter
 camel-jcache-starter
-camel-jclouds-starter
 camel-jcr-starter
 camel-jdbc-starter
 camel-jetty-common-starter
@@ -215,7 +210,6 @@
 camel-pgevent-starter
 camel-printer-starter
 camel-protobuf-starter
-camel-quartz-starter
 camel-quartz2-starter
 camel-quickfix-starter
 camel-rabbitmq-starter
@@ -245,7 +239,6 @@
 camel-snmp-starter
 camel-soap-starter
 camel-solr-starter
-camel-spark-rest-starter
 camel-spark-starter
 camel-splunk-starter
 camel-spring-batch-starter
@@ -269,8 +262,6 @@
 camel-tagsoup-starter
 camel-tarfile-starter
 camel-telegram-starter
-camel-test-starter
-camel-testng-starter
 camel-twitter-starter
 camel-undertow-starter
 camel-univocity-parsers-starter

[02/12] camel git commit: CAMEL-10381 - fix NPE from component configuration

[janstey]

CAMEL-10381 - fix NPE from component configuration


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

Branch: refs/heads/master
Commit: fab550a7e21467acff6307e707c09d4a90820267
Parents: 404ecc5
Author: Jonathan Anstey 
Authored: Tue Oct 11 19:47:27 2016 -0230
Committer: Jonathan Anstey 
Committed: Tue Oct 11 19:47:27 2016 -0230

--
 .../component/google/drive/GoogleDriveComponent.java  | 10 +++---
 .../camel/component/google/drive/GoogleDriveEndpoint.java |  2 +-
 .../component/google/drive/GoogleDriveFilesConverter.java |  3 ++-
 3 files changed, 10 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/fab550a7/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveComponent.java
--
diff --git 
a/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveComponent.java
 
b/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveComponent.java
index 2554d0e..84dc9e2 100644
--- 
a/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveComponent.java
+++ 
b/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveComponent.java
@@ -44,10 +44,11 @@ public class GoogleDriveComponent extends 
AbstractApiComponenthttp://git-wip-us.apache.org/repos/asf/camel/blob/fab550a7/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveEndpoint.java
--
diff --git 
a/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveEndpoint.java
 
b/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveEndpoint.java
index ede52d5..b80a2df 100644
--- 
a/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveEndpoint.java
+++ 
b/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveEndpoint.java
@@ -124,7 +124,7 @@ public class GoogleDriveEndpoint extends 
AbstractApiEndpoint

buildbot success in on camel-site-production

[buildbot]

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

Buildbot URL: https://ci.apache.org/

Buildslave for this Build: bb-cms-slave

Build Reason: The Nightly scheduler named 'camel-site-production' triggered 
this build
Build Source Stamp: [branch camel/website] HEAD
Blamelist: 

Build succeeded!

Sincerely,
 -The Buildbot

buildbot failure in on camel-site-production

[buildbot]

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

Buildbot URL: https://ci.apache.org/

Buildslave for this Build: bb-cms-slave

Build Reason: The Nightly scheduler named 'camel-site-production' triggered 
this build
Build Source Stamp: [branch camel/website] HEAD
Blamelist: 

BUILD FAILED: failed compile

Sincerely,
 -The Buildbot

[3/3] camel git commit: CAMEL-10381 - fix NPE from component configuration

[janstey]

CAMEL-10381 - fix NPE from component configuration


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

Branch: refs/heads/camel-2.17.x
Commit: 592e7cf7de4cbe64066b3f814ced35f4917767ac
Parents: 9fc87f2
Author: Jonathan Anstey 
Authored: Tue Oct 11 16:39:15 2016 -0230
Committer: Jonathan Anstey 
Committed: Tue Oct 11 16:43:42 2016 -0230

--
 .../google/mail/GoogleMailComponent.java| 10 ++-
 .../google/mail/GoogleMailEndpoint.java |  2 +-
 .../google/mail/GmailConfigurationTest.java | 73 
 3 files changed, 81 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/592e7cf7/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/GoogleMailComponent.java
--
diff --git 
a/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/GoogleMailComponent.java
 
b/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/GoogleMailComponent.java
index b6896d6..7871a51 100644
--- 
a/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/GoogleMailComponent.java
+++ 
b/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/GoogleMailComponent.java
@@ -45,10 +45,11 @@ public class GoogleMailComponent extends 
AbstractApiComponent

[1/3] camel git commit: CAMEL-10381 - fix NPE from component configuration

[janstey]

Repository: camel
Updated Branches:
  refs/heads/camel-2.17.x 9fc87f2c4 -> 592e7cf7d
  refs/heads/camel-2.18.x fa1789a36 -> 37a12df6a
  refs/heads/master da614b730 -> 5d79ddc35


CAMEL-10381 - fix NPE from component configuration


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

Branch: refs/heads/master
Commit: 5d79ddc352d5a5266d359dc1c2a597184343abd4
Parents: da614b7
Author: Jonathan Anstey 
Authored: Tue Oct 11 16:39:15 2016 -0230
Committer: Jonathan Anstey 
Committed: Tue Oct 11 16:39:15 2016 -0230

--
 components-starter/pom.xml  |  9 +++
 .../google/mail/GoogleMailComponent.java| 10 ++-
 .../google/mail/GoogleMailEndpoint.java |  2 +-
 .../google/mail/GmailConfigurationTest.java | 73 
 4 files changed, 90 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/5d79ddc3/components-starter/pom.xml
--
diff --git a/components-starter/pom.xml b/components-starter/pom.xml
index 72bf37a..4aca1b4 100644
--- a/components-starter/pom.xml
+++ b/components-starter/pom.xml
@@ -77,12 +77,14 @@
 camel-beanio-starter
 camel-beanstalk-starter
 camel-bindy-starter
+camel-blueprint-starter
 camel-boon-starter
 camel-box-starter
 camel-braintree-starter
 camel-cache-starter
 camel-cassandraql-starter
 camel-castor-starter
+camel-cdi-starter
 camel-chronicle-starter
 camel-chunk-starter
 camel-cm-sms-starter
@@ -105,6 +107,7 @@
 camel-dropbox-starter
 camel-eclipse-starter
 camel-ehcache-starter
+camel-ejb-starter
 camel-elasticsearch-starter
 camel-elsql-starter
 camel-etcd-starter
@@ -140,6 +143,7 @@
 camel-http-starter
 camel-http4-starter
 camel-hystrix-starter
+camel-ibatis-starter
 camel-ical-starter
 camel-ignite-starter
 camel-infinispan-starter
@@ -153,6 +157,7 @@
 camel-jaxb-starter
 camel-jbpm-starter
 camel-jcache-starter
+camel-jclouds-starter
 camel-jcr-starter
 camel-jdbc-starter
 camel-jetty-common-starter
@@ -210,6 +215,7 @@
 camel-pgevent-starter
 camel-printer-starter
 camel-protobuf-starter
+camel-quartz-starter
 camel-quartz2-starter
 camel-quickfix-starter
 camel-rabbitmq-starter
@@ -239,6 +245,7 @@
 camel-snmp-starter
 camel-soap-starter
 camel-solr-starter
+camel-spark-rest-starter
 camel-spark-starter
 camel-splunk-starter
 camel-spring-batch-starter
@@ -262,6 +269,8 @@
 camel-tagsoup-starter
 camel-tarfile-starter
 camel-telegram-starter
+camel-test-starter
+camel-testng-starter
 camel-twitter-starter
 camel-undertow-starter
 camel-univocity-parsers-starter

http://git-wip-us.apache.org/repos/asf/camel/blob/5d79ddc3/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/GoogleMailComponent.java
--
diff --git 
a/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/GoogleMailComponent.java
 
b/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/GoogleMailComponent.java
index b6896d6..7871a51 100644
--- 
a/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/GoogleMailComponent.java
+++ 
b/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/GoogleMailComponent.java
@@ -45,10 +45,11 @@ public class GoogleMailComponent extends 
AbstractApiComponent

[2/3] camel git commit: CAMEL-10381 - fix NPE from component configuration

[janstey]

CAMEL-10381 - fix NPE from component configuration


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

Branch: refs/heads/camel-2.18.x
Commit: 37a12df6a3d6780495b249b959a25966b62afb69
Parents: fa1789a
Author: Jonathan Anstey 
Authored: Tue Oct 11 16:39:15 2016 -0230
Committer: Jonathan Anstey 
Committed: Tue Oct 11 16:41:00 2016 -0230

--
 components-starter/pom.xml  |  9 +++
 .../google/mail/GoogleMailComponent.java| 10 ++-
 .../google/mail/GoogleMailEndpoint.java |  2 +-
 .../google/mail/GmailConfigurationTest.java | 73 
 4 files changed, 90 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/37a12df6/components-starter/pom.xml
--
diff --git a/components-starter/pom.xml b/components-starter/pom.xml
index c284305..e8a168a 100644
--- a/components-starter/pom.xml
+++ b/components-starter/pom.xml
@@ -77,12 +77,14 @@
 camel-beanio-starter
 camel-beanstalk-starter
 camel-bindy-starter
+camel-blueprint-starter
 camel-boon-starter
 camel-box-starter
 camel-braintree-starter
 camel-cache-starter
 camel-cassandraql-starter
 camel-castor-starter
+camel-cdi-starter
 camel-chronicle-starter
 camel-chunk-starter
 camel-cm-sms-starter
@@ -105,6 +107,7 @@
 camel-dropbox-starter
 camel-eclipse-starter
 camel-ehcache-starter
+camel-ejb-starter
 camel-elasticsearch-starter
 camel-elsql-starter
 camel-etcd-starter
@@ -140,6 +143,7 @@
 camel-http-starter
 camel-http4-starter
 camel-hystrix-starter
+camel-ibatis-starter
 camel-ical-starter
 camel-ignite-starter
 camel-infinispan-starter
@@ -153,6 +157,7 @@
 camel-jaxb-starter
 camel-jbpm-starter
 camel-jcache-starter
+camel-jclouds-starter
 camel-jcr-starter
 camel-jdbc-starter
 camel-jetty-common-starter
@@ -210,6 +215,7 @@
 camel-pgevent-starter
 camel-printer-starter
 camel-protobuf-starter
+camel-quartz-starter
 camel-quartz2-starter
 camel-quickfix-starter
 camel-rabbitmq-starter
@@ -239,6 +245,7 @@
 camel-snmp-starter
 camel-soap-starter
 camel-solr-starter
+camel-spark-rest-starter
 camel-spark-starter
 camel-splunk-starter
 camel-spring-batch-starter
@@ -262,6 +269,8 @@
 camel-tagsoup-starter
 camel-tarfile-starter
 camel-telegram-starter
+camel-test-starter
+camel-testng-starter
 camel-twitter-starter
 camel-undertow-starter
 camel-univocity-parsers-starter

http://git-wip-us.apache.org/repos/asf/camel/blob/37a12df6/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/GoogleMailComponent.java
--
diff --git 
a/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/GoogleMailComponent.java
 
b/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/GoogleMailComponent.java
index b6896d6..7871a51 100644
--- 
a/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/GoogleMailComponent.java
+++ 
b/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/GoogleMailComponent.java
@@ -45,10 +45,11 @@ public class GoogleMailComponent extends 
AbstractApiComponent

[2/2] camel git commit: CAMEL-10124 Karaf commands - Switch to non deprecated

[davsclaus]

CAMEL-10124 Karaf commands - Switch to non deprecated


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

Branch: refs/heads/master
Commit: da614b730dc2097357174cb6ed22c6ef535e67cc
Parents: 6060710
Author: Tomohisa Igarashi 
Authored: Fri Oct 7 12:43:11 2016 +0900
Committer: Claus Ibsen 
Committed: Tue Oct 11 17:19:48 2016 +0200

--
 platforms/karaf/commands-catalog/pom.xml|  13 +-
 .../commands/catalog/CatalogComponentDoc.java   |  18 +-
 .../commands/catalog/CatalogComponentInfo.java  |  20 +-
 .../commands/catalog/CatalogComponentList.java  |  15 +-
 .../commands/catalog/CatalogDataFormatDoc.java  |  18 +-
 .../commands/catalog/CatalogDataFormatList.java |  15 +-
 .../karaf/commands/catalog/CatalogEipList.java  |  15 +-
 .../commands/catalog/CatalogLanguageDoc.java|  18 +-
 .../commands/catalog/CatalogLanguageList.java   |  15 +-
 .../completers/ComponentListCompleter.java  |  18 +-
 .../completers/DataFormatListCompleter.java |  18 +-
 .../completers/LanguageListCompleter.java   |  18 +-
 .../blueprint/camel-commands-catalog.xml|  96 ---
 platforms/karaf/commands/pom.xml|   9 +-
 .../karaf/commands/AbstractRouteCommand.java|  11 +-
 .../karaf/commands/CamelCommandSupport.java |  33 ---
 .../camel/karaf/commands/ComponentList.java |  19 +-
 .../camel/karaf/commands/ContextInflight.java   |  21 +-
 .../camel/karaf/commands/ContextInfo.java   |  26 +-
 .../camel/karaf/commands/ContextList.java   |  12 +-
 .../camel/karaf/commands/ContextResume.java |  17 +-
 .../camel/karaf/commands/ContextStart.java  |  17 +-
 .../camel/karaf/commands/ContextStop.java   |  17 +-
 .../camel/karaf/commands/ContextSuspend.java|  17 +-
 .../apache/camel/karaf/commands/EipExplain.java |  19 +-
 .../camel/karaf/commands/EndpointExplain.java   |  19 +-
 .../camel/karaf/commands/EndpointList.java  |  19 +-
 .../camel/karaf/commands/EndpointStats.java |  19 +-
 .../apache/camel/karaf/commands/RestApiDoc.java |  17 +-
 .../camel/karaf/commands/RestRegistryList.java  |  19 +-
 .../apache/camel/karaf/commands/RestShow.java   |  17 +-
 .../apache/camel/karaf/commands/RouteInfo.java  |  15 +-
 .../apache/camel/karaf/commands/RouteList.java  |  17 +-
 .../camel/karaf/commands/RouteProfile.java  |  15 +-
 .../camel/karaf/commands/RouteResetStats.java   |  17 +-
 .../camel/karaf/commands/RouteResume.java   |   8 +-
 .../apache/camel/karaf/commands/RouteShow.java  |   8 +-
 .../apache/camel/karaf/commands/RouteStart.java |   8 +-
 .../apache/camel/karaf/commands/RouteStop.java  |  10 +-
 .../camel/karaf/commands/RouteSuspend.java  |  10 +-
 .../completers/CamelCompleterSupport.java   |  33 ---
 .../completers/CamelContextCompleter.java   |  19 +-
 .../commands/completers/RouteCompleter.java |  20 +-
 .../commands/internal/CamelControllerImpl.java  |   3 +
 .../karaf/commands/internal/StringEscape.java   |  11 +-
 .../OSGI-INF/blueprint/camel-commands.xml   | 252 ---
 platforms/karaf/features/pom.xml|   2 +-
 47 files changed, 432 insertions(+), 641 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/da614b73/platforms/karaf/commands-catalog/pom.xml
--
diff --git a/platforms/karaf/commands-catalog/pom.xml 
b/platforms/karaf/commands-catalog/pom.xml
index a06299b..222c6a4 100644
--- a/platforms/karaf/commands-catalog/pom.xml
+++ b/platforms/karaf/commands-catalog/pom.xml
@@ -45,13 +45,13 @@
 
 
   org.apache.karaf.shell
-  org.apache.karaf.shell.console
-  ${karaf-version}
+  org.apache.karaf.shell.core
+  ${karaf4-version}
 
 
   org.apache.karaf
   org.apache.karaf.util
-  ${karaf-version}
+  ${karaf4-version}
 
 
 
@@ -72,13 +72,12 @@
 
   
 
-  
org.apache.felix.service.command;mandatory:=status;status=provisional;version="[0.6,1)",
-  org.apache.felix.gogo.commands;version="[0.6,1)",
-  org.apache.karaf.shell.console;version="[2.2,4)",
+  org.apache.karaf.shell.api.action;version="[4,5)",
+  org.apache.karaf.shell.support.completers;version="[4,5)",
   org.slf4j.*;version="[1.6,2)",
-  jline.*;version="[2.1,4)",
   *
 
+*
   
 
   

[1/2] camel git commit: CAMEL-10124 Karaf commands - Switch to non deprecated

[davsclaus]

Repository: camel
Updated Branches:
  refs/heads/master 6060710e9 -> da614b730


http://git-wip-us.apache.org/repos/asf/camel/blob/da614b73/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/RouteSuspend.java
--
diff --git 
a/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/RouteSuspend.java
 
b/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/RouteSuspend.java
index 72ebffb..bc929a9 100644
--- 
a/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/RouteSuspend.java
+++ 
b/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/RouteSuspend.java
@@ -17,15 +17,17 @@
 package org.apache.camel.karaf.commands;
 
 import org.apache.camel.commands.RouteSuspendCommand;
-import org.apache.felix.gogo.commands.Command;
+import org.apache.karaf.shell.api.action.Command;
+import org.apache.karaf.shell.api.action.lifecycle.Service;
 
-@Command(scope = "camel", name = " route-suspend", description = "Suspend a 
Camel route")
+@Command(scope = "camel", name = "route-suspend", description = "Suspend a 
Camel route")
+@Service
 public class RouteSuspend extends AbstractRouteCommand {
 
 @Override
-protected Object doExecute() throws Exception {
+public Object execute() throws Exception {
 RouteSuspendCommand command = new RouteSuspendCommand(route, context);
-return command.execute(camelController, System.out, System.err);
+return command.execute(this, System.out, System.err);
 }
 
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/da614b73/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/completers/CamelCompleterSupport.java
--
diff --git 
a/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/completers/CamelCompleterSupport.java
 
b/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/completers/CamelCompleterSupport.java
deleted file mode 100644
index fa5e5cb..000
--- 
a/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/completers/CamelCompleterSupport.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.karaf.commands.completers;
-
-import org.apache.camel.commands.LocalCamelController;
-import org.apache.karaf.shell.console.Completer;
-
-/**
- * The abstract base class for completers.
- */
-public abstract class CamelCompleterSupport implements Completer {
-
-protected LocalCamelController camelController;
-
-public void setCamelController(LocalCamelController camelController) {
-this.camelController = camelController;
-}
-
-}

http://git-wip-us.apache.org/repos/asf/camel/blob/da614b73/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/completers/CamelContextCompleter.java
--
diff --git 
a/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/completers/CamelContextCompleter.java
 
b/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/completers/CamelContextCompleter.java
index 266f25c..b64503a 100644
--- 
a/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/completers/CamelContextCompleter.java
+++ 
b/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/completers/CamelContextCompleter.java
@@ -18,23 +18,28 @@ package org.apache.camel.karaf.commands.completers;
 
 import java.util.List;
 
-import jline.console.completer.StringsCompleter;
 import org.apache.camel.CamelContext;
+import org.apache.camel.karaf.commands.internal.CamelControllerImpl;
+import org.apache.karaf.shell.api.action.lifecycle.Service;
+import org.apache.karaf.shell.api.console.CommandLine;
+import org.apache.karaf.shell.api.console.Completer;
+import org.apache.karaf.shell.api.console.Session;
+import org.apache.karaf.shell.support.completers.StringsCompleter;
 
 /**
- * A JLine completer for the Camel contexts.
+ * A completer for the Camel contexts.
  */
-public class CamelContextCompleter extends 

[2/2] camel git commit: Use attribute 'key' instead 'name' for endpoint properties

[davsclaus]

Use attribute 'key' instead 'name' for endpoint properties


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

Branch: refs/heads/master
Commit: a27cbe29dfec26207210a47fc17d6879acb338fd
Parents: 607b4a8
Author: Rudolf Batt 
Authored: Tue Oct 11 09:38:20 2016 +0200
Committer: Claus Ibsen 
Committed: Tue Oct 11 17:18:58 2016 +0200

--
 docs/user-manual/en/how-do-i-configure-endpoints.adoc | 14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/a27cbe29/docs/user-manual/en/how-do-i-configure-endpoints.adoc
--
diff --git a/docs/user-manual/en/how-do-i-configure-endpoints.adoc 
b/docs/user-manual/en/how-do-i-configure-endpoints.adoc
index 014761c..48fec4b 100644
--- a/docs/user-manual/en/how-do-i-configure-endpoints.adoc
+++ b/docs/user-manual/en/how-do-i-configure-endpoints.adoc
@@ -249,10 +249,10 @@ routes refer to the endpoints using their shorthand ids. 
 
  
   ftp://foo@myserver;>
-
-
-
- 
+
+
+
+ 
   
  
   
@@ -274,9 +274,9 @@ as:
 [source]
 
 ftp://foo@myserver?recursive=true;>
-  
-  
-  
+  
+  
+  
 
 
 

[1/2] camel git commit: Polished error message

[davsclaus]

Repository: camel
Updated Branches:
  refs/heads/master 607b4a864 -> 6060710e9


Polished error message


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

Branch: refs/heads/master
Commit: 6060710e9a3d6cdd05bfe98e9a62884f53551874
Parents: a27cbe2
Author: Claus Ibsen 
Authored: Tue Oct 11 12:19:44 2016 +0200
Committer: Claus Ibsen 
Committed: Tue Oct 11 17:18:58 2016 +0200

--
 .../main/java/org/apache/camel/component/jms/JmsComponent.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/6060710e/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsComponent.java
--
diff --git 
a/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsComponent.java
 
b/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsComponent.java
index 8dd3a1d..2290e2e 100644
--- 
a/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsComponent.java
+++ 
b/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsComponent.java
@@ -966,9 +966,9 @@ public class JmsComponent extends UriEndpointComponent 
implements ApplicationCon
 // if only username or password was provided then fail
 if (cfUsername != null || cfPassword != null) {
 if (cfUsername == null) {
-throw new IllegalArgumentException("Password must also be 
provided when using username/password as credentials.");
-} else {
 throw new IllegalArgumentException("Username must also be 
provided when using username/password as credentials.");
+} else {
+throw new IllegalArgumentException("Password must also be 
provided when using username/password as credentials.");
 }
 }
 }

buildbot success in on camel-site-production

[buildbot]

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

Buildbot URL: https://ci.apache.org/

Buildslave for this Build: bb-cms-slave

Build Reason: The Nightly scheduler named 'camel-site-production' triggered 
this build
Build Source Stamp: [branch camel/website] HEAD
Blamelist: 

Build succeeded!

Sincerely,
 -The Buildbot

[3/4] camel git commit: CAMEL-10357: camel-servicenow: add per release model

[lburgazzoli]

CAMEL-10357: camel-servicenow: add per release model


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

Branch: refs/heads/camel-2.18.x
Commit: f655c94110ae14a3db5b2ce6409684deaa619846
Parents: 9916ee4
Author: lburgazzoli 
Authored: Thu Sep 29 19:25:18 2016 +0200
Committer: lburgazzoli 
Committed: Tue Oct 11 11:25:05 2016 +0200

--
 .../src/main/docs/servicenow-component.adoc | 242 -
 .../servicenow/AbstractServiceNowProcessor.java | 265 +++
 .../servicenow/AbstractServiceNowProducer.java  |  40 +++
 .../component/servicenow/ServiceNowClient.java  | 140 ++
 .../servicenow/ServiceNowComponent.java |  10 +-
 .../servicenow/ServiceNowConfiguration.java | 217 +++
 .../servicenow/ServiceNowConstants.java |  88 +++---
 .../servicenow/ServiceNowDispatcher.java|  55 
 .../servicenow/ServiceNowEndpoint.java  |  46 +---
 .../servicenow/ServiceNowExceptionMapper.java   |  23 +-
 .../component/servicenow/ServiceNowParam.java   |  28 ++
 .../component/servicenow/ServiceNowParams.java  | 123 +
 .../servicenow/ServiceNowProducer.java  |  86 +-
 .../servicenow/ServiceNowProducerProcessor.java | 139 --
 .../servicenow/ServiceNowProducerSupplier.java  |  22 ++
 .../component/servicenow/ServiceNowRelease.java |  41 +++
 .../auth/AuthenticationRequestFilter.java   |   4 +-
 .../component/servicenow/auth/OAuthToken.java   |   8 +-
 .../servicenow/model/ServiceNowAggregate.java   |  50 
 .../model/ServiceNowAggregateProcessor.java |  68 -
 .../servicenow/model/ServiceNowImportSet.java   |  48 
 .../model/ServiceNowImportSetProcessor.java |  79 --
 .../servicenow/model/ServiceNowTable.java   | 108 
 .../model/ServiceNowTableProcessor.java | 169 
 .../fuji/FujiServiceNowAggregateProcessor.java  |  68 +
 .../fuji/FujiServiceNowImportSetProcessor.java  |  77 ++
 .../releases/fuji/FujiServiceNowProcessor.java  |  55 
 .../releases/fuji/FujiServiceNowProducer.java   |  36 +++
 .../fuji/FujiServiceNowTableProcessor.java  | 163 
 .../HelsinkiServiceNowAggregateProcessor.java   |  74 ++
 .../HelsinkiServiceNowAttachmentProcessor.java  | 168 
 .../HelsinkiServiceNowImportSetProcessor.java   |  82 ++
 .../HelsinkiServiceNowMiscProcessor.java|  89 +++
 .../helsinki/HelsinkiServiceNowProducer.java|  42 +++
 .../HelsinkiServiceNowScorecardProcessor.java   |  84 ++
 ...iServiceNowServiceCatalogCartsProcessor.java | 200 ++
 ...iceNowServiceCatalogCategoriesProcessor.java |  66 +
 ...iServiceNowServiceCatalogItemsProcessor.java | 199 ++
 ...lsinkiServiceNowServiceCatalogProcessor.java | 110 
 .../HelsinkiServiceNowTableProcessor.java   | 191 +
 .../servicenow/ServiceNowAttachmentTest.java| 133 ++
 .../servicenow/ServiceNowScorecardTest.java |  67 +
 .../ServiceNowServiceCatalogTest.java   |  97 +++
 .../servicenow/ServiceNowTableTest.java |  57 ++--
 .../component/servicenow/ServiceNowTest.java|  10 +-
 .../servicenow/ServiceNowTestSupport.java   |   7 +-
 .../servicenow/model/AttachmentMeta.java|  92 +++
 .../component/servicenow/model/Incident.java|   1 +
 .../component/servicenow/model/Scorecard.java   |  46 
 .../src/test/resources/my-content.txt   |  16 ++
 50 files changed, 3411 insertions(+), 918 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/f655c941/components/camel-servicenow/src/main/docs/servicenow-component.adoc
--
diff --git 
a/components/camel-servicenow/src/main/docs/servicenow-component.adoc 
b/components/camel-servicenow/src/main/docs/servicenow-component.adoc
index d4537fb..5869258 100644
--- a/components/camel-servicenow/src/main/docs/servicenow-component.adoc
+++ b/components/camel-servicenow/src/main/docs/servicenow-component.adoc
@@ -4,9 +4,10 @@ ServiceNow Component
 
 *Available as of Camel 2.18*
 
-The ServiceNow component provides access to all of ServiceNow
-https://developer.servicenow.com/app.do#!/rest_api_doc?v=fuji[REST
-API]. 
+The ServiceNow component provides access to ServiceNow platform through their 
REST API.
+
+NOTE: From Camel 2.18.1 the component supports multiple version of ServiceNow 
platform with default to Helsinki. Supported version are <> 
and <>
+
 
 Maven users will need to add the following dependency to their pom.xml
 for this component:
@@ 

[1/4] camel git commit: CAMEL-10357: camel-servicenow: add per release model

[lburgazzoli]

Repository: camel
Updated Branches:
  refs/heads/camel-2.18.x 9916ee431 -> fa1789a36


http://git-wip-us.apache.org/repos/asf/camel/blob/f655c941/components/camel-servicenow/src/main/java/org/apache/camel/component/servicenow/releases/helsinki/HelsinkiServiceNowServiceCatalogCategoriesProcessor.java
--
diff --git 
a/components/camel-servicenow/src/main/java/org/apache/camel/component/servicenow/releases/helsinki/HelsinkiServiceNowServiceCatalogCategoriesProcessor.java
 
b/components/camel-servicenow/src/main/java/org/apache/camel/component/servicenow/releases/helsinki/HelsinkiServiceNowServiceCatalogCategoriesProcessor.java
new file mode 100644
index 000..aa361dc
--- /dev/null
+++ 
b/components/camel-servicenow/src/main/java/org/apache/camel/component/servicenow/releases/helsinki/HelsinkiServiceNowServiceCatalogCategoriesProcessor.java
@@ -0,0 +1,66 @@
+/**
+ * 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.servicenow.releases.helsinki;
+
+import javax.ws.rs.HttpMethod;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+
+import org.apache.camel.Exchange;
+import org.apache.camel.Message;
+import org.apache.camel.component.servicenow.AbstractServiceNowProcessor;
+import org.apache.camel.component.servicenow.ServiceNowEndpoint;
+import org.apache.camel.component.servicenow.ServiceNowParams;
+import org.apache.camel.util.ObjectHelper;
+
+import static 
org.apache.camel.component.servicenow.ServiceNowConstants.ACTION_RETRIEVE;
+
+class HelsinkiServiceNowServiceCatalogCategoriesProcessor extends 
AbstractServiceNowProcessor {
+
+HelsinkiServiceNowServiceCatalogCategoriesProcessor(ServiceNowEndpoint 
endpoint) throws Exception {
+super(endpoint);
+
+addDispatcher(ACTION_RETRIEVE, this::retrieveCategory);
+}
+
+/*
+ * This method retrieves all the information about a requested category.
+ *
+ * Method:
+ * - GET
+ *
+ * URL Format:
+ * - /sn_sc/servicecatalog/categories/{sys_id}
+ */
+private void retrieveCategory(Exchange exchange) throws Exception {
+final Message in = exchange.getIn();
+final Class model = getModel(in);
+final String sysId = 
in.getHeader(ServiceNowParams.PARAM_SYS_ID.getHeader(), String.class);
+
+Response response = client.reset()
+.types(MediaType.APPLICATION_JSON_TYPE)
+.path("sn_sc")
+.path("servicecatalog")
+.path("categories")
+.path(ObjectHelper.notNull(sysId, "sysId"))
+.query(ServiceNowParams.SYSPARM_VIEW, in)
+.invoke(HttpMethod.GET);
+
+setBodyAndHeaders(in, model, response);
+}
+}

http://git-wip-us.apache.org/repos/asf/camel/blob/f655c941/components/camel-servicenow/src/main/java/org/apache/camel/component/servicenow/releases/helsinki/HelsinkiServiceNowServiceCatalogItemsProcessor.java
--
diff --git 
a/components/camel-servicenow/src/main/java/org/apache/camel/component/servicenow/releases/helsinki/HelsinkiServiceNowServiceCatalogItemsProcessor.java
 
b/components/camel-servicenow/src/main/java/org/apache/camel/component/servicenow/releases/helsinki/HelsinkiServiceNowServiceCatalogItemsProcessor.java
new file mode 100644
index 000..106f38d
--- /dev/null
+++ 
b/components/camel-servicenow/src/main/java/org/apache/camel/component/servicenow/releases/helsinki/HelsinkiServiceNowServiceCatalogItemsProcessor.java
@@ -0,0 +1,199 @@
+/**
+ * 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" 

[2/4] camel git commit: CAMEL-10357: camel-servicenow: add per release model

[lburgazzoli]

http://git-wip-us.apache.org/repos/asf/camel/blob/f655c941/components/camel-servicenow/src/main/java/org/apache/camel/component/servicenow/auth/OAuthToken.java
--
diff --git 
a/components/camel-servicenow/src/main/java/org/apache/camel/component/servicenow/auth/OAuthToken.java
 
b/components/camel-servicenow/src/main/java/org/apache/camel/component/servicenow/auth/OAuthToken.java
index 11c3842..880cf7f 100644
--- 
a/components/camel-servicenow/src/main/java/org/apache/camel/component/servicenow/auth/OAuthToken.java
+++ 
b/components/camel-servicenow/src/main/java/org/apache/camel/component/servicenow/auth/OAuthToken.java
@@ -30,14 +30,12 @@ import org.slf4j.LoggerFactory;
 public class OAuthToken {
 private static final Logger LOGGER = 
LoggerFactory.getLogger(OAuthToken.class);
 
-private final String url;
 private final ServiceNowConfiguration configuration;
 private ClientAccessToken token;
 private String authString;
 private long expireAt;
 
-public OAuthToken(String url, ServiceNowConfiguration configuration) {
-this.url = url;
+public OAuthToken(ServiceNowConfiguration configuration) {
 this.configuration = configuration;
 this.token = null;
 this.authString = null;
@@ -49,7 +47,7 @@ public class OAuthToken {
 LOGGER.debug("Generate OAuth token");
 
 token = OAuthClientUtils.getAccessToken(
-WebClient.create(url),
+WebClient.create(configuration.getOauthTokenUrl()),
 new Consumer(
 configuration.getOauthClientId(),
 configuration.getOauthClientSecret()),
@@ -74,7 +72,7 @@ public class OAuthToken {
 LOGGER.debug("OAuth token is expired, refresh it");
 
 token = OAuthClientUtils.refreshAccessToken(
-WebClient.create(url),
+WebClient.create(configuration.getOauthTokenUrl()),
 new Consumer(
 configuration.getOauthClientId(),
 configuration.getOauthClientSecret()),

http://git-wip-us.apache.org/repos/asf/camel/blob/f655c941/components/camel-servicenow/src/main/java/org/apache/camel/component/servicenow/model/ServiceNowAggregate.java
--
diff --git 
a/components/camel-servicenow/src/main/java/org/apache/camel/component/servicenow/model/ServiceNowAggregate.java
 
b/components/camel-servicenow/src/main/java/org/apache/camel/component/servicenow/model/ServiceNowAggregate.java
deleted file mode 100644
index b723387..000
--- 
a/components/camel-servicenow/src/main/java/org/apache/camel/component/servicenow/model/ServiceNowAggregate.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.camel.component.servicenow.model;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-
-import com.fasterxml.jackson.databind.JsonNode;
-import org.apache.camel.component.servicenow.ServiceNowException;
-
-@Path("/stats")
-@Produces("application/json")
-@Consumes("application/json")
-public interface ServiceNowAggregate {
-
-@GET
-@Path("{tableName}")
-JsonNode retrieveStats(
-@PathParam("tableName") String tableName,
-@QueryParam("sysparm_query") String query,
-@QueryParam("sysparm_avg_fields") String avgFields,
-@QueryParam("sysparm_count") String count,
-@QueryParam("sysparm_min_fields") String minFields,
-@QueryParam("sysparm_max_fields") String maxFields,
-@QueryParam("sysparm_sum_fields") String sumFields,
-@QueryParam("sysparm_group_by") String groupBy,
-@QueryParam("sysparm_order_by") String orderBy,
-@QueryParam("sysparm_having") String having,
-@QueryParam("sysparm_display_value") String displayValue
-) throws ServiceNowException;
-}

[4/4] camel git commit: CAMEL-10378: Upgrade log4j2 to v2.7

[lburgazzoli]

CAMEL-10378: Upgrade log4j2 to v2.7


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

Branch: refs/heads/camel-2.18.x
Commit: fa1789a36ea81cc03394e2e8806d8d4e8d2197a2
Parents: f655c94
Author: lburgazzoli 
Authored: Mon Oct 10 18:39:44 2016 +0200
Committer: lburgazzoli 
Committed: Tue Oct 11 11:25:23 2016 +0200

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


http://git-wip-us.apache.org/repos/asf/camel/blob/fa1789a3/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 8c9ee98..e13bd9c 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -388,7 +388,7 @@
 
 1.0.0
 1.2.17
-2.6.2
+2.7
 2.5
 1.1.7
 3.6.0_1

buildbot failure in on camel-site-production

[buildbot]

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

Buildbot URL: https://ci.apache.org/

Buildslave for this Build: bb-cms-slave

Build Reason: The Nightly scheduler named 'camel-site-production' triggered 
this build
Build Source Stamp: [branch camel/website] HEAD
Blamelist: 

BUILD FAILED: failed compile

Sincerely,
 -The Buildbot

[1/3] camel git commit: added null check before trying to call containsKey (prevent NPE)

[acosentino]

Repository: camel
Updated Branches:
  refs/heads/camel-2.17.x 091855d68 -> 9fc87f2c4


added null check before trying to call containsKey (prevent NPE)


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

Branch: refs/heads/camel-2.17.x
Commit: 304178c520b672a309863d90c296b5cdae64043a
Parents: 9f1574b
Author: Michael Lück 
Authored: Wed Oct 5 15:22:51 2016 +0200
Committer: Andrea Cosentino 
Committed: Tue Oct 11 10:01:21 2016 +0200

--
 .../aggregate/hazelcast/HazelcastAggregationRepository.java   | 3 +++
 1 file changed, 3 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/304178c5/components/camel-hazelcast/src/main/java/org/apache/camel/processor/aggregate/hazelcast/HazelcastAggregationRepository.java
--
diff --git 
a/components/camel-hazelcast/src/main/java/org/apache/camel/processor/aggregate/hazelcast/HazelcastAggregationRepository.java
 
b/components/camel-hazelcast/src/main/java/org/apache/camel/processor/aggregate/hazelcast/HazelcastAggregationRepository.java
index 33185f0..9dd0c17 100644
--- 
a/components/camel-hazelcast/src/main/java/org/apache/camel/processor/aggregate/hazelcast/HazelcastAggregationRepository.java
+++ 
b/components/camel-hazelcast/src/main/java/org/apache/camel/processor/aggregate/hazelcast/HazelcastAggregationRepository.java
@@ -296,7 +296,10 @@ public class HazelcastAggregationRepository extends 
ServiceSupport
  * @param key Object - key in question
  */
 public boolean containsKey(Object key){
+  if(cache != null)
 return cache.containsKey(key);
+  else
+return false;
 }
 
 public boolean isAllowSerializedHeaders() {

[3/3] camel git commit: Fixed CS

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

Branch: refs/heads/camel-2.17.x
Commit: 9fc87f2c45bfc25c5357f5acc86a89b70159e1a0
Parents: 304178c
Author: Andrea Cosentino 
Authored: Tue Oct 11 09:54:45 2016 +0200
Committer: Andrea Cosentino 
Committed: Tue Oct 11 10:01:22 2016 +0200

--
 .../hazelcast/HazelcastAggregationRepository.java| 11 ++-
 1 file changed, 6 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/9fc87f2c/components/camel-hazelcast/src/main/java/org/apache/camel/processor/aggregate/hazelcast/HazelcastAggregationRepository.java
--
diff --git 
a/components/camel-hazelcast/src/main/java/org/apache/camel/processor/aggregate/hazelcast/HazelcastAggregationRepository.java
 
b/components/camel-hazelcast/src/main/java/org/apache/camel/processor/aggregate/hazelcast/HazelcastAggregationRepository.java
index 9dd0c17..309aee5 100644
--- 
a/components/camel-hazelcast/src/main/java/org/apache/camel/processor/aggregate/hazelcast/HazelcastAggregationRepository.java
+++ 
b/components/camel-hazelcast/src/main/java/org/apache/camel/processor/aggregate/hazelcast/HazelcastAggregationRepository.java
@@ -295,11 +295,12 @@ public class HazelcastAggregationRepository extends 
ServiceSupport
  * 
  * @param key Object - key in question
  */
-public boolean containsKey(Object key){
-  if(cache != null)
-return cache.containsKey(key);
-  else
-return false;
+public boolean containsKey(Object key) {
+if (cache != null) {
+return cache.containsKey(key);
+} else {
+return false;
+}
 }
 
 public boolean isAllowSerializedHeaders() {

[2/3] camel git commit: added method to check for key existence

[acosentino]

added method to check for key existence


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

Branch: refs/heads/camel-2.17.x
Commit: 9f1574bee929658a2cb0c954a24a9d31771f978e
Parents: 091855d
Author: Michael Lück 
Authored: Tue Oct 4 11:18:04 2016 +0200
Committer: Andrea Cosentino 
Committed: Tue Oct 11 10:01:21 2016 +0200

--
 .../aggregate/hazelcast/HazelcastAggregationRepository.java | 9 +
 1 file changed, 9 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/9f1574be/components/camel-hazelcast/src/main/java/org/apache/camel/processor/aggregate/hazelcast/HazelcastAggregationRepository.java
--
diff --git 
a/components/camel-hazelcast/src/main/java/org/apache/camel/processor/aggregate/hazelcast/HazelcastAggregationRepository.java
 
b/components/camel-hazelcast/src/main/java/org/apache/camel/processor/aggregate/hazelcast/HazelcastAggregationRepository.java
index 530bd8c..33185f0 100644
--- 
a/components/camel-hazelcast/src/main/java/org/apache/camel/processor/aggregate/hazelcast/HazelcastAggregationRepository.java
+++ 
b/components/camel-hazelcast/src/main/java/org/apache/camel/processor/aggregate/hazelcast/HazelcastAggregationRepository.java
@@ -290,6 +290,15 @@ public class HazelcastAggregationRepository extends 
ServiceSupport
 return unmarshallExchange(camelContext, cache.get(key));
 }
 
+/**
+ * Checks if the key in question is in the repository.
+ * 
+ * @param key Object - key in question
+ */
+public boolean containsKey(Object key){
+return cache.containsKey(key);
+}
+
 public boolean isAllowSerializedHeaders() {
 return allowSerializedHeaders;
 }

[2/3] camel git commit: added null check before trying to call containsKey (prevent NPE)

[acosentino]

added null check before trying to call containsKey (prevent NPE)


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

Branch: refs/heads/camel-2.18.x
Commit: 201aeb22f7a8eea16690028f2b0969a452ca6bec
Parents: ac002c8
Author: Michael Lück 
Authored: Wed Oct 5 15:22:51 2016 +0200
Committer: Andrea Cosentino 
Committed: Tue Oct 11 09:59:25 2016 +0200

--
 .../aggregate/hazelcast/HazelcastAggregationRepository.java   | 3 +++
 1 file changed, 3 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/201aeb22/components/camel-hazelcast/src/main/java/org/apache/camel/processor/aggregate/hazelcast/HazelcastAggregationRepository.java
--
diff --git 
a/components/camel-hazelcast/src/main/java/org/apache/camel/processor/aggregate/hazelcast/HazelcastAggregationRepository.java
 
b/components/camel-hazelcast/src/main/java/org/apache/camel/processor/aggregate/hazelcast/HazelcastAggregationRepository.java
index 33185f0..9dd0c17 100644
--- 
a/components/camel-hazelcast/src/main/java/org/apache/camel/processor/aggregate/hazelcast/HazelcastAggregationRepository.java
+++ 
b/components/camel-hazelcast/src/main/java/org/apache/camel/processor/aggregate/hazelcast/HazelcastAggregationRepository.java
@@ -296,7 +296,10 @@ public class HazelcastAggregationRepository extends 
ServiceSupport
  * @param key Object - key in question
  */
 public boolean containsKey(Object key){
+  if(cache != null)
 return cache.containsKey(key);
+  else
+return false;
 }
 
 public boolean isAllowSerializedHeaders() {

[1/3] camel git commit: added method to check for key existence

[acosentino]

Repository: camel
Updated Branches:
  refs/heads/camel-2.18.x 20cf933ed -> 9916ee431


added method to check for key existence


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

Branch: refs/heads/camel-2.18.x
Commit: ac002c88d28faec0b59d52a8b2427c23f1540a5a
Parents: 20cf933
Author: Michael Lück 
Authored: Tue Oct 4 11:18:04 2016 +0200
Committer: Andrea Cosentino 
Committed: Tue Oct 11 09:59:24 2016 +0200

--
 .../aggregate/hazelcast/HazelcastAggregationRepository.java | 9 +
 1 file changed, 9 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/ac002c88/components/camel-hazelcast/src/main/java/org/apache/camel/processor/aggregate/hazelcast/HazelcastAggregationRepository.java
--
diff --git 
a/components/camel-hazelcast/src/main/java/org/apache/camel/processor/aggregate/hazelcast/HazelcastAggregationRepository.java
 
b/components/camel-hazelcast/src/main/java/org/apache/camel/processor/aggregate/hazelcast/HazelcastAggregationRepository.java
index 530bd8c..33185f0 100644
--- 
a/components/camel-hazelcast/src/main/java/org/apache/camel/processor/aggregate/hazelcast/HazelcastAggregationRepository.java
+++ 
b/components/camel-hazelcast/src/main/java/org/apache/camel/processor/aggregate/hazelcast/HazelcastAggregationRepository.java
@@ -290,6 +290,15 @@ public class HazelcastAggregationRepository extends 
ServiceSupport
 return unmarshallExchange(camelContext, cache.get(key));
 }
 
+/**
+ * Checks if the key in question is in the repository.
+ * 
+ * @param key Object - key in question
+ */
+public boolean containsKey(Object key){
+return cache.containsKey(key);
+}
+
 public boolean isAllowSerializedHeaders() {
 return allowSerializedHeaders;
 }

[3/3] camel git commit: Fixed CS

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

Branch: refs/heads/camel-2.18.x
Commit: 9916ee431192e1215a87900b5c5c622822d2e98c
Parents: 201aeb2
Author: Andrea Cosentino 
Authored: Tue Oct 11 09:54:45 2016 +0200
Committer: Andrea Cosentino 
Committed: Tue Oct 11 09:59:25 2016 +0200

--
 .../hazelcast/HazelcastAggregationRepository.java| 11 ++-
 1 file changed, 6 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/9916ee43/components/camel-hazelcast/src/main/java/org/apache/camel/processor/aggregate/hazelcast/HazelcastAggregationRepository.java
--
diff --git 
a/components/camel-hazelcast/src/main/java/org/apache/camel/processor/aggregate/hazelcast/HazelcastAggregationRepository.java
 
b/components/camel-hazelcast/src/main/java/org/apache/camel/processor/aggregate/hazelcast/HazelcastAggregationRepository.java
index 9dd0c17..309aee5 100644
--- 
a/components/camel-hazelcast/src/main/java/org/apache/camel/processor/aggregate/hazelcast/HazelcastAggregationRepository.java
+++ 
b/components/camel-hazelcast/src/main/java/org/apache/camel/processor/aggregate/hazelcast/HazelcastAggregationRepository.java
@@ -295,11 +295,12 @@ public class HazelcastAggregationRepository extends 
ServiceSupport
  * 
  * @param key Object - key in question
  */
-public boolean containsKey(Object key){
-  if(cache != null)
-return cache.containsKey(key);
-  else
-return false;
+public boolean containsKey(Object key) {
+if (cache != null) {
+return cache.containsKey(key);
+} else {
+return false;
+}
 }
 
 public boolean isAllowSerializedHeaders() {

[1/3] camel git commit: added null check before trying to call containsKey (prevent NPE)

[acosentino]

Repository: camel
Updated Branches:
  refs/heads/master cb6c9bc0b -> 607b4a864


added null check before trying to call containsKey (prevent NPE)


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

Branch: refs/heads/master
Commit: ed687f94fc86be66bb933e8d028969530964b962
Parents: 1a1a85c
Author: Michael Lück 
Authored: Wed Oct 5 15:22:51 2016 +0200
Committer: Andrea Cosentino 
Committed: Tue Oct 11 09:43:42 2016 +0200

--
 .../aggregate/hazelcast/HazelcastAggregationRepository.java   | 3 +++
 1 file changed, 3 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/ed687f94/components/camel-hazelcast/src/main/java/org/apache/camel/processor/aggregate/hazelcast/HazelcastAggregationRepository.java
--
diff --git 
a/components/camel-hazelcast/src/main/java/org/apache/camel/processor/aggregate/hazelcast/HazelcastAggregationRepository.java
 
b/components/camel-hazelcast/src/main/java/org/apache/camel/processor/aggregate/hazelcast/HazelcastAggregationRepository.java
index 33185f0..9dd0c17 100644
--- 
a/components/camel-hazelcast/src/main/java/org/apache/camel/processor/aggregate/hazelcast/HazelcastAggregationRepository.java
+++ 
b/components/camel-hazelcast/src/main/java/org/apache/camel/processor/aggregate/hazelcast/HazelcastAggregationRepository.java
@@ -296,7 +296,10 @@ public class HazelcastAggregationRepository extends 
ServiceSupport
  * @param key Object - key in question
  */
 public boolean containsKey(Object key){
+  if(cache != null)
 return cache.containsKey(key);
+  else
+return false;
 }
 
 public boolean isAllowSerializedHeaders() {

[2/3] camel git commit: added method to check for key existence

[acosentino]

added method to check for key existence


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

Branch: refs/heads/master
Commit: 1a1a85cdbe4d58d5299b2a63c1c73aaf5e610fd2
Parents: cb6c9bc
Author: Michael Lück 
Authored: Tue Oct 4 11:18:04 2016 +0200
Committer: Andrea Cosentino 
Committed: Tue Oct 11 09:43:42 2016 +0200

--
 .../aggregate/hazelcast/HazelcastAggregationRepository.java | 9 +
 1 file changed, 9 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/1a1a85cd/components/camel-hazelcast/src/main/java/org/apache/camel/processor/aggregate/hazelcast/HazelcastAggregationRepository.java
--
diff --git 
a/components/camel-hazelcast/src/main/java/org/apache/camel/processor/aggregate/hazelcast/HazelcastAggregationRepository.java
 
b/components/camel-hazelcast/src/main/java/org/apache/camel/processor/aggregate/hazelcast/HazelcastAggregationRepository.java
index 530bd8c..33185f0 100644
--- 
a/components/camel-hazelcast/src/main/java/org/apache/camel/processor/aggregate/hazelcast/HazelcastAggregationRepository.java
+++ 
b/components/camel-hazelcast/src/main/java/org/apache/camel/processor/aggregate/hazelcast/HazelcastAggregationRepository.java
@@ -290,6 +290,15 @@ public class HazelcastAggregationRepository extends 
ServiceSupport
 return unmarshallExchange(camelContext, cache.get(key));
 }
 
+/**
+ * Checks if the key in question is in the repository.
+ * 
+ * @param key Object - key in question
+ */
+public boolean containsKey(Object key){
+return cache.containsKey(key);
+}
+
 public boolean isAllowSerializedHeaders() {
 return allowSerializedHeaders;
 }

[3/3] camel git commit: Fixed CS

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

Branch: refs/heads/master
Commit: 607b4a8640584f445268bef9e909ba4403fb4a22
Parents: ed687f9
Author: Andrea Cosentino 
Authored: Tue Oct 11 09:54:45 2016 +0200
Committer: Andrea Cosentino 
Committed: Tue Oct 11 09:54:45 2016 +0200

--
 .../hazelcast/HazelcastAggregationRepository.java| 11 ++-
 1 file changed, 6 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/607b4a86/components/camel-hazelcast/src/main/java/org/apache/camel/processor/aggregate/hazelcast/HazelcastAggregationRepository.java
--
diff --git 
a/components/camel-hazelcast/src/main/java/org/apache/camel/processor/aggregate/hazelcast/HazelcastAggregationRepository.java
 
b/components/camel-hazelcast/src/main/java/org/apache/camel/processor/aggregate/hazelcast/HazelcastAggregationRepository.java
index 9dd0c17..309aee5 100644
--- 
a/components/camel-hazelcast/src/main/java/org/apache/camel/processor/aggregate/hazelcast/HazelcastAggregationRepository.java
+++ 
b/components/camel-hazelcast/src/main/java/org/apache/camel/processor/aggregate/hazelcast/HazelcastAggregationRepository.java
@@ -295,11 +295,12 @@ public class HazelcastAggregationRepository extends 
ServiceSupport
  * 
  * @param key Object - key in question
  */
-public boolean containsKey(Object key){
-  if(cache != null)
-return cache.containsKey(key);
-  else
-return false;
+public boolean containsKey(Object key) {
+if (cache != null) {
+return cache.containsKey(key);
+} else {
+return false;
+}
 }
 
 public boolean isAllowSerializedHeaders() {

camel git commit: Upgrade JackRabbit to version 2.13.4

[acosentino]

Repository: camel
Updated Branches:
  refs/heads/master f876a9ace -> cb6c9bc0b


Upgrade JackRabbit to version 2.13.4


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

Branch: refs/heads/master
Commit: cb6c9bc0b571986606c427f34494c9d61fb031fa
Parents: f876a9a
Author: Andrea Cosentino 
Authored: Tue Oct 11 08:16:08 2016 +0200
Committer: Andrea Cosentino 
Committed: Tue Oct 11 08:16:08 2016 +0200

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


http://git-wip-us.apache.org/repos/asf/camel/blob/cb6c9bc0/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 981212e..215671b 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -282,7 +282,7 @@
 2.4.5
 2.6.1
 2.8.3
-2.13.3
+2.13.4
 15.0
 1.2.154_2
 6.0.44_1