camel git commit: camel-ignite: Update Ignite to v1.7.0.
Repository: camel
Updated Branches:
refs/heads/master 7f3c57e2f -> 210502e22
camel-ignite: Update Ignite to v1.7.0.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/210502e2
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/210502e2
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/210502e2
Branch: refs/heads/master
Commit: 210502e22bfa0eb313fcd57ace8baa4761122395
Parents: 7f3c57e
Author: Raúl Kripalani
Authored: Wed Nov 2 17:44:08 2016 +
Committer: Raúl Kripalani
Committed: Wed Nov 2 17:44:08 2016 +
--
.../java/org/apache/camel/component/ignite/IgniteEventsTest.java | 2 +-
parent/pom.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/210502e2/components/camel-ignite/src/test/java/org/apache/camel/component/ignite/IgniteEventsTest.java
--
diff --git
a/components/camel-ignite/src/test/java/org/apache/camel/component/ignite/IgniteEventsTest.java
b/components/camel-ignite/src/test/java/org/apache/camel/component/ignite/IgniteEventsTest.java
index 316eacd..57a1428 100644
---
a/components/camel-ignite/src/test/java/org/apache/camel/component/ignite/IgniteEventsTest.java
+++
b/components/camel-ignite/src/test/java/org/apache/camel/component/ignite/IgniteEventsTest.java
@@ -71,7 +71,7 @@ public class IgniteEventsTest extends AbstractIgniteTest {
List eventTypes = receivedEventTypes("mock:test1");
assert_().that(eventTypes).containsAllOf(EventType.EVT_CACHE_STARTED,
EventType.EVT_CACHE_ENTRY_CREATED, EventType.EVT_CACHE_OBJECT_PUT,
EventType.EVT_CACHE_OBJECT_READ,
-EventType.EVT_CACHE_OBJECT_REMOVED,
EventType.EVT_CACHE_OBJECT_PUT, EventType.EVT_CACHE_OBJECT_EXPIRED,
EventType.EVT_CACHE_OBJECT_READ).inOrder();
+EventType.EVT_CACHE_OBJECT_REMOVED,
EventType.EVT_CACHE_OBJECT_PUT, EventType.EVT_CACHE_OBJECT_EXPIRED).inOrder();
}
http://git-wip-us.apache.org/repos/asf/camel/blob/210502e2/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 21417e6..9830a4a 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -266,7 +266,7 @@
2.3.4.726_4
2.3.4.726
1.0.7
-1.5.0.final
+1.7.0
[1.5.0-b1,1.6)
8.2.4.Final
2.3
[3/6] camel git commit: CAMEL-10264 Switch project version from 2.18-SNAPSHOT to 2.18.0-SNAPSHOT.
http://git-wip-us.apache.org/repos/asf/camel/blob/7beb3d3a/components/camel-ibatis/pom.xml -- diff --git a/components/camel-ibatis/pom.xml b/components/camel-ibatis/pom.xml index 89e7ee2..e4b59a6 100644 --- a/components/camel-ibatis/pom.xml +++ b/components/camel-ibatis/pom.xml @@ -21,7 +21,7 @@ org.apache.camel components -2.18-SNAPSHOT +2.18.0-SNAPSHOT camel-ibatis http://git-wip-us.apache.org/repos/asf/camel/blob/7beb3d3a/components/camel-ical/pom.xml -- diff --git a/components/camel-ical/pom.xml b/components/camel-ical/pom.xml index 23371d2..9e44d9b 100644 --- a/components/camel-ical/pom.xml +++ b/components/camel-ical/pom.xml @@ -22,7 +22,7 @@ org.apache.camel components -2.18-SNAPSHOT +2.18.0-SNAPSHOT camel-ical http://git-wip-us.apache.org/repos/asf/camel/blob/7beb3d3a/components/camel-ignite/pom.xml -- diff --git a/components/camel-ignite/pom.xml b/components/camel-ignite/pom.xml index 54b682f..1081581 100644 --- a/components/camel-ignite/pom.xml +++ b/components/camel-ignite/pom.xml @@ -23,7 +23,7 @@ org.apache.camel components -2.18-SNAPSHOT +2.18.0-SNAPSHOT camel-ignite http://git-wip-us.apache.org/repos/asf/camel/blob/7beb3d3a/components/camel-infinispan/pom.xml -- diff --git a/components/camel-infinispan/pom.xml b/components/camel-infinispan/pom.xml index eb6c16f..bffcba6 100644 --- a/components/camel-infinispan/pom.xml +++ b/components/camel-infinispan/pom.xml @@ -22,7 +22,7 @@ org.apache.camel components -2.18-SNAPSHOT +2.18.0-SNAPSHOT camel-infinispan http://git-wip-us.apache.org/repos/asf/camel/blob/7beb3d3a/components/camel-influxdb/pom.xml -- diff --git a/components/camel-influxdb/pom.xml b/components/camel-influxdb/pom.xml index 9bf2723..bae58ad 100644 --- a/components/camel-influxdb/pom.xml +++ b/components/camel-influxdb/pom.xml @@ -16,7 +16,7 @@ org.apache.camel components - 2.18-SNAPSHOT + 2.18.0-SNAPSHOT camel-influxdb http://git-wip-us.apache.org/repos/asf/camel/blob/7beb3d3a/components/camel-irc/pom.xml -- diff --git a/components/camel-irc/pom.xml b/components/camel-irc/pom.xml index 84c0614..85bb0b0 100644 --- a/components/camel-irc/pom.xml +++ b/components/camel-irc/pom.xml @@ -21,7 +21,7 @@ org.apache.camel components -2.18-SNAPSHOT +2.18.0-SNAPSHOT camel-irc http://git-wip-us.apache.org/repos/asf/camel/blob/7beb3d3a/components/camel-ironmq/pom.xml -- diff --git a/components/camel-ironmq/pom.xml b/components/camel-ironmq/pom.xml index e20c0c1..c0251e1 100644 --- a/components/camel-ironmq/pom.xml +++ b/components/camel-ironmq/pom.xml @@ -21,7 +21,7 @@ org.apache.camel components -2.18-SNAPSHOT +2.18.0-SNAPSHOT camel-ironmq http://git-wip-us.apache.org/repos/asf/camel/blob/7beb3d3a/components/camel-jackson/pom.xml -- diff --git a/components/camel-jackson/pom.xml b/components/camel-jackson/pom.xml index 7310156..5fc760d 100644 --- a/components/camel-jackson/pom.xml +++ b/components/camel-jackson/pom.xml @@ -21,7 +21,7 @@ org.apache.camel components -2.18-SNAPSHOT +2.18.0-SNAPSHOT camel-jackson http://git-wip-us.apache.org/repos/asf/camel/blob/7beb3d3a/components/camel-jacksonxml/pom.xml -- diff --git a/components/camel-jacksonxml/pom.xml b/components/camel-jacksonxml/pom.xml index b05eaea..40c1714 100644 --- a/components/camel-jacksonxml/pom.xml +++ b/components/camel-jacksonxml/pom.xml @@ -21,7 +21,7 @@ org.apache.camel components -2.18-SNAPSHOT +2.18.0-SNAPSHOT camel-jacksonxml http://git-wip-us.apache.org/repos/asf/camel/blob/7beb3d3a/components/camel-jasypt/pom.xml -- diff --git a/components/camel-jasypt/pom.xml b/components/camel-jasypt/pom.xml index 1a387fb..f0ce476 100644 --- a/components/camel-jasypt/pom.xml +++ b/components/camel-jasypt/pom.xml @@ -21,7 +21,7 @@ org.apache.camel components -2.18-SNAPSHOT +2.18.0-SNAPSHOT camel-jasypt http://git-wip-us.apache.org/repos/asf/camel/blob/7beb3d3a/components/camel-javaspace/pom.xml -
[6/6] camel git commit: CAMEL-10264 Switch project version from 2.18-SNAPSHOT to 2.18.0-SNAPSHOT.
CAMEL-10264 Switch project version from 2.18-SNAPSHOT to 2.18.0-SNAPSHOT. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/7beb3d3a Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/7beb3d3a Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/7beb3d3a Branch: refs/heads/master Commit: 7beb3d3aaedb898f38771c3ff8a70fb273e701d1 Parents: ee41d81 Author: Raúl Kripalani Authored: Tue Aug 23 11:35:25 2016 +0100 Committer: Raúl Kripalani Committed: Tue Aug 23 16:12:49 2016 +0100 -- apache-camel/pom.xml | 2 +- buildingtools/pom.xml | 2 +- camel-core/pom.xml | 2 +- components-starter/camel-ahc-starter/pom.xml | 2 +- components-starter/camel-ahc-ws-starter/pom.xml| 2 +- components-starter/camel-amqp-starter/pom.xml | 2 +- components-starter/camel-apns-starter/pom.xml | 2 +- components-starter/camel-atmos-starter/pom.xml | 2 +- components-starter/camel-atmosphere-websocket-starter/pom.xml | 2 +- components-starter/camel-atom-starter/pom.xml | 2 +- components-starter/camel-avro-starter/pom.xml | 2 +- components-starter/camel-aws-starter/pom.xml | 2 +- components-starter/camel-bam-starter/pom.xml | 2 +- components-starter/camel-barcode-starter/pom.xml | 2 +- components-starter/camel-base64-starter/pom.xml| 2 +- components-starter/camel-bean-validator-starter/pom.xml| 2 +- components-starter/camel-beanio-starter/pom.xml| 2 +- components-starter/camel-beanstalk-starter/pom.xml | 2 +- components-starter/camel-bindy-starter/pom.xml | 2 +- components-starter/camel-blueprint-starter/pom.xml | 2 +- components-starter/camel-boon-starter/pom.xml | 2 +- components-starter/camel-box-starter/pom.xml | 2 +- components-starter/camel-braintree-starter/pom.xml | 2 +- components-starter/camel-cache-starter/pom.xml | 2 +- components-starter/camel-cassandraql-starter/pom.xml | 2 +- components-starter/camel-castor-starter/pom.xml| 2 +- components-starter/camel-cdi-starter/pom.xml | 2 +- components-starter/camel-chronicle-starter/pom.xml | 2 +- components-starter/camel-chunk-starter/pom.xml | 2 +- components-starter/camel-cm-sms-starter/pom.xml| 2 +- components-starter/camel-cmis-starter/pom.xml | 2 +- components-starter/camel-coap-starter/pom.xml | 2 +- components-starter/camel-cometd-starter/pom.xml| 2 +- components-starter/camel-consul-starter/pom.xml| 2 +- components-starter/camel-context-starter/pom.xml | 2 +- components-starter/camel-core-starter/pom.xml | 2 +- components-starter/camel-core-xml-starter/pom.xml | 2 +- components-starter/camel-couchdb-starter/pom.xml | 2 +- components-starter/camel-crypto-starter/pom.xml| 2 +- components-starter/camel-csv-starter/pom.xml | 2 +- components-starter/camel-cxf-starter/pom.xml | 2 +- components-starter/camel-cxf-transport-starter/pom.xml | 2 +- components-starter/camel-disruptor-starter/pom.xml | 2 +- components-starter/camel-dns-starter/pom.xml | 2 +- components-starter/camel-docker-starter/pom.xml| 2 +- components-starter/camel-dozer-starter/pom.xml | 2 +- components-starter/camel-dropbox-starter/pom.xml | 2 +- components-starter/camel-eclipse-starter/pom.xml | 2 +- components-starter/camel-ehcache-starter/pom.xml | 2 +- components-starter/camel-ejb-starter/pom.xml | 2 +- components-starter/camel-elasticsearch-starter/pom.xml | 2 +- components-starter/camel-elsql-starter/pom.xml | 2 +- components-starter/camel-etcd-starter/pom.xml | 2 +- components-starter/camel-exec-starter/pom.xml | 2 +- components-starter/camel-facebook-starter/pom.xml | 2 +- components-starter/camel-flatpack-starter/pom.xml | 2 +- components-starter/camel-flink-starter/pom.xml | 2 +- components-starter/camel-fop-starter/pom.xml | 2 +- components-st
[5/6] camel git commit: CAMEL-10264 Switch project version from 2.18-SNAPSHOT to 2.18.0-SNAPSHOT.
http://git-wip-us.apache.org/repos/asf/camel/blob/7beb3d3a/components-starter/camel-ftp-starter/pom.xml -- diff --git a/components-starter/camel-ftp-starter/pom.xml b/components-starter/camel-ftp-starter/pom.xml index 69d6f17..b6c4892 100644 --- a/components-starter/camel-ftp-starter/pom.xml +++ b/components-starter/camel-ftp-starter/pom.xml @@ -21,7 +21,7 @@ org.apache.camel components-starter -2.18-SNAPSHOT +2.18.0-SNAPSHOT camel-ftp-starter jar http://git-wip-us.apache.org/repos/asf/camel/blob/7beb3d3a/components-starter/camel-ganglia-starter/pom.xml -- diff --git a/components-starter/camel-ganglia-starter/pom.xml b/components-starter/camel-ganglia-starter/pom.xml index bf06a42..fb99612 100644 --- a/components-starter/camel-ganglia-starter/pom.xml +++ b/components-starter/camel-ganglia-starter/pom.xml @@ -21,7 +21,7 @@ org.apache.camel components-starter -2.18-SNAPSHOT +2.18.0-SNAPSHOT camel-ganglia-starter jar http://git-wip-us.apache.org/repos/asf/camel/blob/7beb3d3a/components-starter/camel-geocoder-starter/pom.xml -- diff --git a/components-starter/camel-geocoder-starter/pom.xml b/components-starter/camel-geocoder-starter/pom.xml index b970ad8..11fd0c7 100644 --- a/components-starter/camel-geocoder-starter/pom.xml +++ b/components-starter/camel-geocoder-starter/pom.xml @@ -21,7 +21,7 @@ org.apache.camel components-starter -2.18-SNAPSHOT +2.18.0-SNAPSHOT camel-geocoder-starter jar http://git-wip-us.apache.org/repos/asf/camel/blob/7beb3d3a/components-starter/camel-git-starter/pom.xml -- diff --git a/components-starter/camel-git-starter/pom.xml b/components-starter/camel-git-starter/pom.xml index 92c2984..82b1efa 100644 --- a/components-starter/camel-git-starter/pom.xml +++ b/components-starter/camel-git-starter/pom.xml @@ -21,7 +21,7 @@ org.apache.camel components-starter -2.18-SNAPSHOT +2.18.0-SNAPSHOT camel-git-starter jar http://git-wip-us.apache.org/repos/asf/camel/blob/7beb3d3a/components-starter/camel-github-starter/pom.xml -- diff --git a/components-starter/camel-github-starter/pom.xml b/components-starter/camel-github-starter/pom.xml index abe9f98..aa19577 100644 --- a/components-starter/camel-github-starter/pom.xml +++ b/components-starter/camel-github-starter/pom.xml @@ -21,7 +21,7 @@ org.apache.camel components-starter -2.18-SNAPSHOT +2.18.0-SNAPSHOT camel-github-starter jar http://git-wip-us.apache.org/repos/asf/camel/blob/7beb3d3a/components-starter/camel-google-calendar-starter/pom.xml -- diff --git a/components-starter/camel-google-calendar-starter/pom.xml b/components-starter/camel-google-calendar-starter/pom.xml index 3a5f7de..d07fd5e 100644 --- a/components-starter/camel-google-calendar-starter/pom.xml +++ b/components-starter/camel-google-calendar-starter/pom.xml @@ -21,7 +21,7 @@ org.apache.camel components-starter -2.18-SNAPSHOT +2.18.0-SNAPSHOT camel-google-calendar-starter jar http://git-wip-us.apache.org/repos/asf/camel/blob/7beb3d3a/components-starter/camel-google-drive-starter/pom.xml -- diff --git a/components-starter/camel-google-drive-starter/pom.xml b/components-starter/camel-google-drive-starter/pom.xml index 8134702..476e9e8 100644 --- a/components-starter/camel-google-drive-starter/pom.xml +++ b/components-starter/camel-google-drive-starter/pom.xml @@ -21,7 +21,7 @@ org.apache.camel components-starter -2.18-SNAPSHOT +2.18.0-SNAPSHOT camel-google-drive-starter jar http://git-wip-us.apache.org/repos/asf/camel/blob/7beb3d3a/components-starter/camel-google-mail-starter/pom.xml -- diff --git a/components-starter/camel-google-mail-starter/pom.xml b/components-starter/camel-google-mail-starter/pom.xml index 801c43b..417c2fc 100644 --- a/components-starter/camel-google-mail-starter/pom.xml +++ b/components-starter/camel-google-mail-starter/pom.xml @@ -21,7 +21,7 @@ org.apache.camel components-starter -2.18-SNAPSHOT +2.18.0-SNAPSHOT camel-google-mail-starter jar http://git-wip-us.apache.org/repos/asf/camel/blob/7beb3d3a/components-starter/camel-gora-starter/pom.xml
[1/6] camel git commit: CAMEL-10264 Switch project version from 2.18-SNAPSHOT to 2.18.0-SNAPSHOT.
Repository: camel Updated Branches: refs/heads/master ee41d8168 -> 7beb3d3aa http://git-wip-us.apache.org/repos/asf/camel/blob/7beb3d3a/tooling/maven/camel-api-component-maven-plugin/pom.xml -- diff --git a/tooling/maven/camel-api-component-maven-plugin/pom.xml b/tooling/maven/camel-api-component-maven-plugin/pom.xml index 9b51e41..fc31457 100644 --- a/tooling/maven/camel-api-component-maven-plugin/pom.xml +++ b/tooling/maven/camel-api-component-maven-plugin/pom.xml @@ -22,7 +22,7 @@ org.apache.camel maven-plugins -2.18-SNAPSHOT +2.18.0-SNAPSHOT camel-api-component-maven-plugin http://git-wip-us.apache.org/repos/asf/camel/blob/7beb3d3a/tooling/maven/camel-eip-documentation-enricher-maven-plugin/pom.xml -- diff --git a/tooling/maven/camel-eip-documentation-enricher-maven-plugin/pom.xml b/tooling/maven/camel-eip-documentation-enricher-maven-plugin/pom.xml index 380969e..e9d7a66 100644 --- a/tooling/maven/camel-eip-documentation-enricher-maven-plugin/pom.xml +++ b/tooling/maven/camel-eip-documentation-enricher-maven-plugin/pom.xml @@ -22,7 +22,7 @@ org.apache.camel maven-plugins -2.18-SNAPSHOT +2.18.0-SNAPSHOT camel-eip-documentation-enricher-maven-plugin http://git-wip-us.apache.org/repos/asf/camel/blob/7beb3d3a/tooling/maven/camel-maven-plugin/pom.xml -- diff --git a/tooling/maven/camel-maven-plugin/pom.xml b/tooling/maven/camel-maven-plugin/pom.xml index d31b31f..a76e6fb 100644 --- a/tooling/maven/camel-maven-plugin/pom.xml +++ b/tooling/maven/camel-maven-plugin/pom.xml @@ -21,7 +21,7 @@ org.apache.camel maven-plugins -2.18-SNAPSHOT +2.18.0-SNAPSHOT camel-maven-plugin http://git-wip-us.apache.org/repos/asf/camel/blob/7beb3d3a/tooling/maven/camel-package-maven-plugin/pom.xml -- diff --git a/tooling/maven/camel-package-maven-plugin/pom.xml b/tooling/maven/camel-package-maven-plugin/pom.xml index dca28a6..7ad0e39 100644 --- a/tooling/maven/camel-package-maven-plugin/pom.xml +++ b/tooling/maven/camel-package-maven-plugin/pom.xml @@ -22,7 +22,7 @@ org.apache.camel maven-plugins -2.18-SNAPSHOT +2.18.0-SNAPSHOT camel-package-maven-plugin http://git-wip-us.apache.org/repos/asf/camel/blob/7beb3d3a/tooling/maven/guice-maven-plugin/pom.xml -- diff --git a/tooling/maven/guice-maven-plugin/pom.xml b/tooling/maven/guice-maven-plugin/pom.xml index a93ed6d..f8085c3 100644 --- a/tooling/maven/guice-maven-plugin/pom.xml +++ b/tooling/maven/guice-maven-plugin/pom.xml @@ -22,7 +22,7 @@ org.apache.camel maven-plugins -2.18-SNAPSHOT +2.18.0-SNAPSHOT guice-maven-plugin http://git-wip-us.apache.org/repos/asf/camel/blob/7beb3d3a/tooling/maven/pom.xml -- diff --git a/tooling/maven/pom.xml b/tooling/maven/pom.xml index 6408cca..731ebc1 100644 --- a/tooling/maven/pom.xml +++ b/tooling/maven/pom.xml @@ -21,7 +21,7 @@ org.apache.camel tooling -2.18-SNAPSHOT +2.18.0-SNAPSHOT maven-plugins http://git-wip-us.apache.org/repos/asf/camel/blob/7beb3d3a/tooling/parent/pom.xml -- diff --git a/tooling/parent/pom.xml b/tooling/parent/pom.xml index d01ec4b..03ba475 100644 --- a/tooling/parent/pom.xml +++ b/tooling/parent/pom.xml @@ -22,7 +22,7 @@ org.apache.camel tooling -2.18-SNAPSHOT +2.18.0-SNAPSHOT tooling-parent http://git-wip-us.apache.org/repos/asf/camel/blob/7beb3d3a/tooling/pom.xml -- diff --git a/tooling/pom.xml b/tooling/pom.xml index 0425218..83ef338 100644 --- a/tooling/pom.xml +++ b/tooling/pom.xml @@ -22,7 +22,7 @@ org.apache.camel camel-parent -2.18-SNAPSHOT +2.18.0-SNAPSHOT ../parent http://git-wip-us.apache.org/repos/asf/camel/blob/7beb3d3a/tooling/spi-annotations/pom.xml -- diff --git a/tooling/spi-annotations/pom.xml b/tooling/spi-annotations/pom.xml index 6baeb6c..c355494 100644 --- a/tooling/spi-annotations/pom.xml +++ b/tooling/spi-annotations/pom.xml @@ -22,7 +22,7 @@ org.apache.camel tooling -2.18-SNAPSHOT +2.18.0-SNAPSHOT
[2/6] camel git commit: CAMEL-10264 Switch project version from 2.18-SNAPSHOT to 2.18.0-SNAPSHOT.
http://git-wip-us.apache.org/repos/asf/camel/blob/7beb3d3a/components/camel-weather/pom.xml -- diff --git a/components/camel-weather/pom.xml b/components/camel-weather/pom.xml index 829e100..aa27b58 100644 --- a/components/camel-weather/pom.xml +++ b/components/camel-weather/pom.xml @@ -21,7 +21,7 @@ components org.apache.camel -2.18-SNAPSHOT +2.18.0-SNAPSHOT camel-weather http://git-wip-us.apache.org/repos/asf/camel/blob/7beb3d3a/components/camel-websocket/pom.xml -- diff --git a/components/camel-websocket/pom.xml b/components/camel-websocket/pom.xml index cedc8b9..94e2cba 100644 --- a/components/camel-websocket/pom.xml +++ b/components/camel-websocket/pom.xml @@ -22,7 +22,7 @@ org.apache.camel components -2.18-SNAPSHOT +2.18.0-SNAPSHOT camel-websocket http://git-wip-us.apache.org/repos/asf/camel/blob/7beb3d3a/components/camel-xmlbeans/pom.xml -- diff --git a/components/camel-xmlbeans/pom.xml b/components/camel-xmlbeans/pom.xml index 7d57a18..9e1f0c8 100644 --- a/components/camel-xmlbeans/pom.xml +++ b/components/camel-xmlbeans/pom.xml @@ -23,7 +23,7 @@ org.apache.camel components -2.18-SNAPSHOT +2.18.0-SNAPSHOT camel-xmlbeans http://git-wip-us.apache.org/repos/asf/camel/blob/7beb3d3a/components/camel-xmljson/pom.xml -- diff --git a/components/camel-xmljson/pom.xml b/components/camel-xmljson/pom.xml index 10882d1..910615b 100644 --- a/components/camel-xmljson/pom.xml +++ b/components/camel-xmljson/pom.xml @@ -22,7 +22,7 @@ org.apache.camel components -2.18-SNAPSHOT +2.18.0-SNAPSHOT camel-xmljson http://git-wip-us.apache.org/repos/asf/camel/blob/7beb3d3a/components/camel-xmlrpc/pom.xml -- diff --git a/components/camel-xmlrpc/pom.xml b/components/camel-xmlrpc/pom.xml index a0ba22c..9da1a6a 100644 --- a/components/camel-xmlrpc/pom.xml +++ b/components/camel-xmlrpc/pom.xml @@ -22,7 +22,7 @@ components org.apache.camel -2.18-SNAPSHOT +2.18.0-SNAPSHOT camel-xmlrpc http://git-wip-us.apache.org/repos/asf/camel/blob/7beb3d3a/components/camel-xmlsecurity/pom.xml -- diff --git a/components/camel-xmlsecurity/pom.xml b/components/camel-xmlsecurity/pom.xml index 51aa07a..2c29bdd 100755 --- a/components/camel-xmlsecurity/pom.xml +++ b/components/camel-xmlsecurity/pom.xml @@ -22,7 +22,7 @@ org.apache.camel components -2.18-SNAPSHOT +2.18.0-SNAPSHOT camel-xmlsecurity http://git-wip-us.apache.org/repos/asf/camel/blob/7beb3d3a/components/camel-xmpp/pom.xml -- diff --git a/components/camel-xmpp/pom.xml b/components/camel-xmpp/pom.xml index 86534f8..7a6cec1 100644 --- a/components/camel-xmpp/pom.xml +++ b/components/camel-xmpp/pom.xml @@ -22,7 +22,7 @@ org.apache.camel components -2.18-SNAPSHOT +2.18.0-SNAPSHOT camel-xmpp http://git-wip-us.apache.org/repos/asf/camel/blob/7beb3d3a/components/camel-xstream/pom.xml -- diff --git a/components/camel-xstream/pom.xml b/components/camel-xstream/pom.xml index 13e852f..0dd10f8 100644 --- a/components/camel-xstream/pom.xml +++ b/components/camel-xstream/pom.xml @@ -22,7 +22,7 @@ org.apache.camel components -2.18-SNAPSHOT +2.18.0-SNAPSHOT camel-xstream http://git-wip-us.apache.org/repos/asf/camel/blob/7beb3d3a/components/camel-yammer/pom.xml -- diff --git a/components/camel-yammer/pom.xml b/components/camel-yammer/pom.xml index c90404d..d75c38f 100644 --- a/components/camel-yammer/pom.xml +++ b/components/camel-yammer/pom.xml @@ -21,7 +21,7 @@ org.apache.camel components - 2.18-SNAPSHOT + 2.18.0-SNAPSHOT camel-yammer http://git-wip-us.apache.org/repos/asf/camel/blob/7beb3d3a/components/camel-zipfile/pom.xml -- diff --git a/components/camel-zipfile/pom.xml b/components/camel-zipfile/pom.xml index 43d86e0..5f790e1 100644 --- a/components/camel-zipfile/pom.xml +++ b/components/camel-zipfile/pom.xml @@ -21,7 +21,7 @@ org.apache.camel components -2.18-SNAPSHOT +2.18.0-SNAPSHOT camel-zipfile http://git-wip-us.apache.org/repos/asf/camel/blob/7beb3d3a/components/camel-zipkin/pom.xml -- diff --git a/components/camel
[4/6] camel git commit: CAMEL-10264 Switch project version from 2.18-SNAPSHOT to 2.18.0-SNAPSHOT.
http://git-wip-us.apache.org/repos/asf/camel/blob/7beb3d3a/components-starter/camel-sip-starter/pom.xml -- diff --git a/components-starter/camel-sip-starter/pom.xml b/components-starter/camel-sip-starter/pom.xml index 47624c2..1221991 100644 --- a/components-starter/camel-sip-starter/pom.xml +++ b/components-starter/camel-sip-starter/pom.xml @@ -21,7 +21,7 @@ org.apache.camel components-starter -2.18-SNAPSHOT +2.18.0-SNAPSHOT camel-sip-starter jar http://git-wip-us.apache.org/repos/asf/camel/blob/7beb3d3a/components-starter/camel-sjms-starter/pom.xml -- diff --git a/components-starter/camel-sjms-starter/pom.xml b/components-starter/camel-sjms-starter/pom.xml index 1412b60..93f8357 100644 --- a/components-starter/camel-sjms-starter/pom.xml +++ b/components-starter/camel-sjms-starter/pom.xml @@ -21,7 +21,7 @@ org.apache.camel components-starter -2.18-SNAPSHOT +2.18.0-SNAPSHOT camel-sjms-starter jar http://git-wip-us.apache.org/repos/asf/camel/blob/7beb3d3a/components-starter/camel-slack-starter/pom.xml -- diff --git a/components-starter/camel-slack-starter/pom.xml b/components-starter/camel-slack-starter/pom.xml index 650dc97..dcd0f72 100644 --- a/components-starter/camel-slack-starter/pom.xml +++ b/components-starter/camel-slack-starter/pom.xml @@ -21,7 +21,7 @@ org.apache.camel components-starter -2.18-SNAPSHOT +2.18.0-SNAPSHOT camel-slack-starter jar http://git-wip-us.apache.org/repos/asf/camel/blob/7beb3d3a/components-starter/camel-smpp-starter/pom.xml -- diff --git a/components-starter/camel-smpp-starter/pom.xml b/components-starter/camel-smpp-starter/pom.xml index a8014b5..d066581 100644 --- a/components-starter/camel-smpp-starter/pom.xml +++ b/components-starter/camel-smpp-starter/pom.xml @@ -21,7 +21,7 @@ org.apache.camel components-starter -2.18-SNAPSHOT +2.18.0-SNAPSHOT camel-smpp-starter jar http://git-wip-us.apache.org/repos/asf/camel/blob/7beb3d3a/components-starter/camel-snakeyaml-starter/pom.xml -- diff --git a/components-starter/camel-snakeyaml-starter/pom.xml b/components-starter/camel-snakeyaml-starter/pom.xml index b8040d9..0cedb56 100644 --- a/components-starter/camel-snakeyaml-starter/pom.xml +++ b/components-starter/camel-snakeyaml-starter/pom.xml @@ -21,7 +21,7 @@ org.apache.camel components-starter -2.18-SNAPSHOT +2.18.0-SNAPSHOT camel-snakeyaml-starter jar http://git-wip-us.apache.org/repos/asf/camel/blob/7beb3d3a/components-starter/camel-snmp-starter/pom.xml -- diff --git a/components-starter/camel-snmp-starter/pom.xml b/components-starter/camel-snmp-starter/pom.xml index 83194b4..fe97852 100644 --- a/components-starter/camel-snmp-starter/pom.xml +++ b/components-starter/camel-snmp-starter/pom.xml @@ -21,7 +21,7 @@ org.apache.camel components-starter -2.18-SNAPSHOT +2.18.0-SNAPSHOT camel-snmp-starter jar http://git-wip-us.apache.org/repos/asf/camel/blob/7beb3d3a/components-starter/camel-soap-starter/pom.xml -- diff --git a/components-starter/camel-soap-starter/pom.xml b/components-starter/camel-soap-starter/pom.xml index 45a88f3..f2848b8 100644 --- a/components-starter/camel-soap-starter/pom.xml +++ b/components-starter/camel-soap-starter/pom.xml @@ -21,7 +21,7 @@ org.apache.camel components-starter -2.18-SNAPSHOT +2.18.0-SNAPSHOT camel-soap-starter jar http://git-wip-us.apache.org/repos/asf/camel/blob/7beb3d3a/components-starter/camel-solr-starter/pom.xml -- diff --git a/components-starter/camel-solr-starter/pom.xml b/components-starter/camel-solr-starter/pom.xml index 15b855a..27b799f 100644 --- a/components-starter/camel-solr-starter/pom.xml +++ b/components-starter/camel-solr-starter/pom.xml @@ -21,7 +21,7 @@ org.apache.camel components-starter -2.18-SNAPSHOT +2.18.0-SNAPSHOT camel-solr-starter jar http://git-wip-us.apache.org/repos/asf/camel/blob/7beb3d3a/components-starter/camel-spark-rest-starter/pom.xml -- diff --git a/components-starter/camel-spark-rest-starter/pom.xml b/components-starter/camel-spark-rest-starter/pom
camel git commit: camel-hystrix: Ensure configuration is not lost when setting other parameters separately.
Repository: camel
Updated Branches:
refs/heads/master 3dc47cc6c -> 9b18b1241
camel-hystrix: Ensure configuration is not lost when setting other parameters
separately.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/9b18b124
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/9b18b124
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/9b18b124
Branch: refs/heads/master
Commit: 9b18b12419c8a7378a7589262cf34347378f2f95
Parents: 3dc47cc
Author: Raúl Kripalani
Authored: Mon Jul 25 13:49:58 2016 +0100
Committer: Raúl Kripalani
Committed: Wed Aug 17 23:32:51 2016 +0100
--
.../apache/camel/model/HystrixDefinition.java | 4 +--
.../processor/HystrixRouteConfigTest.java | 33 +++-
2 files changed, 34 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/9b18b124/camel-core/src/main/java/org/apache/camel/model/HystrixDefinition.java
--
diff --git
a/camel-core/src/main/java/org/apache/camel/model/HystrixDefinition.java
b/camel-core/src/main/java/org/apache/camel/model/HystrixDefinition.java
index 7ef7302..901c1ab 100644
--- a/camel-core/src/main/java/org/apache/camel/model/HystrixDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/HystrixDefinition.java
@@ -173,10 +173,10 @@ public class HystrixDefinition extends
ProcessorDefinition {
* Use end when configuration is complete, to return back to the
Hystrix EIP.
*/
public HystrixConfigurationDefinition hystrixConfiguration() {
-hystrixConfiguration = new HystrixConfigurationDefinition(this);
+hystrixConfiguration = hystrixConfiguration == null ? new
HystrixConfigurationDefinition(this) : hystrixConfiguration;
return hystrixConfiguration;
}
-
+
/**
* Configures the Hystrix EIP using the given configuration
*/
http://git-wip-us.apache.org/repos/asf/camel/blob/9b18b124/components/camel-hystrix/src/test/java/org/apache/camel/component/hystrix/processor/HystrixRouteConfigTest.java
--
diff --git
a/components/camel-hystrix/src/test/java/org/apache/camel/component/hystrix/processor/HystrixRouteConfigTest.java
b/components/camel-hystrix/src/test/java/org/apache/camel/component/hystrix/processor/HystrixRouteConfigTest.java
index cf0b164..b9bfc1c 100644
---
a/components/camel-hystrix/src/test/java/org/apache/camel/component/hystrix/processor/HystrixRouteConfigTest.java
+++
b/components/camel-hystrix/src/test/java/org/apache/camel/component/hystrix/processor/HystrixRouteConfigTest.java
@@ -17,6 +17,9 @@
package org.apache.camel.component.hystrix.processor;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.model.HystrixConfigurationDefinition;
+import org.apache.camel.model.HystrixDefinition;
+import org.apache.camel.model.RouteDefinition;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
@@ -30,7 +33,35 @@ public class HystrixRouteConfigTest extends CamelTestSupport
{
assertMockEndpointsSatisfied();
}
-
+
+@Test
+public void
testGroupKeyAndThreadPoolKeyConfigFlagsDoNotScrapHystrixConfiguration() throws
Exception {
+// dummy route
+RouteBuilder rb = new RouteBuilder() {
+@Override
+public void configure() throws Exception {
+from("direct:foo")
+.hystrix()
+
.hystrixConfiguration().groupKey("test1").metricsHealthSnapshotIntervalInMilliseconds(9).end()
+.groupKey("test2")
+// ^^^ should only override the groupKey from the
HystrixConfigurationDefinition;
+// it should not discard the full
HystrixConfigurationDefinition.
+.to("log:hello")
+.end();
+
+}
+};
+
+rb.configure();
+
+RouteDefinition route = rb.getRouteCollection().getRoutes().get(0);
+assertEquals(HystrixDefinition.class,
route.getOutputs().get(0).getClass());
+
+HystrixConfigurationDefinition config = ((HystrixDefinition)
route.getOutputs().get(0)).getHystrixConfiguration();
+assertEquals("test2", config.getGroupKey());
+assertEquals(9,
config.getMetricsHealthSnapshotIntervalInMilliseconds().intValue());
+}
+
@Override
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
camel git commit: CAMEL-9764: Fix OSGi import issues in camel-ftp and camel-ognl.
Repository: camel
Updated Branches:
refs/heads/master d9b9eaf87 -> 7bb9230af
CAMEL-9764: Fix OSGi import issues in camel-ftp and camel-ognl.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/7bb9230a
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/7bb9230a
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/7bb9230a
Branch: refs/heads/master
Commit: 7bb9230af56076f6fae746578c673a1a0da686ce
Parents: d9b9eaf
Author: Raúl Kripalani
Authored: Thu Mar 31 16:40:36 2016 +0100
Committer: Raúl Kripalani
Committed: Thu Mar 31 16:41:01 2016 +0100
--
components/camel-ftp/pom.xml | 3 +--
components/camel-ognl/pom.xml | 2 --
2 files changed, 1 insertion(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/7bb9230a/components/camel-ftp/pom.xml
--
diff --git a/components/camel-ftp/pom.xml b/components/camel-ftp/pom.xml
index 301a662..6e4691e 100644
--- a/components/camel-ftp/pom.xml
+++ b/components/camel-ftp/pom.xml
@@ -31,8 +31,7 @@
-com.jcraft.jsch.*;version="[0.1.40,0.2)",
-
org.apache.camel.component.file.strategy;${camel.osgi.import.strict.version}
+com.jcraft.jsch.*;version="[0.1.40,0.2)"
org.apache.camel.component.file.remote.*
http://git-wip-us.apache.org/repos/asf/camel/blob/7bb9230a/components/camel-ognl/pom.xml
--
diff --git a/components/camel-ognl/pom.xml b/components/camel-ognl/pom.xml
index 24d0e10..0958355 100644
--- a/components/camel-ognl/pom.xml
+++ b/components/camel-ognl/pom.xml
@@ -30,8 +30,6 @@
Camel OGNL support
-
-
org.apache.camel.spi;${camel.osgi.import.strict.version}
org.apache.camel.language.ognl.*
org.apache.camel.spi.LanguageResolver;language=ognl
[camel] Git Push Summary
Repository: camel Updated Branches: refs/heads/jdk8-lambdas [deleted] 385ecf58f
camel git commit: CAMEL-9765: Direct-VM - Ensure that TCCL is restored in async scenarios.
Repository: camel
Updated Branches:
refs/heads/master 80957b2d3 -> 0343d3fe5
CAMEL-9765: Direct-VM - Ensure that TCCL is restored in async scenarios.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/0343d3fe
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/0343d3fe
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/0343d3fe
Branch: refs/heads/master
Commit: 0343d3fe5c7c042ccdfde344fc1c01bedd66bfc9
Parents: 80957b2
Author: Raúl Kripalani
Authored: Wed Mar 30 20:21:53 2016 +0100
Committer: Raúl Kripalani
Committed: Wed Mar 30 20:21:53 2016 +0100
--
.../apache/camel/component/directvm/DirectVmProcessor.java| 7 +++
1 file changed, 7 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/0343d3fe/camel-core/src/main/java/org/apache/camel/component/directvm/DirectVmProcessor.java
--
diff --git
a/camel-core/src/main/java/org/apache/camel/component/directvm/DirectVmProcessor.java
b/camel-core/src/main/java/org/apache/camel/component/directvm/DirectVmProcessor.java
index 299ddf0..2844f6a 100644
---
a/camel-core/src/main/java/org/apache/camel/component/directvm/DirectVmProcessor.java
+++
b/camel-core/src/main/java/org/apache/camel/component/directvm/DirectVmProcessor.java
@@ -52,10 +52,17 @@ public final class DirectVmProcessor extends
DelegateAsyncProcessor {
Thread.currentThread().setContextClassLoader(appClassLoader);
changed = true;
}
+
+final boolean chgd = changed;
return processor.process(copy, new AsyncCallback() {
@Override
public void done(boolean done) {
try {
+// restore TCCL if it was changed during processing
+if (chgd) {
+LOG.trace("Restoring Thread ContextClassLoader to
{}", current);
+
Thread.currentThread().setContextClassLoader(current);
+}
// make sure to copy results back
ExchangeHelper.copyResults(exchange, copy);
} finally {
camel git commit: CAMEL-9765: Direct-VM - Header filter strategy & property propagation flag.
Repository: camel
Updated Branches:
refs/heads/master fd89a88cf -> 80957b2d3
CAMEL-9765: Direct-VM - Header filter strategy & property propagation flag.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/80957b2d
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/80957b2d
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/80957b2d
Branch: refs/heads/master
Commit: 80957b2d3d9c1d2ebf4c51630f76cf4828f37170
Parents: fd89a88
Author: Raúl Kripalani
Authored: Fri Mar 25 21:07:40 2016 +
Committer: Raúl Kripalani
Committed: Wed Mar 30 20:01:36 2016 +0100
--
.../component/directvm/DirectVmComponent.java | 32
.../component/directvm/DirectVmConsumer.java| 1 -
.../component/directvm/DirectVmEndpoint.java| 33 -
.../component/directvm/DirectVmProducer.java| 54 +-
.../DirectVmHeaderFilterStrategyTest.java | 77
...ectVmNoPropertyPropagationComponentTest.java | 62
.../DirectVmNoPropertyPropagationTest.java | 61
7 files changed, 299 insertions(+), 21 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/80957b2d/camel-core/src/main/java/org/apache/camel/component/directvm/DirectVmComponent.java
--
diff --git
a/camel-core/src/main/java/org/apache/camel/component/directvm/DirectVmComponent.java
b/camel-core/src/main/java/org/apache/camel/component/directvm/DirectVmComponent.java
index 3e48c7c..d5c341f 100644
---
a/camel-core/src/main/java/org/apache/camel/component/directvm/DirectVmComponent.java
+++
b/camel-core/src/main/java/org/apache/camel/component/directvm/DirectVmComponent.java
@@ -25,6 +25,7 @@ import java.util.concurrent.atomic.AtomicInteger;
import org.apache.camel.Endpoint;
import org.apache.camel.impl.UriEndpointComponent;
+import org.apache.camel.spi.HeaderFilterStrategy;
import org.apache.camel.spi.Metadata;
/**
@@ -41,6 +42,9 @@ public class DirectVmComponent extends UriEndpointComponent {
private boolean block;
@Metadata(defaultValue = "3")
private long timeout = 3L;
+private HeaderFilterStrategy headerFilterStrategy;
+@Metadata(defaultValue = "true")
+private Boolean propagateProperties = Boolean.TRUE;
public DirectVmComponent() {
super(DirectVmEndpoint.class);
@@ -65,6 +69,7 @@ public class DirectVmComponent extends UriEndpointComponent {
answer.setBlock(block);
answer.setTimeout(timeout);
answer.configureProperties(parameters);
+setProperties(answer, parameters);
return answer;
}
@@ -132,4 +137,31 @@ public class DirectVmComponent extends
UriEndpointComponent {
public void setTimeout(long timeout) {
this.timeout = timeout;
}
+
+public HeaderFilterStrategy getHeaderFilterStrategy() {
+return headerFilterStrategy;
+}
+
+/**
+ * Sets a {@link HeaderFilterStrategy} that will only be applied on
producer endpoints (on both directions: request and response).
+ * Default value: none.
+ * @param headerFilterStrategy
+ */
+public void setHeaderFilterStrategy(HeaderFilterStrategy
headerFilterStrategy) {
+this.headerFilterStrategy = headerFilterStrategy;
+}
+
+public boolean isPropagateProperties() {
+return propagateProperties;
+}
+
+/**
+ * Whether to propagate or not properties from the producer side to the
consumer side, and viceversa.
+ * Default value: true.
+ * @param propagateProperties
+ */
+public void setPropagateProperties(boolean propagateProperties) {
+this.propagateProperties = propagateProperties;
+}
+
}
http://git-wip-us.apache.org/repos/asf/camel/blob/80957b2d/camel-core/src/main/java/org/apache/camel/component/directvm/DirectVmConsumer.java
--
diff --git
a/camel-core/src/main/java/org/apache/camel/component/directvm/DirectVmConsumer.java
b/camel-core/src/main/java/org/apache/camel/component/directvm/DirectVmConsumer.java
index 4b18fe3..827e975 100644
---
a/camel-core/src/main/java/org/apache/camel/component/directvm/DirectVmConsumer.java
+++
b/camel-core/src/main/java/org/apache/camel/component/directvm/DirectVmConsumer.java
@@ -18,7 +18,6 @@ package org.apache.camel.component.directvm;
import org.apache.camel.Processor;
import org.apache.camel.Suspendable;
-import org.apache.camel.SuspendableService;
import org.apache.camel.impl.DefaultConsumer;
/**
http://git-wip-us.apache.org/repos/asf/camel/blob/80957b2d/camel-core/src/main/java/org/apache/camel/component/directvm/DirectVmEndpoint.java
--
camel git commit: CAMEL-9764: Switch the camel-zipkin module to the new JAR-based build.
Repository: camel Updated Branches: refs/heads/master 7ae918f23 -> fd89a88cf CAMEL-9764: Switch the camel-zipkin module to the new JAR-based build. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/fd89a88c Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/fd89a88c Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/fd89a88c Branch: refs/heads/master Commit: fd89a88cfe80908860360614417ccddfc8518c48 Parents: 7ae918f Author: Raúl Kripalani Authored: Wed Mar 30 19:56:14 2016 +0100 Committer: Raúl Kripalani Committed: Wed Mar 30 19:56:14 2016 +0100 -- components/camel-zipkin/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/fd89a88c/components/camel-zipkin/pom.xml -- diff --git a/components/camel-zipkin/pom.xml b/components/camel-zipkin/pom.xml index be6ab4b..9473ef2 100644 --- a/components/camel-zipkin/pom.xml +++ b/components/camel-zipkin/pom.xml @@ -27,7 +27,7 @@ camel-zipkin - bundle + jar Camel :: Zookeeper Camel Zipkin Support
[3/3] camel git commit: CAMEL-9764 Update maven-bundle-plugin to 3.0.1 to allow JDK8 lambdas.
CAMEL-9764 Update maven-bundle-plugin to 3.0.1 to allow JDK8 lambdas. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/7ae918f2 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/7ae918f2 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/7ae918f2 Branch: refs/heads/master Commit: 7ae918f23c269c8ad78fc8e536b53342af569dec Parents: 8f0bcd8 Author: Raúl Kripalani Authored: Wed Mar 30 19:39:45 2016 +0100 Committer: Raúl Kripalani Committed: Wed Mar 30 19:43:09 2016 +0100 -- camel-core/pom.xml | 3 +- components/camel-ahc-ws/pom.xml | 2 +- components/camel-ahc/pom.xml| 2 +- components/camel-amqp/pom.xml | 2 +- components/camel-apns/pom.xml | 2 +- components/camel-atmos/pom.xml | 2 +- components/camel-atmosphere-websocket/pom.xml | 2 +- components/camel-atom/pom.xml | 2 +- components/camel-avro/pom.xml | 2 +- components/camel-aws/pom.xml| 2 +- components/camel-bam/pom.xml| 2 +- components/camel-barcode/pom.xml| 2 +- components/camel-base64/pom.xml | 2 +- components/camel-bean-validator/pom.xml | 2 +- components/camel-beanio/pom.xml | 2 +- components/camel-beanstalk/pom.xml | 2 +- components/camel-bindy/pom.xml | 2 +- components/camel-blueprint/pom.xml | 56 - components/camel-boon/pom.xml | 2 +- components/camel-box/pom.xml| 2 +- components/camel-braintree/pom.xml | 2 +- components/camel-cache/pom.xml | 2 +- components/camel-cassandraql/pom.xml| 2 +- components/camel-castor/pom.xml | 2 +- components/camel-cdi/pom.xml| 2 +- components/camel-chunk/pom.xml | 2 +- components/camel-cm-sms/pom.xml | 2 +- components/camel-cmis/pom.xml | 2 +- components/camel-coap/pom.xml | 2 +- components/camel-cometd/pom.xml | 2 +- components/camel-context/pom.xml| 2 +- components/camel-core-osgi/pom.xml | 2 +- components/camel-core-xml/pom.xml | 6 + components/camel-couchdb/pom.xml| 2 +- components/camel-crypto/pom.xml | 2 +- components/camel-csv/pom.xml| 2 +- components/camel-cxf-transport/pom.xml | 2 +- components/camel-cxf/pom.xml| 3 +- components/camel-disruptor/pom.xml | 2 +- components/camel-dns/pom.xml| 2 +- components/camel-docker/pom.xml | 2 +- components/camel-dozer/pom.xml | 2 +- components/camel-dropbox/pom.xml| 2 +- components/camel-eclipse/pom.xml| 2 +- components/camel-ejb/pom.xml| 2 +- components/camel-elasticsearch/pom.xml | 2 +- components/camel-elsql/pom.xml | 2 +- components/camel-etcd/pom.xml | 2 +- components/camel-eventadmin/pom.xml | 2 +- components/camel-exec/pom.xml | 2 +- components/camel-facebook/pom.xml | 2 +- components/camel-flatpack/pom.xml | 2 +- components/camel-fop/pom.xml| 2 +- components/camel-freemarker/pom.xml | 2 +- components/camel-ftp/pom.xml| 2 +- components/camel-gae/pom.xml| 211 +++ components/camel-ganglia/pom.xml| 2 +- components/camel-geocoder/pom.xml | 2 +- components/camel-git/pom.xml| 2 +- components/camel-github/pom.xml | 2 +- components/camel-google-calendar/pom.xml| 2 +- components/camel-google-drive/pom.xml | 2 +- components/camel-google-mail/pom.xml| 2 +- components/camel-gora/pom.xml | 2 +- components/camel-grape/pom.xml | 1 + components/camel-groovy/pom.xml | 2 +- components/camel-gson/pom.xml | 2 +- components/camel-guava-eventbus/pom.xml | 2 +- components/camel-guice/pom.xml | 2 +- components/camel-hawtdb/pom.xml | 2 +- components/camel-hazelcast/pom.xml | 2 +- components/camel-hbase/pom.xml | 2 +- components/camel-hdfs/pom.xml | 2 +- components/camel-hdfs2/pom.xml | 2 +- components/camel-hessian/pom.xml| 2 +-
[1/3] camel git commit: CAMEL-9764 Update maven-bundle-plugin to 3.0.1 to allow JDK8 lambdas.
Repository: camel
Updated Branches:
refs/heads/master 8f0bcd803 -> 7ae918f23
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/examples/camel-example-cxf-osgi/pom.xml
--
diff --git a/examples/camel-example-cxf-osgi/pom.xml
b/examples/camel-example-cxf-osgi/pom.xml
index 1c92b7d..e423f2c 100644
--- a/examples/camel-example-cxf-osgi/pom.xml
+++ b/examples/camel-example-cxf-osgi/pom.xml
@@ -28,7 +28,43 @@
camel-example-cxf-osgi
Camel :: Example :: CXF :: OSGI
An example which use a CXF consumer and the OSGI HTTP
Service
- bundle
+ jar
+
+
+
+org.apache.cxf,
+ org.apache.cxf.binding,
+ org.apache.cxf.binding.corba,
+ org.apache.cxf.binding.soap,
+ org.apache.cxf.binding.soap.spring,
+ org.apache.cxf.bus,
+ org.apache.cxf.bus.resource,
+ org.apache.cxf.bus.spring,
+ org.apache.cxf.buslifecycle,
+ org.apache.cxf.catalog,
+ org.apache.cxf.configuration,
+ org.apache.cxf.configuration.spring,
+ org.apache.cxf.endpoint,
+ org.apache.cxf.headers,
+ org.apache.cxf.management,
+ org.apache.cxf.management.jmx,
+ org.apache.cxf.phase,
+ org.apache.cxf.resource,
+ org.apache.cxf.service.factory,
+ org.apache.cxf.transport,
+ org.apache.cxf.transport.http,
+ org.apache.cxf.transport.http.policy,
+ org.apache.cxf.transport.http_jetty,
+ org.apache.cxf.transport.jms,
+ org.apache.cxf.workqueue,
+ org.apache.cxf.wsdl,
+ org.apache.cxf.wsdl11,
+ *
+
+
+org.apache.camel.example.reportincident*
+
+
@@ -106,50 +142,6 @@
-
-
-
- org.apache.felix
- maven-bundle-plugin
- true
-
-
target/META-INF
-
-
${project.groupId}.${project.artifactId}
-
org.apache.camel.example.reportincident*
-
- org.apache.cxf,
- org.apache.cxf.binding,
-
org.apache.cxf.binding.corba,
-
org.apache.cxf.binding.soap,
-
org.apache.cxf.binding.soap.spring,
- org.apache.cxf.bus,
-
org.apache.cxf.bus.resource,
-
org.apache.cxf.bus.spring,
-
org.apache.cxf.buslifecycle,
- org.apache.cxf.catalog,
-
org.apache.cxf.configuration,
-
org.apache.cxf.configuration.spring,
- org.apache.cxf.endpoint,
- org.apache.cxf.headers,
-
org.apache.cxf.management,
-
org.apache.cxf.management.jmx,
- org.apache.cxf.phase,
- org.apache.cxf.resource,
-
org.apache.cxf.service.factory,
-
org.apache.cxf.transport,
-
org.apache.cxf.transport.http,
-
org.apache.cxf.transport.http.policy,
-
org.apache.cxf.transport.http_jetty,
-
org.apache.cxf.transport.jms,
-
org.apache.cxf.workqueue,
- org.apache.cxf.wsdl,
- org.apache.cxf.wsdl11,
- *
-
[2/3] camel git commit: CAMEL-9764 Update maven-bundle-plugin to 3.0.1 to allow JDK8 lambdas.
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-jms/pom.xml -- diff --git a/components/camel-jms/pom.xml b/components/camel-jms/pom.xml index 07a91e0..63a344c 100644 --- a/components/camel-jms/pom.xml +++ b/components/camel-jms/pom.xml @@ -25,7 +25,7 @@ camel-jms -bundle +jar Camel :: JMS Camel JMS support http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-jmx/pom.xml -- diff --git a/components/camel-jmx/pom.xml b/components/camel-jmx/pom.xml index 1a8f2fb..69dda09 100644 --- a/components/camel-jmx/pom.xml +++ b/components/camel-jmx/pom.xml @@ -25,7 +25,7 @@ camel-jmx -bundle +jar Camel :: JMX Camel JMX support http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-jolt/pom.xml -- diff --git a/components/camel-jolt/pom.xml b/components/camel-jolt/pom.xml index e44f9f6..d74e09b 100644 --- a/components/camel-jolt/pom.xml +++ b/components/camel-jolt/pom.xml @@ -26,7 +26,7 @@ camel-jolt - bundle + jar Camel :: Jolt Camel Jolt Support http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-josql/pom.xml -- diff --git a/components/camel-josql/pom.xml b/components/camel-josql/pom.xml index 4463651..975a6d8 100644 --- a/components/camel-josql/pom.xml +++ b/components/camel-josql/pom.xml @@ -25,7 +25,7 @@ camel-josql - bundle + jar Camel :: JoSQL Camel JoSQL support http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-jpa/pom.xml -- diff --git a/components/camel-jpa/pom.xml b/components/camel-jpa/pom.xml index 8c020a2..4a8a180 100644 --- a/components/camel-jpa/pom.xml +++ b/components/camel-jpa/pom.xml @@ -25,7 +25,7 @@ camel-jpa - bundle + jar Camel :: JPA Camel JPA support http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-jsch/pom.xml -- diff --git a/components/camel-jsch/pom.xml b/components/camel-jsch/pom.xml index d82effc..002475b 100644 --- a/components/camel-jsch/pom.xml +++ b/components/camel-jsch/pom.xml @@ -27,7 +27,7 @@ camel-jsch - bundle + jar Camel :: Jsch Camel SCP Support http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-jsonpath/pom.xml -- diff --git a/components/camel-jsonpath/pom.xml b/components/camel-jsonpath/pom.xml index 7bee585..3d24dc6 100644 --- a/components/camel-jsonpath/pom.xml +++ b/components/camel-jsonpath/pom.xml @@ -26,7 +26,7 @@ camel-jsonpath - bundle + jar Camel :: JSon Path Camel JSON Path Language http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-jt400/pom.xml -- diff --git a/components/camel-jt400/pom.xml b/components/camel-jt400/pom.xml index d3281aa..b135b0a 100644 --- a/components/camel-jt400/pom.xml +++ b/components/camel-jt400/pom.xml @@ -25,7 +25,7 @@ camel-jt400 - bundle + jar Camel :: Java Toolbox for AS/400 Camel AS/400 support http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-juel/pom.xml -- diff --git a/components/camel-juel/pom.xml b/components/camel-juel/pom.xml index 7c7322b..ab3db28 100644 --- a/components/camel-juel/pom.xml +++ b/components/camel-juel/pom.xml @@ -25,7 +25,7 @@ camel-juel - bundle + jar Camel :: JUEL Camel JUEL support http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-jxpath/pom.xml -- diff --git a/components/camel-jxpath/pom.xml b/components/camel-jxpath/pom.xml index 88b9902..53da26f 100644 --- a/components/camel-jxpath/pom.xml +++ b/components/camel-jxpath/pom.xml @@ -25,7 +25,7 @@ camel-jxpath - bundle + jar Camel :: JXPath Camel JXPath support http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-kafka/pom.xml -- diff --git a/components/camel-kafka/pom.xml b/components/camel-kafka/pom.xml index e31c0a4..5cb899f 100644 --- a/components/camel-kafka/pom.xml +++ b/components/camel-kafka/pom.xml @@ -26,7 +26,7 @@ camel-kafka - bundle + jar Camel :: Kafka Camel Kafka support http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-kestrel/pom.xml ---
[1/2] camel git commit: CAMEL-9764: Build - Adapt camel-blueprint, camel-cxf and camel-spring builds.
Repository: camel
Updated Branches:
refs/heads/jdk8-lambdas 55c405583 -> 385ecf58f
CAMEL-9764: Build - Adapt camel-blueprint, camel-cxf and camel-spring builds.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/3a3ad7a9
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/3a3ad7a9
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/3a3ad7a9
Branch: refs/heads/jdk8-lambdas
Commit: 3a3ad7a9ef0d9f0b012120116c949e1067a58680
Parents: 55c4055
Author: Raúl Kripalani
Authored: Wed Mar 30 17:53:05 2016 +0100
Committer: Raúl Kripalani
Committed: Wed Mar 30 17:53:05 2016 +0100
--
components/camel-blueprint/pom.xml | 54 ++---
components/camel-cxf/pom.xml | 1 +
components/camel-spring/pom.xml| 52 ---
parent/pom.xml | 2 +-
4 files changed, 100 insertions(+), 9 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/3a3ad7a9/components/camel-blueprint/pom.xml
--
diff --git a/components/camel-blueprint/pom.xml
b/components/camel-blueprint/pom.xml
index fe9b62b..b5f7a83 100644
--- a/components/camel-blueprint/pom.xml
+++ b/components/camel-blueprint/pom.xml
@@ -33,6 +33,8 @@
!org.apache.camel.blueprint.*,
!org.apache.camel.util.blueprint.*,
+!org.apache.camel.core.osgi.*,
+!org.apache.camel.core.xml.*,
org.apache.camel.*;${camel.osgi.import.strict.version},
org.osgi.service.event*;resolution:=optional,
org.apache.aries*;version="[1.0,2)",
@@ -43,10 +45,10 @@
org.apache.camel.blueprint*;${camel.osgi.version},
org.apache.camel.util.blueprint*;${camel.osgi.version}
-
- org.apache.camel.core.osgi*,
- org.apache.camel.core.xml*
-
+
+ org.apache.camel.core.osgi*,
+ org.apache.camel.core.xml*
+
@@ -120,6 +122,39 @@
+
+
+ org.apache.maven.plugins
+ maven-dependency-plugin
+ 2.10
+
+
+ unpack
+ prepare-package
+
+unpack
+
+
+
+
+org.apache.camel
+camel-core-xml
+${project.version}
+org/apache/camel/**
+
${project.build.directory}/classes
+
+
+org.apache.camel
+camel-core-osgi
+${project.version}
+org/apache/camel/**
+
${project.build.directory}/classes
+
+
+
+
+
+
@@ -165,6 +200,17 @@
+
+
+ org.apache.felix
+ maven-bundle-plugin
+
+
+ bundle-manifest
+ prepare-package
+
+
+
http://git-wip-us.apache.org/repos/asf/camel/blob/3a3ad7a9/components/camel-cxf/pom.xml
--
diff --git a/components/camel-cxf/pom.xml b/components/camel-cxf/pom.xml
index 08ff58e..55622d3 100644
--- a/components/camel-cxf/pom.xml
+++ b/components/camel-cxf/pom.xml
@@ -40,6 +40,7 @@
!org.apache.camel.component.cxf.jaxrs,
!org.apache.camel.component.cxf.spring,
!org.apache.camel.component.cxf.util,
+ !org.apache.camel.blueprint,
javax.activation*;version="[0.0,2)",
javax.annotation*;version="[0.0,2)",
javax.jws*;version="[0.0,3)",
http://git-wip-us.apache.org/repos/asf/camel/blob/3a3ad7a9/components/camel-spring/pom.xml
--
diff --git a/components/camel-spring/pom.xml b/components/camel-spring/pom.xml
index 9e9ace5..5b79d0e 100644
--- a/components/camel-spring/pom.xml
+++ b/components/camel-spring/pom.xml
@@ -37,6 +37,8 @@
!org.apache.camel.component,
!org.apache.camel.component.event,
!org.apache.camel.language.spel,
+!org.apache.camel.core.osgi*,
+!org.apache.camel.core.xml*,
org.apache.camel.*;${camel.osgi.import.strict.version},
org.springframework.osgi.*;version="[1.2,2)",
[2/2] camel git commit: CAMEL-9764: Build - Simplify build for all JARs that don't need to be bundles.
CAMEL-9764: Build - Simplify build for all JARs that don't need to be bundles. In reality, we generate manifests for all JARs, setting OSGi exports on non-bundles to empty. The manifests are valid, even if not used. Unfortunately Maven cannot turn on/off profiles based on build properties, only based on system properties (and files, etc.). Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/385ecf58 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/385ecf58 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/385ecf58 Branch: refs/heads/jdk8-lambdas Commit: 385ecf58fb789d089c660da96a8d7bbc0f34d762 Parents: 3a3ad7a Author: Raúl Kripalani Authored: Wed Mar 30 19:05:20 2016 +0100 Committer: Raúl Kripalani Committed: Wed Mar 30 19:06:10 2016 +0100 -- components/camel-grape/pom.xml | 2 +- components/camel-spring-boot-starter/pom.xml| 2 +- components/camel-spring-boot/pom.xml| 2 +- examples/camel-example-cdi-metrics/pom.xml | 4 - examples/camel-example-cdi-test/pom.xml | 4 - examples/camel-example-cdi/pom.xml | 4 - examples/camel-example-console/pom.xml | 4 - examples/camel-example-ftp/pom.xml | 4 - examples/camel-example-guice-jms/pom.xml| 4 - examples/camel-example-jms-file/pom.xml | 4 - examples/camel-example-loadbalancing/pom.xml| 4 - examples/camel-example-splunk/pom.xml | 4 - .../camel-example-spring-boot-metrics/pom.xml | 1 - .../camel-example-spring-boot-starter/pom.xml | 1 - examples/camel-example-swagger-cdi/pom.xml | 4 - .../camel-example-twitter-websocket/pom.xml | 4 - .../camel-example-widget-gadget-cdi/pom.xml | 4 - .../camel-example-widget-gadget-java/pom.xml| 4 - .../camel-example-widget-gadget-xml/pom.xml | 4 - examples/pom.xml| 1 + parent/pom.xml | 134 --- platforms/commands/commands-spring-boot/pom.xml | 2 +- tests/pom.xml | 2 +- tooling/pom.xml | 2 +- 24 files changed, 66 insertions(+), 139 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/385ecf58/components/camel-grape/pom.xml -- diff --git a/components/camel-grape/pom.xml b/components/camel-grape/pom.xml index 9886c71..affddcc 100644 --- a/components/camel-grape/pom.xml +++ b/components/camel-grape/pom.xml @@ -33,7 +33,7 @@ 2.4.3-01 2.9.2-01 2.7 -true + http://git-wip-us.apache.org/repos/asf/camel/blob/385ecf58/components/camel-spring-boot-starter/pom.xml -- diff --git a/components/camel-spring-boot-starter/pom.xml b/components/camel-spring-boot-starter/pom.xml index 9640e3e..c99f8e3 100644 --- a/components/camel-spring-boot-starter/pom.xml +++ b/components/camel-spring-boot-starter/pom.xml @@ -30,7 +30,7 @@ Spring Boot Apache Camel Starter -true + http://git-wip-us.apache.org/repos/asf/camel/blob/385ecf58/components/camel-spring-boot/pom.xml -- diff --git a/components/camel-spring-boot/pom.xml b/components/camel-spring-boot/pom.xml index ac500f8..035bcff 100644 --- a/components/camel-spring-boot/pom.xml +++ b/components/camel-spring-boot/pom.xml @@ -30,7 +30,7 @@ Camel :: Spring Boot -true + http://git-wip-us.apache.org/repos/asf/camel/blob/385ecf58/examples/camel-example-cdi-metrics/pom.xml -- diff --git a/examples/camel-example-cdi-metrics/pom.xml b/examples/camel-example-cdi-metrics/pom.xml index a6c2998..f1fd5d0 100755 --- a/examples/camel-example-cdi-metrics/pom.xml +++ b/examples/camel-example-cdi-metrics/pom.xml @@ -31,10 +31,6 @@ Dropwizard Metrics CDI example jar - -true - - http://git-wip-us.apache.org/repos/asf/camel/blob/385ecf58/examples/camel-example-cdi-test/pom.xml -- diff --git a/examples/camel-example-cdi-test/pom.xml b/examples/camel-example-cdi-test/pom.xml index 53b183c..0d060fc 100644 --- a/examples/camel-example-cdi-test/pom.xml +++ b/examples/camel-example-cdi-test/pom.xml @@ -28,10 +28,6 @@ Camel :: Example :: CDI :: Testing An example illustrating Camel CDI testing features - -true - - http://git-wip-us.apache.org/repos/asf/camel/blob/385ecf58/examples/camel-example-cdi/pom.xml --
camel git commit: CAMEL-9764: Build - Ability to suppress OSGi bundle packaging through build property. Fix camel-core-xml not having OSGi exports.
Repository: camel Updated Branches: refs/heads/jdk8-lambdas e5f2b28e2 -> 55c405583 CAMEL-9764: Build - Ability to suppress OSGi bundle packaging through build property. Fix camel-core-xml not having OSGi exports. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/55c40558 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/55c40558 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/55c40558 Branch: refs/heads/jdk8-lambdas Commit: 55c405583c5d8f58ac155f8aff53efd73111eb06 Parents: e5f2b28 Author: Raúl Kripalani Authored: Tue Mar 29 00:02:42 2016 +0100 Committer: Raúl Kripalani Committed: Tue Mar 29 00:02:42 2016 +0100 -- camel-core/pom.xml | 7 - components/camel-core-xml/pom.xml | 6 + components/camel-grape/pom.xml | 1 + components/camel-spring-boot-starter/pom.xml| 4 + components/camel-spring-boot/pom.xml| 4 + components/pom.xml | 5 - examples/camel-example-cdi-metrics/pom.xml | 4 + examples/camel-example-cdi-test/pom.xml | 4 + examples/camel-example-cdi/pom.xml | 4 + examples/camel-example-console/pom.xml | 4 + examples/camel-example-ftp/pom.xml | 4 + examples/camel-example-guice-jms/pom.xml| 4 + examples/camel-example-jms-file/pom.xml | 4 + examples/camel-example-loadbalancing/pom.xml| 4 + examples/camel-example-splunk/pom.xml | 4 + .../camel-example-spring-boot-metrics/pom.xml | 1 + .../camel-example-spring-boot-starter/pom.xml | 1 + examples/camel-example-swagger-cdi/pom.xml | 4 + .../camel-example-twitter-websocket/pom.xml | 4 + .../camel-example-widget-gadget-cdi/pom.xml | 4 + .../camel-example-widget-gadget-java/pom.xml| 4 + .../camel-example-widget-gadget-xml/pom.xml | 4 + examples/pom.xml| 6 - parent/pom.xml | 136 +++ platforms/commands/commands-spring-boot/pom.xml | 4 + platforms/pom.xml | 10 -- tests/pom.xml | 14 +- tooling/apt/pom.xml | 7 - tooling/camel-manual/pom.xml| 6 - tooling/maven/pom.xml | 49 +++ tooling/pom.xml | 4 + tooling/spi-annotations/pom.xml | 10 -- 32 files changed, 188 insertions(+), 143 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/55c40558/camel-core/pom.xml -- diff --git a/camel-core/pom.xml b/camel-core/pom.xml index 188f6f0..92abf73 100644 --- a/camel-core/pom.xml +++ b/camel-core/pom.xml @@ -213,13 +213,6 @@ - - - -org.apache.maven.plugins -maven-jar-plugin - - org.apache.maven.plugins http://git-wip-us.apache.org/repos/asf/camel/blob/55c40558/components/camel-core-xml/pom.xml -- diff --git a/components/camel-core-xml/pom.xml b/components/camel-core-xml/pom.xml index 7ac2fc2..a7da334 100644 --- a/components/camel-core-xml/pom.xml +++ b/components/camel-core-xml/pom.xml @@ -28,6 +28,12 @@ Camel :: Core XML Camel Core XML support + + + org.apache.camel.core.xml.* + + + org.apache.camel http://git-wip-us.apache.org/repos/asf/camel/blob/55c40558/components/camel-grape/pom.xml -- diff --git a/components/camel-grape/pom.xml b/components/camel-grape/pom.xml index 25b66fb..9886c71 100644 --- a/components/camel-grape/pom.xml +++ b/components/camel-grape/pom.xml @@ -33,6 +33,7 @@ 2.4.3-01 2.9.2-01 2.7 +true http://git-wip-us.apache.org/repos/asf/camel/blob/55c40558/components/camel-spring-boot-starter/pom.xml -- diff --git a/components/camel-spring-boot-starter/pom.xml b/components/camel-spring-boot-starter/pom.xml index 2c71e43..9640e3e 100644 --- a/components/camel-spring-boot-starter/pom.xml +++ b/components/camel-spring-boot-starter/pom.xml @@ -29,6 +29,10 @@ Camel :: Spring Boot :: Starter Spring Boot Apache Camel Starter + +true + + http://git-wip-us.apache.org/repos/asf/camel/blob/55c40558/components/camel-spring-boot/pom.xml -- diff --git a/components/camel-spring-boot/pom.xml b/components/camel-spring-boot/pom.xml index 84e1055..ac500f8 100644 ---
[23/27] camel git commit: CAMEL-9766: camel-itest-karaf to get working on karaf 4. Use a script to run the tests reliable.
CAMEL-9766: camel-itest-karaf to get working on karaf 4. Use a script to run
the tests reliable.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/930d4fe6
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/930d4fe6
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/930d4fe6
Branch: refs/heads/jdk8-lambdas
Commit: 930d4fe62acb203ded8f8ed21aa5fcc0aa0cb3ca
Parents: ab16fa2
Author: Claus Ibsen
Authored: Sun Mar 27 18:20:45 2016 +0200
Committer: Claus Ibsen
Committed: Sun Mar 27 18:20:45 2016 +0200
--
.../camel/component/ignite/IgniteComponent.java | 15 +++
.../camel/itest/karaf/AbstractFeatureTest.java | 3 +--
.../apache/camel/itest/karaf/CamelIgniteTest.java| 14 +++---
.../src/test/resources/jre.properties| 3 +++
4 files changed, 18 insertions(+), 17 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/930d4fe6/components/camel-ignite/src/main/java/org/apache/camel/component/ignite/IgniteComponent.java
--
diff --git
a/components/camel-ignite/src/main/java/org/apache/camel/component/ignite/IgniteComponent.java
b/components/camel-ignite/src/main/java/org/apache/camel/component/ignite/IgniteComponent.java
index 587d9be..beccf93 100644
---
a/components/camel-ignite/src/main/java/org/apache/camel/component/ignite/IgniteComponent.java
+++
b/components/camel-ignite/src/main/java/org/apache/camel/component/ignite/IgniteComponent.java
@@ -179,13 +179,13 @@ public class IgniteComponent extends UriEndpointComponent
{
return;
}
-ignite.close();
+if (ignite != null) {
+ignite.close();
+}
}
/**
* Returns the {@link Ignite} instance.
- *
- * @return
*/
public Ignite getIgnite() {
return ignite;
@@ -193,8 +193,6 @@ public class IgniteComponent extends UriEndpointComponent {
/**
* Sets the {@link Ignite} instance.
- *
- * @param ignite
*/
public void setIgnite(Ignite ignite) {
this.ignite = ignite;
@@ -203,8 +201,6 @@ public class IgniteComponent extends UriEndpointComponent {
/**
* Gets the resource from where to load the configuration. It can be a:
{@link URI}, {@link String} (URI)
* or an {@link InputStream}.
- *
- * @return
*/
public Object getConfigurationResource() {
return configurationResource;
@@ -213,8 +209,6 @@ public class IgniteComponent extends UriEndpointComponent {
/**
* Sets the resource from where to load the configuration. It can be a:
{@link URI}, {@link String} (URI)
* or an {@link InputStream}.
- *
- * @param configurationResource
*/
public void setConfigurationResource(Object configurationResource) {
this.configurationResource = configurationResource;
@@ -222,7 +216,6 @@ public class IgniteComponent extends UriEndpointComponent {
/**
* Gets the {@link IgniteConfiguration} if the user set it explicitly.
- * @return
*/
public IgniteConfiguration getIgniteConfiguration() {
return igniteConfiguration;
@@ -230,8 +223,6 @@ public class IgniteComponent extends UriEndpointComponent {
/**
* Allows the user to set a programmatic {@link IgniteConfiguration}.
- *
- * @param igniteConfiguration
*/
public void setIgniteConfiguration(IgniteConfiguration
igniteConfiguration) {
this.igniteConfiguration = igniteConfiguration;
http://git-wip-us.apache.org/repos/asf/camel/blob/930d4fe6/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java
--
diff --git
a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java
b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java
index 4c8ed2f..6fa7905 100644
---
a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java
+++
b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java
@@ -60,10 +60,9 @@ import static org.ops4j.pax.exam.CoreOptions.maven;
import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
import static org.ops4j.pax.exam.CoreOptions.vmOption;
-
public abstract class AbstractFeatureTest {
-private static final Logger LOG =
LoggerFactory.getLogger(AbstractFeatureTest.class);
+protected static final Logger LOG =
LoggerFactory.getLogger(AbstractFeatureTest.class);
@Inject
protected BundleContext bundleContext;
http://git-wip-us.apache.org/repos/asf/camel/blob/930d4fe6/tests/camel-itest-karaf/src/test/java/org/
[24/27] camel git commit: Renamed Hystrix properties to follow naming convention
Renamed Hystrix properties to follow naming convention
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/bf6d63a7
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/bf6d63a7
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/bf6d63a7
Branch: refs/heads/jdk8-lambdas
Commit: bf6d63a7c3dee2c340ca2eb5740106823ef72aae
Parents: 930d4fe
Author: bibryam
Authored: Sun Mar 27 20:59:58 2016 +0100
Committer: bibryam
Committed: Sun Mar 27 20:59:58 2016 +0100
--
.../component/hystrix/HystrixConfiguration.java | 30 ++--
.../component/hystrix/HystrixConstants.java | 8 --
.../component/hystrix/HystrixProducer.java | 16 +--
3 files changed, 29 insertions(+), 25 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/bf6d63a7/components/camel-hystrix/src/main/java/org/apache/camel/component/hystrix/HystrixConfiguration.java
--
diff --git
a/components/camel-hystrix/src/main/java/org/apache/camel/component/hystrix/HystrixConfiguration.java
b/components/camel-hystrix/src/main/java/org/apache/camel/component/hystrix/HystrixConfiguration.java
index 157b5ac..2e5c6c5 100644
---
a/components/camel-hystrix/src/main/java/org/apache/camel/component/hystrix/HystrixConfiguration.java
+++
b/components/camel-hystrix/src/main/java/org/apache/camel/component/hystrix/HystrixConfiguration.java
@@ -69,12 +69,12 @@ public class HystrixConfiguration {
@UriParam(label = "producer")
private String fallbackEndpointId;
-private Integer corePoolSize;
+private Integer coreSize;
private Integer keepAliveTime;
private Integer maxQueueSize;
private Integer queueSizeRejectionThreshold;
-private Integer threadPoolRollingNumberStatisticalWindowInMilliseconds;
-private Integer threadPoolRollingNumberStatisticalWindowBuckets;
+private Integer threadPoolMetricsRollingStatisticalWindowInMilliseconds;
+private Integer threadPoolMetricsRollingStatisticalWindowBuckets;
private Boolean circuitBreakerEnabled;
private Integer circuitBreakerErrorThresholdPercentage;
@@ -161,12 +161,12 @@ public class HystrixConfiguration {
this.threadPoolKey = threadPoolKey;
}
-public Integer getCorePoolSize() {
-return corePoolSize;
+public Integer getCoreSize() {
+return coreSize;
}
-public void setCorePoolSize(Integer corePoolSize) {
-this.corePoolSize = corePoolSize;
+public void setCoreSize(Integer coreSize) {
+this.coreSize = coreSize;
}
public Integer getKeepAliveTime() {
@@ -193,20 +193,20 @@ public class HystrixConfiguration {
this.queueSizeRejectionThreshold = queueSizeRejectionThreshold;
}
-public Integer getThreadPoolRollingNumberStatisticalWindowInMilliseconds()
{
-return threadPoolRollingNumberStatisticalWindowInMilliseconds;
+public Integer
getThreadPoolMetricsRollingStatisticalWindowInMilliseconds() {
+return threadPoolMetricsRollingStatisticalWindowInMilliseconds;
}
-public void
setThreadPoolRollingNumberStatisticalWindowInMilliseconds(Integer
threadPoolRollingNumberStatisticalWindowInMilliseconds) {
-this.threadPoolRollingNumberStatisticalWindowInMilliseconds =
threadPoolRollingNumberStatisticalWindowInMilliseconds;
+public void
setThreadPoolMetricsRollingStatisticalWindowInMilliseconds(Integer
threadPoolMetricsRollingStatisticalWindowInMilliseconds) {
+this.threadPoolMetricsRollingStatisticalWindowInMilliseconds =
threadPoolMetricsRollingStatisticalWindowInMilliseconds;
}
-public Integer getThreadPoolRollingNumberStatisticalWindowBuckets() {
-return threadPoolRollingNumberStatisticalWindowBuckets;
+public Integer getThreadPoolMetricsRollingStatisticalWindowBuckets() {
+return threadPoolMetricsRollingStatisticalWindowBuckets;
}
-public void setThreadPoolRollingNumberStatisticalWindowBuckets(Integer
threadPoolRollingNumberStatisticalWindowBuckets) {
-this.threadPoolRollingNumberStatisticalWindowBuckets =
threadPoolRollingNumberStatisticalWindowBuckets;
+public void setThreadPoolMetricsRollingStatisticalWindowBuckets(Integer
threadPoolMetricsRollingStatisticalWindowBuckets) {
+this.threadPoolMetricsRollingStatisticalWindowBuckets =
threadPoolMetricsRollingStatisticalWindowBuckets;
}
public Boolean getCircuitBreakerEnabled() {
http://git-wip-us.apache.org/repos/asf/camel/blob/bf6d63a7/components/camel-hystrix/src/main/java/org/apache/camel/component/hystrix/HystrixConstants.java
--
diff --git
a/components/camel-hystrix/src/main/java/org/apache/camel/component/hyst
[04/27] camel git commit: Component docs
Component docs Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f15a264d Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f15a264d Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f15a264d Branch: refs/heads/jdk8-lambdas Commit: f15a264d94d4a4c357785e31cd1e89557dc0e58d Parents: fbfadb8 Author: Claus Ibsen Authored: Sat Mar 26 06:53:14 2016 +0100 Committer: Claus Ibsen Committed: Sat Mar 26 06:53:14 2016 +0100 -- components/camel-freemarker/src/main/docs/freemarker.adoc | 4 components/camel-ganglia/src/main/docs/ganglia.adoc | 4 2 files changed, 8 insertions(+) -- http://git-wip-us.apache.org/repos/asf/camel/blob/f15a264d/components/camel-freemarker/src/main/docs/freemarker.adoc -- diff --git a/components/camel-freemarker/src/main/docs/freemarker.adoc b/components/camel-freemarker/src/main/docs/freemarker.adoc index f25f464..48d0cca 100644 --- a/components/camel-freemarker/src/main/docs/freemarker.adoc +++ b/components/camel-freemarker/src/main/docs/freemarker.adoc @@ -39,9 +39,12 @@ You can append query options to the URI in the following format, Options ^^^ + // component options: START The Freemarker component supports 1 options which are listed below. + + [width="100%",cols="2s,1m,8",options="header"] |=== | Name | Java Type | Description @@ -49,6 +52,7 @@ The Freemarker component supports 1 options which are listed below. |=== // component options: END + // endpoint options: START The Freemarker component supports 7 endpoint options which are listed below: http://git-wip-us.apache.org/repos/asf/camel/blob/f15a264d/components/camel-ganglia/src/main/docs/ganglia.adoc -- diff --git a/components/camel-ganglia/src/main/docs/ganglia.adoc b/components/camel-ganglia/src/main/docs/ganglia.adoc index f0ffc50..845552f 100644 --- a/components/camel-ganglia/src/main/docs/ganglia.adoc +++ b/components/camel-ganglia/src/main/docs/ganglia.adoc @@ -53,9 +53,12 @@ You can append query options to the URI in the following format, Ganglia component and endpoint URI options ~~ + // component options: START The Ganglia component supports 1 options which are listed below. + + [width="100%",cols="2s,1m,8",options="header"] |=== | Name | Java Type | Description @@ -63,6 +66,7 @@ The Ganglia component supports 1 options which are listed below. |=== // component options: END + // endpoint options: START The Ganglia component supports 16 endpoint options which are listed below:
[10/27] camel git commit: Add Spring schema references for release 2.17.0
Add Spring schema references for release 2.17.0
Signed-off-by: Gregor Zurowski
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/502e0c29
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/502e0c29
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/502e0c29
Branch: refs/heads/jdk8-lambdas
Commit: 502e0c2983b238d75e6429cdef1f4076d53b7173
Parents: 49678cf
Author: Gregor Zurowski
Authored: Sat Mar 26 21:43:23 2016 +0100
Committer: Gregor Zurowski
Committed: Sat Mar 26 21:43:23 2016 +0100
--
components/camel-cxf/src/main/resources/META-INF/spring.schemas | 1 +
.../src/main/resources/META-INF/spring.schemas | 1 +
.../src/main/resources/META-INF/spring.schemas | 1 +
components/camel-spring/src/main/resources/META-INF/spring.schemas | 1 +
4 files changed, 4 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/502e0c29/components/camel-cxf/src/main/resources/META-INF/spring.schemas
--
diff --git a/components/camel-cxf/src/main/resources/META-INF/spring.schemas
b/components/camel-cxf/src/main/resources/META-INF/spring.schemas
index 6fb0f7f..bee35f2 100644
--- a/components/camel-cxf/src/main/resources/META-INF/spring.schemas
+++ b/components/camel-cxf/src/main/resources/META-INF/spring.schemas
@@ -90,4 +90,5 @@
http\://camel.apache.org/schema/cxf/camel-cxf-2.15.5.xsd=schema/cxfEndpoint.xsd
http\://camel.apache.org/schema/cxf/camel-cxf-2.16.0.xsd=schema/cxfEndpoint.xsd
http\://camel.apache.org/schema/cxf/camel-cxf-2.16.1.xsd=schema/cxfEndpoint.xsd
http\://camel.apache.org/schema/cxf/camel-cxf-2.16.2.xsd=schema/cxfEndpoint.xsd
+http\://camel.apache.org/schema/cxf/camel-cxf-2.17.0.xsd=schema/cxfEndpoint.xsd
http\://camel.apache.org/schema/cxf/camel-cxf-${project.version}.xsd=schema/cxfEndpoint.xsd
http://git-wip-us.apache.org/repos/asf/camel/blob/502e0c29/components/camel-spring-integration/src/main/resources/META-INF/spring.schemas
--
diff --git
a/components/camel-spring-integration/src/main/resources/META-INF/spring.schemas
b/components/camel-spring-integration/src/main/resources/META-INF/spring.schemas
index 1de6992..fd2ec5b 100644
---
a/components/camel-spring-integration/src/main/resources/META-INF/spring.schemas
+++
b/components/camel-spring-integration/src/main/resources/META-INF/spring.schemas
@@ -87,4 +87,5 @@
http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.15
http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.16.0.xsd=schema/camel-spring-integration.xsd
http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.16.1.xsd=schema/camel-spring-integration.xsd
http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.16.2.xsd=schema/camel-spring-integration.xsd
+http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.17.0.xsd=schema/camel-spring-integration.xsd
http\://camel.apache.org/schema/spring/integration/camel-spring-integration-${project.version}.xsd=schema/camel-spring-integration.xsd
http://git-wip-us.apache.org/repos/asf/camel/blob/502e0c29/components/camel-spring-security/src/main/resources/META-INF/spring.schemas
--
diff --git
a/components/camel-spring-security/src/main/resources/META-INF/spring.schemas
b/components/camel-spring-security/src/main/resources/META-INF/spring.schemas
index 6dcadcf..4305fcf 100644
---
a/components/camel-spring-security/src/main/resources/META-INF/spring.schemas
+++
b/components/camel-spring-security/src/main/resources/META-INF/spring.schemas
@@ -81,4 +81,5 @@
http\://camel.apache.org/schema/spring-security/camel-spring-security-2.15.5.xsd
http\://camel.apache.org/schema/spring-security/camel-spring-security-2.16.0.xsd=schema/camel-spring-security.xsd
http\://camel.apache.org/schema/spring-security/camel-spring-security-2.16.1.xsd=schema/camel-spring-security.xsd
http\://camel.apache.org/schema/spring-security/camel-spring-security-2.16.2.xsd=schema/camel-spring-security.xsd
+http\://camel.apache.org/schema/spring-security/camel-spring-security-2.17.0.xsd=schema/camel-spring-security.xsd
http\://camel.apache.org/schema/spring-security/camel-spring-security-${project.version}.xsd=schema/camel-spring-security.xsd
http://git-wip-us.apache.org/repos/asf/camel/blob/502e0c29/components/camel-spring/src/main/resources/META-INF/spring.schemas
--
diff --git a/components/camel-spring/src/main/resources/META-INF/spring.schemas
b/components/camel-spring/src/main/resources/META-INF/
[20/27] camel git commit: CAMEL-9766: camel-itest-karaf to get working on karaf 4. Use a script to run the tests reliable.
CAMEL-9766: camel-itest-karaf to get working on karaf 4. Use a script to run
the tests reliable.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/9d838555
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/9d838555
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/9d838555
Branch: refs/heads/jdk8-lambdas
Commit: 9d83855589bb8bfc3233433e21b3ce9c1f4d6d86
Parents: 909f7dd
Author: Claus Ibsen
Authored: Sun Mar 27 17:47:11 2016 +0200
Committer: Claus Ibsen
Committed: Sun Mar 27 17:47:11 2016 +0200
--
.../features/src/main/resources/features.xml| 4 +++
tests/camel-itest-karaf/run-tests.sh| 6 ++--
.../camel/itest/karaf/CamelCmSmsTest.java | 2 +-
.../apache/camel/itest/karaf/CamelGsonTest.java | 2 +-
.../camel/itest/karaf/CamelGuiceTest.java | 2 ++
.../camel/itest/karaf/CamelIgniteTest.java | 3 ++
.../camel/itest/karaf/CamelJCacheTest.java | 2 +-
.../camel/itest/karaf/CamelJacksonTest.java | 2 +-
.../apache/camel/itest/karaf/CamelJbpmTest.java | 3 ++
.../camel/itest/karaf/CamelLuceneTest.java | 1 +
.../camel/itest/karaf/CamelOptaplannerTest.java | 1 +
.../camel/itest/karaf/CamelSnakeyamlTest.java | 2 +-
.../apache/camel/itest/karaf/CamelSoapTest.java | 2 +-
.../camel/itest/karaf/CamelTagsoupTest.java | 3 +-
.../itest/karaf/CamelUnivocityParsersTest.java | 35
.../camel/itest/karaf/CamelXmlsecurityTest.java | 2 +-
.../camel/itest/karaf/CamelXstreamTest.java | 2 +-
17 files changed, 62 insertions(+), 12 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/9d838555/platforms/karaf/features/src/main/resources/features.xml
--
diff --git a/platforms/karaf/features/src/main/resources/features.xml
b/platforms/karaf/features/src/main/resources/features.xml
index bbba22e..b0f6c82 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -302,6 +302,10 @@
mvn:org.jsoup/jsoup/${jsoup-version}
mvn:javax.validation/validation-api/${validation-api-version}
mvn:javax.el/javax.el-api/${javax.el-api-version}
+mvn:org.glassfish.web/javax.el/${javax.el-version}
+mvn:com.fasterxml/classmate/${classmate-version}
+mvn:org.hibernate/hibernate-validator/${hibernate-validator-version}
+mvn:org.jboss.logging/jboss-logging/${jboss-logging-version}
mvn:org.apache.camel/camel-cm-sms/${project.version}
http://git-wip-us.apache.org/repos/asf/camel/blob/9d838555/tests/camel-itest-karaf/run-tests.sh
--
diff --git a/tests/camel-itest-karaf/run-tests.sh
b/tests/camel-itest-karaf/run-tests.sh
index 88ed7cb..25f1145 100755
--- a/tests/camel-itest-karaf/run-tests.sh
+++ b/tests/camel-itest-karaf/run-tests.sh
@@ -24,7 +24,8 @@
echo "Running tests and kill karaf after each test"
-FILES=src/test/java/org/apache/camel/itest/karaf/*
+## directory where the karaf unit tests are
+testdir='src/test/java/org/apache/camel/itest/karaf'
## you can pass in the test name to start from eg run-tests.sh CamelFtpTest
## to start testing from this test and onwards.
@@ -35,7 +36,8 @@ else
found=0
fi
-for filename in $FILES
+## ensure the files are sorted
+for filename in $(ls -f $testdir/* | sort);
do
testname=$(basename ${filename%.*})
http://git-wip-us.apache.org/repos/asf/camel/blob/9d838555/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCmSmsTest.java
--
diff --git
a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCmSmsTest.java
b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCmSmsTest.java
index 0e29c11..5bca9a1 100644
---
a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCmSmsTest.java
+++
b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCmSmsTest.java
@@ -27,8 +27,8 @@ public class CamelCmSmsTest extends AbstractFeatureTest {
@Test
public void test() throws Exception {
+// TODO: fails as javax bean validator must be installed also
testComponent(COMPONENT);
}
-
}
http://git-wip-us.apache.org/repos/asf/camel/blob/9d838555/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGsonTest.java
--
diff --git
a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGsonTest.java
b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGsonTest.java
index 2f4daaa..11ab80c 100644
---
a
[12/27] camel git commit: CAMEL-9766: camel-itest-karaf to get working on karaf 4
CAMEL-9766: camel-itest-karaf to get working on karaf 4
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/88f01405
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/88f01405
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/88f01405
Branch: refs/heads/jdk8-lambdas
Commit: 88f01405d5c644b3b9d297be1d5b3514a42abccb
Parents: ec9f12b
Author: Claus Ibsen
Authored: Sun Mar 27 11:21:14 2016 +0200
Committer: Claus Ibsen
Committed: Sun Mar 27 11:21:14 2016 +0200
--
.../camel/itest/karaf/AbstractFeatureTest.java | 135 ---
.../camel/itest/karaf/CamelCassandraqlTest.java | 2 +-
.../test/resources/OSGI-INF/blueprint/camel.xml | 10 ++
3 files changed, 126 insertions(+), 21 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/88f01405/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java
--
diff --git
a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java
b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java
index ee7d51f..29faff6 100644
---
a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java
+++
b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java
@@ -21,24 +21,39 @@ import java.io.InputStream;
import java.lang.reflect.Field;
import java.nio.charset.Charset;
import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Dictionary;
+import java.util.EnumSet;
+import java.util.Enumeration;
import java.util.List;
import java.util.Properties;
import javax.inject.Inject;
import org.apache.camel.CamelContext;
+import org.apache.camel.Component;
import org.apache.camel.blueprint.BlueprintCamelContext;
import org.apache.camel.impl.DefaultRouteContext;
import org.apache.camel.model.DataFormatDefinition;
+import org.apache.karaf.features.FeaturesService;
import org.junit.After;
import org.junit.Before;
+import org.ops4j.pax.exam.CoreOptions;
import org.ops4j.pax.exam.Option;
+import org.ops4j.pax.exam.ProbeBuilder;
+import org.ops4j.pax.exam.TestProbeBuilder;
import org.ops4j.pax.exam.karaf.options.KarafDistributionOption;
import org.ops4j.pax.exam.karaf.options.LogLevelOption;
import org.ops4j.pax.exam.options.MavenArtifactProvisionOption;
import org.ops4j.pax.exam.options.UrlReference;
-import org.ops4j.pax.exam.rbc.Constants;
import org.osgi.framework.BundleContext;
+import org.osgi.framework.Constants;
+import org.osgi.framework.Filter;
+import org.osgi.framework.FrameworkUtil;
+import org.osgi.framework.InvalidSyntaxException;
+import org.osgi.framework.ServiceReference;
import org.osgi.service.blueprint.container.BlueprintContainer;
+import org.osgi.util.tracker.ServiceTracker;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -58,12 +73,19 @@ public abstract class AbstractFeatureTest {
@Inject
protected BlueprintContainer blueprintContainer;
+@Inject
+protected FeaturesService featuresService;
+
+@ProbeBuilder
+public TestProbeBuilder probeConfiguration(TestProbeBuilder probe) {
+// makes sure the generated Test-Bundle contains this import!
+probe.setHeader(Constants.DYNAMICIMPORT_PACKAGE, "*");
+return probe;
+}
+
@Before
public void setUp() throws Exception {
LOG.info("setUp() using BundleContext: {}", bundleContext);
-
-// give time for karaf to install
-Thread.sleep(3000);
}
@After
@@ -72,19 +94,25 @@ public abstract class AbstractFeatureTest {
}
protected void testComponent(String component) throws Exception {
-long max = System.currentTimeMillis() + 1;
-while (true) {
-try {
-assertNotNull("Cannot get component with name: " + component,
createCamelContext().getComponent(component));
-return;
-} catch (Throwable t) {
-if (System.currentTimeMillis() < max) {
-Thread.sleep(1000);
-} else {
-throw t;
-}
-}
-}
+testComponent("camel-" + component, component);
+}
+
+protected void testComponent(String mainFeature, String component) throws
Exception {
+LOG.info("Looking up CamelContext(myCamel) in OSGi Service Registry");
+
+LOG.info("Install main feature: {}", mainFeature);
+// do not refresh bundles causing out bundle context to be invalid
+// TODO: see if we can find a way maybe to install camel.xml as
bundle/feature instead of part of unit test (see
src/test/resources/OSGI-INF/bl
[18/27] camel git commit: CAMEL-9766: camel-itest-karaf to get working on karaf 4. Use a script to run the tests reliable.
CAMEL-9766: camel-itest-karaf to get working on karaf 4. Use a script to run
the tests reliable.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c3f865ad
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c3f865ad
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c3f865ad
Branch: refs/heads/jdk8-lambdas
Commit: c3f865ada4af0f0adbe2d064e39377f0f1916890
Parents: 015cc1a
Author: Claus Ibsen
Authored: Sun Mar 27 14:16:34 2016 +0200
Committer: Claus Ibsen
Committed: Sun Mar 27 14:16:34 2016 +0200
--
tests/camel-itest-karaf/run-tests.sh | 38 ---
1 file changed, 35 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/c3f865ad/tests/camel-itest-karaf/run-tests.sh
--
diff --git a/tests/camel-itest-karaf/run-tests.sh
b/tests/camel-itest-karaf/run-tests.sh
index 6b85e6d..88ed7cb 100755
--- a/tests/camel-itest-karaf/run-tests.sh
+++ b/tests/camel-itest-karaf/run-tests.sh
@@ -26,14 +26,46 @@ echo "Running tests and kill karaf after each test"
FILES=src/test/java/org/apache/camel/itest/karaf/*
+## you can pass in the test name to start from eg run-tests.sh CamelFtpTest
+## to start testing from this test and onwards.
+if [ "$#" -eq "0" ]
+then
+ found=1
+else
+ found=0
+fi
+
for filename in $FILES
do
testname=$(basename ${filename%.*})
- if [ $testname != "AbstractFeatureTest" ]
+
+ if [ $found -eq 0 ]
+ then
+if [ $testname == "$1" ]
+then
+ found=1
+fi
+ fi
+
+ if [ $found -eq 1 ] && [ $testname != "AbstractFeatureTest" ]
then
+echo "***"
echo "Running test $testname"
-mvn test -Dtest=$testname
-## TODO: wonder if we can get exit code from mvn, and fail if its not 0 ?
+echo "***"
+if mvn test -Dtest=$testname ; then
+ echo "\n"
+ echo
"***"
+ echo "Test success: $testname"
+ echo
"***"
+ echo "\n"
+else
+ echo "\n"
+ echo
"***"
+ echo "Test failure: $testname"
+ echo
"***"
+ echo "\n"
+ exit 1;
+fi
echo "Killing Karaf to ensure no dangling karaf running"
jps -l | grep karaf | cut -d ' ' -f 1 | xargs -n1 kill -kill
fi
[02/27] camel git commit: CAMEL-9762 - Add setters on CipherSuitesParameters and SecureSocketProtocolsParameters
CAMEL-9762 - Add setters on CipherSuitesParameters and
SecureSocketProtocolsParameters
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/bda2666d
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/bda2666d
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/bda2666d
Branch: refs/heads/jdk8-lambdas
Commit: bda2666d72fadeeb6b11a7e502fe2556a94b69cc
Parents: 359f4c5
Author: Antoine DESSAIGNE
Authored: Fri Mar 25 17:18:53 2016 +0100
Committer: Claus Ibsen
Committed: Fri Mar 25 17:27:16 2016 +0100
--
.../camel/util/jsse/CipherSuitesParameters.java | 17 +-
.../jsse/SecureSocketProtocolsParameters.java | 17 +-
.../util/jsse/SSLContextParametersTest.java | 333 ++-
...ractBaseSSLContextParametersFactoryBean.java | 42 +--
4 files changed, 210 insertions(+), 199 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/bda2666d/camel-core/src/main/java/org/apache/camel/util/jsse/CipherSuitesParameters.java
--
diff --git
a/camel-core/src/main/java/org/apache/camel/util/jsse/CipherSuitesParameters.java
b/camel-core/src/main/java/org/apache/camel/util/jsse/CipherSuitesParameters.java
index 64b0611..0a038f1 100644
---
a/camel-core/src/main/java/org/apache/camel/util/jsse/CipherSuitesParameters.java
+++
b/camel-core/src/main/java/org/apache/camel/util/jsse/CipherSuitesParameters.java
@@ -17,14 +17,12 @@
package org.apache.camel.util.jsse;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.List;
/**
* Represents a list of TLS/SSL cipher suite names.
*/
public class CipherSuitesParameters {
-
private List cipherSuite;
/**
@@ -34,19 +32,26 @@ public class CipherSuitesParameters {
*/
public List getCipherSuite() {
if (this.cipherSuite == null) {
-this.cipherSuite = new ArrayList();
+this.cipherSuite = new ArrayList<>();
}
return this.cipherSuite;
}
+/**
+ * Sets the cipher suite. It creates a copy of the given cipher suite.
+ *
+ * @param cipherSuite cipher suite
+ */
+public void setCipherSuite(List cipherSuite) {
+this.cipherSuite = cipherSuite == null ? null : new
ArrayList<>(cipherSuite);
+}
+
@Override
public String toString() {
StringBuilder builder = new StringBuilder();
builder.append("CipherSuitesParameters[cipherSuite=");
-builder.append(Arrays.toString(getCipherSuite().toArray(new
String[getCipherSuite().size()])));
+builder.append(getCipherSuite());
builder.append("]");
return builder.toString();
}
-
-
}
http://git-wip-us.apache.org/repos/asf/camel/blob/bda2666d/camel-core/src/main/java/org/apache/camel/util/jsse/SecureSocketProtocolsParameters.java
--
diff --git
a/camel-core/src/main/java/org/apache/camel/util/jsse/SecureSocketProtocolsParameters.java
b/camel-core/src/main/java/org/apache/camel/util/jsse/SecureSocketProtocolsParameters.java
index de63a80..0f15407 100644
---
a/camel-core/src/main/java/org/apache/camel/util/jsse/SecureSocketProtocolsParameters.java
+++
b/camel-core/src/main/java/org/apache/camel/util/jsse/SecureSocketProtocolsParameters.java
@@ -17,14 +17,12 @@
package org.apache.camel.util.jsse;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.List;
/**
* Represents a list of TLS/SSL cipher suite names.
*/
public class SecureSocketProtocolsParameters {
-
private List secureSocketProtocol;
/**
@@ -34,19 +32,26 @@ public class SecureSocketProtocolsParameters {
*/
public List getSecureSocketProtocol() {
if (this.secureSocketProtocol == null) {
-this.secureSocketProtocol = new ArrayList();
+this.secureSocketProtocol = new ArrayList<>();
}
return this.secureSocketProtocol;
}
+/**
+ * Sets the list of secure socket protocol names. It creates a copy of the
given protocol list.
+ *
+ * @param secureSocketProtocol list of secure socket protocol names
+ */
+public void setSecureSocketProtocol(List secureSocketProtocol) {
+this.secureSocketProtocol = secureSocketProtocol == null ? null : new
ArrayList<>(secureSocketProtocol);
+}
+
@Override
public String toString() {
StringBuilder builder = new StringBuilder();
builder.append("SecureSocketProtocolsParameters[secureSocketProtocol=");
-builder.append(Arrays.toString(getSecureSocketProtocol().toArray(new
String[getSecureSocketProtocol().size()])));
+builder.append(getSecureSocketProtocol());
builder.append("]");
return build
[19/27] camel git commit: Fixed CS
Fixed CS
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/909f7ddb
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/909f7ddb
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/909f7ddb
Branch: refs/heads/jdk8-lambdas
Commit: 909f7ddb60c5bd1d376c5361d296753400d6b8d3
Parents: c3f865a
Author: Claus Ibsen
Authored: Sun Mar 27 14:18:49 2016 +0200
Committer: Claus Ibsen
Committed: Sun Mar 27 14:18:49 2016 +0200
--
.../camel/itest/karaf/AbstractFeatureTest.java | 34 ++--
1 file changed, 17 insertions(+), 17 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/909f7ddb/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java
--
diff --git
a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java
b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java
index adb4d00..c5d7f71 100644
---
a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java
+++
b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java
@@ -218,29 +218,29 @@ public abstract class AbstractFeatureTest {
LOG.info("*** Apache Karaf version is " + karafVersion + " ***");
Option[] options = new Option[]{
-// for remote debugging
-//org.ops4j.pax.exam.CoreOptions.vmOption("-Xdebug"),
-
//org.ops4j.pax.exam.CoreOptions.vmOption("-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5008"),
+// for remote debugging
+//org.ops4j.pax.exam.CoreOptions.vmOption("-Xdebug"),
+
//org.ops4j.pax.exam.CoreOptions.vmOption("-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5008"),
-// we need INFO logging otherwise we cannot see what happens
-new LogLevelOption(LogLevelOption.LogLevel.INFO),
+// we need INFO logging otherwise we cannot see what happens
+new LogLevelOption(LogLevelOption.LogLevel.INFO),
-KarafDistributionOption.karafDistributionConfiguration()
-
.frameworkUrl(maven().groupId("org.apache.karaf").artifactId("apache-karaf").type("tar.gz").versionAsInProject())
-.karafVersion(karafVersion)
-.name("Apache Karaf")
-.useDeployFolder(false).unpackDirectory(new
File("target/paxexam/unpack/")),
+KarafDistributionOption.karafDistributionConfiguration()
+
.frameworkUrl(maven().groupId("org.apache.karaf").artifactId("apache-karaf").type("tar.gz").versionAsInProject())
+.karafVersion(karafVersion)
+.name("Apache Karaf")
+.useDeployFolder(false).unpackDirectory(new
File("target/paxexam/unpack/")),
-// keep the folder so we can look inside when something fails
-KarafDistributionOption.keepRuntimeFolder(),
+// keep the folder so we can look inside when something fails
+KarafDistributionOption.keepRuntimeFolder(),
-vmOption("-Dfile.encoding=UTF-8"),
+vmOption("-Dfile.encoding=UTF-8"),
-// install junit
-CoreOptions.junitBundles(),
+// install junit
+CoreOptions.junitBundles(),
-// install camel
-KarafDistributionOption.features(getCamelKarafFeatureUrl(),
"camel")
+// install camel
+KarafDistributionOption.features(getCamelKarafFeatureUrl(),
"camel")
};
return options;
[22/27] camel git commit: CAMEL-9766: camel-itest-karaf to get working on karaf 4. Use a script to run the tests reliable.
CAMEL-9766: camel-itest-karaf to get working on karaf 4. Use a script to run
the tests reliable.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/ab16fa22
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ab16fa22
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ab16fa22
Branch: refs/heads/jdk8-lambdas
Commit: ab16fa229e3152f76b139f0a6a48b66864d4b37c
Parents: f5c3e17
Author: Claus Ibsen
Authored: Sun Mar 27 18:05:06 2016 +0200
Committer: Claus Ibsen
Committed: Sun Mar 27 18:05:06 2016 +0200
--
.../camel/itest/karaf/AbstractFeatureTest.java | 3 +
.../apache/camel/itest/karaf/CamelJbpmTest.java | 4 -
.../camel/itest/karaf/CamelLuceneTest.java | 3 +-
.../camel/itest/karaf/CamelOptaplannerTest.java | 1 -
.../src/test/resources/jre.properties | 548 +++
5 files changed, 553 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/ab16fa22/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java
--
diff --git
a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java
b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java
index c5d7f71..4c8ed2f 100644
---
a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java
+++
b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java
@@ -234,6 +234,9 @@ public abstract class AbstractFeatureTest {
// keep the folder so we can look inside when something fails
KarafDistributionOption.keepRuntimeFolder(),
+// need to modify the jre.properties to export some com.sun
packages that some features rely on
+
KarafDistributionOption.replaceConfigurationFile("etc/jre.properties", new
File("src/test/resources/jre.properties")),
+
vmOption("-Dfile.encoding=UTF-8"),
// install junit
http://git-wip-us.apache.org/repos/asf/camel/blob/ab16fa22/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJbpmTest.java
--
diff --git
a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJbpmTest.java
b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJbpmTest.java
index 6fe1411..4acc623 100644
---
a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJbpmTest.java
+++
b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJbpmTest.java
@@ -16,22 +16,18 @@
*/
package org.apache.camel.itest.karaf;
-import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)
-@Ignore
public class CamelJbpmTest extends AbstractFeatureTest {
public static final String COMPONENT = extractName(CamelJbpmTest.class);
@Test
public void test() throws Exception {
-// TODO: need to expose com.sun.tools.xjc in jre.properties
testComponent(COMPONENT);
}
-
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/ab16fa22/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelLuceneTest.java
--
diff --git
a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelLuceneTest.java
b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelLuceneTest.java
index 81a1ff2b..c8f8040 100644
---
a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelLuceneTest.java
+++
b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelLuceneTest.java
@@ -16,11 +16,13 @@
*/
package org.apache.camel.itest.karaf;
+import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)
+@Ignore("Need new version of lucene bundle")
public class CamelLuceneTest extends AbstractFeatureTest {
public static final String COMPONENT = extractName(CamelLuceneTest.class);
@@ -31,5 +33,4 @@ public class CamelLuceneTest extends AbstractFeatureTest {
testComponent(COMPONENT);
}
-
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/ab16fa22/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelOptaplannerTest.java
--
diff --git
a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelOptaplannerTest.java
b/tests/camel-ite
[16/27] camel git commit: CAMEL-9766: camel-itest-karaf to get working on karaf 4
CAMEL-9766: camel-itest-karaf to get working on karaf 4
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/ff1fb0e3
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ff1fb0e3
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ff1fb0e3
Branch: refs/heads/jdk8-lambdas
Commit: ff1fb0e39cb38f5251b75702b6e232b25f1b2267
Parents: 9e7714a
Author: Claus Ibsen
Authored: Sun Mar 27 12:46:49 2016 +0200
Committer: Claus Ibsen
Committed: Sun Mar 27 12:46:49 2016 +0200
--
.../java/org/apache/camel/CamelContext.java | 17 +
.../apache/camel/impl/DefaultCamelContext.java | 20 ++--
.../camel/impl/DefaultCamelContextTest.java | 20
.../camel/itest/karaf/AbstractFeatureTest.java | 3 ++-
.../camel/itest/karaf/CamelBindyTest.java | 4 +++-
5 files changed, 60 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/ff1fb0e3/camel-core/src/main/java/org/apache/camel/CamelContext.java
--
diff --git a/camel-core/src/main/java/org/apache/camel/CamelContext.java
b/camel-core/src/main/java/org/apache/camel/CamelContext.java
index 727a2b7..c7d212f 100644
--- a/camel-core/src/main/java/org/apache/camel/CamelContext.java
+++ b/camel-core/src/main/java/org/apache/camel/CamelContext.java
@@ -304,6 +304,9 @@ public interface CamelContext extends SuspendableService,
RuntimeConfiguration {
/**
* Gets a component from the context by name.
+ *
+ * Notice the returned component will be auto-started. If you do not
intend to do that
+ * then use {@link #getComponent(String, boolean, boolean)}.
*
* @param componentName the name of the component
* @return the component
@@ -312,6 +315,9 @@ public interface CamelContext extends SuspendableService,
RuntimeConfiguration {
/**
* Gets a component from the context by name.
+ *
+ * Notice the returned component will be auto-started. If you do not
intend to do that
+ * then use {@link #getComponent(String, boolean, boolean)}.
*
* @param name the name of the component
* @param autoCreateComponents whether or not the component should
@@ -321,6 +327,17 @@ public interface CamelContext extends SuspendableService,
RuntimeConfiguration {
Component getComponent(String name, boolean autoCreateComponents);
/**
+ * Gets a component from the context by name.
+ *
+ * @param name the name of the component
+ * @param autoCreateComponents whether or not the component should
+ * be lazily created if it does not already
exist
+ * @param autoStartwhether to auto start the component if
{@link CamelContext} is already started.
+ * @return the component
+ */
+Component getComponent(String name, boolean autoCreateComponents, boolean
autoStart);
+
+/**
* Gets a component from the context by name and specifying the expected
type of component.
*
* @param name the name to lookup
http://git-wip-us.apache.org/repos/asf/camel/blob/ff1fb0e3/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
--
diff --git
a/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
b/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
index 26ddea9..65deba6 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
@@ -383,10 +383,14 @@ public class DefaultCamelContext extends ServiceSupport
implements ModelCamelCon
}
public Component getComponent(String name) {
-return getComponent(name, autoCreateComponents);
+return getComponent(name, autoCreateComponents, true);
}
public Component getComponent(String name, boolean autoCreateComponents) {
+return getComponent(name, autoCreateComponents, true);
+}
+
+public Component getComponent(String name, boolean autoCreateComponents,
boolean autoStart) {
// synchronize the look up and auto create so that 2 threads can't
// concurrently auto create the same component.
synchronized (components) {
@@ -399,7 +403,7 @@ public class DefaultCamelContext extends ServiceSupport
implements ModelCamelCon
component = getComponentResolver().resolveComponent(name,
this);
if (component != null) {
addComponent(name, component);
-if (isStarted() || isStarting()) {
+if (autoStart &
[05/27] camel git commit: Deprecate camel-context
Deprecate camel-context Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/2d595fce Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/2d595fce Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/2d595fce Branch: refs/heads/jdk8-lambdas Commit: 2d595fce3b319ba7dfa149f20c2c0d38d3c67515 Parents: f15a264 Author: Claus Ibsen Authored: Sat Mar 26 07:05:43 2016 +0100 Committer: Claus Ibsen Committed: Sat Mar 26 07:05:43 2016 +0100 -- components/camel-context/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/2d595fce/components/camel-context/pom.xml -- diff --git a/components/camel-context/pom.xml b/components/camel-context/pom.xml index 1ab5db1..f2bf700 100644 --- a/components/camel-context/pom.xml +++ b/components/camel-context/pom.xml @@ -25,7 +25,7 @@ camel-context -Camel :: Context +Camel :: Context (deprecated) Camel Context component to expose CamelContext objects as a black box Component for use in other routes bundle
[17/27] camel git commit: CAMEL-9766: camel-itest-karaf to get working on karaf 4. Use a script to run the tests reliable.
CAMEL-9766: camel-itest-karaf to get working on karaf 4. Use a script to run
the tests reliable.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/015cc1a3
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/015cc1a3
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/015cc1a3
Branch: refs/heads/jdk8-lambdas
Commit: 015cc1a304948b018e2816dae4298385eced8d03
Parents: ff1fb0e
Author: Claus Ibsen
Authored: Sun Mar 27 13:51:42 2016 +0200
Committer: Claus Ibsen
Committed: Sun Mar 27 13:51:42 2016 +0200
--
tests/camel-itest-karaf/run-tests.sh | 40 +++
1 file changed, 40 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/015cc1a3/tests/camel-itest-karaf/run-tests.sh
--
diff --git a/tests/camel-itest-karaf/run-tests.sh
b/tests/camel-itest-karaf/run-tests.sh
new file mode 100755
index 000..6b85e6d
--- /dev/null
+++ b/tests/camel-itest-karaf/run-tests.sh
@@ -0,0 +1,40 @@
+#!/bin/sh
+
+## ---
+## 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.
+## ---
+
+## This script runs the camel-itest-karaf in a more reliable way
+## than Maven surefire will do as it can hang after a while
+## The script also kills each karaf container after a test to ensure there is
no Java JVMs
+## danging around.
+
+echo "Running tests and kill karaf after each test"
+
+FILES=src/test/java/org/apache/camel/itest/karaf/*
+
+for filename in $FILES
+do
+ testname=$(basename ${filename%.*})
+ if [ $testname != "AbstractFeatureTest" ]
+ then
+echo "Running test $testname"
+mvn test -Dtest=$testname
+## TODO: wonder if we can get exit code from mvn, and fail if its not 0 ?
+echo "Killing Karaf to ensure no dangling karaf running"
+jps -l | grep karaf | cut -d ' ' -f 1 | xargs -n1 kill -kill
+ fi
+done
[03/27] camel git commit: CAMEL-9760: Fixed syntax of google-drive
CAMEL-9760: Fixed syntax of google-drive
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/fbfadb8d
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/fbfadb8d
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/fbfadb8d
Branch: refs/heads/jdk8-lambdas
Commit: fbfadb8dad9f2593f2c202b3af76022194e83990
Parents: bda2666
Author: Claus Ibsen
Authored: Sat Mar 26 06:53:04 2016 +0100
Committer: Claus Ibsen
Committed: Sat Mar 26 06:53:04 2016 +0100
--
.../apache/camel/component/google/drive/GoogleDriveEndpoint.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/fbfadb8d/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 c18b0e5..ede52d5 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
@@ -35,7 +35,7 @@ import
org.apache.camel.util.component.ApiMethodPropertiesHelper;
/**
* The google-drive component provides access to Google Drive file storage
service.
*/
-@UriEndpoint(scheme = "google-drive", title = "Google Drive", syntax =
"google:drive:apiName/methodName",
+@UriEndpoint(scheme = "google-drive", title = "Google Drive", syntax =
"google-drive:apiName/methodName",
consumerClass = GoogleDriveConsumer.class, consumerPrefix = "consumer", label
= "api,cloud,file")
public class GoogleDriveEndpoint extends
AbstractApiEndpoint {
private Object apiProxy;
[26/27] camel git commit: CAMEL-9764: Remove redundant plugin declaration.
CAMEL-9764: Remove redundant plugin declaration. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c2b0aa3c Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c2b0aa3c Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c2b0aa3c Branch: refs/heads/jdk8-lambdas Commit: c2b0aa3cd1047590f785e1b90184204b2293b87e Parents: 8b19725 Author: Raúl Kripalani Authored: Mon Mar 28 11:28:27 2016 +0100 Committer: Raúl Kripalani Committed: Mon Mar 28 11:28:27 2016 +0100 -- tooling/maven/camel-package-maven-plugin/pom.xml | 19 --- 1 file changed, 19 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/c2b0aa3c/tooling/maven/camel-package-maven-plugin/pom.xml -- diff --git a/tooling/maven/camel-package-maven-plugin/pom.xml b/tooling/maven/camel-package-maven-plugin/pom.xml index 06f3ea4..4393469 100644 --- a/tooling/maven/camel-package-maven-plugin/pom.xml +++ b/tooling/maven/camel-package-maven-plugin/pom.xml @@ -98,23 +98,4 @@ - - - - -maven-jar-plugin - - -default-jar -never - - ___ - ___ - - - - - - -
[11/27] camel git commit: camel-amqp feature should not use hardcoded versions
camel-amqp feature should not use hardcoded versions
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/ec9f12b2
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ec9f12b2
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ec9f12b2
Branch: refs/heads/jdk8-lambdas
Commit: ec9f12b299cf483aca509910b8221de0593bb4f1
Parents: 502e0c2
Author: Claus Ibsen
Authored: Sun Mar 27 09:33:35 2016 +0200
Committer: Claus Ibsen
Committed: Sun Mar 27 09:33:35 2016 +0200
--
parent/pom.xml | 1 +
platforms/karaf/features/src/main/resources/features.xml | 9 ++---
2 files changed, 7 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/ec9f12b2/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index cd79925..f516f74 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -452,6 +452,7 @@
2.6.1
0.28_1
0.28
+0.12.0
0.8.0
1.8.6_1
1.8.6
http://git-wip-us.apache.org/repos/asf/camel/blob/ec9f12b2/platforms/karaf/features/src/main/resources/features.xml
--
diff --git a/platforms/karaf/features/src/main/resources/features.xml
b/platforms/karaf/features/src/main/resources/features.xml
index 5bbae10..bbba22e 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -95,10 +95,13 @@
camel-jms
mvn:commons-lang/commons-lang/${commons-lang-version}
mvn:commons-collections/commons-collections/${commons-collections-version}
-mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.mina/${mina-bundle-version}
wrap:mvn:org.apache.qpid/qpid-jms-client/${qpid-jms-client-version}
-wrap:mvn:org.apache.qpid/proton-j/0.10
-wrap:mvn:io.netty/netty-all/4.0.17.Final
+wrap:mvn:org.apache.qpid/proton-j/${qpid-proton-j-version}
+mvn:io.netty/netty-common/${netty-version}
+mvn:io.netty/netty-transport/${netty-version}
+mvn:io.netty/netty-buffer/${netty-version}
+mvn:io.netty/netty-handler/${netty-version}
+mvn:io.netty/netty-codec/${netty-version}
mvn:org.apache.camel/camel-amqp/${project.version}
[01/27] camel git commit: Fix syntax to correspond to the correct naming of contextIdPattern
Repository: camel
Updated Branches:
refs/heads/jdk8-lambdas 8b197255a -> e5f2b28e2
Fix syntax to correspond to the correct naming of contextIdPattern
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/359f4c5c
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/359f4c5c
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/359f4c5c
Branch: refs/heads/jdk8-lambdas
Commit: 359f4c5c4cc1b673eaa8d43b21d6208aef2caa4b
Parents: b523b1b
Author: Aurelien Pupier
Authored: Fri Mar 25 16:10:45 2016 +0100
Committer: Claus Ibsen
Committed: Fri Mar 25 17:14:24 2016 +0100
--
.../main/java/org/apache/camel/component/rest/RestApiEndpoint.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/359f4c5c/camel-core/src/main/java/org/apache/camel/component/rest/RestApiEndpoint.java
--
diff --git
a/camel-core/src/main/java/org/apache/camel/component/rest/RestApiEndpoint.java
b/camel-core/src/main/java/org/apache/camel/component/rest/RestApiEndpoint.java
index eca625c..935bc25 100644
---
a/camel-core/src/main/java/org/apache/camel/component/rest/RestApiEndpoint.java
+++
b/camel-core/src/main/java/org/apache/camel/component/rest/RestApiEndpoint.java
@@ -41,7 +41,7 @@ import org.apache.camel.util.ObjectHelper;
/**
* The rest-api component is used for providing Swagger API of the REST
services which has been defined using the rest-dsl in Camel.
*/
-@UriEndpoint(scheme = "rest-api", title = "REST API", syntax =
"rest-api:path/contextId", consumerOnly = true, label = "core,rest",
lenientProperties = true)
+@UriEndpoint(scheme = "rest-api", title = "REST API", syntax =
"rest-api:path/contextIdPattern", consumerOnly = true, label = "core,rest",
lenientProperties = true)
public class RestApiEndpoint extends DefaultEndpoint {
public static final String DEFAULT_API_COMPONENT_NAME = "swagger";
[09/27] camel git commit: Added unit tests, usage of headers, and other imrpovements to Hystrix component
Added unit tests, usage of headers, and other imrpovements to Hystrix component
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/49678cfb
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/49678cfb
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/49678cfb
Branch: refs/heads/jdk8-lambdas
Commit: 49678cfbc040ed8da6214d5d46f4c0ba69649aff
Parents: fe66ce3
Author: bibryam
Authored: Sat Mar 26 18:59:54 2016 +
Committer: bibryam
Committed: Sat Mar 26 18:59:54 2016 +
--
.../component/hystrix/CamelHystrixCommand.java | 22 +-
.../component/hystrix/HystrixConfiguration.java | 58 +++--
.../component/hystrix/HystrixConstants.java | 58 -
.../component/hystrix/HystrixProducer.java | 255 +--
.../component/hystrix/HystrixComponentBase.java | 50
.../hystrix/HystrixComponentCacheTest.java | 84 ++
.../HystrixComponentCircuitBreakerTest.java | 30 +--
.../hystrix/HystrixComponentFallbackTest.java | 98 +++
.../HystrixComponentRequestContextTest.java | 25 +-
.../component/hystrix/HystrixComponentTest.java | 154 ---
.../hystrix/HystrixComponentTimeOutTest.java| 98 +++
11 files changed, 623 insertions(+), 309 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/49678cfb/components/camel-hystrix/src/main/java/org/apache/camel/component/hystrix/CamelHystrixCommand.java
--
diff --git
a/components/camel-hystrix/src/main/java/org/apache/camel/component/hystrix/CamelHystrixCommand.java
b/components/camel-hystrix/src/main/java/org/apache/camel/component/hystrix/CamelHystrixCommand.java
index b728d37..184f036 100644
---
a/components/camel-hystrix/src/main/java/org/apache/camel/component/hystrix/CamelHystrixCommand.java
+++
b/components/camel-hystrix/src/main/java/org/apache/camel/component/hystrix/CamelHystrixCommand.java
@@ -47,9 +47,17 @@ public class CamelHystrixCommand extends
HystrixCommand {
}
try {
Endpoint endpoint = findEndpoint(fallbackEndpointId);
+if (exchange.getException() != null) {
+Exception exception = exchange.getException();
+exchange.setException(null);
+if (exception instanceof InterruptedException) {
+exchange.removeProperty(Exchange.ROUTE_STOP);
+}
+}
+
endpoint.createProducer().process(exchange);
-} catch (Exception e) {
- throw new RuntimeException(e.getMessage());
+} catch (Exception exception) {
+throw new RuntimeException(exception.getMessage());
}
return exchange;
}
@@ -59,14 +67,20 @@ public class CamelHystrixCommand extends
HystrixCommand {
try {
Endpoint endpoint = findEndpoint(runEndpointId);
endpoint.createProducer().process(exchange);
-} catch (Exception e) {
+} catch (Exception exception) {
exchange.setException(null);
-throw new RuntimeException(e.getMessage());
+if (exception instanceof InterruptedException) {
+exchange.removeProperty(Exchange.ROUTE_STOP);
+}
+throw new RuntimeException(exception.getMessage());
}
if (exchange.getException() != null) {
Exception exception = exchange.getException();
exchange.setException(null);
+if (exception instanceof InterruptedException) {
+exchange.removeProperty(Exchange.ROUTE_STOP);
+}
throw new RuntimeException(exception.getMessage());
}
return exchange;
http://git-wip-us.apache.org/repos/asf/camel/blob/49678cfb/components/camel-hystrix/src/main/java/org/apache/camel/component/hystrix/HystrixConfiguration.java
--
diff --git
a/components/camel-hystrix/src/main/java/org/apache/camel/component/hystrix/HystrixConfiguration.java
b/components/camel-hystrix/src/main/java/org/apache/camel/component/hystrix/HystrixConfiguration.java
index 8e0ee8e..157b5ac 100644
---
a/components/camel-hystrix/src/main/java/org/apache/camel/component/hystrix/HystrixConfiguration.java
+++
b/components/camel-hystrix/src/main/java/org/apache/camel/component/hystrix/HystrixConfiguration.java
@@ -52,10 +52,10 @@ public class HystrixConfiguration {
/**
- * Specifies the propagateRequestContext to use
+ * Specifies the initializeRequestContext to use
*/
@UriParam(label = "producer")
-private Boolean propagateRequestContext;
+private Boolean initializeRequestContext;
/**
* Specifies the endpoint to use
@@ -69,12 +69,1
[21/27] camel git commit: CAMEL-9766: camel-itest-karaf to get working on karaf 4. Use a script to run the tests reliable.
CAMEL-9766: camel-itest-karaf to get working on karaf 4. Use a script to run
the tests reliable.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f5c3e173
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f5c3e173
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f5c3e173
Branch: refs/heads/jdk8-lambdas
Commit: f5c3e1735a28c1a6bd2b13dac3ce47a99a254b9e
Parents: 9d83855
Author: Claus Ibsen
Authored: Sun Mar 27 17:56:48 2016 +0200
Committer: Claus Ibsen
Committed: Sun Mar 27 17:56:48 2016 +0200
--
.../features/src/main/resources/features.xml| 10 +++---
.../camel/itest/karaf/CamelCmSmsTest.java | 2 ++
.../camel/itest/karaf/CamelHystrixTest.java | 35
.../apache/camel/itest/karaf/CamelYamlTest.java | 2 +-
4 files changed, 43 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/f5c3e173/platforms/karaf/features/src/main/resources/features.xml
--
diff --git a/platforms/karaf/features/src/main/resources/features.xml
b/platforms/karaf/features/src/main/resources/features.xml
index b0f6c82..67986fe 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -733,11 +733,11 @@
mvn:org.apache.camel/camel-http-common/${project.version}
mvn:org.apache.camel/camel-http4/${project.version}
-
-camel-core
-mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.hystrix/${hystrix-bundle-version}
-mvn:org.apache.camel/camel-hystrix/${project.version}
-
+
+camel-core
+mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.hystrix/${hystrix-bundle-version}
+mvn:org.apache.camel/camel-hystrix/${project.version}
+
camel-core
transaction
http://git-wip-us.apache.org/repos/asf/camel/blob/f5c3e173/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCmSmsTest.java
--
diff --git
a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCmSmsTest.java
b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCmSmsTest.java
index 5bca9a1..d1172f6 100644
---
a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCmSmsTest.java
+++
b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCmSmsTest.java
@@ -16,11 +16,13 @@
*/
package org.apache.camel.itest.karaf;
+import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)
+@Ignore("The CmSmsComponent need to not requires @Inject")
public class CamelCmSmsTest extends AbstractFeatureTest {
public static final String COMPONENT = extractName(CamelCmSmsTest.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/f5c3e173/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHystrixTest.java
--
diff --git
a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHystrixTest.java
b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHystrixTest.java
new file mode 100644
index 000..dd50e26
--- /dev/null
+++
b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHystrixTest.java
@@ -0,0 +1,35 @@
+/**
+ * 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.itest.karaf;
+
+import org.junit.Ignore;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.junit.PaxExam;
+
+@RunWith(PaxExam.class)
+@Ignore("Need a new hystrix SMX bundle")
+public class CamelHystrixTest extends AbstractFeatureTest {
+
+public static final String COMPONENT = extractName(CamelHystrixTest.class);
+
+@Test
+public void test() throws Exception {
+testComponent(COMPON
[06/27] camel git commit: CAMEL-9761: camel-swagger-java - Allow to use custom CORS headers for api-docs
CAMEL-9761: camel-swagger-java - Allow to use custom CORS headers for api-docs
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/edcb05e9
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/edcb05e9
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/edcb05e9
Branch: refs/heads/jdk8-lambdas
Commit: edcb05e923185e70aaad82cfcea6a95c41f3b939
Parents: 2d595fc
Author: Claus Ibsen
Authored: Sat Mar 26 07:39:03 2016 +0100
Committer: Claus Ibsen
Committed: Sat Mar 26 07:39:03 2016 +0100
--
.../camel/swagger/RestSwaggerProcessor.java | 9 ++-
.../camel/swagger/RestSwaggerSupport.java | 48 +++---
.../swagger/SwaggerRestApiProcessorFactory.java | 8 ++-
.../swagger/servlet/RestSwaggerCorsFilter.java | 68 ++--
.../swagger/servlet/RestSwaggerServlet.java | 9 ++-
5 files changed, 121 insertions(+), 21 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/edcb05e9/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerProcessor.java
--
diff --git
a/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerProcessor.java
b/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerProcessor.java
index 51ffd12..9edf41e 100644
---
a/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerProcessor.java
+++
b/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerProcessor.java
@@ -22,6 +22,7 @@ import java.util.Map;
import io.swagger.jaxrs.config.BeanConfig;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
+import org.apache.camel.spi.RestConfiguration;
import org.apache.camel.util.EndpointHelper;
import org.apache.camel.util.ObjectHelper;
import org.slf4j.Logger;
@@ -34,11 +35,13 @@ public class RestSwaggerProcessor implements Processor {
private final RestSwaggerSupport support;
private final String contextIdPattern;
private final boolean contextIdListing;
+private final RestConfiguration configuration;
@SuppressWarnings("unchecked")
-public RestSwaggerProcessor(String contextIdPattern, boolean
contextIdListing, Map parameters) {
+public RestSwaggerProcessor(String contextIdPattern, boolean
contextIdListing, Map parameters, RestConfiguration
configuration) {
this.contextIdPattern = contextIdPattern;
this.contextIdListing = contextIdListing;
+this.configuration = configuration;
this.support = new RestSwaggerSupport();
this.swaggerConfig = new BeanConfig();
@@ -79,7 +82,7 @@ public class RestSwaggerProcessor implements Processor {
try {
// render list of camel contexts as root
if (contextIdListing && (ObjectHelper.isEmpty(route) ||
route.equals("/"))) {
-support.renderCamelContexts(adapter, contextId,
contextIdPattern, json, yaml);
+support.renderCamelContexts(adapter, contextId,
contextIdPattern, json, yaml, configuration);
} else {
String name;
if (ObjectHelper.isNotEmpty(route)) {
@@ -112,7 +115,7 @@ public class RestSwaggerProcessor implements Processor {
if (!match) {
adapter.noContent();
} else {
-support.renderResourceListing(adapter, swaggerConfig,
name, route, json, yaml, exchange.getContext().getClassResolver());
+support.renderResourceListing(adapter, swaggerConfig,
name, route, json, yaml, exchange.getContext().getClassResolver(),
configuration);
}
}
} catch (Exception e) {
http://git-wip-us.apache.org/repos/asf/camel/blob/edcb05e9/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerSupport.java
--
diff --git
a/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerSupport.java
b/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerSupport.java
index a275a0e..982d8f3 100644
---
a/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerSupport.java
+++
b/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerSupport.java
@@ -191,14 +191,11 @@ public class RestSwaggerSupport {
}
public void renderResourceListing(RestApiResponseAdapter response,
BeanConfig swaggerConfig, String contextId, String route, boolean json, boolean
yaml,
- ClassResolver classResolver) throws
Exception {
+ ClassResolver classResolver,
Re
[15/27] camel git commit: CAMEL-9766: camel-itest-karaf to get working on karaf 4
CAMEL-9766: camel-itest-karaf to get working on karaf 4 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/9e7714a7 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/9e7714a7 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/9e7714a7 Branch: refs/heads/jdk8-lambdas Commit: 9e7714a7484f92b7e69e06a3d1d3325dcfb08a28 Parents: 88f0140 Author: Claus Ibsen Authored: Sun Mar 27 12:07:40 2016 +0200 Committer: Claus Ibsen Committed: Sun Mar 27 12:07:40 2016 +0200 -- tests/camel-itest-karaf/pom.xml | 17 +- .../camel/itest/karaf/AbstractFeatureTest.java | 162 --- .../apache/camel/itest/karaf/CamelAhcTest.java | 11 +- .../camel/itest/karaf/CamelAhcWsTest.java | 7 - .../apache/camel/itest/karaf/CamelAmqpTest.java | 7 - .../apache/camel/itest/karaf/CamelApnsTest.java | 7 - .../karaf/CamelAtmosphereWebsocketTest.java | 8 +- .../apache/camel/itest/karaf/CamelAtomTest.java | 7 - .../apache/camel/itest/karaf/CamelAvroTest.java | 13 -- .../apache/camel/itest/karaf/CamelAwsTest.java | 23 +-- .../apache/camel/itest/karaf/CamelBamTest.java | 9 +- .../camel/itest/karaf/CamelBarcodeTest.java | 14 -- .../camel/itest/karaf/CamelBase64Test.java | 13 -- .../itest/karaf/CamelBeanValidatorTest.java | 7 - .../camel/itest/karaf/CamelBeanioTest.java | 13 -- .../camel/itest/karaf/CamelBeanstalkTest.java | 7 - .../camel/itest/karaf/CamelBindyTest.java | 15 -- .../apache/camel/itest/karaf/CamelBoonTest.java | 13 -- .../apache/camel/itest/karaf/CamelBoxTest.java | 7 - .../camel/itest/karaf/CamelBraintreeTest.java | 7 - .../camel/itest/karaf/CamelCacheTest.java | 7 - .../camel/itest/karaf/CamelCassandraqlTest.java | 7 - .../camel/itest/karaf/CamelCastorTest.java | 13 -- .../camel/itest/karaf/CamelChunkTest.java | 6 - .../camel/itest/karaf/CamelCmSmsTest.java | 7 +- .../apache/camel/itest/karaf/CamelCmisTest.java | 7 +- .../camel/itest/karaf/CamelCometdTest.java | 7 - .../camel/itest/karaf/CamelContextTest.java | 7 - .../camel/itest/karaf/CamelCouchDBTest.java | 7 - .../camel/itest/karaf/CamelCryptoTest.java | 13 -- .../apache/camel/itest/karaf/CamelCsvTest.java | 14 -- .../apache/camel/itest/karaf/CamelCxfTest.java | 13 +- .../camel/itest/karaf/CamelDisruptorTest.java | 13 +- .../apache/camel/itest/karaf/CamelDnsTest.java | 7 - .../camel/itest/karaf/CamelDockerTest.java | 7 - .../camel/itest/karaf/CamelDozerTest.java | 7 - .../camel/itest/karaf/CamelDropboxTest.java | 11 +- .../itest/karaf/CamelElasticsearchTest.java | 9 +- .../camel/itest/karaf/CamelElsqlTest.java | 9 +- .../apache/camel/itest/karaf/CamelEtcdTest.java | 7 - .../camel/itest/karaf/CamelEventadminTest.java | 9 +- .../apache/camel/itest/karaf/CamelExecTest.java | 9 +- .../camel/itest/karaf/CamelFacebookTest.java| 7 - .../camel/itest/karaf/CamelFlatpackTest.java| 13 -- .../apache/camel/itest/karaf/CamelFopTest.java | 7 - .../camel/itest/karaf/CamelFreemarkerTest.java | 7 - .../apache/camel/itest/karaf/CamelFtpTest.java | 11 +- .../camel/itest/karaf/CamelGangliaTest.java | 7 - .../camel/itest/karaf/CamelGeocoderTest.java| 7 - .../apache/camel/itest/karaf/CamelGitTest.java | 7 - .../camel/itest/karaf/CamelGithubTest.java | 7 - .../itest/karaf/CamelGoogleCalendarTest.java| 7 - .../camel/itest/karaf/CamelGoogleDriveTest.java | 7 - .../camel/itest/karaf/CamelGoogleMailTest.java | 7 - .../camel/itest/karaf/CamelGroovyTest.java | 7 - .../apache/camel/itest/karaf/CamelGsonTest.java | 16 -- .../itest/karaf/CamelGuavaEventBusTest.java | 7 - .../camel/itest/karaf/CamelGuiceTest.java | 9 +- .../camel/itest/karaf/CamelHazelcastTest.java | 7 - .../camel/itest/karaf/CamelHbaseTest.java | 7 - .../camel/itest/karaf/CamelHdfs2Test.java | 7 - .../apache/camel/itest/karaf/CamelHdfsTest.java | 7 - .../camel/itest/karaf/CamelHessianTest.java | 13 -- .../camel/itest/karaf/CamelHipchatTest.java | 7 - .../apache/camel/itest/karaf/CamelHl7Test.java | 13 -- .../camel/itest/karaf/CamelHttp4Test.java | 7 - .../apache/camel/itest/karaf/CamelHttpTest.java | 7 - .../camel/itest/karaf/CamelIbatisTest.java | 7 - .../apache/camel/itest/karaf/CamelIcalTest.java | 13 -- .../camel/itest/karaf/CamelIgniteTest.java | 7 - .../camel/itest/karaf/CamelInfinispanTest.java | 8 +- .../apache/camel/itest/karaf/CamelIrcTest.java | 7 - .../camel/itest/karaf/CamelJCacheTest.java | 6 - .../camel/itest/karaf/CamelJacksonTest.java | 13 -- .../camel/itest/karaf/CamelJacksonxmlTest.java | 12 -- .../camel/itest/karaf/CamelJasyptTest.java | 8 +-
[25/27] camel git commit: Apt plugin do not scan JDK classes.
Apt plugin do not scan JDK classes.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/95d15316
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/95d15316
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/95d15316
Branch: refs/heads/jdk8-lambdas
Commit: 95d15316d9c679a27d494d1febf60dfcb3c076a4
Parents: bf6d63a
Author: Claus Ibsen
Authored: Mon Mar 28 07:53:41 2016 +0200
Committer: Claus Ibsen
Committed: Mon Mar 28 07:53:41 2016 +0200
--
.../org/apache/camel/tools/apt/AbstractAnnotationProcessor.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/95d15316/tooling/apt/src/main/java/org/apache/camel/tools/apt/AbstractAnnotationProcessor.java
--
diff --git
a/tooling/apt/src/main/java/org/apache/camel/tools/apt/AbstractAnnotationProcessor.java
b/tooling/apt/src/main/java/org/apache/camel/tools/apt/AbstractAnnotationProcessor.java
index c5af901..9250196 100644
---
a/tooling/apt/src/main/java/org/apache/camel/tools/apt/AbstractAnnotationProcessor.java
+++
b/tooling/apt/src/main/java/org/apache/camel/tools/apt/AbstractAnnotationProcessor.java
@@ -262,7 +262,8 @@ public abstract class AbstractAnnotationProcessor extends
AbstractProcessor {
protected boolean hasSuperClass(RoundEnvironment roundEnv, TypeElement
classElement, String superClassName) {
String aRootName =
canonicalClassName(classElement.getQualifiedName().toString());
-if (isNullOrEmpty(aRootName) || "java.lang.Object".equals(aRootName)) {
+// do not check the classes from JDK itself
+if (isNullOrEmpty(aRootName) || aRootName.startsWith("java.") ||
aRootName.startsWith("javax.")) {
return false;
}
[13/27] camel git commit: CAMEL-9766: camel-itest-karaf to get working on karaf 4
http://git-wip-us.apache.org/repos/asf/camel/blob/9e7714a7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelOpenshiftTest.java
--
diff --git
a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelOpenshiftTest.java
b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelOpenshiftTest.java
index 0ee8cd6..ebd23df 100644
---
a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelOpenshiftTest.java
+++
b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelOpenshiftTest.java
@@ -18,8 +18,6 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.Configuration;
-import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)
@@ -32,9 +30,5 @@ public class CamelOpenshiftTest extends AbstractFeatureTest {
testComponent(COMPONENT);
}
-@Configuration
-public static Option[] configure() {
-return configure(COMPONENT);
-}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/9e7714a7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelOptaplannerTest.java
--
diff --git
a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelOptaplannerTest.java
b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelOptaplannerTest.java
index 1a975ba..811f82c 100644
---
a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelOptaplannerTest.java
+++
b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelOptaplannerTest.java
@@ -18,8 +18,6 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.Configuration;
-import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)
@@ -32,9 +30,5 @@ public class CamelOptaplannerTest extends AbstractFeatureTest
{
testComponent(COMPONENT);
}
-@Configuration
-public static Option[] configure() {
-return configure(COMPONENT);
-}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/9e7714a7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelPahoTest.java
--
diff --git
a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelPahoTest.java
b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelPahoTest.java
index 9ec0e81..e385c84 100644
---
a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelPahoTest.java
+++
b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelPahoTest.java
@@ -18,8 +18,6 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.Configuration;
-import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)
@@ -32,9 +30,5 @@ public class CamelPahoTest extends AbstractFeatureTest {
testComponent(COMPONENT);
}
-@Configuration
-public static Option[] configure() {
-return configure(COMPONENT);
-}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/9e7714a7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelPaxloggingTest.java
--
diff --git
a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelPaxloggingTest.java
b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelPaxloggingTest.java
index cbbfec1..86cf30f 100644
---
a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelPaxloggingTest.java
+++
b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelPaxloggingTest.java
@@ -18,8 +18,6 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.Configuration;
-import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)
@@ -32,9 +30,5 @@ public class CamelPaxloggingTest extends AbstractFeatureTest {
testComponent(COMPONENT);
}
-@Configuration
-public static Option[] configure() {
-return configure(COMPONENT);
-}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/9e7714a7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelPdfTest.java
--
diff --git
a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelPdfTest.java
[08/27] camel git commit: Upgrade Braintree Gateway to version 2.58.0
Upgrade Braintree Gateway to version 2.58.0 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/fe66ce3f Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/fe66ce3f Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/fe66ce3f Branch: refs/heads/jdk8-lambdas Commit: fe66ce3f72b9359208a8ceeaba499bc7caefe1d4 Parents: 05b1535 Author: Andrea Cosentino Authored: Sat Mar 26 11:38:59 2016 +0100 Committer: Andrea Cosentino Committed: Sat Mar 26 11:38:59 2016 +0100 -- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/fe66ce3f/parent/pom.xml -- diff --git a/parent/pom.xml b/parent/pom.xml index 5f5886f..cd79925 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -76,7 +76,7 @@ 0.33 1.54 3.2.1 -2.55.0 +2.58.0 1.10 0.9.5.2 1.0.0-M3
[07/27] camel git commit: Removed smack-bundle-version properties since it is not used
Removed smack-bundle-version properties since it is not used Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/05b15350 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/05b15350 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/05b15350 Branch: refs/heads/jdk8-lambdas Commit: 05b153502977529a03a511ef2b23f11926558036 Parents: edcb05e Author: Andrea Cosentino Authored: Sat Mar 26 11:00:38 2016 +0100 Committer: Andrea Cosentino Committed: Sat Mar 26 11:00:38 2016 +0100 -- parent/pom.xml | 1 - 1 file changed, 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/05b15350/parent/pom.xml -- diff --git a/parent/pom.xml b/parent/pom.xml index 688d662..5f5886f 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -488,7 +488,6 @@ 1.1 1.7.13 1.7.13 -4.0.6 4.0.7 1.17 1.1.2.1
[27/27] camel git commit: Merge branch 'master' into jdk8-lambdas.
Merge branch 'master' into jdk8-lambdas. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/e5f2b28e Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/e5f2b28e Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/e5f2b28e Branch: refs/heads/jdk8-lambdas Commit: e5f2b28e21a5a800a268df96650caa9e655667a8 Parents: c2b0aa3 95d1531 Author: Raúl Kripalani Authored: Mon Mar 28 11:30:14 2016 +0100 Committer: Raúl Kripalani Committed: Mon Mar 28 11:30:14 2016 +0100 -- .../java/org/apache/camel/CamelContext.java | 17 + .../camel/component/rest/RestApiEndpoint.java | 2 +- .../apache/camel/impl/DefaultCamelContext.java | 20 +- .../camel/util/jsse/CipherSuitesParameters.java | 17 +- .../jsse/SecureSocketProtocolsParameters.java | 17 +- .../camel/impl/DefaultCamelContextTest.java | 20 + .../util/jsse/SSLContextParametersTest.java | 333 +-- components/camel-context/pom.xml| 2 +- ...ractBaseSSLContextParametersFactoryBean.java | 42 +- .../src/main/resources/META-INF/spring.schemas | 1 + .../src/main/docs/freemarker.adoc | 4 + .../camel-ganglia/src/main/docs/ganglia.adoc| 4 + .../google/drive/GoogleDriveEndpoint.java | 2 +- .../component/hystrix/CamelHystrixCommand.java | 22 +- .../component/hystrix/HystrixConfiguration.java | 48 +- .../component/hystrix/HystrixConstants.java | 62 ++- .../component/hystrix/HystrixProducer.java | 255 ++--- .../component/hystrix/HystrixComponentBase.java | 50 ++ .../hystrix/HystrixComponentCacheTest.java | 84 +++ .../HystrixComponentCircuitBreakerTest.java | 30 +- .../hystrix/HystrixComponentFallbackTest.java | 98 .../HystrixComponentRequestContextTest.java | 25 +- .../component/hystrix/HystrixComponentTest.java | 154 -- .../hystrix/HystrixComponentTimeOutTest.java| 98 .../camel/component/ignite/IgniteComponent.java | 15 +- .../src/main/resources/META-INF/spring.schemas | 1 + .../src/main/resources/META-INF/spring.schemas | 1 + .../src/main/resources/META-INF/spring.schemas | 1 + .../camel/swagger/RestSwaggerProcessor.java | 9 +- .../camel/swagger/RestSwaggerSupport.java | 48 +- .../swagger/SwaggerRestApiProcessorFactory.java | 8 +- .../swagger/servlet/RestSwaggerCorsFilter.java | 68 ++- .../swagger/servlet/RestSwaggerServlet.java | 9 +- parent/pom.xml | 4 +- .../features/src/main/resources/features.xml| 23 +- tests/camel-itest-karaf/pom.xml | 17 +- tests/camel-itest-karaf/run-tests.sh| 74 +++ .../camel/itest/karaf/AbstractFeatureTest.java | 250 ++--- .../apache/camel/itest/karaf/CamelAhcTest.java | 11 +- .../camel/itest/karaf/CamelAhcWsTest.java | 7 - .../apache/camel/itest/karaf/CamelAmqpTest.java | 7 - .../apache/camel/itest/karaf/CamelApnsTest.java | 7 - .../karaf/CamelAtmosphereWebsocketTest.java | 8 +- .../apache/camel/itest/karaf/CamelAtomTest.java | 7 - .../apache/camel/itest/karaf/CamelAvroTest.java | 13 - .../apache/camel/itest/karaf/CamelAwsTest.java | 23 +- .../apache/camel/itest/karaf/CamelBamTest.java | 9 +- .../camel/itest/karaf/CamelBarcodeTest.java | 14 - .../camel/itest/karaf/CamelBase64Test.java | 13 - .../itest/karaf/CamelBeanValidatorTest.java | 7 - .../camel/itest/karaf/CamelBeanioTest.java | 13 - .../camel/itest/karaf/CamelBeanstalkTest.java | 7 - .../camel/itest/karaf/CamelBindyTest.java | 19 +- .../apache/camel/itest/karaf/CamelBoonTest.java | 13 - .../apache/camel/itest/karaf/CamelBoxTest.java | 7 - .../camel/itest/karaf/CamelBraintreeTest.java | 7 - .../camel/itest/karaf/CamelCacheTest.java | 7 - .../camel/itest/karaf/CamelCassandraqlTest.java | 9 +- .../camel/itest/karaf/CamelCastorTest.java | 13 - .../camel/itest/karaf/CamelChunkTest.java | 6 - .../camel/itest/karaf/CamelCmSmsTest.java | 11 +- .../apache/camel/itest/karaf/CamelCmisTest.java | 7 +- .../camel/itest/karaf/CamelCometdTest.java | 7 - .../camel/itest/karaf/CamelContextTest.java | 7 - .../camel/itest/karaf/CamelCouchDBTest.java | 7 - .../camel/itest/karaf/CamelCryptoTest.java | 13 - .../apache/camel/itest/karaf/CamelCsvTest.java | 14 - .../apache/camel/itest/karaf/CamelCxfTest.java | 13 +- .../camel/itest/karaf/CamelDisruptorTest.java | 13 +- .../apache/camel/itest/karaf/CamelDnsTest.java | 7 - .../camel/itest/karaf/CamelDockerTest.java | 7 - .../camel/itest/karaf/CamelDozerTest.java | 7 - .../camel/itest/karaf/CamelDropboxTest.java | 11 +- .../itest/karaf/CamelElasticsearchTest.java | 9 +- .../camel/itest/karaf/CamelElsqlTest.java | 9 +- .../apache/camel/itest/karaf/
[14/27] camel git commit: CAMEL-9766: camel-itest-karaf to get working on karaf 4
http://git-wip-us.apache.org/repos/asf/camel/blob/9e7714a7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGoogleCalendarTest.java
--
diff --git
a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGoogleCalendarTest.java
b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGoogleCalendarTest.java
index 58330f3..43e17c9 100644
---
a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGoogleCalendarTest.java
+++
b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGoogleCalendarTest.java
@@ -18,8 +18,6 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.Configuration;
-import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)
@@ -32,9 +30,4 @@ public class CamelGoogleCalendarTest extends
AbstractFeatureTest {
testComponent(COMPONENT);
}
-@Configuration
-public static Option[] configure() {
-return configure(COMPONENT);
-}
-
}
http://git-wip-us.apache.org/repos/asf/camel/blob/9e7714a7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGoogleDriveTest.java
--
diff --git
a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGoogleDriveTest.java
b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGoogleDriveTest.java
index 5b64439..3ec7e84 100644
---
a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGoogleDriveTest.java
+++
b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGoogleDriveTest.java
@@ -18,8 +18,6 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.Configuration;
-import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)
@@ -32,9 +30,4 @@ public class CamelGoogleDriveTest extends AbstractFeatureTest
{
testComponent(COMPONENT);
}
-@Configuration
-public static Option[] configure() {
-return configure(COMPONENT);
-}
-
}
http://git-wip-us.apache.org/repos/asf/camel/blob/9e7714a7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGoogleMailTest.java
--
diff --git
a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGoogleMailTest.java
b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGoogleMailTest.java
index c518625..ad0b93c 100644
---
a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGoogleMailTest.java
+++
b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGoogleMailTest.java
@@ -18,8 +18,6 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.Configuration;
-import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)
@@ -32,9 +30,4 @@ public class CamelGoogleMailTest extends AbstractFeatureTest {
testComponent(COMPONENT);
}
-@Configuration
-public static Option[] configure() {
-return configure(COMPONENT);
-}
-
}
http://git-wip-us.apache.org/repos/asf/camel/blob/9e7714a7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGroovyTest.java
--
diff --git
a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGroovyTest.java
b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGroovyTest.java
index 0babdb1..a9e7ecb 100644
---
a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGroovyTest.java
+++
b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGroovyTest.java
@@ -18,8 +18,6 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.Configuration;
-import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)
@@ -32,9 +30,4 @@ public class CamelGroovyTest extends AbstractFeatureTest {
testLanguage(COMPONENT);
}
-@Configuration
-public static Option[] configure() {
-return configure(COMPONENT);
-}
-
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/9e7714a7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGsonTest.java
--
diff --git
a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGsonTest.java
b/tests/camel-itest-karaf/src/test/jav
camel git commit: CAMEL-9764: Maven build - Fix unruly projects w/ independent maven-bundle-plugin executions.
Repository: camel
Updated Branches:
refs/heads/jdk8-lambdas b68c5c4a2 -> 8b197255a
CAMEL-9764: Maven build - Fix unruly projects w/ independent
maven-bundle-plugin executions.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/8b197255
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/8b197255
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/8b197255
Branch: refs/heads/jdk8-lambdas
Commit: 8b197255a85fe28253405e8e6314d7beea3e49a6
Parents: b68c5c4
Author: Raúl Kripalani
Authored: Sat Mar 26 00:48:03 2016 +
Committer: Raúl Kripalani
Committed: Sat Mar 26 00:48:03 2016 +
--
examples/camel-example-bam/pom.xml | 4 +-
examples/camel-example-box-osgi/pom.xml | 26 ++
examples/camel-example-cdi-properties/pom.xml | 7 +-
examples/camel-example-cxf-blueprint/pom.xml| 24 ++
examples/camel-example-cxf-osgi/pom.xml | 80 --
.../camel-example-netty-http/myapp-one/pom.xml | 34 +++-
.../camel-example-netty-http/myapp-two/pom.xml | 34 +++-
.../shared-netty-http-server/pom.xml| 33 +++-
.../pom.xml | 89 +---
.../pom.xml | 32 ++-
.../pom.xml | 34 +++-
11 files changed, 147 insertions(+), 250 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/8b197255/examples/camel-example-bam/pom.xml
--
diff --git a/examples/camel-example-bam/pom.xml
b/examples/camel-example-bam/pom.xml
index 8fc2f6e..9a5c1b2 100644
--- a/examples/camel-example-bam/pom.xml
+++ b/examples/camel-example-bam/pom.xml
@@ -38,7 +38,7 @@
org.apache.camel.bam.model
-*
+ *
@@ -93,7 +93,7 @@
maven-surefire-plugin
1
- false
+ false
http://git-wip-us.apache.org/repos/asf/camel/blob/8b197255/examples/camel-example-box-osgi/pom.xml
--
diff --git a/examples/camel-example-box-osgi/pom.xml
b/examples/camel-example-box-osgi/pom.xml
index 0fd6600..703e647 100644
--- a/examples/camel-example-box-osgi/pom.xml
+++ b/examples/camel-example-box-osgi/pom.xml
@@ -30,6 +30,12 @@
An example which use a Box Endpoint in OSGi
jar
+
+
+ org.apache.camel.example*
+
+
+
org.apache.camel
@@ -62,24 +68,4 @@
-
-
-
-
- org.apache.felix
- maven-bundle-plugin
- true
-
-
target/META-INF
-
-
${project.groupId}.${project.artifactId}
-
org.apache.camel.example*
-
- *
-
-
-
-
-
-
http://git-wip-us.apache.org/repos/asf/camel/blob/8b197255/examples/camel-example-cdi-properties/pom.xml
--
diff --git a/examples/camel-example-cdi-properties/pom.xml
b/examples/camel-example-cdi-properties/pom.xml
index 0ab190b..940f185 100755
--- a/examples/camel-example-cdi-properties/pom.xml
+++ b/examples/camel-example-cdi-properties/pom.xml
@@ -31,6 +31,12 @@
DeltaSpike configuration properties CDI example
jar
+
+
+ org.apache.camel.example.cdi.properties*
+
+
+
@@ -89,7 +95,6 @@
-
org.apache.camel
camel-maven-plugin
http://git-wip-us.apache.org/repos/asf/camel/blob/8b197255/examples/camel-example-cxf-blueprint/pom.xml
--
diff --git a/examples/camel-example-cxf-blueprint/pom.xml
b/examples/camel-example-cxf-blueprint/pom.xml
index 8d50637..b0dcd2a 100644
--- a/examples/camel-example-cxf-blueprint/pom.xml
+++ b/examples/camel-example-cxf-blueprint/pom.xml
@@ -30,6 +30,12 @@
An example which use a CXF consumer and the OSGI HTTP
Service
jar
+
+
+ org.apache.camel.example.reportincident*
+
+
+
org.apache.camel
@@ -96,24 +102,6 @@
-
-
-
-org.ap
camel git commit: CAMEL-9764: Maven build - Fix Camel Salesforce Maven plugin.
Repository: camel Updated Branches: refs/heads/jdk8-lambdas 5a60b6e0d -> b68c5c4a2 CAMEL-9764: Maven build - Fix Camel Salesforce Maven plugin. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/b68c5c4a Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/b68c5c4a Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/b68c5c4a Branch: refs/heads/jdk8-lambdas Commit: b68c5c4a24a3f19a719914a89da18e0855bc20d0 Parents: 5a60b6e Author: Raúl Kripalani Authored: Sat Mar 26 00:13:07 2016 + Committer: Raúl Kripalani Committed: Sat Mar 26 00:13:07 2016 + -- .../camel-salesforce-maven-plugin/pom.xml | 23 1 file changed, 23 insertions(+) -- http://git-wip-us.apache.org/repos/asf/camel/blob/b68c5c4a/components/camel-salesforce/camel-salesforce-maven-plugin/pom.xml -- diff --git a/components/camel-salesforce/camel-salesforce-maven-plugin/pom.xml b/components/camel-salesforce/camel-salesforce-maven-plugin/pom.xml index b28bbd5..6ca701c 100644 --- a/components/camel-salesforce/camel-salesforce-maven-plugin/pom.xml +++ b/components/camel-salesforce/camel-salesforce-maven-plugin/pom.xml @@ -147,6 +147,29 @@ + + +maven-jar-plugin + + +bundle-jar +package + + jar + + + + + + + + true + true + + + + + org.apache.maven.plugins
[2/4] camel git commit: CAMEL-9764: Maven build - Fix to support lambdas in code (JDK8).
http://git-wip-us.apache.org/repos/asf/camel/blob/5aff9223/components/camel-mail/pom.xml -- diff --git a/components/camel-mail/pom.xml b/components/camel-mail/pom.xml index 727cbe3..2405c1d 100644 --- a/components/camel-mail/pom.xml +++ b/components/camel-mail/pom.xml @@ -25,7 +25,7 @@ camel-mail -bundle +jar Camel :: Mail Camel Mail support http://git-wip-us.apache.org/repos/asf/camel/blob/5aff9223/components/camel-metrics/pom.xml -- diff --git a/components/camel-metrics/pom.xml b/components/camel-metrics/pom.xml index 44f3d54..64f8d4a 100644 --- a/components/camel-metrics/pom.xml +++ b/components/camel-metrics/pom.xml @@ -24,7 +24,7 @@ camel-metrics - bundle + jar Camel :: Metrics Camel Metrics based monitoring component http://git-wip-us.apache.org/repos/asf/camel/blob/5aff9223/components/camel-mina/pom.xml -- diff --git a/components/camel-mina/pom.xml b/components/camel-mina/pom.xml index a25fe5b..8606f97 100644 --- a/components/camel-mina/pom.xml +++ b/components/camel-mina/pom.xml @@ -25,7 +25,7 @@ camel-mina -bundle +jar Camel :: MINA (deprecated) Camel MINA support http://git-wip-us.apache.org/repos/asf/camel/blob/5aff9223/components/camel-mina2/pom.xml -- diff --git a/components/camel-mina2/pom.xml b/components/camel-mina2/pom.xml index 408ba13..787ee7f 100644 --- a/components/camel-mina2/pom.xml +++ b/components/camel-mina2/pom.xml @@ -25,7 +25,7 @@ camel-mina2 -bundle +jar Camel :: MINA-2 Camel MINA 2.x support http://git-wip-us.apache.org/repos/asf/camel/blob/5aff9223/components/camel-mllp/pom.xml -- diff --git a/components/camel-mllp/pom.xml b/components/camel-mllp/pom.xml index 4dce008..35f5588 100644 --- a/components/camel-mllp/pom.xml +++ b/components/camel-mllp/pom.xml @@ -28,7 +28,7 @@ camel-mllp - bundle + jar Camel :: MLLP Camel MLLP Component http://git-wip-us.apache.org/repos/asf/camel/blob/5aff9223/components/camel-mongodb-gridfs/pom.xml -- diff --git a/components/camel-mongodb-gridfs/pom.xml b/components/camel-mongodb-gridfs/pom.xml index a258461..1492292 100644 --- a/components/camel-mongodb-gridfs/pom.xml +++ b/components/camel-mongodb-gridfs/pom.xml @@ -28,7 +28,7 @@ camel-mongodb-gridfs -bundle +jar Camel :: MongoDB GridFS Camel MongoDB GridFS component http://git-wip-us.apache.org/repos/asf/camel/blob/5aff9223/components/camel-mongodb/pom.xml -- diff --git a/components/camel-mongodb/pom.xml b/components/camel-mongodb/pom.xml index 117387f..99c40bc5 100644 --- a/components/camel-mongodb/pom.xml +++ b/components/camel-mongodb/pom.xml @@ -27,7 +27,7 @@ camel-mongodb - bundle + jar Camel :: MongoDB Camel MongoDB component http://git-wip-us.apache.org/repos/asf/camel/blob/5aff9223/components/camel-mqtt/pom.xml -- diff --git a/components/camel-mqtt/pom.xml b/components/camel-mqtt/pom.xml index 60c9b96..e712707 100644 --- a/components/camel-mqtt/pom.xml +++ b/components/camel-mqtt/pom.xml @@ -25,7 +25,7 @@ camel-mqtt -bundle +jar Camel :: MQTT Camel MQTT client http://git-wip-us.apache.org/repos/asf/camel/blob/5aff9223/components/camel-msv/pom.xml -- diff --git a/components/camel-msv/pom.xml b/components/camel-msv/pom.xml index 5984491..715631f 100644 --- a/components/camel-msv/pom.xml +++ b/components/camel-msv/pom.xml @@ -25,7 +25,7 @@ camel-msv - bundle + jar Camel :: MSV Camel MSV support http://git-wip-us.apache.org/repos/asf/camel/blob/5aff9223/components/camel-mustache/pom.xml -- diff --git a/components/camel-mustache/pom.xml b/components/camel-mustache/pom.xml index 3b5b826..aba667d 100644 --- a/components/camel-mustache/pom.xml +++ b/components/camel-mustache/pom.xml @@ -25,7 +25,7 @@ camel-mustache - bundle + jar Camel :: Mustache Camel Mustache support http://git-wip-us.apache.org/repos/asf/camel/blob/5aff9223/components/camel-mvel/pom.xml -- diff --git a/components/camel-mvel/pom.xml b/components/camel-mvel/pom.xml index 88ab9fe..d6dc2b4 100644 --- a/components/camel-mvel/pom.xml +++ b/components/camel-mvel/pom.xml @@ -25,7 +25,7 @@ camel-mvel - bundle + jar
[3/4] camel git commit: CAMEL-9764: Maven build - Fix to support lambdas in code (JDK8).
CAMEL-9764: Maven build - Fix to support lambdas in code (JDK8). Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/5aff9223 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/5aff9223 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/5aff9223 Branch: refs/heads/jdk8-lambdas Commit: 5aff9223fb6dcdaf6669b912fd2c6cb8d1fedc63 Parents: b523b1b Author: Raúl Kripalani Authored: Fri Mar 25 23:30:37 2016 + Committer: Raúl Kripalani Committed: Fri Mar 25 23:59:22 2016 + -- camel-core/pom.xml | 8 +- components/camel-ahc-ws/pom.xml | 2 +- components/camel-ahc/pom.xml| 2 +- components/camel-amqp/pom.xml | 2 +- components/camel-apns/pom.xml | 2 +- components/camel-atmos/pom.xml | 2 +- components/camel-atmosphere-websocket/pom.xml | 2 +- components/camel-atom/pom.xml | 2 +- components/camel-avro/pom.xml | 2 +- components/camel-aws/pom.xml| 2 +- components/camel-bam/pom.xml| 2 +- components/camel-barcode/pom.xml| 2 +- components/camel-base64/pom.xml | 2 +- components/camel-bean-validator/pom.xml | 2 +- components/camel-beanio/pom.xml | 2 +- components/camel-beanstalk/pom.xml | 2 +- components/camel-bindy/pom.xml | 2 +- components/camel-blueprint/pom.xml | 2 +- components/camel-boon/pom.xml | 2 +- components/camel-box/pom.xml| 2 +- components/camel-braintree/pom.xml | 2 +- components/camel-cache/pom.xml | 2 +- components/camel-cassandraql/pom.xml| 2 +- components/camel-castor/pom.xml | 2 +- components/camel-cdi/pom.xml| 2 +- components/camel-chunk/pom.xml | 2 +- components/camel-cm-sms/pom.xml | 2 +- components/camel-cmis/pom.xml | 2 +- components/camel-coap/pom.xml | 2 +- components/camel-cometd/pom.xml | 2 +- components/camel-context/pom.xml| 2 +- components/camel-core-osgi/pom.xml | 2 +- components/camel-couchdb/pom.xml| 2 +- components/camel-crypto/pom.xml | 2 +- components/camel-csv/pom.xml| 2 +- components/camel-cxf-transport/pom.xml | 2 +- components/camel-cxf/pom.xml| 2 +- components/camel-disruptor/pom.xml | 2 +- components/camel-dns/pom.xml| 2 +- components/camel-docker/pom.xml | 2 +- components/camel-dozer/pom.xml | 2 +- components/camel-dropbox/pom.xml| 2 +- components/camel-eclipse/pom.xml| 2 +- components/camel-ejb/pom.xml| 2 +- components/camel-elasticsearch/pom.xml | 2 +- components/camel-elsql/pom.xml | 2 +- components/camel-etcd/pom.xml | 2 +- components/camel-eventadmin/pom.xml | 2 +- components/camel-exec/pom.xml | 2 +- components/camel-facebook/pom.xml | 2 +- components/camel-flatpack/pom.xml | 2 +- components/camel-fop/pom.xml| 2 +- components/camel-freemarker/pom.xml | 2 +- components/camel-ftp/pom.xml| 2 +- components/camel-gae/pom.xml| 2 +- components/camel-ganglia/pom.xml| 2 +- components/camel-geocoder/pom.xml | 2 +- components/camel-git/pom.xml| 2 +- components/camel-github/pom.xml | 2 +- components/camel-google-calendar/pom.xml| 2 +- components/camel-google-drive/pom.xml | 2 +- components/camel-google-mail/pom.xml| 2 +- components/camel-gora/pom.xml | 2 +- components/camel-groovy/pom.xml | 2 +- components/camel-gson/pom.xml | 2 +- components/camel-guava-eventbus/pom.xml | 2 +- components/camel-guice/pom.xml | 2 +- components/camel-hawtdb/pom.xml | 2 +- components/camel-hazelcast/pom.xml | 2 +- components/camel-hbase/pom.xml | 2 +- components/camel-hdfs/pom.xml | 2 +- components/camel-hdfs2/pom.xml | 2 +- components/camel-hessian/pom.xml| 2 +- components/camel-hipchat/pom.xml| 2 +- components/camel-hl7/pom.xml| 2 +- components/camel-http-common/pom.xml| 2 +- components/camel-http/pom.xml
[4/4] camel git commit: CAMEL-9765: Direct-VM - Header filter strategy & property propagation flag.
CAMEL-9765: Direct-VM - Header filter strategy & property propagation flag.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/5a60b6e0
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/5a60b6e0
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/5a60b6e0
Branch: refs/heads/jdk8-lambdas
Commit: 5a60b6e0da927e27562c6afde23cf356eae9d264
Parents: 5aff922
Author: Raúl Kripalani
Authored: Fri Mar 25 21:07:40 2016 +
Committer: Raúl Kripalani
Committed: Sat Mar 26 00:00:47 2016 +
--
.../component/directvm/DirectVmComponent.java | 32
.../component/directvm/DirectVmConsumer.java| 1 -
.../component/directvm/DirectVmEndpoint.java| 33 -
.../component/directvm/DirectVmProducer.java| 54 +-
.../DirectVmHeaderFilterStrategyTest.java | 77
...ectVmNoPropertyPropagationComponentTest.java | 62
.../DirectVmNoPropertyPropagationTest.java | 61
7 files changed, 299 insertions(+), 21 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/5a60b6e0/camel-core/src/main/java/org/apache/camel/component/directvm/DirectVmComponent.java
--
diff --git
a/camel-core/src/main/java/org/apache/camel/component/directvm/DirectVmComponent.java
b/camel-core/src/main/java/org/apache/camel/component/directvm/DirectVmComponent.java
index 3e48c7c..d5c341f 100644
---
a/camel-core/src/main/java/org/apache/camel/component/directvm/DirectVmComponent.java
+++
b/camel-core/src/main/java/org/apache/camel/component/directvm/DirectVmComponent.java
@@ -25,6 +25,7 @@ import java.util.concurrent.atomic.AtomicInteger;
import org.apache.camel.Endpoint;
import org.apache.camel.impl.UriEndpointComponent;
+import org.apache.camel.spi.HeaderFilterStrategy;
import org.apache.camel.spi.Metadata;
/**
@@ -41,6 +42,9 @@ public class DirectVmComponent extends UriEndpointComponent {
private boolean block;
@Metadata(defaultValue = "3")
private long timeout = 3L;
+private HeaderFilterStrategy headerFilterStrategy;
+@Metadata(defaultValue = "true")
+private Boolean propagateProperties = Boolean.TRUE;
public DirectVmComponent() {
super(DirectVmEndpoint.class);
@@ -65,6 +69,7 @@ public class DirectVmComponent extends UriEndpointComponent {
answer.setBlock(block);
answer.setTimeout(timeout);
answer.configureProperties(parameters);
+setProperties(answer, parameters);
return answer;
}
@@ -132,4 +137,31 @@ public class DirectVmComponent extends
UriEndpointComponent {
public void setTimeout(long timeout) {
this.timeout = timeout;
}
+
+public HeaderFilterStrategy getHeaderFilterStrategy() {
+return headerFilterStrategy;
+}
+
+/**
+ * Sets a {@link HeaderFilterStrategy} that will only be applied on
producer endpoints (on both directions: request and response).
+ * Default value: none.
+ * @param headerFilterStrategy
+ */
+public void setHeaderFilterStrategy(HeaderFilterStrategy
headerFilterStrategy) {
+this.headerFilterStrategy = headerFilterStrategy;
+}
+
+public boolean isPropagateProperties() {
+return propagateProperties;
+}
+
+/**
+ * Whether to propagate or not properties from the producer side to the
consumer side, and viceversa.
+ * Default value: true.
+ * @param propagateProperties
+ */
+public void setPropagateProperties(boolean propagateProperties) {
+this.propagateProperties = propagateProperties;
+}
+
}
http://git-wip-us.apache.org/repos/asf/camel/blob/5a60b6e0/camel-core/src/main/java/org/apache/camel/component/directvm/DirectVmConsumer.java
--
diff --git
a/camel-core/src/main/java/org/apache/camel/component/directvm/DirectVmConsumer.java
b/camel-core/src/main/java/org/apache/camel/component/directvm/DirectVmConsumer.java
index 4b18fe3..827e975 100644
---
a/camel-core/src/main/java/org/apache/camel/component/directvm/DirectVmConsumer.java
+++
b/camel-core/src/main/java/org/apache/camel/component/directvm/DirectVmConsumer.java
@@ -18,7 +18,6 @@ package org.apache.camel.component.directvm;
import org.apache.camel.Processor;
import org.apache.camel.Suspendable;
-import org.apache.camel.SuspendableService;
import org.apache.camel.impl.DefaultConsumer;
/**
http://git-wip-us.apache.org/repos/asf/camel/blob/5a60b6e0/camel-core/src/main/java/org/apache/camel/component/directvm/DirectVmEndpoint.java
--
diff --git
a/camel-core/src/main/java/org/apache/camel/component/directvm
[1/4] camel git commit: CAMEL-9764: Maven build - Fix to support lambdas in code (JDK8).
Repository: camel
Updated Branches:
refs/heads/jdk8-lambdas [created] 5a60b6e0d
http://git-wip-us.apache.org/repos/asf/camel/blob/5aff9223/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 688d662..52d3323 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -381,14 +381,15 @@
2.0
2.0
${maven-bundle-plugin-version}
-
-2.3.7
+
+2.5.4
2.16
6.6
2.10
+2.6
2.9.1
7.7.Final
1.4
@@ -2825,6 +2826,16 @@
+ org.apache.maven.plugins
+ maven-jar-plugin
+ ${maven-jar-plugin-version}
+
+
+
${project.build.outputDirectory}/META-INF/MANIFEST.MF
+
+
+
+
net.alchim31.maven
scala-maven-plugin
${scala-maven-plugin-version}
@@ -3191,6 +3202,7 @@
cleanVersions
package
+ manifest
@@ -3227,7 +3239,7 @@
org.apache.felix
maven-bundle-plugin
${maven-bundle-plugin-version}
-true
+false
${camel.osgi.exclude.dependencies}
@@ -3262,6 +3274,13 @@
+
+bundle-manifest
+process-classes
+
+ manifest
+
+
http://git-wip-us.apache.org/repos/asf/camel/blob/5aff9223/platforms/catalog-lucene/pom.xml
--
diff --git a/platforms/catalog-lucene/pom.xml b/platforms/catalog-lucene/pom.xml
index e9edcf3..f4abee5 100644
--- a/platforms/catalog-lucene/pom.xml
+++ b/platforms/catalog-lucene/pom.xml
@@ -25,7 +25,7 @@
camel-catalog-lucene
- bundle
+ jar
Camel :: Platforms :: Catalog :: Lucene
Camel Catalog Lucene
http://git-wip-us.apache.org/repos/asf/camel/blob/5aff9223/platforms/catalog/pom.xml
--
diff --git a/platforms/catalog/pom.xml b/platforms/catalog/pom.xml
index 02beb31a..a2e869c 100644
--- a/platforms/catalog/pom.xml
+++ b/platforms/catalog/pom.xml
@@ -25,7 +25,7 @@
camel-catalog
- bundle
+ jar
Camel :: Platforms :: Catalog
Camel Catalog
http://git-wip-us.apache.org/repos/asf/camel/blob/5aff9223/platforms/commands/commands-core/pom.xml
--
diff --git a/platforms/commands/commands-core/pom.xml
b/platforms/commands/commands-core/pom.xml
index ad00498..fb8f942 100644
--- a/platforms/commands/commands-core/pom.xml
+++ b/platforms/commands/commands-core/pom.xml
@@ -26,7 +26,7 @@
camel-commands-core
- bundle
+ jar
Camel :: Platforms :: Commands :: Core
Core Camel Commands
http://git-wip-us.apache.org/repos/asf/camel/blob/5aff9223/platforms/commands/commands-jolokia/pom.xml
--
diff --git a/platforms/commands/commands-jolokia/pom.xml
b/platforms/commands/commands-jolokia/pom.xml
index e68db67..debc15b 100644
--- a/platforms/commands/commands-jolokia/pom.xml
+++ b/platforms/commands/commands-jolokia/pom.xml
@@ -26,7 +26,7 @@
camel-commands-jolokia
- bundle
+ jar
Camel :: Platforms :: Commands :: Jolokia
Camel Commands using Jolokia
http://git-wip-us.apache.org/repos/asf/camel/blob/5aff9223/platforms/karaf/commands-catalog/pom.xml
--
diff --git a/platforms/karaf/commands-catalog/pom.xml
b/platforms/karaf/commands-catalog/pom.xml
index cbbf589..e2aa32f 100644
--- a/platforms/karaf/commands-catalog/pom.xml
+++ b/platforms/karaf/commands-catalog/pom.xml
@@ -27,7 +27,7 @@
org.apache.camel.karaf
camel-karaf-commands-catalog
- bundle
+ jar
Camel :: Platforms :: Apache Karaf :: Commands :: Catalog
http://git-wip-us.apache.org/repos/asf/camel/blob/5aff9223/platforms/karaf/commands/pom.xml
--
diff --git a/platforms/karaf/commands/pom.xml b/platforms/karaf/commands/pom.xml
index 36377f5..871bcd9 100644
--- a/platforms/karaf/commands/pom.xml
+++ b/platforms/karaf/commands/pom.xml
@@ -27,7 +27,7 @@
org.apache.camel.karaf
camel-karaf-commands
- bundle
+ jar
Camel :: Platforms :: Apache Karaf :: Commands
http://git-wip-us.apache.org/repos/asf/camel/blob/5aff9223/platforms/pom.xml
--
diff --git a/platforms/pom.xml b/platforms/pom.xml
index 418eb44..5f69c84 100644
--- a/platforms/pom.xml
+++ b/platforms/pom.xml
@@ -37,4 +37,15 @@
commands
karaf
+
+
+
+
+
+org.apache.maven.pl
camel git commit: camel-nats: Adjust header names.
Repository: camel
Updated Branches:
refs/heads/master 8e11b7ace -> 9bee8ddc4
camel-nats: Adjust header names.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/9bee8ddc
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/9bee8ddc
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/9bee8ddc
Branch: refs/heads/master
Commit: 9bee8ddc4907729dd2724cdbaf0bf845118f639e
Parents: 8e11b7a
Author: Raúl Kripalani
Authored: Sun Mar 20 11:30:30 2016 +
Committer: Raúl Kripalani
Committed: Sun Mar 20 11:30:30 2016 +
--
.../main/java/org/apache/camel/component/nats/NatsConstants.java | 4 ++--
.../main/java/org/apache/camel/component/nats/NatsConsumer.java | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/9bee8ddc/components/camel-nats/src/main/java/org/apache/camel/component/nats/NatsConstants.java
--
diff --git
a/components/camel-nats/src/main/java/org/apache/camel/component/nats/NatsConstants.java
b/components/camel-nats/src/main/java/org/apache/camel/component/nats/NatsConstants.java
index 1d38369..9bdee5d 100644
---
a/components/camel-nats/src/main/java/org/apache/camel/component/nats/NatsConstants.java
+++
b/components/camel-nats/src/main/java/org/apache/camel/component/nats/NatsConstants.java
@@ -18,6 +18,6 @@ package org.apache.camel.component.nats;
public interface NatsConstants {
-String NATS_MESSAGE_TIMESTAMP = "natsMessageTimestamp";
-String NATS_SUBSCRIBE_SID = "natsSubscribeSid";
+String NATS_MESSAGE_TIMESTAMP = "CamelNatsMessageTimestamp";
+String NATS_SUBSCRIPTION_ID = "CamelNatsSubscriptionId";
}
http://git-wip-us.apache.org/repos/asf/camel/blob/9bee8ddc/components/camel-nats/src/main/java/org/apache/camel/component/nats/NatsConsumer.java
--
diff --git
a/components/camel-nats/src/main/java/org/apache/camel/component/nats/NatsConsumer.java
b/components/camel-nats/src/main/java/org/apache/camel/component/nats/NatsConsumer.java
index 7b77b16..9c8a29d 100644
---
a/components/camel-nats/src/main/java/org/apache/camel/component/nats/NatsConsumer.java
+++
b/components/camel-nats/src/main/java/org/apache/camel/component/nats/NatsConsumer.java
@@ -113,7 +113,7 @@ public class NatsConsumer extends DefaultConsumer {
Exchange exchange = getEndpoint().createExchange();
exchange.getIn().setBody(msg);
exchange.getIn().setHeader(NatsConstants.NATS_MESSAGE_TIMESTAMP,
System.currentTimeMillis());
-
exchange.getIn().setHeader(NatsConstants.NATS_SUBSCRIBE_SID, sid);
+
exchange.getIn().setHeader(NatsConstants.NATS_SUBSCRIPTION_ID, sid);
try {
processor.process(exchange);
} catch (Exception e) {
camel git commit: CAMEL-9458 Add details in camel-ignite Karaf feature (displayed with feature:info).
Repository: camel
Updated Branches:
refs/heads/master 4aa1d392b -> 9ede6a24b
CAMEL-9458 Add details in camel-ignite Karaf feature (displayed with
feature:info).
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/9ede6a24
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/9ede6a24
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/9ede6a24
Branch: refs/heads/master
Commit: 9ede6a24be919c8ea437e500ac87754c43c04ac9
Parents: 4aa1d39
Author: Raul Kripalani
Authored: Sun Feb 21 20:20:18 2016 +
Committer: Raul Kripalani
Committed: Sun Feb 21 20:20:18 2016 +
--
platforms/karaf/features/src/main/resources/features.xml | 10 +-
1 file changed, 9 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/9ede6a24/platforms/karaf/features/src/main/resources/features.xml
--
diff --git a/platforms/karaf/features/src/main/resources/features.xml
b/platforms/karaf/features/src/main/resources/features.xml
index f1b6a8e..160fc3c 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -714,7 +714,15 @@
mvn:org.apache.camel/camel-ibatis/${project.version}
-The camel-ignite feature can only run on a SUN JVM. You need to
add the package sun.nio.ch to the java platform packages in the
etc/jre.properties file.
+
+
+
camel-core
ignite-core
mvn:org.apache.camel/camel-ignite/${project.version}
[1/2] camel git commit: camel-ignite: polish code.
Repository: camel
Updated Branches:
refs/heads/master 799857b72 -> 933985c65
camel-ignite: polish code.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d9e03472
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d9e03472
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d9e03472
Branch: refs/heads/master
Commit: d9e03472f65427165f24f4d26153c3db5f848bd9
Parents: 799857b
Author: Raul Kripalani
Authored: Mon Jan 11 13:21:14 2016 +
Committer: Raul Kripalani
Committed: Wed Jan 20 12:29:35 2016 +
--
.../java/org/apache/camel/component/ignite/IgniteConstants.java | 1 -
.../apache/camel/component/ignite/cache/IgniteCacheEndpoint.java | 3 +--
2 files changed, 1 insertion(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/d9e03472/components/camel-ignite/src/main/java/org/apache/camel/component/ignite/IgniteConstants.java
--
diff --git
a/components/camel-ignite/src/main/java/org/apache/camel/component/ignite/IgniteConstants.java
b/components/camel-ignite/src/main/java/org/apache/camel/component/ignite/IgniteConstants.java
index e9b9256..6cd4944 100644
---
a/components/camel-ignite/src/main/java/org/apache/camel/component/ignite/IgniteConstants.java
+++
b/components/camel-ignite/src/main/java/org/apache/camel/component/ignite/IgniteConstants.java
@@ -43,7 +43,6 @@ public final class IgniteConstants {
// Ignite Sets.
public static final String IGNITE_SETS_OPERATION =
"CamelIgniteSetsOperation";
-public static final String IGNITE_SETS_OPERATION_RESULT =
"CamelIgniteSetsOperationResult";
// Ignite ID Gen.
public static final String IGNITE_IDGEN_OPERATION =
"CamelIgniteIdGenOperation";
http://git-wip-us.apache.org/repos/asf/camel/blob/d9e03472/components/camel-ignite/src/main/java/org/apache/camel/component/ignite/cache/IgniteCacheEndpoint.java
--
diff --git
a/components/camel-ignite/src/main/java/org/apache/camel/component/ignite/cache/IgniteCacheEndpoint.java
b/components/camel-ignite/src/main/java/org/apache/camel/component/ignite/cache/IgniteCacheEndpoint.java
index 2b22409..d6a3049 100644
---
a/components/camel-ignite/src/main/java/org/apache/camel/component/ignite/cache/IgniteCacheEndpoint.java
+++
b/components/camel-ignite/src/main/java/org/apache/camel/component/ignite/cache/IgniteCacheEndpoint.java
@@ -43,8 +43,7 @@ import org.apache.ignite.cache.query.Query;
consumerClass = IgniteCacheContinuousQueryConsumer.class)
public class IgniteCacheEndpoint extends AbstractIgniteEndpoint {
-@UriParam
-@Metadata(required = "true")
+@UriParam @Metadata(required = "true")
private String cacheName;
@UriParam
[2/2] camel git commit: camel-ignite: Update to 1.5.0.final.
camel-ignite: Update to 1.5.0.final. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/933985c6 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/933985c6 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/933985c6 Branch: refs/heads/master Commit: 933985c65f532cd4040c6e8eda5bd1bf39991aa3 Parents: d9e0347 Author: Raul Kripalani Authored: Wed Jan 20 13:56:32 2016 + Committer: Raul Kripalani Committed: Wed Jan 20 13:56:32 2016 + -- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/933985c6/parent/pom.xml -- diff --git a/parent/pom.xml b/parent/pom.xml index 6de2ea6..15354c7 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -242,7 +242,7 @@ 2.3.4.726_4 2.3.4.726 1.0.7 -1.5.0-b1 +1.5.0.final [1.5.0-b1,1.6) 8.1.0.Final 1.10_5
[3/6] camel git commit: CAMEL-9445 camel-ignite: New Apache Ignite component. Initial work.
CAMEL-9445 camel-ignite: New Apache Ignite component. Initial work.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a695c5d3
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a695c5d3
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a695c5d3
Branch: refs/heads/master
Commit: a695c5d3656dcbac1e17b3109c7a6c340e8df7f0
Parents: ff8e1f1
Author: Raul Kripalani
Authored: Wed Dec 23 13:26:42 2015 +
Committer: Raul Kripalani
Committed: Wed Dec 23 15:18:57 2015 +
--
components/camel-ignite/pom.xml | 92 ++
.../ignite/AbstractIgniteEndpoint.java | 99 ++
.../ignite/ClusterGroupExpression.java | 30 ++
.../ignite/ClusterGroupExpressions.java | 85 +
.../camel/component/ignite/IgniteComponent.java | 240 ++
.../camel/component/ignite/IgniteConstants.java | 59
.../camel/component/ignite/IgniteHelper.java| 38 +++
.../IgniteCacheContinuousQueryConsumer.java | 155 +
.../ignite/cache/IgniteCacheEndpoint.java | 311 +++
.../ignite/cache/IgniteCacheOperation.java | 26 ++
.../ignite/cache/IgniteCacheProducer.java | 208 +
.../ignite/compute/IgniteComputeEndpoint.java | 155 +
.../compute/IgniteComputeExecutionType.java | 26 ++
.../ignite/compute/IgniteComputeProducer.java | 275
.../ignite/events/IgniteEventsConsumer.java | 92 ++
.../ignite/events/IgniteEventsEndpoint.java | 146 +
.../ignite/idgen/IgniteIdGenEndpoint.java | 116 +++
.../ignite/idgen/IgniteIdGenOperation.java | 26 ++
.../ignite/idgen/IgniteIdGenProducer.java | 83 +
.../messaging/IgniteMessagingConsumer.java | 78 +
.../messaging/IgniteMessagingEndpoint.java | 123
.../messaging/IgniteMessagingProducer.java | 69
.../messaging/IgniteMessagingSendMode.java | 23 ++
.../ignite/queue/IgniteQueueEndpoint.java | 175 +++
.../ignite/queue/IgniteQueueOperation.java | 26 ++
.../ignite/queue/IgniteQueueProducer.java | 170 ++
.../component/ignite/set/IgniteSetEndpoint.java | 131
.../ignite/set/IgniteSetOperation.java | 26 ++
.../component/ignite/set/IgniteSetProducer.java | 120 +++
.../src/main/resources/META-INF/LICENSE.txt | 203
.../src/main/resources/META-INF/NOTICE.txt | 11 +
.../services/org/apache/camel/component/ignite | 18 ++
.../component/ignite/AbstractIgniteTest.java| 63
.../ignite/IgniteCacheContinuousQueryTest.java | 281 +
.../camel/component/ignite/IgniteCacheTest.java | 237 ++
.../component/ignite/IgniteComputeTest.java | 192
.../component/ignite/IgniteEventsTest.java | 168 ++
.../camel/component/ignite/IgniteIdGenTest.java | 83 +
.../component/ignite/IgniteMessagingTest.java | 164 ++
.../camel/component/ignite/IgniteQueueTest.java | 257 +++
.../camel/component/ignite/IgniteSetTest.java | 176 +++
.../ignite/TestIgniteComputeResources.java | 149 +
.../src/test/resources/log4j.properties | 37 +++
components/pom.xml | 1 +
parent/pom.xml | 1 +
45 files changed, 5244 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/a695c5d3/components/camel-ignite/pom.xml
--
diff --git a/components/camel-ignite/pom.xml b/components/camel-ignite/pom.xml
new file mode 100644
index 000..53af3f7
--- /dev/null
+++ b/components/camel-ignite/pom.xml
@@ -0,0 +1,92 @@
+
+
+http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+ 4.0.0
+
+
+org.apache.camel
+components
+2.17-SNAPSHOT
+
+
+ camel-ignite
+ bundle
+ Camel :: Ignite
+ Camel Ignite component
+
+
+
org.apache.camel.component.ignite.*
+
org.apache.camel.spi.ComponentResolver;component=ignite
+
+
+
+
+
+ org.apache.camel
+ camel-core
+
+
+
+
+ org.apache.ignite
+ ignite-core
+ ${ignite-version}
+
+
+
+
+ org.apache.camel
+ camel-test-spring
+ test
+
+
+
+ org.slf4j
+ slf4j-log4j12
+ test
+
+
+
+ junit
+ junit
+ test
+
+
+
+ com.google.truth
+ truth
+ test
+
+
+
+ com.google.guava
+ guava
+ test
+
+
+
+ com.jayway.awaitility
+ awaitility
+ test
+
+
+
+
+
http://git-wip-us.apache.org
[2/6] camel git commit: CAMEL-9445 camel-ignite: New Apache Ignite component. Initial work.
http://git-wip-us.apache.org/repos/asf/camel/blob/a695c5d3/components/camel-ignite/src/main/java/org/apache/camel/component/ignite/idgen/IgniteIdGenEndpoint.java
--
diff --git
a/components/camel-ignite/src/main/java/org/apache/camel/component/ignite/idgen/IgniteIdGenEndpoint.java
b/components/camel-ignite/src/main/java/org/apache/camel/component/ignite/idgen/IgniteIdGenEndpoint.java
new file mode 100644
index 000..3e1da3c
--- /dev/null
+++
b/components/camel-ignite/src/main/java/org/apache/camel/component/ignite/idgen/IgniteIdGenEndpoint.java
@@ -0,0 +1,116 @@
+/**
+ * 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.ignite.idgen;
+
+import java.net.URI;
+import java.util.Map;
+
+import org.apache.camel.Consumer;
+import org.apache.camel.Processor;
+import org.apache.camel.Producer;
+import org.apache.camel.component.ignite.AbstractIgniteEndpoint;
+import org.apache.camel.component.ignite.IgniteComponent;
+import org.apache.camel.spi.Metadata;
+import org.apache.camel.spi.UriEndpoint;
+import org.apache.camel.spi.UriParam;
+import org.apache.camel.util.ObjectHelper;
+import org.apache.ignite.IgniteAtomicSequence;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Ignite ID Generator endpoint.
+ */
+@UriEndpoint(scheme = "ignite:idgen", title = "Ignite ID Generator", syntax =
"ignite:idgen:[name]", label = "nosql,cache,compute", producerOnly = true)
+public class IgniteIdGenEndpoint extends AbstractIgniteEndpoint {
+
+private static final Logger LOG =
LoggerFactory.getLogger(IgniteIdGenEndpoint.class);
+
+@UriParam
+@Metadata(required = "true")
+private String name;
+
+@UriParam
+private Integer batchSize;
+
+@UriParam(defaultValue = "0")
+private Long initialValue = 0L;
+
+@UriParam
+private IgniteIdGenOperation operation;
+
+public IgniteIdGenEndpoint(String endpointUri, URI remainingUri,
Map parameters, IgniteComponent igniteComponent) throws
Exception {
+super(endpointUri, igniteComponent);
+name = remainingUri.getHost();
+
+ObjectHelper.notNull(name, "ID Generator name");
+}
+
+@Override
+public Producer createProducer() throws Exception {
+IgniteAtomicSequence atomicSeq = ignite().atomicSequence(name,
initialValue, false);
+
+if (atomicSeq == null) {
+atomicSeq = ignite().atomicSequence(name, initialValue, true);
+LOG.info("Created AtomicSequence of ID Generator with name {}.",
name);
+}
+
+if (batchSize != null) {
+atomicSeq.batchSize(batchSize);
+}
+
+return new IgniteIdGenProducer(this, atomicSeq);
+}
+
+@Override
+public Consumer createConsumer(Processor processor) throws Exception {
+throw new UnsupportedOperationException("The Ignite Id Generator
endpoint doesn't support consumers.");
+}
+
+public String getName() {
+return name;
+}
+
+public void setName(String name) {
+this.name = name;
+}
+
+public Long getInitialValue() {
+return initialValue;
+}
+
+public void setInitialValue(Long initialValue) {
+this.initialValue = initialValue;
+}
+
+public IgniteIdGenOperation getOperation() {
+return operation;
+}
+
+public void setOperation(IgniteIdGenOperation operation) {
+this.operation = operation;
+}
+
+public Integer getBatchSize() {
+return batchSize;
+}
+
+public void setBatchSize(Integer batchSize) {
+this.batchSize = batchSize;
+}
+
+}
http://git-wip-us.apache.org/repos/asf/camel/blob/a695c5d3/components/camel-ignite/src/main/java/org/apache/camel/component/ignite/idgen/IgniteIdGenOperation.java
--
diff --git
a/components/camel-ignite/src/main/java/org/apache/camel/component/ignite/idgen/IgniteIdGenOperation.java
b/components/camel-ignite/src/main/java/org/apache/camel/component/ignite/idgen/IgniteIdGenOperation.java
new file mode 100644
index 000..d5d1db0
--- /dev/null
+++
b/components/camel-ignite/src/main/java/org/apache
[6/6] camel git commit: CAMEL-9445 camel-ignite: New Apache Ignite component. Merge code.
CAMEL-9445 camel-ignite: New Apache Ignite component. Merge code. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/0350423d Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/0350423d Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/0350423d Branch: refs/heads/master Commit: 0350423d99c6cc184bf21751c59a88ef5d3bb0fe Parents: d20d0be 99c5594 Author: Raul Kripalani Authored: Wed Dec 23 15:56:50 2015 + Committer: Raul Kripalani Committed: Wed Dec 23 15:56:50 2015 + -- components/camel-ignite/pom.xml | 92 ++ .../ignite/AbstractIgniteEndpoint.java | 99 ++ .../ignite/ClusterGroupExpression.java | 30 ++ .../ignite/ClusterGroupExpressions.java | 85 + .../camel/component/ignite/IgniteComponent.java | 240 ++ .../camel/component/ignite/IgniteConstants.java | 59 .../camel/component/ignite/IgniteHelper.java| 38 +++ .../IgniteCacheContinuousQueryConsumer.java | 165 ++ .../ignite/cache/IgniteCacheEndpoint.java | 311 +++ .../ignite/cache/IgniteCacheOperation.java | 26 ++ .../ignite/cache/IgniteCacheProducer.java | 208 + .../ignite/compute/IgniteComputeEndpoint.java | 155 + .../compute/IgniteComputeExecutionType.java | 26 ++ .../ignite/compute/IgniteComputeProducer.java | 275 .../ignite/events/IgniteEventsConsumer.java | 101 ++ .../ignite/events/IgniteEventsEndpoint.java | 146 + .../ignite/idgen/IgniteIdGenEndpoint.java | 116 +++ .../ignite/idgen/IgniteIdGenOperation.java | 26 ++ .../ignite/idgen/IgniteIdGenProducer.java | 83 + .../messaging/IgniteMessagingConsumer.java | 88 ++ .../messaging/IgniteMessagingEndpoint.java | 127 .../messaging/IgniteMessagingProducer.java | 72 + .../messaging/IgniteMessagingSendMode.java | 26 ++ .../ignite/queue/IgniteQueueEndpoint.java | 175 +++ .../ignite/queue/IgniteQueueOperation.java | 26 ++ .../ignite/queue/IgniteQueueProducer.java | 170 ++ .../component/ignite/set/IgniteSetEndpoint.java | 131 .../ignite/set/IgniteSetOperation.java | 26 ++ .../component/ignite/set/IgniteSetProducer.java | 120 +++ .../src/main/resources/META-INF/LICENSE.txt | 203 .../src/main/resources/META-INF/NOTICE.txt | 11 + .../services/org/apache/camel/component/ignite | 18 ++ .../component/ignite/AbstractIgniteTest.java| 63 .../ignite/IgniteCacheContinuousQueryTest.java | 281 + .../camel/component/ignite/IgniteCacheTest.java | 237 ++ .../component/ignite/IgniteComputeTest.java | 192 .../component/ignite/IgniteEventsTest.java | 168 ++ .../camel/component/ignite/IgniteIdGenTest.java | 83 + .../component/ignite/IgniteMessagingTest.java | 164 ++ .../camel/component/ignite/IgniteQueueTest.java | 257 +++ .../camel/component/ignite/IgniteSetTest.java | 176 +++ .../ignite/TestIgniteComputeResources.java | 149 + .../src/test/resources/log4j.properties | 37 +++ components/pom.xml | 1 + parent/pom.xml | 2 + .../features/src/main/resources/features.xml| 5 + 46 files changed, 5289 insertions(+) --
[5/6] camel git commit: CAMEL-9445 camel-ignite: Adjust endpoint metadata and add logs to consumers.
CAMEL-9445 camel-ignite: Adjust endpoint metadata and add logs to consumers.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/99c55941
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/99c55941
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/99c55941
Branch: refs/heads/master
Commit: 99c559419847d1d635fbe4c6af909aea121996f2
Parents: d26af3d
Author: Raul Kripalani
Authored: Wed Dec 23 15:55:55 2015 +
Committer: Raul Kripalani
Committed: Wed Dec 23 15:55:55 2015 +
--
.../ignite/cache/IgniteCacheContinuousQueryConsumer.java | 10 ++
.../component/ignite/compute/IgniteComputeEndpoint.java | 2 +-
.../component/ignite/events/IgniteEventsConsumer.java | 9 +
.../component/ignite/events/IgniteEventsEndpoint.java | 2 +-
.../ignite/messaging/IgniteMessagingConsumer.java | 10 ++
.../ignite/messaging/IgniteMessagingEndpoint.java | 6 +-
.../ignite/messaging/IgniteMessagingProducer.java | 3 +++
.../ignite/messaging/IgniteMessagingSendMode.java | 3 +++
8 files changed, 42 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/99c55941/components/camel-ignite/src/main/java/org/apache/camel/component/ignite/cache/IgniteCacheContinuousQueryConsumer.java
--
diff --git
a/components/camel-ignite/src/main/java/org/apache/camel/component/ignite/cache/IgniteCacheContinuousQueryConsumer.java
b/components/camel-ignite/src/main/java/org/apache/camel/component/ignite/cache/IgniteCacheContinuousQueryConsumer.java
index e4c7302..cb06424 100644
---
a/components/camel-ignite/src/main/java/org/apache/camel/component/ignite/cache/IgniteCacheContinuousQueryConsumer.java
+++
b/components/camel-ignite/src/main/java/org/apache/camel/component/ignite/cache/IgniteCacheContinuousQueryConsumer.java
@@ -16,6 +16,8 @@
*/
package org.apache.camel.component.ignite.cache;
+import java.util.Arrays;
+
import javax.cache.Cache.Entry;
import javax.cache.event.CacheEntryEvent;
import javax.cache.event.CacheEntryListenerException;
@@ -59,6 +61,8 @@ public class IgniteCacheContinuousQueryConsumer extends
DefaultConsumer {
launchContinuousQuery();
+LOG.info("Started Ignite Cache Continuous Query consumer for cache {}
with query:Â {}.", cache.getName(), endpoint.getQuery());
+
maybeFireExistingQueryResults();
}
@@ -96,6 +100,10 @@ public class IgniteCacheContinuousQueryConsumer extends
DefaultConsumer {
continuousQuery.setLocalListener(new CacheEntryUpdatedListener() {
@Override
public void onUpdated(Iterable> events) throws CacheEntryListenerException {
+if (LOG.isTraceEnabled()) {
+LOG.info("Processing Continuous Query event(s):Â {}.",
events);
+}
+
if (!endpoint.isOneExchangePerUpdate()) {
fireGroupedExchange(events);
return;
@@ -119,6 +127,8 @@ public class IgniteCacheContinuousQueryConsumer extends
DefaultConsumer {
super.doStop();
cursor.close();
+
+LOG.info("Stopped Ignite Cache Continuous Query consumer for cache {}
with query:Â {}.", cache.getName(), endpoint.getQuery());
}
private void fireSingleExchange(CacheEntryEvent entry) {
http://git-wip-us.apache.org/repos/asf/camel/blob/99c55941/components/camel-ignite/src/main/java/org/apache/camel/component/ignite/compute/IgniteComputeEndpoint.java
--
diff --git
a/components/camel-ignite/src/main/java/org/apache/camel/component/ignite/compute/IgniteComputeEndpoint.java
b/components/camel-ignite/src/main/java/org/apache/camel/component/ignite/compute/IgniteComputeEndpoint.java
index 1dc0663..d6a3eb2 100644
---
a/components/camel-ignite/src/main/java/org/apache/camel/component/ignite/compute/IgniteComputeEndpoint.java
+++
b/components/camel-ignite/src/main/java/org/apache/camel/component/ignite/compute/IgniteComputeEndpoint.java
@@ -33,7 +33,7 @@ import org.apache.ignite.IgniteCompute;
/**
* Ignite Compute endpoint.
*/
-@UriEndpoint(scheme = "ignite:compute", title = "Ignite Compute", syntax =
"ignite:compute:endpointId", label = "nosql,cache,compute", producerOnly = true)
+@UriEndpoint(scheme = "ignite:compute", title = "Ignite Compute", syntax =
"ignite:compute:[endpointId]", label = "nosql,cache,compute", producerOnly =
true)
public class IgniteComputeEndpoint extends AbstractIgniteEndpoint {
@UriParam
http://git-wip-us.apache.org/repos/asf/camel/blob/99c55941/components/camel-ignite/src/main/java/org/apache/camel/component/ignite/events/IgniteEventsConsumer.java
-
[1/6] camel git commit: CAMEL-9445 camel-ignite: New Apache Ignite component. Initial work.
Repository: camel
Updated Branches:
refs/heads/master d20d0be4c -> 0350423d9
http://git-wip-us.apache.org/repos/asf/camel/blob/a695c5d3/components/camel-ignite/src/test/java/org/apache/camel/component/ignite/IgniteComputeTest.java
--
diff --git
a/components/camel-ignite/src/test/java/org/apache/camel/component/ignite/IgniteComputeTest.java
b/components/camel-ignite/src/test/java/org/apache/camel/component/ignite/IgniteComputeTest.java
new file mode 100644
index 000..fd66450
--- /dev/null
+++
b/components/camel-ignite/src/test/java/org/apache/camel/component/ignite/IgniteComputeTest.java
@@ -0,0 +1,192 @@
+/**
+ * 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.ignite;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+
+import com.google.common.base.Splitter;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.Lists;
+
+import org.apache.camel.RuntimeCamelException;
+import org.apache.camel.util.ObjectHelper;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.Ignition;
+import org.apache.ignite.events.EventType;
+import org.junit.After;
+import org.junit.Test;
+
+import static com.google.common.truth.Truth.assert_;
+
+public class IgniteComputeTest extends AbstractIgniteTest {
+
+private static final List ADDITIONAL_INSTANCES =
Lists.newArrayList();
+private static final List LISTENERS = Lists.newArrayList();
+
+@Test
+public void testExecuteWithWrongPayload() {
+try {
+template.requestBody("ignite:compute:abc?executionType=EXECUTE",
TestIgniteComputeResources.TEST_CALLABLE, String.class);
+} catch (Exception e) {
+
assert_().that(ObjectHelper.getException(RuntimeCamelException.class,
e).getMessage()).startsWith("Ignite Compute endpoint with EXECUTE");
+return;
+}
+
+fail();
+}
+
+@Test
+@SuppressWarnings("unchecked")
+public void testCall() {
+TestIgniteComputeResources.COUNTER.set(0);
+
+// Single Callable.
+String result =
template.requestBody("ignite:compute:abc?executionType=CALL",
TestIgniteComputeResources.TEST_CALLABLE, String.class);
+
+assert_().that(result).isEqualTo("hello");
+
+// Collection of Callables.
+Object[] callables = new Object[5];
+Arrays.fill(callables, TestIgniteComputeResources.TEST_CALLABLE);
+Collection colResult =
template.requestBody("ignite:compute:abc?executionType=CALL",
Lists.newArrayList(callables), Collection.class);
+
+assert_().that(colResult).containsExactly("hello", "hello", "hello",
"hello", "hello").inOrder();
+
+// Callables with a Reducer.
+String reduced =
template.requestBodyAndHeader("ignite:compute:abc?executionType=CALL",
Lists.newArrayList(callables), IgniteConstants.IGNITE_COMPUTE_REDUCER,
+TestIgniteComputeResources.STRING_JOIN_REDUCER, String.class);
+
+assert_().that(reduced).isEqualTo("hellohellohellohellohello");
+}
+
+@Test
+public void testRun() {
+TestIgniteComputeResources.COUNTER.set(0);
+
+// Single Runnable.
+Object result =
template.requestBody("ignite:compute:abc?executionType=RUN",
TestIgniteComputeResources.TEST_RUNNABLE_COUNTER, Object.class);
+assert_().that(result).isNull();
+assert_().that(TestIgniteComputeResources.COUNTER.get()).isEqualTo(1);
+
+// Multiple Runnables.
+Object[] runnables = new Object[5];
+Arrays.fill(runnables,
TestIgniteComputeResources.TEST_RUNNABLE_COUNTER);
+result = template.requestBody("ignite:compute:abc?executionType=RUN",
Lists.newArrayList(runnables), Collection.class);
+assert_().that(result).isNull();
+assert_().that(TestIgniteComputeResources.COUNTER.get()).isEqualTo(6);
+}
+
+@Test
+@SuppressWarnings("unchecked")
+public void testBroadcast() {
+TestIgniteComputeResources.COUNTER.set(0);
+
+startAdditionalGridInstance();
+startAdditionalGridInstance();
+
+igni
[4/6] camel git commit: CAMEL-9445 camel-ignite: Add Karaf feature.
CAMEL-9445 camel-ignite: Add Karaf feature.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d26af3dd
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d26af3dd
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d26af3dd
Branch: refs/heads/master
Commit: d26af3ddaa70cbe0562360b119f035467918ab96
Parents: a695c5d
Author: Raul Kripalani
Authored: Wed Dec 23 15:36:40 2015 +
Committer: Raul Kripalani
Committed: Wed Dec 23 15:36:40 2015 +
--
parent/pom.xml | 1 +
platforms/karaf/features/src/main/resources/features.xml | 5 +
2 files changed, 6 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/d26af3dd/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 2839035..8189b1a 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -234,6 +234,7 @@
2.3.4.726
1.0.7
1.5.0-b1
+[1.5.0-b1,1.6)
8.1.0.Final
1.10_5
1.10
http://git-wip-us.apache.org/repos/asf/camel/blob/d26af3dd/platforms/karaf/features/src/main/resources/features.xml
--
diff --git a/platforms/karaf/features/src/main/resources/features.xml
b/platforms/karaf/features/src/main/resources/features.xml
index 2b7a26e..178180c 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -702,6 +702,11 @@
mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ibatis-sqlmap/${ibatis-bundle-version}
mvn:org.apache.camel/camel-ibatis/${project.version}
+
+camel-core
+ignite-core
+mvn:org.apache.camel/camel-ignite/${project.version}
+
mvn:commons-lang/commons-lang/${commons-lang-version}
mvn:commons-codec/commons-codec/${commons-codec-version}
[1/2] camel git commit: CAMEL-9445 camel-ignite: Add Karaf feature.
Repository: camel
Updated Branches:
refs/heads/camel-ignite a695c5d36 -> 99c559419
CAMEL-9445 camel-ignite: Add Karaf feature.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d26af3dd
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d26af3dd
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d26af3dd
Branch: refs/heads/camel-ignite
Commit: d26af3ddaa70cbe0562360b119f035467918ab96
Parents: a695c5d
Author: Raul Kripalani
Authored: Wed Dec 23 15:36:40 2015 +
Committer: Raul Kripalani
Committed: Wed Dec 23 15:36:40 2015 +
--
parent/pom.xml | 1 +
platforms/karaf/features/src/main/resources/features.xml | 5 +
2 files changed, 6 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/d26af3dd/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 2839035..8189b1a 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -234,6 +234,7 @@
2.3.4.726
1.0.7
1.5.0-b1
+[1.5.0-b1,1.6)
8.1.0.Final
1.10_5
1.10
http://git-wip-us.apache.org/repos/asf/camel/blob/d26af3dd/platforms/karaf/features/src/main/resources/features.xml
--
diff --git a/platforms/karaf/features/src/main/resources/features.xml
b/platforms/karaf/features/src/main/resources/features.xml
index 2b7a26e..178180c 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -702,6 +702,11 @@
mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ibatis-sqlmap/${ibatis-bundle-version}
mvn:org.apache.camel/camel-ibatis/${project.version}
+
+camel-core
+ignite-core
+mvn:org.apache.camel/camel-ignite/${project.version}
+
mvn:commons-lang/commons-lang/${commons-lang-version}
mvn:commons-codec/commons-codec/${commons-codec-version}
[2/2] camel git commit: CAMEL-9445 camel-ignite: Adjust endpoint metadata and add logs to consumers.
CAMEL-9445 camel-ignite: Adjust endpoint metadata and add logs to consumers.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/99c55941
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/99c55941
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/99c55941
Branch: refs/heads/camel-ignite
Commit: 99c559419847d1d635fbe4c6af909aea121996f2
Parents: d26af3d
Author: Raul Kripalani
Authored: Wed Dec 23 15:55:55 2015 +
Committer: Raul Kripalani
Committed: Wed Dec 23 15:55:55 2015 +
--
.../ignite/cache/IgniteCacheContinuousQueryConsumer.java | 10 ++
.../component/ignite/compute/IgniteComputeEndpoint.java | 2 +-
.../component/ignite/events/IgniteEventsConsumer.java | 9 +
.../component/ignite/events/IgniteEventsEndpoint.java | 2 +-
.../ignite/messaging/IgniteMessagingConsumer.java | 10 ++
.../ignite/messaging/IgniteMessagingEndpoint.java | 6 +-
.../ignite/messaging/IgniteMessagingProducer.java | 3 +++
.../ignite/messaging/IgniteMessagingSendMode.java | 3 +++
8 files changed, 42 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/99c55941/components/camel-ignite/src/main/java/org/apache/camel/component/ignite/cache/IgniteCacheContinuousQueryConsumer.java
--
diff --git
a/components/camel-ignite/src/main/java/org/apache/camel/component/ignite/cache/IgniteCacheContinuousQueryConsumer.java
b/components/camel-ignite/src/main/java/org/apache/camel/component/ignite/cache/IgniteCacheContinuousQueryConsumer.java
index e4c7302..cb06424 100644
---
a/components/camel-ignite/src/main/java/org/apache/camel/component/ignite/cache/IgniteCacheContinuousQueryConsumer.java
+++
b/components/camel-ignite/src/main/java/org/apache/camel/component/ignite/cache/IgniteCacheContinuousQueryConsumer.java
@@ -16,6 +16,8 @@
*/
package org.apache.camel.component.ignite.cache;
+import java.util.Arrays;
+
import javax.cache.Cache.Entry;
import javax.cache.event.CacheEntryEvent;
import javax.cache.event.CacheEntryListenerException;
@@ -59,6 +61,8 @@ public class IgniteCacheContinuousQueryConsumer extends
DefaultConsumer {
launchContinuousQuery();
+LOG.info("Started Ignite Cache Continuous Query consumer for cache {}
with query:Â {}.", cache.getName(), endpoint.getQuery());
+
maybeFireExistingQueryResults();
}
@@ -96,6 +100,10 @@ public class IgniteCacheContinuousQueryConsumer extends
DefaultConsumer {
continuousQuery.setLocalListener(new CacheEntryUpdatedListener() {
@Override
public void onUpdated(Iterable> events) throws CacheEntryListenerException {
+if (LOG.isTraceEnabled()) {
+LOG.info("Processing Continuous Query event(s):Â {}.",
events);
+}
+
if (!endpoint.isOneExchangePerUpdate()) {
fireGroupedExchange(events);
return;
@@ -119,6 +127,8 @@ public class IgniteCacheContinuousQueryConsumer extends
DefaultConsumer {
super.doStop();
cursor.close();
+
+LOG.info("Stopped Ignite Cache Continuous Query consumer for cache {}
with query:Â {}.", cache.getName(), endpoint.getQuery());
}
private void fireSingleExchange(CacheEntryEvent entry) {
http://git-wip-us.apache.org/repos/asf/camel/blob/99c55941/components/camel-ignite/src/main/java/org/apache/camel/component/ignite/compute/IgniteComputeEndpoint.java
--
diff --git
a/components/camel-ignite/src/main/java/org/apache/camel/component/ignite/compute/IgniteComputeEndpoint.java
b/components/camel-ignite/src/main/java/org/apache/camel/component/ignite/compute/IgniteComputeEndpoint.java
index 1dc0663..d6a3eb2 100644
---
a/components/camel-ignite/src/main/java/org/apache/camel/component/ignite/compute/IgniteComputeEndpoint.java
+++
b/components/camel-ignite/src/main/java/org/apache/camel/component/ignite/compute/IgniteComputeEndpoint.java
@@ -33,7 +33,7 @@ import org.apache.ignite.IgniteCompute;
/**
* Ignite Compute endpoint.
*/
-@UriEndpoint(scheme = "ignite:compute", title = "Ignite Compute", syntax =
"ignite:compute:endpointId", label = "nosql,cache,compute", producerOnly = true)
+@UriEndpoint(scheme = "ignite:compute", title = "Ignite Compute", syntax =
"ignite:compute:[endpointId]", label = "nosql,cache,compute", producerOnly =
true)
public class IgniteComputeEndpoint extends AbstractIgniteEndpoint {
@UriParam
http://git-wip-us.apache.org/repos/asf/camel/blob/99c55941/components/camel-ignite/src/main/java/org/apache/camel/component/ignite/events/IgniteEventsConsumer.
[1/3] camel git commit: CAMEL-9445 camel-ignite: New Apache Ignite component. Initial work.
Repository: camel
Updated Branches:
refs/heads/camel-ignite [created] a695c5d36
http://git-wip-us.apache.org/repos/asf/camel/blob/a695c5d3/components/camel-ignite/src/test/java/org/apache/camel/component/ignite/IgniteComputeTest.java
--
diff --git
a/components/camel-ignite/src/test/java/org/apache/camel/component/ignite/IgniteComputeTest.java
b/components/camel-ignite/src/test/java/org/apache/camel/component/ignite/IgniteComputeTest.java
new file mode 100644
index 000..fd66450
--- /dev/null
+++
b/components/camel-ignite/src/test/java/org/apache/camel/component/ignite/IgniteComputeTest.java
@@ -0,0 +1,192 @@
+/**
+ * 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.ignite;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+
+import com.google.common.base.Splitter;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.Lists;
+
+import org.apache.camel.RuntimeCamelException;
+import org.apache.camel.util.ObjectHelper;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.Ignition;
+import org.apache.ignite.events.EventType;
+import org.junit.After;
+import org.junit.Test;
+
+import static com.google.common.truth.Truth.assert_;
+
+public class IgniteComputeTest extends AbstractIgniteTest {
+
+private static final List ADDITIONAL_INSTANCES =
Lists.newArrayList();
+private static final List LISTENERS = Lists.newArrayList();
+
+@Test
+public void testExecuteWithWrongPayload() {
+try {
+template.requestBody("ignite:compute:abc?executionType=EXECUTE",
TestIgniteComputeResources.TEST_CALLABLE, String.class);
+} catch (Exception e) {
+
assert_().that(ObjectHelper.getException(RuntimeCamelException.class,
e).getMessage()).startsWith("Ignite Compute endpoint with EXECUTE");
+return;
+}
+
+fail();
+}
+
+@Test
+@SuppressWarnings("unchecked")
+public void testCall() {
+TestIgniteComputeResources.COUNTER.set(0);
+
+// Single Callable.
+String result =
template.requestBody("ignite:compute:abc?executionType=CALL",
TestIgniteComputeResources.TEST_CALLABLE, String.class);
+
+assert_().that(result).isEqualTo("hello");
+
+// Collection of Callables.
+Object[] callables = new Object[5];
+Arrays.fill(callables, TestIgniteComputeResources.TEST_CALLABLE);
+Collection colResult =
template.requestBody("ignite:compute:abc?executionType=CALL",
Lists.newArrayList(callables), Collection.class);
+
+assert_().that(colResult).containsExactly("hello", "hello", "hello",
"hello", "hello").inOrder();
+
+// Callables with a Reducer.
+String reduced =
template.requestBodyAndHeader("ignite:compute:abc?executionType=CALL",
Lists.newArrayList(callables), IgniteConstants.IGNITE_COMPUTE_REDUCER,
+TestIgniteComputeResources.STRING_JOIN_REDUCER, String.class);
+
+assert_().that(reduced).isEqualTo("hellohellohellohellohello");
+}
+
+@Test
+public void testRun() {
+TestIgniteComputeResources.COUNTER.set(0);
+
+// Single Runnable.
+Object result =
template.requestBody("ignite:compute:abc?executionType=RUN",
TestIgniteComputeResources.TEST_RUNNABLE_COUNTER, Object.class);
+assert_().that(result).isNull();
+assert_().that(TestIgniteComputeResources.COUNTER.get()).isEqualTo(1);
+
+// Multiple Runnables.
+Object[] runnables = new Object[5];
+Arrays.fill(runnables,
TestIgniteComputeResources.TEST_RUNNABLE_COUNTER);
+result = template.requestBody("ignite:compute:abc?executionType=RUN",
Lists.newArrayList(runnables), Collection.class);
+assert_().that(result).isNull();
+assert_().that(TestIgniteComputeResources.COUNTER.get()).isEqualTo(6);
+}
+
+@Test
+@SuppressWarnings("unchecked")
+public void testBroadcast() {
+TestIgniteComputeResources.COUNTER.set(0);
+
+startAdditionalGridInstance();
+startAdditionalGridInstance();
+
+i
[3/3] camel git commit: CAMEL-9445 camel-ignite: New Apache Ignite component. Initial work.
CAMEL-9445 camel-ignite: New Apache Ignite component. Initial work.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a695c5d3
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a695c5d3
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a695c5d3
Branch: refs/heads/camel-ignite
Commit: a695c5d3656dcbac1e17b3109c7a6c340e8df7f0
Parents: ff8e1f1
Author: Raul Kripalani
Authored: Wed Dec 23 13:26:42 2015 +
Committer: Raul Kripalani
Committed: Wed Dec 23 15:18:57 2015 +
--
components/camel-ignite/pom.xml | 92 ++
.../ignite/AbstractIgniteEndpoint.java | 99 ++
.../ignite/ClusterGroupExpression.java | 30 ++
.../ignite/ClusterGroupExpressions.java | 85 +
.../camel/component/ignite/IgniteComponent.java | 240 ++
.../camel/component/ignite/IgniteConstants.java | 59
.../camel/component/ignite/IgniteHelper.java| 38 +++
.../IgniteCacheContinuousQueryConsumer.java | 155 +
.../ignite/cache/IgniteCacheEndpoint.java | 311 +++
.../ignite/cache/IgniteCacheOperation.java | 26 ++
.../ignite/cache/IgniteCacheProducer.java | 208 +
.../ignite/compute/IgniteComputeEndpoint.java | 155 +
.../compute/IgniteComputeExecutionType.java | 26 ++
.../ignite/compute/IgniteComputeProducer.java | 275
.../ignite/events/IgniteEventsConsumer.java | 92 ++
.../ignite/events/IgniteEventsEndpoint.java | 146 +
.../ignite/idgen/IgniteIdGenEndpoint.java | 116 +++
.../ignite/idgen/IgniteIdGenOperation.java | 26 ++
.../ignite/idgen/IgniteIdGenProducer.java | 83 +
.../messaging/IgniteMessagingConsumer.java | 78 +
.../messaging/IgniteMessagingEndpoint.java | 123
.../messaging/IgniteMessagingProducer.java | 69
.../messaging/IgniteMessagingSendMode.java | 23 ++
.../ignite/queue/IgniteQueueEndpoint.java | 175 +++
.../ignite/queue/IgniteQueueOperation.java | 26 ++
.../ignite/queue/IgniteQueueProducer.java | 170 ++
.../component/ignite/set/IgniteSetEndpoint.java | 131
.../ignite/set/IgniteSetOperation.java | 26 ++
.../component/ignite/set/IgniteSetProducer.java | 120 +++
.../src/main/resources/META-INF/LICENSE.txt | 203
.../src/main/resources/META-INF/NOTICE.txt | 11 +
.../services/org/apache/camel/component/ignite | 18 ++
.../component/ignite/AbstractIgniteTest.java| 63
.../ignite/IgniteCacheContinuousQueryTest.java | 281 +
.../camel/component/ignite/IgniteCacheTest.java | 237 ++
.../component/ignite/IgniteComputeTest.java | 192
.../component/ignite/IgniteEventsTest.java | 168 ++
.../camel/component/ignite/IgniteIdGenTest.java | 83 +
.../component/ignite/IgniteMessagingTest.java | 164 ++
.../camel/component/ignite/IgniteQueueTest.java | 257 +++
.../camel/component/ignite/IgniteSetTest.java | 176 +++
.../ignite/TestIgniteComputeResources.java | 149 +
.../src/test/resources/log4j.properties | 37 +++
components/pom.xml | 1 +
parent/pom.xml | 1 +
45 files changed, 5244 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/a695c5d3/components/camel-ignite/pom.xml
--
diff --git a/components/camel-ignite/pom.xml b/components/camel-ignite/pom.xml
new file mode 100644
index 000..53af3f7
--- /dev/null
+++ b/components/camel-ignite/pom.xml
@@ -0,0 +1,92 @@
+
+
+http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+ 4.0.0
+
+
+org.apache.camel
+components
+2.17-SNAPSHOT
+
+
+ camel-ignite
+ bundle
+ Camel :: Ignite
+ Camel Ignite component
+
+
+
org.apache.camel.component.ignite.*
+
org.apache.camel.spi.ComponentResolver;component=ignite
+
+
+
+
+
+ org.apache.camel
+ camel-core
+
+
+
+
+ org.apache.ignite
+ ignite-core
+ ${ignite-version}
+
+
+
+
+ org.apache.camel
+ camel-test-spring
+ test
+
+
+
+ org.slf4j
+ slf4j-log4j12
+ test
+
+
+
+ junit
+ junit
+ test
+
+
+
+ com.google.truth
+ truth
+ test
+
+
+
+ com.google.guava
+ guava
+ test
+
+
+
+ com.jayway.awaitility
+ awaitility
+ test
+
+
+
+
+
http://git-wip-us.apac
[2/3] camel git commit: CAMEL-9445 camel-ignite: New Apache Ignite component. Initial work.
http://git-wip-us.apache.org/repos/asf/camel/blob/a695c5d3/components/camel-ignite/src/main/java/org/apache/camel/component/ignite/idgen/IgniteIdGenEndpoint.java
--
diff --git
a/components/camel-ignite/src/main/java/org/apache/camel/component/ignite/idgen/IgniteIdGenEndpoint.java
b/components/camel-ignite/src/main/java/org/apache/camel/component/ignite/idgen/IgniteIdGenEndpoint.java
new file mode 100644
index 000..3e1da3c
--- /dev/null
+++
b/components/camel-ignite/src/main/java/org/apache/camel/component/ignite/idgen/IgniteIdGenEndpoint.java
@@ -0,0 +1,116 @@
+/**
+ * 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.ignite.idgen;
+
+import java.net.URI;
+import java.util.Map;
+
+import org.apache.camel.Consumer;
+import org.apache.camel.Processor;
+import org.apache.camel.Producer;
+import org.apache.camel.component.ignite.AbstractIgniteEndpoint;
+import org.apache.camel.component.ignite.IgniteComponent;
+import org.apache.camel.spi.Metadata;
+import org.apache.camel.spi.UriEndpoint;
+import org.apache.camel.spi.UriParam;
+import org.apache.camel.util.ObjectHelper;
+import org.apache.ignite.IgniteAtomicSequence;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Ignite ID Generator endpoint.
+ */
+@UriEndpoint(scheme = "ignite:idgen", title = "Ignite ID Generator", syntax =
"ignite:idgen:[name]", label = "nosql,cache,compute", producerOnly = true)
+public class IgniteIdGenEndpoint extends AbstractIgniteEndpoint {
+
+private static final Logger LOG =
LoggerFactory.getLogger(IgniteIdGenEndpoint.class);
+
+@UriParam
+@Metadata(required = "true")
+private String name;
+
+@UriParam
+private Integer batchSize;
+
+@UriParam(defaultValue = "0")
+private Long initialValue = 0L;
+
+@UriParam
+private IgniteIdGenOperation operation;
+
+public IgniteIdGenEndpoint(String endpointUri, URI remainingUri,
Map parameters, IgniteComponent igniteComponent) throws
Exception {
+super(endpointUri, igniteComponent);
+name = remainingUri.getHost();
+
+ObjectHelper.notNull(name, "ID Generator name");
+}
+
+@Override
+public Producer createProducer() throws Exception {
+IgniteAtomicSequence atomicSeq = ignite().atomicSequence(name,
initialValue, false);
+
+if (atomicSeq == null) {
+atomicSeq = ignite().atomicSequence(name, initialValue, true);
+LOG.info("Created AtomicSequence of ID Generator with name {}.",
name);
+}
+
+if (batchSize != null) {
+atomicSeq.batchSize(batchSize);
+}
+
+return new IgniteIdGenProducer(this, atomicSeq);
+}
+
+@Override
+public Consumer createConsumer(Processor processor) throws Exception {
+throw new UnsupportedOperationException("The Ignite Id Generator
endpoint doesn't support consumers.");
+}
+
+public String getName() {
+return name;
+}
+
+public void setName(String name) {
+this.name = name;
+}
+
+public Long getInitialValue() {
+return initialValue;
+}
+
+public void setInitialValue(Long initialValue) {
+this.initialValue = initialValue;
+}
+
+public IgniteIdGenOperation getOperation() {
+return operation;
+}
+
+public void setOperation(IgniteIdGenOperation operation) {
+this.operation = operation;
+}
+
+public Integer getBatchSize() {
+return batchSize;
+}
+
+public void setBatchSize(Integer batchSize) {
+this.batchSize = batchSize;
+}
+
+}
http://git-wip-us.apache.org/repos/asf/camel/blob/a695c5d3/components/camel-ignite/src/main/java/org/apache/camel/component/ignite/idgen/IgniteIdGenOperation.java
--
diff --git
a/components/camel-ignite/src/main/java/org/apache/camel/component/ignite/idgen/IgniteIdGenOperation.java
b/components/camel-ignite/src/main/java/org/apache/camel/component/ignite/idgen/IgniteIdGenOperation.java
new file mode 100644
index 000..d5d1db0
--- /dev/null
+++
b/components/camel-ignite/src/main/java/org/apache
[1/2] camel git commit: CAMEL-9097 XSLT Aggregation Strategy. Thanks to Ranil Wijeyratne.
Repository: camel
Updated Branches:
refs/heads/master 9c5395b15 -> 2b7055f7e
CAMEL-9097 XSLT Aggregation Strategy. Thanks to Ranil Wijeyratne.
This closes #598.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/cc71df31
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/cc71df31
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/cc71df31
Branch: refs/heads/master
Commit: cc71df3100fa47e9c757a1213589e064a856
Parents: 9c5395b
Author: Raul Kripalani
Authored: Mon Sep 14 00:59:11 2015 +0100
Committer: Raul Kripalani
Committed: Mon Sep 14 00:59:11 2015 +0100
--
camel-core/pom.xml | 7 +
.../camel/component/xslt/XsltEndpoint.java | 3 +-
.../util/toolbox/AggregationStrategies.java | 7 +
.../util/toolbox/XsltAggregationStrategy.java | 235 +++
.../toolbox/XsltAggregationStrategyTest.java| 74 ++
.../util/toolbox/aggregate-user-property.xsl| 32 +++
.../org/apache/camel/util/toolbox/aggregate.xsl | 32 +++
.../org/apache/camel/util/toolbox/data1.xml | 18 ++
.../org/apache/camel/util/toolbox/data2.xml | 18 ++
.../org/apache/camel/util/toolbox/data3.xml | 18 ++
10 files changed, 443 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/cc71df31/camel-core/pom.xml
--
diff --git a/camel-core/pom.xml b/camel-core/pom.xml
index 0152138..5817dee 100644
--- a/camel-core/pom.xml
+++ b/camel-core/pom.xml
@@ -169,6 +169,13 @@
test
+
+
+ net.sf.saxon
+ Saxon-HE
+ test
+
+
xml-resolver
http://git-wip-us.apache.org/repos/asf/camel/blob/cc71df31/camel-core/src/main/java/org/apache/camel/component/xslt/XsltEndpoint.java
--
diff --git
a/camel-core/src/main/java/org/apache/camel/component/xslt/XsltEndpoint.java
b/camel-core/src/main/java/org/apache/camel/component/xslt/XsltEndpoint.java
index 6a4ecd0..51d0790 100644
--- a/camel-core/src/main/java/org/apache/camel/component/xslt/XsltEndpoint.java
+++ b/camel-core/src/main/java/org/apache/camel/component/xslt/XsltEndpoint.java
@@ -47,8 +47,9 @@ import org.slf4j.LoggerFactory;
@UriEndpoint(scheme = "xslt", title = "XSLT", syntax = "xslt:resourceUri",
producerOnly = true, label = "core,transformation")
public class XsltEndpoint extends ProcessorEndpoint {
+public static final String SAXON_TRANSFORMER_FACTORY_CLASS_NAME =
"net.sf.saxon.TransformerFactoryImpl";
+
private static final Logger LOG =
LoggerFactory.getLogger(XsltEndpoint.class);
-private static final String SAXON_TRANSFORMER_FACTORY_CLASS_NAME =
"net.sf.saxon.TransformerFactoryImpl";
private volatile boolean cacheCleared;
private volatile XsltBuilder xslt;
http://git-wip-us.apache.org/repos/asf/camel/blob/cc71df31/camel-core/src/main/java/org/apache/camel/util/toolbox/AggregationStrategies.java
--
diff --git
a/camel-core/src/main/java/org/apache/camel/util/toolbox/AggregationStrategies.java
b/camel-core/src/main/java/org/apache/camel/util/toolbox/AggregationStrategies.java
index 9877758..0dbfbb4 100644
---
a/camel-core/src/main/java/org/apache/camel/util/toolbox/AggregationStrategies.java
+++
b/camel-core/src/main/java/org/apache/camel/util/toolbox/AggregationStrategies.java
@@ -123,4 +123,11 @@ public final class AggregationStrategies {
return adapter;
}
+/**
+ * Creates a {@link XsltAggregationStrategy} as the aggregation strategy.
+ */
+public static XsltAggregationStrategy xslt(String xslFileLocation) {
+return XsltAggregationStrategy.create(xslFileLocation);
+}
+
}
http://git-wip-us.apache.org/repos/asf/camel/blob/cc71df31/camel-core/src/main/java/org/apache/camel/util/toolbox/XsltAggregationStrategy.java
--
diff --git
a/camel-core/src/main/java/org/apache/camel/util/toolbox/XsltAggregationStrategy.java
b/camel-core/src/main/java/org/apache/camel/util/toolbox/XsltAggregationStrategy.java
new file mode 100644
index 000..fbadfae
--- /dev/null
+++
b/camel-core/src/main/java/org/apache/camel/util/toolbox/XsltAggregationStrategy.java
@@ -0,0 +1,235 @@
+/**
+ * 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
[2/2] camel git commit: Fix checkstyle.
Fix checkstyle.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/2b7055f7
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/2b7055f7
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/2b7055f7
Branch: refs/heads/master
Commit: 2b7055f7e8811a7b64175df8eb44f7965110875e
Parents: cc71df3
Author: Raul Kripalani
Authored: Mon Sep 14 00:59:18 2015 +0100
Committer: Raul Kripalani
Committed: Mon Sep 14 00:59:18 2015 +0100
--
.../org/apache/camel/component/rest/FromRestOptionsTest.java | 6 --
1 file changed, 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/2b7055f7/camel-core/src/test/java/org/apache/camel/component/rest/FromRestOptionsTest.java
--
diff --git
a/camel-core/src/test/java/org/apache/camel/component/rest/FromRestOptionsTest.java
b/camel-core/src/test/java/org/apache/camel/component/rest/FromRestOptionsTest.java
index 07e03a8..7485cb1 100644
---
a/camel-core/src/test/java/org/apache/camel/component/rest/FromRestOptionsTest.java
+++
b/camel-core/src/test/java/org/apache/camel/component/rest/FromRestOptionsTest.java
@@ -21,14 +21,8 @@ import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.impl.JndiRegistry;
-import org.apache.camel.model.ToDefinition;
import org.apache.camel.model.rest.OptionsVerbDefinition;
import org.apache.camel.model.rest.RestDefinition;
-import org.apache.camel.model.rest.RestParamType;
-import org.apache.camel.spi.RestConfiguration;
-
-import java.util.Arrays;
-import java.util.List;
public class FromRestOptionsTest extends ContextTestSupport {
[1/3] camel git commit: CAMEL-9129. Add OptionsVerbDefinition. Extend Rest & VerbDefintion to include OPTIONS. Create unit test
Repository: camel
Updated Branches:
refs/heads/camel-2.15.x 1e2f7dc07 -> 55889c39c
refs/heads/master 36fdb1e5a -> 9c5395b15
CAMEL-9129. Add OptionsVerbDefinition. Extend Rest & VerbDefintion to include
OPTIONS. Create unit test
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d307ff12
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d307ff12
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d307ff12
Branch: refs/heads/camel-2.15.x
Commit: d307ff126ac3d4955c1eb804f3d3bce8deeefcff
Parents: 1e2f7dc
Author: Charles Moulliard
Authored: Sun Sep 13 17:57:34 2015 +0200
Committer: Raul Kripalani
Committed: Sun Sep 13 17:59:37 2015 +0100
--
.../camel/model/rest/OptionsVerbDefinition.java | 33 +
.../apache/camel/model/rest/RestDefinition.java | 10 +++
.../apache/camel/model/rest/VerbDefinition.java | 2 +
.../component/rest/FromRestOptionsTest.java | 71
4 files changed, 116 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/d307ff12/camel-core/src/main/java/org/apache/camel/model/rest/OptionsVerbDefinition.java
--
diff --git
a/camel-core/src/main/java/org/apache/camel/model/rest/OptionsVerbDefinition.java
b/camel-core/src/main/java/org/apache/camel/model/rest/OptionsVerbDefinition.java
new file mode 100644
index 000..11a121c
--- /dev/null
+++
b/camel-core/src/main/java/org/apache/camel/model/rest/OptionsVerbDefinition.java
@@ -0,0 +1,33 @@
+/**
+ * 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.model.rest;
+
+import org.apache.camel.spi.Metadata;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
+
+/**
+ * Rest OPTIONS command
+ */
+@Metadata(label = "rest")
+@XmlRootElement(name = "options")
+@XmlAccessorType(XmlAccessType.FIELD)
+public class OptionsVerbDefinition extends VerbDefinition {
+
+}
http://git-wip-us.apache.org/repos/asf/camel/blob/d307ff12/camel-core/src/main/java/org/apache/camel/model/rest/RestDefinition.java
--
diff --git
a/camel-core/src/main/java/org/apache/camel/model/rest/RestDefinition.java
b/camel-core/src/main/java/org/apache/camel/model/rest/RestDefinition.java
index 82633ca..5fcaa21 100644
--- a/camel-core/src/main/java/org/apache/camel/model/rest/RestDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/rest/RestDefinition.java
@@ -208,6 +208,14 @@ public class RestDefinition extends
OptionalIdentifiedDefinition
return addVerb("head", uri);
}
+public RestDefinition options() {
+return addVerb("options", null);
+}
+
+public RestDefinition options(String uri) {
+return addVerb("options", uri);
+}
+
public RestDefinition verb(String verb) {
return addVerb(verb, null);
}
@@ -412,6 +420,8 @@ public class RestDefinition extends
OptionalIdentifiedDefinition
answer = new HeadVerbDefinition();
} else if ("put".equals(verb)) {
answer = new PutVerbDefinition();
+} else if ("options".equals(verb)) {
+answer = new OptionsVerbDefinition();
} else {
answer = new VerbDefinition();
answer.setMethod(verb);
http://git-wip-us.apache.org/repos/asf/camel/blob/d307ff12/camel-core/src/main/java/org/apache/camel/model/rest/VerbDefinition.java
--
diff --git
a/camel-core/src/main/java/org/apache/camel/model/rest/VerbDefinition.java
b/camel-core/src/main/java/org/apache/camel/model/rest/VerbDefinition.java
index df053fd..965e43c 100644
--- a/camel-core/src/main/java/org/apache/camel/model/rest/VerbDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/rest/VerbDefinition.java
@@ -313,6 +313,8 @@ public class VerbDefinition extends
OptionalIdentifiedDefinition
[2/3] camel git commit: Fix checkstyle.
Fix checkstyle.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/55889c39
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/55889c39
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/55889c39
Branch: refs/heads/camel-2.15.x
Commit: 55889c39cd0b10fc41a9deaae33446499da0287a
Parents: d307ff1
Author: Raul Kripalani
Authored: Sun Sep 13 18:02:40 2015 +0100
Committer: Raul Kripalani
Committed: Sun Sep 13 18:02:40 2015 +0100
--
.../apache/camel/model/rest/OptionsVerbDefinition.java | 4 ++--
.../camel/component/rest/FromRestOptionsTest.java | 12 ++--
2 files changed, 8 insertions(+), 8 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/55889c39/camel-core/src/main/java/org/apache/camel/model/rest/OptionsVerbDefinition.java
--
diff --git
a/camel-core/src/main/java/org/apache/camel/model/rest/OptionsVerbDefinition.java
b/camel-core/src/main/java/org/apache/camel/model/rest/OptionsVerbDefinition.java
index 11a121c..2c4afa3 100644
---
a/camel-core/src/main/java/org/apache/camel/model/rest/OptionsVerbDefinition.java
+++
b/camel-core/src/main/java/org/apache/camel/model/rest/OptionsVerbDefinition.java
@@ -16,12 +16,12 @@
*/
package org.apache.camel.model.rest;
-import org.apache.camel.spi.Metadata;
-
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlRootElement;
+import org.apache.camel.spi.Metadata;
+
/**
* Rest OPTIONS command
*/
http://git-wip-us.apache.org/repos/asf/camel/blob/55889c39/camel-core/src/test/java/org/apache/camel/component/rest/FromRestOptionsTest.java
--
diff --git
a/camel-core/src/test/java/org/apache/camel/component/rest/FromRestOptionsTest.java
b/camel-core/src/test/java/org/apache/camel/component/rest/FromRestOptionsTest.java
index 2bff7fc..7485cb1 100644
---
a/camel-core/src/test/java/org/apache/camel/component/rest/FromRestOptionsTest.java
+++
b/camel-core/src/test/java/org/apache/camel/component/rest/FromRestOptionsTest.java
@@ -26,7 +26,7 @@ import org.apache.camel.model.rest.RestDefinition;
public class FromRestOptionsTest extends ContextTestSupport {
-final static String ALLOWS = "HEAD,GET,PUT,POST,DELETE,OPTIONS";
+static final String ALLOWS = "HEAD,GET,PUT,POST,DELETE,OPTIONS";
@Override
protected JndiRegistry createRegistry() throws Exception {
@@ -44,11 +44,11 @@ public class FromRestOptionsTest extends ContextTestSupport
{
assertIsInstanceOf(OptionsVerbDefinition.class,
rest.getVerbs().get(0));
Exchange out = template.request("seda:options-say-hello", new
Processor() {
-@Override
-public void process(Exchange exchange) throws Exception {
-exchange.getIn().setBody("Me");
-}
-});
+@Override
+public void process(Exchange exchange) throws Exception {
+exchange.getIn().setBody("Me");
+}
+});
assertMockEndpointsSatisfied();
assertNotNull(out);
assertEquals(out.getOut().getHeader("Allow"), ALLOWS);
[3/3] camel git commit: Fix checkstyle.
Fix checkstyle.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/9c5395b1
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/9c5395b1
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/9c5395b1
Branch: refs/heads/master
Commit: 9c5395b1577e817a5dd2fcc42347a5f174e860f3
Parents: 36fdb1e
Author: Raul Kripalani
Authored: Sun Sep 13 18:02:40 2015 +0100
Committer: Raul Kripalani
Committed: Sun Sep 13 18:03:07 2015 +0100
--
.../apache/camel/model/rest/OptionsVerbDefinition.java | 4 ++--
.../camel/component/rest/FromRestOptionsTest.java | 12 ++--
2 files changed, 8 insertions(+), 8 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/9c5395b1/camel-core/src/main/java/org/apache/camel/model/rest/OptionsVerbDefinition.java
--
diff --git
a/camel-core/src/main/java/org/apache/camel/model/rest/OptionsVerbDefinition.java
b/camel-core/src/main/java/org/apache/camel/model/rest/OptionsVerbDefinition.java
index 11a121c..2c4afa3 100644
---
a/camel-core/src/main/java/org/apache/camel/model/rest/OptionsVerbDefinition.java
+++
b/camel-core/src/main/java/org/apache/camel/model/rest/OptionsVerbDefinition.java
@@ -16,12 +16,12 @@
*/
package org.apache.camel.model.rest;
-import org.apache.camel.spi.Metadata;
-
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlRootElement;
+import org.apache.camel.spi.Metadata;
+
/**
* Rest OPTIONS command
*/
http://git-wip-us.apache.org/repos/asf/camel/blob/9c5395b1/camel-core/src/test/java/org/apache/camel/component/rest/FromRestOptionsTest.java
--
diff --git
a/camel-core/src/test/java/org/apache/camel/component/rest/FromRestOptionsTest.java
b/camel-core/src/test/java/org/apache/camel/component/rest/FromRestOptionsTest.java
index b8409c3..07e03a8 100644
---
a/camel-core/src/test/java/org/apache/camel/component/rest/FromRestOptionsTest.java
+++
b/camel-core/src/test/java/org/apache/camel/component/rest/FromRestOptionsTest.java
@@ -32,7 +32,7 @@ import java.util.List;
public class FromRestOptionsTest extends ContextTestSupport {
-final static String ALLOWS = "HEAD,GET,PUT,POST,DELETE,OPTIONS";
+static final String ALLOWS = "HEAD,GET,PUT,POST,DELETE,OPTIONS";
@Override
protected JndiRegistry createRegistry() throws Exception {
@@ -50,11 +50,11 @@ public class FromRestOptionsTest extends ContextTestSupport
{
assertIsInstanceOf(OptionsVerbDefinition.class,
rest.getVerbs().get(0));
Exchange out = template.request("seda:options-say-hello", new
Processor() {
-@Override
-public void process(Exchange exchange) throws Exception {
-exchange.getIn().setBody("Me");
-}
-});
+@Override
+public void process(Exchange exchange) throws Exception {
+exchange.getIn().setBody("Me");
+}
+});
assertMockEndpointsSatisfied();
assertNotNull(out);
assertEquals(out.getOut().getHeader("Allow"), ALLOWS);
[1/2] camel git commit: CAMEL-9111 Camel Tarfile dataformat, splitter and aggregation strategy.
Repository: camel Updated Branches: refs/heads/master b1b49bfba -> 2051db4b4 http://git-wip-us.apache.org/repos/asf/camel/blob/2051db4b/components/camel-tarfile/src/test/resources/org/apache/camel/aggregate/tarfile/data/another/hello.txt -- diff --git a/components/camel-tarfile/src/test/resources/org/apache/camel/aggregate/tarfile/data/another/hello.txt b/components/camel-tarfile/src/test/resources/org/apache/camel/aggregate/tarfile/data/another/hello.txt new file mode 100644 index 000..b6fc4c6 --- /dev/null +++ b/components/camel-tarfile/src/test/resources/org/apache/camel/aggregate/tarfile/data/another/hello.txt @@ -0,0 +1 @@ +hello \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/2051db4b/components/camel-tarfile/src/test/resources/org/apache/camel/aggregate/tarfile/data/chiau.txt -- diff --git a/components/camel-tarfile/src/test/resources/org/apache/camel/aggregate/tarfile/data/chiau.txt b/components/camel-tarfile/src/test/resources/org/apache/camel/aggregate/tarfile/data/chiau.txt new file mode 100644 index 000..7842486 --- /dev/null +++ b/components/camel-tarfile/src/test/resources/org/apache/camel/aggregate/tarfile/data/chiau.txt @@ -0,0 +1 @@ +chau \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/2051db4b/components/camel-tarfile/src/test/resources/org/apache/camel/aggregate/tarfile/data/hi.txt -- diff --git a/components/camel-tarfile/src/test/resources/org/apache/camel/aggregate/tarfile/data/hi.txt b/components/camel-tarfile/src/test/resources/org/apache/camel/aggregate/tarfile/data/hi.txt new file mode 100644 index 000..32f95c0 --- /dev/null +++ b/components/camel-tarfile/src/test/resources/org/apache/camel/aggregate/tarfile/data/hi.txt @@ -0,0 +1 @@ +hi \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/2051db4b/components/camel-tarfile/src/test/resources/org/apache/camel/aggregate/tarfile/data/hola.txt -- diff --git a/components/camel-tarfile/src/test/resources/org/apache/camel/aggregate/tarfile/data/hola.txt b/components/camel-tarfile/src/test/resources/org/apache/camel/aggregate/tarfile/data/hola.txt new file mode 100644 index 000..b8b4a4e --- /dev/null +++ b/components/camel-tarfile/src/test/resources/org/apache/camel/aggregate/tarfile/data/hola.txt @@ -0,0 +1 @@ +hola \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/2051db4b/components/camel-tarfile/src/test/resources/org/apache/camel/aggregate/tarfile/data/other/greetings.txt -- diff --git a/components/camel-tarfile/src/test/resources/org/apache/camel/aggregate/tarfile/data/other/greetings.txt b/components/camel-tarfile/src/test/resources/org/apache/camel/aggregate/tarfile/data/other/greetings.txt new file mode 100644 index 000..9eaa11a --- /dev/null +++ b/components/camel-tarfile/src/test/resources/org/apache/camel/aggregate/tarfile/data/other/greetings.txt @@ -0,0 +1 @@ +greetings \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/2051db4b/components/camel-tarfile/src/test/resources/org/apache/camel/dataformat/tarfile/SpringTarSplitterRouteTest.xml -- diff --git a/components/camel-tarfile/src/test/resources/org/apache/camel/dataformat/tarfile/SpringTarSplitterRouteTest.xml b/components/camel-tarfile/src/test/resources/org/apache/camel/dataformat/tarfile/SpringTarSplitterRouteTest.xml new file mode 100644 index 000..8212452 --- /dev/null +++ b/components/camel-tarfile/src/test/resources/org/apache/camel/dataformat/tarfile/SpringTarSplitterRouteTest.xml @@ -0,0 +1,42 @@ + + +http://www.springframework.org/schema/beans"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation=" + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd +"> + + + + + + + http://camel.apache.org/schema/spring";> + + + + +tarSplitter + + + + + + + http://git-wip-us.apache.org/repos/asf/camel/blob/2051db4b/components/camel-tarfile/src/test/resources/org/apache/camel/dataformat/tarfile/data/tarfile.tar -- diff --git a/components/camel-tarfile/src/test/resources/org/apache/camel/dataformat/tarfile/data/tarfile.tar b/components/camel-tarfile/src/test/resources/org/apache/camel/dataformat/tarfile/data/tarfile.tar new file mode 100644 index 0
[2/2] camel git commit: CAMEL-9111 Camel Tarfile dataformat, splitter and aggregation strategy.
CAMEL-9111 Camel Tarfile dataformat, splitter and aggregation strategy.
With thanks to Sverker Abrahamsson. This closes #599.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/2051db4b
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/2051db4b
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/2051db4b
Branch: refs/heads/master
Commit: 2051db4b46b7b423915fa77cad7f54e71358e659
Parents: b1b49bf
Author: Raul Kripalani
Authored: Thu Sep 3 21:54:51 2015 +0100
Committer: Raul Kripalani
Committed: Thu Sep 3 21:55:43 2015 +0100
--
.../model/dataformat/TarFileDataFormat.java | 61 +
components/camel-tarfile/pom.xml| 78 ++
.../tarfile/TarElementInputStreamWrapper.java | 46
.../dataformat/tarfile/TarFileDataFormat.java | 111
.../camel/dataformat/tarfile/TarIterator.java | 175 +
.../camel/dataformat/tarfile/TarSplitter.java | 44
.../tarfile/TarAggregationStrategy.java | 259 +++
.../src/main/resources/META-INF/LICENSE.txt | 203 +++
.../src/main/resources/META-INF/NOTICE.txt | 11 +
.../org/apache/camel/dataformat/tarfile | 18 ++
.../tarfile/SpringTarSplitterRouteTest.java | 38 +++
.../tarfile/TarFileDataFormatTest.java | 221
.../TarFileMultipleFilesSplitterTest.java | 82 ++
.../tarfile/TarSplitterRouteIssueTest.java | 69 +
.../tarfile/TarSplitterRouteTest.java | 51
...gregationStrategyWithFilenameHeaderTest.java | 94 +++
...AggregationStrategyWithPreservationTest.java | 97 +++
.../tarfile/TarAggregationStrategyTest.java | 87 +++
.../src/test/resources/data/tarfile3.tar| Bin 0 -> 4096 bytes
.../src/test/resources/log4j.properties | 38 +++
.../aggregate/tarfile/data/another/hello.txt| 1 +
.../camel/aggregate/tarfile/data/chiau.txt | 1 +
.../apache/camel/aggregate/tarfile/data/hi.txt | 1 +
.../camel/aggregate/tarfile/data/hola.txt | 1 +
.../aggregate/tarfile/data/other/greetings.txt | 1 +
.../tarfile/SpringTarSplitterRouteTest.xml | 42 +++
.../camel/dataformat/tarfile/data/tarfile.tar | Bin 0 -> 7168 bytes
components/pom.xml | 1 +
.../features/src/main/resources/features.xml| 5 +
29 files changed, 1836 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/2051db4b/camel-core/src/main/java/org/apache/camel/model/dataformat/TarFileDataFormat.java
--
diff --git
a/camel-core/src/main/java/org/apache/camel/model/dataformat/TarFileDataFormat.java
b/camel-core/src/main/java/org/apache/camel/model/dataformat/TarFileDataFormat.java
new file mode 100644
index 000..ecd8e51
--- /dev/null
+++
b/camel-core/src/main/java/org/apache/camel/model/dataformat/TarFileDataFormat.java
@@ -0,0 +1,61 @@
+/**
+ * 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.model.dataformat;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlRootElement;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.model.DataFormatDefinition;
+import org.apache.camel.spi.DataFormat;
+import org.apache.camel.spi.Metadata;
+
+/**
+ * Represents the TAR file XML {@link org.apache.camel.spi.DataFormat}.
+ */
+@Metadata(label = "dataformat,transformation", title = "Tar File")
+@XmlRootElement(name = "tarfile")
+@XmlAccessorType(XmlAccessType.FIELD)
+public class TarFileDataFormat extends DataFormatDefinition {
+@XmlAttribute
+private Boolean usingIterator;
+
+public TarFileDataFormat() {
+super("tarfile");
+}
+
+@Override
+protected void configureDataFormat(DataFormat dataFormat, CamelContext
camelContext) {
+if (usingIterator != null) {
+setProperty(camelContext, dataFor
[1/2] camel git commit: CAMEL-8923 Fixed the infinite loop by adding bridgeEndpoint option to kafka endpoint.
Repository: camel
Updated Branches:
refs/heads/camel-2.15.x bd29f1ccc -> 5ac926c3c
refs/heads/master dc9e8ebcd -> a9bad7b1a
CAMEL-8923 Fixed the infinite loop by adding bridgeEndpoint option to kafka
endpoint.
Cherry-picked from 19e70a6a36b75a1e2c3291d9d21df24e263023fa.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/5ac926c3
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/5ac926c3
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/5ac926c3
Branch: refs/heads/camel-2.15.x
Commit: 5ac926c3ca70dd35e8109405c51b69d87e12ef22
Parents: bd29f1c
Author: Willem Jiang
Authored: Wed Jul 1 23:03:12 2015 +0800
Committer: Raul Kripalani
Committed: Wed Sep 2 23:30:45 2015 +0100
--
.../apache/camel/component/kafka/KafkaEndpoint.java| 8
.../apache/camel/component/kafka/KafkaProducer.java| 5 -
.../camel/component/kafka/KafkaProducerTest.java | 13 +
3 files changed, 25 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/5ac926c3/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaEndpoint.java
--
diff --git
a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaEndpoint.java
b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaEndpoint.java
index 1652d78..9960a89 100644
---
a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaEndpoint.java
+++
b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaEndpoint.java
@@ -489,4 +489,12 @@ public class KafkaEndpoint extends DefaultEndpoint
implements MultipleConsumersS
public boolean isMultipleConsumersSupported() {
return true;
}
+
+public boolean isBridgeEndpoint() {
+return bridgeEndpoint;
+}
+
+public void setBridgeEndpoint(boolean bridgeEndpoint) {
+this.bridgeEndpoint = bridgeEndpoint;
+}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/5ac926c3/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaProducer.java
--
diff --git
a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaProducer.java
b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaProducer.java
index 0fde1ae..06a0317 100644
---
a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaProducer.java
+++
b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaProducer.java
@@ -64,7 +64,10 @@ public class KafkaProducer extends DefaultProducer {
@Override
@SuppressWarnings("unchecked")
public void process(Exchange exchange) throws CamelException {
-String topic = exchange.getIn().getHeader(KafkaConstants.TOPIC,
endpoint.getTopic(), String.class);
+String topic = endpoint.getTopic();
+if (!endpoint.isBridgeEndpoint()) {
+topic = exchange.getIn().getHeader(KafkaConstants.TOPIC, topic,
String.class);
+}
if (topic == null) {
throw new CamelExchangeException("No topic key set", exchange);
}
http://git-wip-us.apache.org/repos/asf/camel/blob/5ac926c3/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaProducerTest.java
--
diff --git
a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaProducerTest.java
b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaProducerTest.java
index d989c96..d2e868d 100644
---
a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaProducerTest.java
+++
b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaProducerTest.java
@@ -128,6 +128,19 @@ public class KafkaProducerTest {
verifySendMessage("someKey", "someTopic", "someKey");
}
+
+@Test
+public void processSendMessageWithBridgeEndpoint() throws Exception {
+endpoint.setTopic("someTopic");
+endpoint.setBridgeEndpoint(true);
+Mockito.when(exchange.getIn()).thenReturn(in);
+in.setHeader(KafkaConstants.TOPIC, "anotherTopic");
+in.setHeader(KafkaConstants.KEY, "someKey");
+
+producer.process(exchange);
+
+verifySendMessage("someKey", "someTopic", "someKey");
+}
@SuppressWarnings({"unchecked", "rawtypes"})
protected void verifySendMessage(String partitionKey, String topic, String
messageKey) {
[2/2] camel git commit: CAMEL-8923 Use local var instead of getter again.
CAMEL-8923 Use local var instead of getter again.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a9bad7b1
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a9bad7b1
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a9bad7b1
Branch: refs/heads/master
Commit: a9bad7b1a06758f5dad72e436aed8dc6d21537e5
Parents: dc9e8eb
Author: Raul Kripalani
Authored: Wed Sep 2 23:32:13 2015 +0100
Committer: Raul Kripalani
Committed: Wed Sep 2 23:32:13 2015 +0100
--
.../main/java/org/apache/camel/component/kafka/KafkaProducer.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/a9bad7b1/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaProducer.java
--
diff --git
a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaProducer.java
b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaProducer.java
index 3bc8e78..06a0317 100644
---
a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaProducer.java
+++
b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaProducer.java
@@ -66,7 +66,7 @@ public class KafkaProducer extends DefaultProducer {
public void process(Exchange exchange) throws CamelException {
String topic = endpoint.getTopic();
if (!endpoint.isBridgeEndpoint()) {
-topic = exchange.getIn().getHeader(KafkaConstants.TOPIC,
endpoint.getTopic(), String.class);
+topic = exchange.getIn().getHeader(KafkaConstants.TOPIC, topic,
String.class);
}
if (topic == null) {
throw new CamelExchangeException("No topic key set", exchange);
[1/2] camel git commit: CAMEL-9092 MQTT consumer receives duplicate messages after broker restart.
Repository: camel
Updated Branches:
refs/heads/camel-2.15.x 7cdb7c1f1 -> ac31039c9
refs/heads/master d1c7f6507 -> 17391a12e
CAMEL-9092 MQTT consumer receives duplicate messages after broker restart.
With thanks to Tomohisa Igarashi. Code merged with modifications.
This closes #601.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/17391a12
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/17391a12
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/17391a12
Branch: refs/heads/master
Commit: 17391a12e9e7a3158058d4e885c6af65141a1338
Parents: d1c7f65
Author: Raul Kripalani
Authored: Fri Aug 28 15:44:35 2015 +0100
Committer: Raul Kripalani
Committed: Fri Aug 28 15:51:38 2015 +0100
--
.../camel/component/mqtt/MQTTEndpoint.java | 139 +++-
.../component/mqtt/MQTTDuplicatesTest.java | 158 +++
.../src/test/resources/log4j.properties | 2 +-
3 files changed, 296 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/17391a12/components/camel-mqtt/src/main/java/org/apache/camel/component/mqtt/MQTTEndpoint.java
--
diff --git
a/components/camel-mqtt/src/main/java/org/apache/camel/component/mqtt/MQTTEndpoint.java
b/components/camel-mqtt/src/main/java/org/apache/camel/component/mqtt/MQTTEndpoint.java
index 92c8d17..89caedd 100644
---
a/components/camel-mqtt/src/main/java/org/apache/camel/component/mqtt/MQTTEndpoint.java
+++
b/components/camel-mqtt/src/main/java/org/apache/camel/component/mqtt/MQTTEndpoint.java
@@ -39,6 +39,21 @@ import org.fusesource.mqtt.client.Listener;
import org.fusesource.mqtt.client.Promise;
import org.fusesource.mqtt.client.QoS;
import org.fusesource.mqtt.client.Topic;
+import org.fusesource.mqtt.client.Tracer;
+import org.fusesource.mqtt.codec.CONNACK;
+import org.fusesource.mqtt.codec.CONNECT;
+import org.fusesource.mqtt.codec.DISCONNECT;
+import org.fusesource.mqtt.codec.MQTTFrame;
+import org.fusesource.mqtt.codec.PINGREQ;
+import org.fusesource.mqtt.codec.PINGRESP;
+import org.fusesource.mqtt.codec.PUBACK;
+import org.fusesource.mqtt.codec.PUBCOMP;
+import org.fusesource.mqtt.codec.PUBLISH;
+import org.fusesource.mqtt.codec.PUBREC;
+import org.fusesource.mqtt.codec.PUBREL;
+import org.fusesource.mqtt.codec.SUBACK;
+import org.fusesource.mqtt.codec.SUBSCRIBE;
+import org.fusesource.mqtt.codec.UNSUBSCRIBE;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -57,12 +72,127 @@ public class MQTTEndpoint extends DefaultEndpoint {
@UriPath @Metadata(required = "true")
private String name;
+
@UriParam
private final MQTTConfiguration configuration;
-public MQTTEndpoint(String uri, MQTTComponent component, MQTTConfiguration
properties) {
+public MQTTEndpoint(final String uri, MQTTComponent component,
MQTTConfiguration properties) {
super(uri, component);
this.configuration = properties;
+if (LOG.isTraceEnabled()) {
+configuration.setTracer(new Tracer() {
+@Override
+public void debug(String message, Object...args) {
+LOG.trace("tracer.debug() " + this + ": uri=" + uri + ",
message=" + String.format(message, args));
+}
+
+@Override
+public void onSend(MQTTFrame frame) {
+String decoded = null;
+try {
+switch (frame.messageType()) {
+case PINGREQ.TYPE:
+decoded = new PINGREQ().decode(frame).toString();
+break;
+case PINGRESP.TYPE:
+decoded = new PINGRESP().decode(frame).toString();
+break;
+case CONNECT.TYPE:
+decoded = new CONNECT().decode(frame).toString();
+break;
+case DISCONNECT.TYPE:
+decoded = new
DISCONNECT().decode(frame).toString();
+break;
+case SUBSCRIBE.TYPE:
+decoded = new SUBSCRIBE().decode(frame).toString();
+break;
+case UNSUBSCRIBE.TYPE:
+decoded = new
UNSUBSCRIBE().decode(frame).toString();
+break;
+case PUBLISH.TYPE:
+decoded = new PUBLISH().decode(frame).toString();
+break;
+case PUBACK.TYPE:
+decoded = new PUBACK().decode(frame).toString();
+
[2/2] camel git commit: CAMEL-9092 MQTT consumer receives duplicate messages after broker restart.
CAMEL-9092 MQTT consumer receives duplicate messages after broker restart.
With thanks to Tomohisa Igarashi. Code merged with modifications.
This closes #601.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/ac31039c
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ac31039c
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ac31039c
Branch: refs/heads/camel-2.15.x
Commit: ac31039c9d26e567698bf70aa8e727fed0cbfc42
Parents: 7cdb7c1
Author: Raul Kripalani
Authored: Fri Aug 28 15:44:35 2015 +0100
Committer: Raul Kripalani
Committed: Fri Aug 28 15:57:39 2015 +0100
--
.../camel/component/mqtt/MQTTEndpoint.java | 139 +++-
.../component/mqtt/MQTTDuplicatesTest.java | 158 +++
.../src/test/resources/log4j.properties | 2 +-
3 files changed, 296 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/ac31039c/components/camel-mqtt/src/main/java/org/apache/camel/component/mqtt/MQTTEndpoint.java
--
diff --git
a/components/camel-mqtt/src/main/java/org/apache/camel/component/mqtt/MQTTEndpoint.java
b/components/camel-mqtt/src/main/java/org/apache/camel/component/mqtt/MQTTEndpoint.java
index cfd2eb9..94b3008 100644
---
a/components/camel-mqtt/src/main/java/org/apache/camel/component/mqtt/MQTTEndpoint.java
+++
b/components/camel-mqtt/src/main/java/org/apache/camel/component/mqtt/MQTTEndpoint.java
@@ -39,6 +39,21 @@ import org.fusesource.mqtt.client.Listener;
import org.fusesource.mqtt.client.Promise;
import org.fusesource.mqtt.client.QoS;
import org.fusesource.mqtt.client.Topic;
+import org.fusesource.mqtt.client.Tracer;
+import org.fusesource.mqtt.codec.CONNACK;
+import org.fusesource.mqtt.codec.CONNECT;
+import org.fusesource.mqtt.codec.DISCONNECT;
+import org.fusesource.mqtt.codec.MQTTFrame;
+import org.fusesource.mqtt.codec.PINGREQ;
+import org.fusesource.mqtt.codec.PINGRESP;
+import org.fusesource.mqtt.codec.PUBACK;
+import org.fusesource.mqtt.codec.PUBCOMP;
+import org.fusesource.mqtt.codec.PUBLISH;
+import org.fusesource.mqtt.codec.PUBREC;
+import org.fusesource.mqtt.codec.PUBREL;
+import org.fusesource.mqtt.codec.SUBACK;
+import org.fusesource.mqtt.codec.SUBSCRIBE;
+import org.fusesource.mqtt.codec.UNSUBSCRIBE;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -54,14 +69,129 @@ public class MQTTEndpoint extends DefaultEndpoint {
private CallbackConnection connection;
@UriPath @Metadata(required = "true")
private String name;
+
@UriParam
private final MQTTConfiguration configuration;
private volatile boolean connected;
private final List consumers = new
CopyOnWriteArrayList();
-public MQTTEndpoint(String uri, MQTTComponent component, MQTTConfiguration
properties) {
+public MQTTEndpoint(final String uri, MQTTComponent component,
MQTTConfiguration properties) {
super(uri, component);
this.configuration = properties;
+if (LOG.isTraceEnabled()) {
+configuration.setTracer(new Tracer() {
+@Override
+public void debug(String message, Object...args) {
+LOG.trace("tracer.debug() " + this + ": uri=" + uri + ",
message=" + String.format(message, args));
+}
+
+@Override
+public void onSend(MQTTFrame frame) {
+String decoded = null;
+try {
+switch (frame.messageType()) {
+case PINGREQ.TYPE:
+decoded = new PINGREQ().decode(frame).toString();
+break;
+case PINGRESP.TYPE:
+decoded = new PINGRESP().decode(frame).toString();
+break;
+case CONNECT.TYPE:
+decoded = new CONNECT().decode(frame).toString();
+break;
+case DISCONNECT.TYPE:
+decoded = new
DISCONNECT().decode(frame).toString();
+break;
+case SUBSCRIBE.TYPE:
+decoded = new SUBSCRIBE().decode(frame).toString();
+break;
+case UNSUBSCRIBE.TYPE:
+decoded = new
UNSUBSCRIBE().decode(frame).toString();
+break;
+case PUBLISH.TYPE:
+decoded = new PUBLISH().decode(frame).toString();
+break;
+case PUBACK.TYPE:
+decoded = new PUBACK().decode(frame).toStr
camel git commit: Upgrade c3p0 dependency to 0.9.5.1.
Repository: camel
Updated Branches:
refs/heads/master 37ad9d9ed -> d1c7f6507
Upgrade c3p0 dependency to 0.9.5.1.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d1c7f650
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d1c7f650
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d1c7f650
Branch: refs/heads/master
Commit: d1c7f65079ef94fd27a735d9c02e38920975dfa6
Parents: 37ad9d9
Author: Raul Kripalani
Authored: Fri Aug 28 01:07:48 2015 +0100
Committer: Raul Kripalani
Committed: Fri Aug 28 01:07:48 2015 +0100
--
components/camel-quartz2/pom.xml | 2 +-
parent/pom.xml | 2 +-
platforms/karaf/features/src/main/resources/features.xml | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/d1c7f650/components/camel-quartz2/pom.xml
--
diff --git a/components/camel-quartz2/pom.xml b/components/camel-quartz2/pom.xml
index e10b30b..36bc980 100644
--- a/components/camel-quartz2/pom.xml
+++ b/components/camel-quartz2/pom.xml
@@ -56,7 +56,7 @@
${quartz2-version}
- c3p0
+ com.mchange
c3p0
${c3p0-version}
http://git-wip-us.apache.org/repos/asf/camel/blob/d1c7f650/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 88e9309..4215069 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -77,7 +77,7 @@
1.52
3.2.1
1.8
-0.9.1.2
+0.9.5.1
1.0.0-M3
camel-test-spring
2.1.7.1
http://git-wip-us.apache.org/repos/asf/camel/blob/d1c7f650/platforms/karaf/features/src/main/resources/features.xml
--
diff --git a/platforms/karaf/features/src/main/resources/features.xml
b/platforms/karaf/features/src/main/resources/features.xml
index 5e874dc..e5f7bae 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -1198,7 +1198,7 @@
mvn:org.apache.camel/camel-quartz/${project.version}
-wrap:mvn:c3p0/c3p0/${c3p0-version}
+wrap:mvn:com.mchange/c3p0/${c3p0-version}
mvn:org.quartz-scheduler/quartz/${quartz2-version}
camel-core
mvn:org.apache.camel/camel-quartz2/${project.version}
camel git commit: CAMEL-9104 Fix http[4] and netty[4]-http: Exch.HTTP_PATH and query string.
Repository: camel
Updated Branches:
refs/heads/master 3ffadbd92 -> 37ad9d9ed
CAMEL-9104 Fix http[4] and netty[4]-http: Exch.HTTP_PATH and query string.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/37ad9d9e
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/37ad9d9e
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/37ad9d9e
Branch: refs/heads/master
Commit: 37ad9d9ed364fee4604d5e81c1f8ef2c50a72e15
Parents: 3ffadbd
Author: Raul Kripalani
Authored: Thu Aug 27 23:45:44 2015 +0100
Committer: Raul Kripalani
Committed: Fri Aug 28 00:37:38 2015 +0100
--
.../apache/camel/http/common/HttpHelper.java| 19 +++---
...tWithPathHeaderAndStaticQueryStringTest.java | 37
.../camel/component/http4/HttpPathTest.java | 28 ++-
.../component/netty/http/NettyHttpHelper.java | 20 ---
.../http/NettyHttpProducerQueryParamTest.java | 35 ++
.../component/netty4/http/NettyHttpHelper.java | 20 ---
.../http/NettyHttpProducerQueryParamTest.java | 35 ++
7 files changed, 178 insertions(+), 16 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/37ad9d9e/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpHelper.java
--
diff --git
a/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpHelper.java
b/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpHelper.java
index 20e949d..c9b8d7b 100644
---
a/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpHelper.java
+++
b/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpHelper.java
@@ -277,12 +277,21 @@ public final class HttpHelper {
path = path.substring(1);
}
if (path.length() > 0) {
-// make sure that there is exactly one "/" between HTTP_URI and
-// HTTP_PATH
-if (!uri.endsWith("/")) {
-uri = uri + "/";
+// inject the dynamic path before the query params, if there
are any
+int idx = uri.indexOf("?");
+
+// if there are no query params
+if (idx == -1) {
+// make sure that there is exactly one "/" between
HTTP_URI and HTTP_PATH
+uri = uri.endsWith("/") ? uri : uri + "/";
+uri = uri.concat(path);
+} else {
+// there are query params, so inject the relative path in
the right place
+String base = uri.substring(0, idx);
+base = base.endsWith("/") ? base : base + "/";
+base = base.concat(path);
+uri = base.concat(uri.substring(idx));
}
-uri = uri.concat(path);
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/37ad9d9e/components/camel-http/src/test/java/org/apache/camel/component/http/HttpGetWithPathHeaderAndStaticQueryStringTest.java
--
diff --git
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpGetWithPathHeaderAndStaticQueryStringTest.java
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpGetWithPathHeaderAndStaticQueryStringTest.java
new file mode 100644
index 000..2c4c797
--- /dev/null
+++
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpGetWithPathHeaderAndStaticQueryStringTest.java
@@ -0,0 +1,37 @@
+/**
+ * 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.http;
+
+import org.apache.camel.Exchange;
+import org.apache.camel.builder.RouteBuilder;
+
+/**
+ * @version
+ */
+public class HttpGetWithPathHeaderAndStaticQueryStringTest extends HttpGetTest
{
+
+@Override
+protected RouteBuilder createRouteBuilder()
[2/2] camel git commit: CAMEL-9098 camel-hystrix (WIP): Add tests for Hystrix Endpoints.
CAMEL-9098 camel-hystrix (WIP): Add tests for Hystrix Endpoints.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d8fc17c7
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d8fc17c7
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d8fc17c7
Branch: refs/heads/feature/camel-hystrix
Commit: d8fc17c74408ef20ded2704242b28576f49c37e2
Parents: edc0ba8
Author: Raul Kripalani
Authored: Thu Aug 27 13:24:39 2015 +0100
Committer: Raul Kripalani
Committed: Thu Aug 27 13:24:39 2015 +0100
--
.../component/hystrix/AbstractHystrixTest.java | 18 ++
.../component/hystrix/HystrixEndpointTest.java | 225 +++
.../component/hystrix/HystrixProcessorTest.java | 6 -
3 files changed, 243 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/d8fc17c7/components/camel-hystrix/src/test/java/org/apache/camel/component/hystrix/AbstractHystrixTest.java
--
diff --git
a/components/camel-hystrix/src/test/java/org/apache/camel/component/hystrix/AbstractHystrixTest.java
b/components/camel-hystrix/src/test/java/org/apache/camel/component/hystrix/AbstractHystrixTest.java
index 785c764..ae76e71 100644
---
a/components/camel-hystrix/src/test/java/org/apache/camel/component/hystrix/AbstractHystrixTest.java
+++
b/components/camel-hystrix/src/test/java/org/apache/camel/component/hystrix/AbstractHystrixTest.java
@@ -19,9 +19,11 @@ package org.apache.camel.component.hystrix;
import com.netflix.hystrix.HystrixCommandGroupKey;
import com.netflix.hystrix.HystrixCommandKey;
import com.netflix.hystrix.HystrixObservableCommand;
+import com.netflix.hystrix.strategy.concurrency.HystrixRequestContext;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.After;
/**
* Abstract Hystrix test.
@@ -54,4 +56,20 @@ public abstract class AbstractHystrixTest extends
CamelTestSupport {
hystrix = context.getComponent("hystrix", HystrixComponent.class);
}
+/**
+ * Remove the HystrixRequestContext from the current thread, if one is
present.
+ * @throws Exception
+ */
+@After
+public void tearDown() throws Exception {
+super.tearDown();
+HystrixRequestContext.setContextOnCurrentThread(null);
+}
+
+protected class DummyException extends RuntimeException {
+public DummyException(String message) {
+super(message);
+}
+}
+
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/d8fc17c7/components/camel-hystrix/src/test/java/org/apache/camel/component/hystrix/HystrixEndpointTest.java
--
diff --git
a/components/camel-hystrix/src/test/java/org/apache/camel/component/hystrix/HystrixEndpointTest.java
b/components/camel-hystrix/src/test/java/org/apache/camel/component/hystrix/HystrixEndpointTest.java
index ddabbb3..cb42762 100644
---
a/components/camel-hystrix/src/test/java/org/apache/camel/component/hystrix/HystrixEndpointTest.java
+++
b/components/camel-hystrix/src/test/java/org/apache/camel/component/hystrix/HystrixEndpointTest.java
@@ -16,7 +16,17 @@
*/
package org.apache.camel.component.hystrix;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+import com.netflix.hystrix.strategy.concurrency.HystrixRequestContext;
+import org.apache.camel.CamelExecutionException;
+import org.apache.camel.Exchange;
+import org.apache.camel.Processor;
+import org.apache.camel.builder.ExpressionBuilder;
+import org.apache.camel.util.ObjectHelper;
import org.junit.Test;
+import rx.functions.Action2;
/**
* Tests for Hystrix endpoints.
@@ -36,7 +46,222 @@ public class HystrixEndpointTest extends
AbstractHystrixTest {
assertEquals("Hello World 0", template.requestBody(hystrixE, "Hello
World"));
assertMockEndpointsSatisfied();
+}
+
+@Test
+public void testEndpointFallbackExceptionThrown() throws Exception {
+HystrixDelegateEndpoint hystrixE = hystrix.wrapper()
+.forStaticEndpoint("mock:test", setter)
+.withFallbackProcessor(fallback)
+.build();
+hystrixE.setCamelContext(context);
+
+getMockEndpoint("mock:test").whenAnyExchangeReceived(new Processor() {
+@Override
+public void process(Exchange exchange) throws Exception {
+throw new DummyException("Bang!");
+}
+});
+getMockEndpoint("mock:test").message(0).body().isEqualTo("Hello
World");
+
+assertEquals("Hello Fallback", template.requestBody(hystrixE, "Hello
World"));
+
+}
+
+@Test
+
[1/2] camel git commit: CAMEL-9098 camel-hystrix (WIP): Rename suppressFallbackForExceptions in DSL.
Repository: camel
Updated Branches:
refs/heads/feature/camel-hystrix 07f38b3b2 -> d8fc17c74
CAMEL-9098 camel-hystrix (WIP): Rename suppressFallbackForExceptions in DSL.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/edc0ba81
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/edc0ba81
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/edc0ba81
Branch: refs/heads/feature/camel-hystrix
Commit: edc0ba81842fa8ce37db8ed84a092744213362bf
Parents: 07f38b3
Author: Raul Kripalani
Authored: Thu Aug 27 13:24:23 2015 +0100
Committer: Raul Kripalani
Committed: Thu Aug 27 13:24:23 2015 +0100
--
.../camel/component/hystrix/HystrixDelegateEndpoint.java | 8
.../camel/component/hystrix/builders/HystrixWrappers.java| 2 +-
.../apache/camel/component/hystrix/HystrixProcessorTest.java | 4 ++--
3 files changed, 3 insertions(+), 11 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/edc0ba81/components/camel-hystrix/src/main/java/org/apache/camel/component/hystrix/HystrixDelegateEndpoint.java
--
diff --git
a/components/camel-hystrix/src/main/java/org/apache/camel/component/hystrix/HystrixDelegateEndpoint.java
b/components/camel-hystrix/src/main/java/org/apache/camel/component/hystrix/HystrixDelegateEndpoint.java
index d139172..c365167 100644
---
a/components/camel-hystrix/src/main/java/org/apache/camel/component/hystrix/HystrixDelegateEndpoint.java
+++
b/components/camel-hystrix/src/main/java/org/apache/camel/component/hystrix/HystrixDelegateEndpoint.java
@@ -74,18 +74,10 @@ public class HystrixDelegateEndpoint extends
DefaultEndpoint {
return target;
}
-public void setTarget(Endpoint target) {
-this.target = target;
-}
-
public Producer getProducer() {
return producer;
}
-public void setProducer(Producer producer) {
-this.producer = producer;
-}
-
public HystrixConfiguration getConfiguration() {
return configuration;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/edc0ba81/components/camel-hystrix/src/main/java/org/apache/camel/component/hystrix/builders/HystrixWrappers.java
--
diff --git
a/components/camel-hystrix/src/main/java/org/apache/camel/component/hystrix/builders/HystrixWrappers.java
b/components/camel-hystrix/src/main/java/org/apache/camel/component/hystrix/builders/HystrixWrappers.java
index 493f731..d3624c2 100644
---
a/components/camel-hystrix/src/main/java/org/apache/camel/component/hystrix/builders/HystrixWrappers.java
+++
b/components/camel-hystrix/src/main/java/org/apache/camel/component/hystrix/builders/HystrixWrappers.java
@@ -98,7 +98,7 @@ public final class HystrixWrappers {
return thisBuilder();
}
-public T withSuppressedExceptions(Class...
throwables) {
+public T suppressFallbackForExceptions(Class...
throwables) {
Set> t = new
HashSet<>(Arrays.asList(throwables));
configuration.setExceptionsSuppressingFallback(t);
return thisBuilder();
http://git-wip-us.apache.org/repos/asf/camel/blob/edc0ba81/components/camel-hystrix/src/test/java/org/apache/camel/component/hystrix/HystrixProcessorTest.java
--
diff --git
a/components/camel-hystrix/src/test/java/org/apache/camel/component/hystrix/HystrixProcessorTest.java
b/components/camel-hystrix/src/test/java/org/apache/camel/component/hystrix/HystrixProcessorTest.java
index b3e6b9a..210fa14 100644
---
a/components/camel-hystrix/src/test/java/org/apache/camel/component/hystrix/HystrixProcessorTest.java
+++
b/components/camel-hystrix/src/test/java/org/apache/camel/component/hystrix/HystrixProcessorTest.java
@@ -90,7 +90,7 @@ public class HystrixProcessorTest extends AbstractHystrixTest
{
}
}, setter)
.withFallbackProcessor(fallback)
-.withSuppressedExceptions(DummyException.class)
+.suppressFallbackForExceptions(DummyException.class)
.build();
ServiceHelper.startService(hystrixP);
@@ -113,7 +113,7 @@ public class HystrixProcessorTest extends
AbstractHystrixTest {
}
}, setter)
.withFallbackProcessor(fallback)
-.withSuppressedExceptions(DummyException.class)
+.suppressFallbackForExceptions(DummyException.class)
.build();
ServiceHelper.startService(hystrixP);
camel git commit: CAMEL-9098 camel-hystrix initial implementation (work in progress).
Repository: camel
Updated Branches:
refs/heads/feature/camel-hystrix [created] 07f38b3b2
CAMEL-9098 camel-hystrix initial implementation (work in progress).
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/07f38b3b
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/07f38b3b
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/07f38b3b
Branch: refs/heads/feature/camel-hystrix
Commit: 07f38b3b2bbaf0ab96e18697bcf1d7f30b24c26b
Parents: cdbdfb5
Author: Raul Kripalani
Authored: Sun Aug 23 23:36:10 2015 +0100
Committer: Raul Kripalani
Committed: Tue Aug 25 01:59:25 2015 +0100
--
components/camel-hystrix/pom.xml| 90 ++
.../component/hystrix/HystrixComponent.java | 41 +++
.../component/hystrix/HystrixConfiguration.java | 287 +++
.../hystrix/HystrixDelegateEndpoint.java| 92 ++
.../hystrix/HystrixDelegateProcessor.java | 90 ++
.../hystrix/HystrixDelegateProducer.java| 58
.../camel/component/hystrix/HystrixHelper.java | 85 ++
.../ProcessorInvokingObservableCommand.java | 201 +
.../hystrix/builders/HystrixWrappers.java | 146 ++
.../src/main/resources/META-INF/LICENSE.txt | 203 +
.../src/main/resources/META-INF/NOTICE.txt | 11 +
.../services/org/apache/camel/component/hystrix | 18 ++
.../component/hystrix/AbstractHystrixTest.java | 57
.../component/hystrix/HystrixEndpointTest.java | 42 +++
.../component/hystrix/HystrixProcessorTest.java | 235 +++
.../src/test/resources/log4j.properties | 37 +++
components/pom.xml | 1 +
parent/pom.xml | 1 +
18 files changed, 1695 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/07f38b3b/components/camel-hystrix/pom.xml
--
diff --git a/components/camel-hystrix/pom.xml b/components/camel-hystrix/pom.xml
new file mode 100644
index 000..c3fa90c
--- /dev/null
+++ b/components/camel-hystrix/pom.xml
@@ -0,0 +1,90 @@
+
+
+http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+4.0.0
+
+
+org.apache.camel
+components
+2.16-SNAPSHOT
+
+
+camel-hystrix
+bundle
+Camel :: Hystrix
+Camel Hystrix component
+
+
+
org.apache.camel.component.hystrix.*
+
org.apache.camel.spi.ComponentResolver;component=hystrix
+
+
+
+
+
+org.apache.camel
+camel-core
+
+
+
+com.netflix.hystrix
+hystrix-core
+${hystrix-version}
+
+
+
+io.reactivex
+rxjava
+1.0.13
+
+
+
+com.netflix.archaius
+archaius-core
+0.4.1
+
+
+
+
+org.apache.camel
+camel-test-spring
+test
+
+
+org.slf4j
+slf4j-log4j12
+test
+
+
+junit
+junit
+test
+
+
+com.netflix.hystrix
+hystrix-servo-metrics-publisher
+1.1.2
+test
+
+
+
+
+
http://git-wip-us.apache.org/repos/asf/camel/blob/07f38b3b/components/camel-hystrix/src/main/java/org/apache/camel/component/hystrix/HystrixComponent.java
--
diff --git
a/components/camel-hystrix/src/main/java/org/apache/camel/component/hystrix/HystrixComponent.java
b/components/camel-hystrix/src/main/java/org/apache/camel/component/hystrix/HystrixComponent.java
new file mode 100644
index 000..12994db
--- /dev/null
+++
b/components/camel-hystrix/src/main/java/org/apache/camel/component/hystrix/HystrixComponent.java
@@ -0,0 +1,41 @@
+/**
+ * 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
camel git commit: CAMEL-9082 Upgrade ServiceMix Specs to 2.5.0.
Repository: camel
Updated Branches:
refs/heads/master cda9eb838 -> cdbdfb5c1
CAMEL-9082 Upgrade ServiceMix Specs to 2.5.0.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/cdbdfb5c
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/cdbdfb5c
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/cdbdfb5c
Branch: refs/heads/master
Commit: cdbdfb5c15438b4852e8267db3176fa017953a90
Parents: cda9eb8
Author: Raul Kripalani
Authored: Fri Aug 14 19:38:58 2015 +0100
Committer: Raul Kripalani
Committed: Fri Aug 14 19:38:58 2015 +0100
--
parent/pom.xml | 3 +--
platforms/karaf/features/src/main/resources/features.xml | 2 +-
2 files changed, 2 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/cdbdfb5c/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 70581b8..d9bc3f7 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -426,8 +426,7 @@
1.3.7_1
1.1.1
1.14.1_1
-2.4.0
-2.5.0
+2.5.0
1.0
[2.5,4)
1.2.3
http://git-wip-us.apache.org/repos/asf/camel/blob/cdbdfb5c/platforms/karaf/features/src/main/resources/features.xml
--
diff --git a/platforms/karaf/features/src/main/resources/features.xml
b/platforms/karaf/features/src/main/resources/features.xml
index 708b898..45323e4 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -1320,7 +1320,7 @@
camel-core
-mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jain-sip-api-1.2.1/${servicemix-specs-2.5.0-version}
+mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jain-sip-api-1.2.1/${servicemix-specs-version}
mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jain-sip-ri/${jain-sip-ri-bundle-version}
mvn:org.apache.camel/camel-sip/${project.version}
camel git commit: Fix camel-sip Karaf feature.
Repository: camel
Updated Branches:
refs/heads/master 285189e9d -> cda9eb838
Fix camel-sip Karaf feature.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/cda9eb83
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/cda9eb83
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/cda9eb83
Branch: refs/heads/master
Commit: cda9eb838be1a976e953431070b4dcb0d601dc2c
Parents: 285189e
Author: Raul Kripalani
Authored: Fri Aug 14 18:59:03 2015 +0100
Committer: Raul Kripalani
Committed: Fri Aug 14 18:59:28 2015 +0100
--
parent/pom.xml | 1 +
platforms/karaf/features/src/main/resources/features.xml | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/cda9eb83/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 13f39e8..70581b8 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -427,6 +427,7 @@
1.1.1
1.14.1_1
2.4.0
+2.5.0
1.0
[2.5,4)
1.2.3
http://git-wip-us.apache.org/repos/asf/camel/blob/cda9eb83/platforms/karaf/features/src/main/resources/features.xml
--
diff --git a/platforms/karaf/features/src/main/resources/features.xml
b/platforms/karaf/features/src/main/resources/features.xml
index 6c97436..708b898 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -1320,7 +1320,7 @@
camel-core
-mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jain-sip-api-1.2/${servicemix-specs-version}
+mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jain-sip-api-1.2.1/${servicemix-specs-2.5.0-version}
mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jain-sip-ri/${jain-sip-ri-bundle-version}
mvn:org.apache.camel/camel-sip/${project.version}
camel git commit: Fix camel-sip Karaf feature.
Repository: camel
Updated Branches:
refs/heads/camel-2.15.x 1234e0a2d -> f17e13f52
Fix camel-sip Karaf feature.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f17e13f5
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f17e13f5
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f17e13f5
Branch: refs/heads/camel-2.15.x
Commit: f17e13f52315e143b39129fa9ea59948278a9801
Parents: 1234e0a
Author: Raul Kripalani
Authored: Fri Aug 14 18:59:03 2015 +0100
Committer: Raul Kripalani
Committed: Fri Aug 14 18:59:03 2015 +0100
--
parent/pom.xml | 1 +
platforms/karaf/features/src/main/resources/features.xml | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/f17e13f5/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 9c8a6b9..6517409 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -411,6 +411,7 @@
1.1.1
1.14.1_1
2.4.0
+2.5.0
1.0
[2.5,4)
1.2.3
http://git-wip-us.apache.org/repos/asf/camel/blob/f17e13f5/platforms/karaf/features/src/main/resources/features.xml
--
diff --git a/platforms/karaf/features/src/main/resources/features.xml
b/platforms/karaf/features/src/main/resources/features.xml
index e078e89..898523e 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -1261,7 +1261,7 @@
camel-core
-mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jain-sip-api-1.2/${servicemix-specs-version}
+mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jain-sip-api-1.2.1/${servicemix-specs-2.5.0-version}
mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jain-sip-ri/${jain-sip-ri-bundle-version}
mvn:org.apache.camel/camel-sip/${project.version}
[3/5] camel git commit: Merge branch 'fix/CAMEL-8689-camel-dozer-classloading-issue' into camel-2.14.x
Merge branch 'fix/CAMEL-8689-camel-dozer-classloading-issue' into camel-2.14.x Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/08462c14 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/08462c14 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/08462c14 Branch: refs/heads/camel-2.14.x Commit: 08462c146e10d5c8665d1e0992ae840c5bd35f9b Parents: 1127a32 bf7e94f Author: Raul Kripalani Authored: Mon May 4 18:10:57 2015 +0100 Committer: Raul Kripalani Committed: Mon May 4 18:10:57 2015 +0100 -- .../dozer/CamelToDozerClassResolverAdapter.java | 46 --- .../dozer/DozerThreadContextClassLoader.java| 83 .../converter/dozer/DozerTypeConverter.java | 23 +- .../dozer/DozerTypeConverterLoader.java | 28 +-- 4 files changed, 126 insertions(+), 54 deletions(-) --
[5/5] camel git commit: CAMEL-8689 Backport fix to 2.16.x.
CAMEL-8689 Backport fix to 2.16.x.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/cfdf1854
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/cfdf1854
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/cfdf1854
Branch: refs/heads/master
Commit: cfdf185422bcc54661e92810cd85a3b35670fc64
Parents: e05a8da
Author: Raul Kripalani
Authored: Mon May 4 18:10:57 2015 +0100
Committer: Raul Kripalani
Committed: Mon May 4 18:15:22 2015 +0100
--
.../dozer/CamelToDozerClassResolverAdapter.java | 46 ---
.../dozer/DozerThreadContextClassLoader.java| 83
.../converter/dozer/DozerTypeConverter.java | 23 +-
.../dozer/DozerTypeConverterLoader.java | 28 +--
4 files changed, 126 insertions(+), 54 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/cfdf1854/components/camel-dozer/src/main/java/org/apache/camel/converter/dozer/CamelToDozerClassResolverAdapter.java
--
diff --git
a/components/camel-dozer/src/main/java/org/apache/camel/converter/dozer/CamelToDozerClassResolverAdapter.java
b/components/camel-dozer/src/main/java/org/apache/camel/converter/dozer/CamelToDozerClassResolverAdapter.java
deleted file mode 100644
index ad913d1..000
---
a/components/camel-dozer/src/main/java/org/apache/camel/converter/dozer/CamelToDozerClassResolverAdapter.java
+++ /dev/null
@@ -1,46 +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.converter.dozer;
-
-import java.net.URL;
-
-import org.apache.camel.CamelContext;
-import org.apache.camel.impl.DefaultClassResolver;
-import org.apache.camel.spi.ClassResolver;
-import org.dozer.util.DozerClassLoader;
-
-public final class CamelToDozerClassResolverAdapter implements
DozerClassLoader {
-
-private final ClassResolver classResolver;
-
-public CamelToDozerClassResolverAdapter() {
-// must have a default nor-arg constructor to allow Dozer to work with
OSGi
-classResolver = new DefaultClassResolver();
-}
-
-public CamelToDozerClassResolverAdapter(CamelContext camelContext) {
-classResolver = camelContext.getClassResolver();
-}
-
-public Class loadClass(String name) {
-return classResolver.resolveClass(name);
-}
-
-public URL loadResource(String name) {
-return DozerTypeConverterLoader.loadMappingFile(classResolver, name);
-}
-}
http://git-wip-us.apache.org/repos/asf/camel/blob/cfdf1854/components/camel-dozer/src/main/java/org/apache/camel/converter/dozer/DozerThreadContextClassLoader.java
--
diff --git
a/components/camel-dozer/src/main/java/org/apache/camel/converter/dozer/DozerThreadContextClassLoader.java
b/components/camel-dozer/src/main/java/org/apache/camel/converter/dozer/DozerThreadContextClassLoader.java
new file mode 100644
index 000..e5d89e1
--- /dev/null
+++
b/components/camel-dozer/src/main/java/org/apache/camel/converter/dozer/DozerThreadContextClassLoader.java
@@ -0,0 +1,83 @@
+/**
+ * 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.converter.dozer;
+
+import java.net.MalformedURLException;
+import java.net.UR
Git Push Summary
Repository: camel Updated Branches: refs/heads/fix/CAMEL-8689-camel-dozer-classloading-issue [deleted] bf7e94fcb
[4/5] camel git commit: CAMEL-8689 Backport fix to 2.15.x.
CAMEL-8689 Backport fix to 2.15.x.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c0896f8a
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c0896f8a
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c0896f8a
Branch: refs/heads/camel-2.15.x
Commit: c0896f8a4cbbf89ecb9d4876aa4a34fe786d4dfb
Parents: cfcf4e6
Author: Raul Kripalani
Authored: Mon May 4 18:10:57 2015 +0100
Committer: Raul Kripalani
Committed: Mon May 4 18:14:55 2015 +0100
--
.../dozer/CamelToDozerClassResolverAdapter.java | 46 ---
.../dozer/DozerThreadContextClassLoader.java| 83
.../converter/dozer/DozerTypeConverter.java | 23 +-
.../dozer/DozerTypeConverterLoader.java | 28 +--
4 files changed, 126 insertions(+), 54 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/c0896f8a/components/camel-dozer/src/main/java/org/apache/camel/converter/dozer/CamelToDozerClassResolverAdapter.java
--
diff --git
a/components/camel-dozer/src/main/java/org/apache/camel/converter/dozer/CamelToDozerClassResolverAdapter.java
b/components/camel-dozer/src/main/java/org/apache/camel/converter/dozer/CamelToDozerClassResolverAdapter.java
deleted file mode 100644
index ad913d1..000
---
a/components/camel-dozer/src/main/java/org/apache/camel/converter/dozer/CamelToDozerClassResolverAdapter.java
+++ /dev/null
@@ -1,46 +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.converter.dozer;
-
-import java.net.URL;
-
-import org.apache.camel.CamelContext;
-import org.apache.camel.impl.DefaultClassResolver;
-import org.apache.camel.spi.ClassResolver;
-import org.dozer.util.DozerClassLoader;
-
-public final class CamelToDozerClassResolverAdapter implements
DozerClassLoader {
-
-private final ClassResolver classResolver;
-
-public CamelToDozerClassResolverAdapter() {
-// must have a default nor-arg constructor to allow Dozer to work with
OSGi
-classResolver = new DefaultClassResolver();
-}
-
-public CamelToDozerClassResolverAdapter(CamelContext camelContext) {
-classResolver = camelContext.getClassResolver();
-}
-
-public Class loadClass(String name) {
-return classResolver.resolveClass(name);
-}
-
-public URL loadResource(String name) {
-return DozerTypeConverterLoader.loadMappingFile(classResolver, name);
-}
-}
http://git-wip-us.apache.org/repos/asf/camel/blob/c0896f8a/components/camel-dozer/src/main/java/org/apache/camel/converter/dozer/DozerThreadContextClassLoader.java
--
diff --git
a/components/camel-dozer/src/main/java/org/apache/camel/converter/dozer/DozerThreadContextClassLoader.java
b/components/camel-dozer/src/main/java/org/apache/camel/converter/dozer/DozerThreadContextClassLoader.java
new file mode 100644
index 000..e5d89e1
--- /dev/null
+++
b/components/camel-dozer/src/main/java/org/apache/camel/converter/dozer/DozerThreadContextClassLoader.java
@@ -0,0 +1,83 @@
+/**
+ * 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.converter.dozer;
+
+import java.net.MalformedURLException;
+import java.
[1/5] camel git commit: CAMEL-8689 Fix Camel Dozer class loading issue when using multiple contexts with different classloaders.
Repository: camel
Updated Branches:
refs/heads/camel-2.14.x 1127a32f0 -> 08462c146
refs/heads/camel-2.15.x cfcf4e6a4 -> c0896f8a4
refs/heads/master e05a8da55 -> cfdf18542
CAMEL-8689 Fix Camel Dozer class loading issue when using multiple contexts
with different classloaders.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/87eebc6c
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/87eebc6c
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/87eebc6c
Branch: refs/heads/camel-2.14.x
Commit: 87eebc6c04f5364c6ebdab15e9c69efa40e5c5cd
Parents: 42de535
Author: Raul Kripalani
Authored: Thu Apr 23 13:46:35 2015 +0100
Committer: Raul Kripalani
Committed: Thu Apr 23 13:46:35 2015 +0100
--
.../dozer/CamelToDozerClassResolverAdapter.java | 46 ---
.../converter/dozer/DozerTypeConverter.java | 23 +-
.../dozer/DozerTypeConverterLoader.java | 28 +--
.../dozer/ThreadContextClassLoader.java | 83
4 files changed, 126 insertions(+), 54 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/87eebc6c/components/camel-dozer/src/main/java/org/apache/camel/converter/dozer/CamelToDozerClassResolverAdapter.java
--
diff --git
a/components/camel-dozer/src/main/java/org/apache/camel/converter/dozer/CamelToDozerClassResolverAdapter.java
b/components/camel-dozer/src/main/java/org/apache/camel/converter/dozer/CamelToDozerClassResolverAdapter.java
deleted file mode 100644
index ad913d1..000
---
a/components/camel-dozer/src/main/java/org/apache/camel/converter/dozer/CamelToDozerClassResolverAdapter.java
+++ /dev/null
@@ -1,46 +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.converter.dozer;
-
-import java.net.URL;
-
-import org.apache.camel.CamelContext;
-import org.apache.camel.impl.DefaultClassResolver;
-import org.apache.camel.spi.ClassResolver;
-import org.dozer.util.DozerClassLoader;
-
-public final class CamelToDozerClassResolverAdapter implements
DozerClassLoader {
-
-private final ClassResolver classResolver;
-
-public CamelToDozerClassResolverAdapter() {
-// must have a default nor-arg constructor to allow Dozer to work with
OSGi
-classResolver = new DefaultClassResolver();
-}
-
-public CamelToDozerClassResolverAdapter(CamelContext camelContext) {
-classResolver = camelContext.getClassResolver();
-}
-
-public Class loadClass(String name) {
-return classResolver.resolveClass(name);
-}
-
-public URL loadResource(String name) {
-return DozerTypeConverterLoader.loadMappingFile(classResolver, name);
-}
-}
http://git-wip-us.apache.org/repos/asf/camel/blob/87eebc6c/components/camel-dozer/src/main/java/org/apache/camel/converter/dozer/DozerTypeConverter.java
--
diff --git
a/components/camel-dozer/src/main/java/org/apache/camel/converter/dozer/DozerTypeConverter.java
b/components/camel-dozer/src/main/java/org/apache/camel/converter/dozer/DozerTypeConverter.java
index f1ab849..3bc6135 100644
---
a/components/camel-dozer/src/main/java/org/apache/camel/converter/dozer/DozerTypeConverter.java
+++
b/components/camel-dozer/src/main/java/org/apache/camel/converter/dozer/DozerTypeConverter.java
@@ -23,6 +23,8 @@ import org.apache.camel.TypeConverter;
import org.apache.camel.support.TypeConverterSupport;
import org.dozer.DozerBeanMapper;
import org.dozer.Mapper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* DozerTypeConverter is a standard {@link TypeConverter} that
@@ -36,6 +38,8 @@ import org.dozer.Mapper;
*/
public class DozerTypeConverter extends TypeConverterSupport {
+private static final Logger LOG =
LoggerFactory.getLogger(DozerTypeConverter.class);
+
private final DozerBeanMapper mapper;
public DozerTypeConverter(DozerBeanMapper mapper) {
@@ -48,6 +52,23 @@ public class DozerT
[2/5] camel git commit: CAMEL-8689 Camel Dozer classloading issue: minor adjustments for code quality/clarity.
CAMEL-8689 Camel Dozer classloading issue: minor adjustments for code
quality/clarity.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/bf7e94fc
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/bf7e94fc
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/bf7e94fc
Branch: refs/heads/camel-2.14.x
Commit: bf7e94fcb189760fd3c2d33376dce66c6f9273ee
Parents: 87eebc6
Author: Raul Kripalani
Authored: Thu Apr 23 15:40:41 2015 +0100
Committer: Raul Kripalani
Committed: Thu Apr 23 15:40:41 2015 +0100
--
.../dozer/DozerThreadContextClassLoader.java| 83
.../dozer/DozerTypeConverterLoader.java | 8 +-
.../dozer/ThreadContextClassLoader.java | 83
3 files changed, 87 insertions(+), 87 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/bf7e94fc/components/camel-dozer/src/main/java/org/apache/camel/converter/dozer/DozerThreadContextClassLoader.java
--
diff --git
a/components/camel-dozer/src/main/java/org/apache/camel/converter/dozer/DozerThreadContextClassLoader.java
b/components/camel-dozer/src/main/java/org/apache/camel/converter/dozer/DozerThreadContextClassLoader.java
new file mode 100644
index 000..e5d89e1
--- /dev/null
+++
b/components/camel-dozer/src/main/java/org/apache/camel/converter/dozer/DozerThreadContextClassLoader.java
@@ -0,0 +1,83 @@
+/**
+ * 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.converter.dozer;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+
+import org.apache.commons.lang3.ClassUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.dozer.util.DozerClassLoader;
+import org.dozer.util.MappingUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class DozerThreadContextClassLoader implements DozerClassLoader {
+
+private static final Logger LOG =
LoggerFactory.getLogger(DozerThreadContextClassLoader.class);
+
+private final DozerClassLoader delegate;
+
+public DozerThreadContextClassLoader(DozerClassLoader delegate) {
+this.delegate = delegate;
+}
+
+@Override
+public Class loadClass(String className) {
+LOG.debug("Loading class from classloader: {}.",
Thread.currentThread().getContextClassLoader());
+Class result = null;
+try {
+// try to resolve the class from the thread context classloader
+result =
ClassUtils.getClass(Thread.currentThread().getContextClassLoader(), className);
+} catch (ClassNotFoundException e) {
+// if unresolvable, ask the delegate
+result = delegate.loadClass(className);
+if (result == null) {
+MappingUtils.throwMappingException(e);
+}
+}
+return result;
+}
+
+@Override
+public URL loadResource(String uri) {
+LOG.debug("Loading resource from classloader: {}.",
Thread.currentThread().getContextClassLoader());
+URL answer =
Thread.currentThread().getContextClassLoader().getResource(uri);
+
+// try loading it from the delegate
+if (answer == null) {
+answer = delegate.loadResource(uri);
+}
+
+// try treating it as a system resource
+if (answer == null) {
+answer = ClassLoader.getSystemResource(uri);
+}
+
+// one more time in case it's a normal URI
+if (answer == null && StringUtils.contains(uri, ":")) {
+try {
+answer = new URL(uri);
+} catch (MalformedURLException e) {
+MappingUtils.throwMappingException(e);
+}
+}
+
+return answer;
+}
+
+}
http://git-wip-us.apache.org/repos/asf/camel/blob/bf7e94fc/components/camel-dozer/src/main/java/org/apache/camel/converter/dozer/DozerTypeConverterLoader.java
--
diff --git
a/components/c
camel git commit: CAMEL-8689 Camel Dozer classloading issue: minor adjustments for code quality/clarity.
Repository: camel
Updated Branches:
refs/heads/fix/CAMEL-8689-camel-dozer-classloading-issue 87eebc6c0 ->
bf7e94fcb
CAMEL-8689 Camel Dozer classloading issue: minor adjustments for code
quality/clarity.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/bf7e94fc
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/bf7e94fc
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/bf7e94fc
Branch: refs/heads/fix/CAMEL-8689-camel-dozer-classloading-issue
Commit: bf7e94fcb189760fd3c2d33376dce66c6f9273ee
Parents: 87eebc6
Author: Raul Kripalani
Authored: Thu Apr 23 15:40:41 2015 +0100
Committer: Raul Kripalani
Committed: Thu Apr 23 15:40:41 2015 +0100
--
.../dozer/DozerThreadContextClassLoader.java| 83
.../dozer/DozerTypeConverterLoader.java | 8 +-
.../dozer/ThreadContextClassLoader.java | 83
3 files changed, 87 insertions(+), 87 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/bf7e94fc/components/camel-dozer/src/main/java/org/apache/camel/converter/dozer/DozerThreadContextClassLoader.java
--
diff --git
a/components/camel-dozer/src/main/java/org/apache/camel/converter/dozer/DozerThreadContextClassLoader.java
b/components/camel-dozer/src/main/java/org/apache/camel/converter/dozer/DozerThreadContextClassLoader.java
new file mode 100644
index 000..e5d89e1
--- /dev/null
+++
b/components/camel-dozer/src/main/java/org/apache/camel/converter/dozer/DozerThreadContextClassLoader.java
@@ -0,0 +1,83 @@
+/**
+ * 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.converter.dozer;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+
+import org.apache.commons.lang3.ClassUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.dozer.util.DozerClassLoader;
+import org.dozer.util.MappingUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class DozerThreadContextClassLoader implements DozerClassLoader {
+
+private static final Logger LOG =
LoggerFactory.getLogger(DozerThreadContextClassLoader.class);
+
+private final DozerClassLoader delegate;
+
+public DozerThreadContextClassLoader(DozerClassLoader delegate) {
+this.delegate = delegate;
+}
+
+@Override
+public Class loadClass(String className) {
+LOG.debug("Loading class from classloader: {}.",
Thread.currentThread().getContextClassLoader());
+Class result = null;
+try {
+// try to resolve the class from the thread context classloader
+result =
ClassUtils.getClass(Thread.currentThread().getContextClassLoader(), className);
+} catch (ClassNotFoundException e) {
+// if unresolvable, ask the delegate
+result = delegate.loadClass(className);
+if (result == null) {
+MappingUtils.throwMappingException(e);
+}
+}
+return result;
+}
+
+@Override
+public URL loadResource(String uri) {
+LOG.debug("Loading resource from classloader: {}.",
Thread.currentThread().getContextClassLoader());
+URL answer =
Thread.currentThread().getContextClassLoader().getResource(uri);
+
+// try loading it from the delegate
+if (answer == null) {
+answer = delegate.loadResource(uri);
+}
+
+// try treating it as a system resource
+if (answer == null) {
+answer = ClassLoader.getSystemResource(uri);
+}
+
+// one more time in case it's a normal URI
+if (answer == null && StringUtils.contains(uri, ":")) {
+try {
+answer = new URL(uri);
+} catch (MalformedURLException e) {
+MappingUtils.throwMappingException(e);
+}
+}
+
+return answer;
+}
+
+}
http://git-wip-us.apache.org/repos/asf/camel/blob/bf7e94fc/components/camel-dozer/src/main/java/org/ap
camel git commit: CAMEL-8689 Fix Camel Dozer class loading issue when using multiple contexts with different classloaders.
Repository: camel
Updated Branches:
refs/heads/fix/CAMEL-8689-camel-dozer-classloading-issue [created] 87eebc6c0
CAMEL-8689 Fix Camel Dozer class loading issue when using multiple contexts
with different classloaders.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/87eebc6c
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/87eebc6c
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/87eebc6c
Branch: refs/heads/fix/CAMEL-8689-camel-dozer-classloading-issue
Commit: 87eebc6c04f5364c6ebdab15e9c69efa40e5c5cd
Parents: 42de535
Author: Raul Kripalani
Authored: Thu Apr 23 13:46:35 2015 +0100
Committer: Raul Kripalani
Committed: Thu Apr 23 13:46:35 2015 +0100
--
.../dozer/CamelToDozerClassResolverAdapter.java | 46 ---
.../converter/dozer/DozerTypeConverter.java | 23 +-
.../dozer/DozerTypeConverterLoader.java | 28 +--
.../dozer/ThreadContextClassLoader.java | 83
4 files changed, 126 insertions(+), 54 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/87eebc6c/components/camel-dozer/src/main/java/org/apache/camel/converter/dozer/CamelToDozerClassResolverAdapter.java
--
diff --git
a/components/camel-dozer/src/main/java/org/apache/camel/converter/dozer/CamelToDozerClassResolverAdapter.java
b/components/camel-dozer/src/main/java/org/apache/camel/converter/dozer/CamelToDozerClassResolverAdapter.java
deleted file mode 100644
index ad913d1..000
---
a/components/camel-dozer/src/main/java/org/apache/camel/converter/dozer/CamelToDozerClassResolverAdapter.java
+++ /dev/null
@@ -1,46 +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.converter.dozer;
-
-import java.net.URL;
-
-import org.apache.camel.CamelContext;
-import org.apache.camel.impl.DefaultClassResolver;
-import org.apache.camel.spi.ClassResolver;
-import org.dozer.util.DozerClassLoader;
-
-public final class CamelToDozerClassResolverAdapter implements
DozerClassLoader {
-
-private final ClassResolver classResolver;
-
-public CamelToDozerClassResolverAdapter() {
-// must have a default nor-arg constructor to allow Dozer to work with
OSGi
-classResolver = new DefaultClassResolver();
-}
-
-public CamelToDozerClassResolverAdapter(CamelContext camelContext) {
-classResolver = camelContext.getClassResolver();
-}
-
-public Class loadClass(String name) {
-return classResolver.resolveClass(name);
-}
-
-public URL loadResource(String name) {
-return DozerTypeConverterLoader.loadMappingFile(classResolver, name);
-}
-}
http://git-wip-us.apache.org/repos/asf/camel/blob/87eebc6c/components/camel-dozer/src/main/java/org/apache/camel/converter/dozer/DozerTypeConverter.java
--
diff --git
a/components/camel-dozer/src/main/java/org/apache/camel/converter/dozer/DozerTypeConverter.java
b/components/camel-dozer/src/main/java/org/apache/camel/converter/dozer/DozerTypeConverter.java
index f1ab849..3bc6135 100644
---
a/components/camel-dozer/src/main/java/org/apache/camel/converter/dozer/DozerTypeConverter.java
+++
b/components/camel-dozer/src/main/java/org/apache/camel/converter/dozer/DozerTypeConverter.java
@@ -23,6 +23,8 @@ import org.apache.camel.TypeConverter;
import org.apache.camel.support.TypeConverterSupport;
import org.dozer.DozerBeanMapper;
import org.dozer.Mapper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* DozerTypeConverter is a standard {@link TypeConverter} that
@@ -36,6 +38,8 @@ import org.dozer.Mapper;
*/
public class DozerTypeConverter extends TypeConverterSupport {
+private static final Logger LOG =
LoggerFactory.getLogger(DozerTypeConverter.class);
+
private final DozerBeanMapper mapper;
public DozerTypeConverter(DozerBeanMapper mapper) {
@@ -48,6 +52,23 @@ public class DozerTypeConverter extends TypeConv
Git Push Summary
Repository: camel Updated Branches: refs/heads/features/camel-xmljson-legal-license-compliance [deleted] 85fd23d8c
[2/4] camel git commit: WIP
WIP
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/8c97cad0
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/8c97cad0
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/8c97cad0
Branch: refs/heads/camel-hystrix
Commit: 8c97cad0e837d3e1bf4d1d38113b27bd8616f679
Parents: eab6bca
Author: Raul Kripalani
Authored: Sun Feb 16 17:36:45 2014 +
Committer: Raul Kripalani
Committed: Sun Feb 16 17:36:45 2014 +
--
.../camel/processor/CamelLogProcessor.java | 10 ++-
.../java/org/apache/camel/util/CamelLogger.java | 30
.../org/apache/camel/util/ObjectHelper.java | 27 ++
parent/pom.xml | 1 +
4 files changed, 61 insertions(+), 7 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/8c97cad0/camel-core/src/main/java/org/apache/camel/processor/CamelLogProcessor.java
--
diff --git
a/camel-core/src/main/java/org/apache/camel/processor/CamelLogProcessor.java
b/camel-core/src/main/java/org/apache/camel/processor/CamelLogProcessor.java
index 052d1e7..521ce9c 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/CamelLogProcessor.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/CamelLogProcessor.java
@@ -16,6 +16,8 @@
*/
package org.apache.camel.processor;
+import java.util.concurrent.Callable;
+
import org.apache.camel.AsyncCallback;
import org.apache.camel.AsyncProcessor;
import org.apache.camel.Exchange;
@@ -24,6 +26,7 @@ import org.apache.camel.Processor;
import org.apache.camel.spi.ExchangeFormatter;
import org.apache.camel.util.AsyncProcessorHelper;
import org.apache.camel.util.CamelLogger;
+import org.apache.camel.util.ObjectHelper;
/**
* A {@link Processor} which just logs to a {@link CamelLogger} object which
can be used
@@ -39,7 +42,12 @@ public class CamelLogProcessor implements AsyncProcessor {
private ExchangeFormatter formatter;
public CamelLogProcessor() {
-this(new CamelLogger(CamelLogProcessor.class.getName()));
+this(ObjectHelper.runWithClassLoader(null, new Callable()
{
+@Override
+public CamelLogger call() throws Exception {
+return new CamelLogger(CamelLogProcessor.class.getName());
+}
+}));
}
public CamelLogProcessor(CamelLogger log) {
http://git-wip-us.apache.org/repos/asf/camel/blob/8c97cad0/camel-core/src/main/java/org/apache/camel/util/CamelLogger.java
--
diff --git a/camel-core/src/main/java/org/apache/camel/util/CamelLogger.java
b/camel-core/src/main/java/org/apache/camel/util/CamelLogger.java
index 1787bd7..96773f0 100644
--- a/camel-core/src/main/java/org/apache/camel/util/CamelLogger.java
+++ b/camel-core/src/main/java/org/apache/camel/util/CamelLogger.java
@@ -16,6 +16,8 @@
*/
package org.apache.camel.util;
+import java.util.concurrent.Callable;
+
import org.apache.camel.LoggingLevel;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -36,7 +38,12 @@ public class CamelLogger {
private Marker marker;
public CamelLogger() {
-this(LoggerFactory.getLogger(CamelLogger.class));
+this(ObjectHelper.runWithClassLoader(null, new Callable() {
+@Override
+public Logger call() throws Exception {
+return LoggerFactory.getLogger(CamelLogger.class);
+}
+}));
}
public CamelLogger(Logger log) {
@@ -53,16 +60,27 @@ public class CamelLogger {
setMarker(marker);
}
-public CamelLogger(String logName) {
-this(LoggerFactory.getLogger(logName));
+public CamelLogger(final String logName) {
+this(ObjectHelper.runWithClassLoader(null, new Callable() {
+@Override
+public Logger call() throws Exception {
+return LoggerFactory.getLogger(logName);
+}
+}));
}
-public CamelLogger(String logName, LoggingLevel level) {
+public CamelLogger(final String logName, final LoggingLevel level) {
this(logName, level, null);
}
-public CamelLogger(String logName, LoggingLevel level, String marker) {
-this(LoggerFactory.getLogger(logName), level, marker);
+public CamelLogger(final String logName, final LoggingLevel level, final
String marker) {
+this(ObjectHelper.runWithClassLoader(null, new Callable() {
+@Override
+public Logger call() throws Exception {
+return LoggerFactory.getLogger(logName);
+}
+}), level, marker);
+
}
@Override
http://git-wip-us.apache.org/repos/asf/camel/blob/8c97c
[4/4] camel git commit: CAMEL-8514 camel-castor: change dep from SMX OSGi bundle to castor-xml (keeping versions). Thanks to Thomas Diesler.
CAMEL-8514 camel-castor: change dep from SMX OSGi bundle to castor-xml (keeping
versions). Thanks to Thomas Diesler.
This closes #441
Conflicts:
parent/pom.xml
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/51cf4226
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/51cf4226
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/51cf4226
Branch: refs/heads/camel-2.14.x
Commit: 51cf42260fc6e28ed4c98408b6ce0e71aa6efabb
Parents: 5a4e372
Author: Raul Kripalani
Authored: Thu Mar 19 14:05:39 2015 +
Committer: Raul Kripalani
Committed: Thu Mar 19 14:12:28 2015 +
--
components/camel-castor/pom.xml | 4 ++--
parent/pom.xml | 6 ++
2 files changed, 8 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/51cf4226/components/camel-castor/pom.xml
--
diff --git a/components/camel-castor/pom.xml b/components/camel-castor/pom.xml
index e0c77ca..290eac0 100644
--- a/components/camel-castor/pom.xml
+++ b/components/camel-castor/pom.xml
@@ -42,8 +42,8 @@
camel-core
-org.apache.servicemix.bundles
-org.apache.servicemix.bundles.castor
+org.codehaus.castor
+castor-xml
http://git-wip-us.apache.org/repos/asf/camel/blob/51cf4226/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index bed6b5f..9c7e6e9 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -74,6 +74,7 @@
1.8
0.9.1.2
camel-test-spring3
+1.3.2
1.3.2_2
1.2
2.1_3_7
@@ -1882,6 +1883,11 @@
+org.codehaus.castor
+castor-xml
+${castor-version}
+
+
org.apache.servicemix.bundles
org.apache.servicemix.bundles.castor
${castor-bundle-version}
Git Push Summary
Repository: camel Updated Branches: refs/heads/camel-hystrix [deleted] 8c97cad0e
[3/4] camel git commit: CAMEL-8514 camel-castor: change dep from SMX OSGi bundle to castor-xml (keeping versions). Thanks to Thomas Diesler.
CAMEL-8514 camel-castor: change dep from SMX OSGi bundle to castor-xml (keeping
versions). Thanks to Thomas Diesler.
This closes #441
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f8d1d999
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f8d1d999
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f8d1d999
Branch: refs/heads/master
Commit: f8d1d999f4b2a251979f647e55e4f9d604117598
Parents: 2144590
Author: Raul Kripalani
Authored: Thu Mar 19 14:05:39 2015 +
Committer: Raul Kripalani
Committed: Thu Mar 19 14:09:37 2015 +
--
components/camel-castor/pom.xml | 4 ++--
parent/pom.xml | 6 ++
2 files changed, 8 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/f8d1d999/components/camel-castor/pom.xml
--
diff --git a/components/camel-castor/pom.xml b/components/camel-castor/pom.xml
index 2fb143a..ce831bf 100644
--- a/components/camel-castor/pom.xml
+++ b/components/camel-castor/pom.xml
@@ -42,8 +42,8 @@
camel-core
-org.apache.servicemix.bundles
-org.apache.servicemix.bundles.castor
+org.codehaus.castor
+castor-xml
http://git-wip-us.apache.org/repos/asf/camel/blob/f8d1d999/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 557819f..7852cd6 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -82,6 +82,7 @@
16.0.1
2.1.2
2.0.2.2
+1.3.2
1.3.2_2
1.0
2.1_3_7
@@ -2109,6 +2110,11 @@
+org.codehaus.castor
+castor-xml
+${castor-version}
+
+
org.apache.servicemix.bundles
org.apache.servicemix.bundles.castor
${castor-bundle-version}
[1/4] camel git commit: WIP
Repository: camel
Updated Branches:
refs/heads/camel-2.14.x 5a4e3729b -> 51cf42260
refs/heads/camel-hystrix [created] 8c97cad0e
refs/heads/features/camel-xmljson-legal-license-compliance [created] 85fd23d8c
refs/heads/master 2144590dd -> f8d1d999f
WIP
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/eab6bcad
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/eab6bcad
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/eab6bcad
Branch: refs/heads/camel-hystrix
Commit: eab6bcad9d7c23f701672c6ea116c3ba3c5584c7
Parents: c1616bc
Author: Raul Kripalani
Authored: Sun Feb 16 17:36:07 2014 +
Committer: Raul Kripalani
Committed: Sun Feb 16 17:36:07 2014 +
--
components/camel-hystrix/pom.xml| 67 ++
.../camel/hystrix/CamelHystrixCommand.java | 21 ++
.../apache/camel/hystrix/HystrixComponent.java | 18 ++
.../apache/camel/hystrix/HystrixEndpoint.java | 29 +++
.../apache/camel/hystrix/HystrixPattern.java| 9 +
.../apache/camel/hystrix/HystrixProducer.java | 23 +++
.../src/main/resources/META-INF/LICENSE.txt | 203 +++
.../src/main/resources/META-INF/NOTICE.txt | 11 +
.../services/org/apache/camel/component/hystrix | 18 ++
.../org/apache/camel/rx/ObservableBodyTest.java | 81
.../apache/camel/rx/ObservableMessageTest.java | 78 +++
.../test/java/org/apache/camel/rx/Order.java| 42
.../java/org/apache/camel/rx/RxTestSupport.java | 46 +
.../java/org/apache/camel/rx/SendToTest.java| 41
.../apache/camel/rx/ToObservableAndMapTest.java | 60 ++
.../apache/camel/rx/ToObservableBodyTest.java | 72 +++
.../org/apache/camel/rx/ToObservableTest.java | 50 +
.../src/test/resources/log4j.properties | 36
18 files changed, 905 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/eab6bcad/components/camel-hystrix/pom.xml
--
diff --git a/components/camel-hystrix/pom.xml b/components/camel-hystrix/pom.xml
new file mode 100644
index 000..4cb75bf
--- /dev/null
+++ b/components/camel-hystrix/pom.xml
@@ -0,0 +1,67 @@
+
+
+http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+ 4.0.0
+
+
+org.apache.camel
+components
+2.13-SNAPSHOT
+
+
+ camel-hystrix
+ bundle
+ Camel :: Hystrix
+ Camel Hystrix support
+
+
+org.apache.camel.hystrix.*
+
+
+
+
+
+ org.apache.camel
+ camel-core
+
+
+
+ com.netflix.hystrix
+ hystrix-core
+ ${hystrix-version}
+
+
+
+
+ org.apache.camel
+ camel-test
+ test
+
+
+ org.slf4j
+ slf4j-log4j12
+ test
+
+
+ junit
+ junit
+ test
+
+
+
+
http://git-wip-us.apache.org/repos/asf/camel/blob/eab6bcad/components/camel-hystrix/src/main/java/org/apache/camel/hystrix/CamelHystrixCommand.java
--
diff --git
a/components/camel-hystrix/src/main/java/org/apache/camel/hystrix/CamelHystrixCommand.java
b/components/camel-hystrix/src/main/java/org/apache/camel/hystrix/CamelHystrixCommand.java
new file mode 100644
index 000..11a86fa
--- /dev/null
+++
b/components/camel-hystrix/src/main/java/org/apache/camel/hystrix/CamelHystrixCommand.java
@@ -0,0 +1,21 @@
+package org.apache.camel.hystrix;
+
+import org.apache.camel.Exchange;
+
+import com.netflix.hystrix.HystrixCommand;
+
+public class CamelHystrixCommand extends HystrixCommand {
+
+protected CamelHystrixCommand(Setter setter) {
+super(setter);
+}
+
+@Override
+protected Exchange run() throws Exception {
+// TODO Auto-generated method stub
+return null;
+}
+
+
+
+}
http://git-wip-us.apache.org/repos/asf/camel/blob/eab6bcad/components/camel-hystrix/src/main/java/org/apache/camel/hystrix/HystrixComponent.java
--
diff --git
a/components/camel-hystrix/src/main/java/org/apache/camel/hystrix/HystrixComponent.java
b/components/camel-hystrix/src/main/java/org/apache/camel/hystrix/HystrixComponent.java
new file mode 100644
index 000..5ebae5c
--- /dev/null
+++
b/components/camel-hystrix/src/main/java/org/apache/camel/hystrix/HystrixComponent.java
@@ -0,0 +1,18 @@
+package org.apache.camel.hystrix;
+
+import java.util.Map;
+
+import org.apache.camel.Endpoint;
+import org.apache.camel.impl.DefaultComponent;
+
+public class HystrixComponent extends DefaultComponent {
+
+@Override
+protected Endpoint createEndpoint(String uri, String remaining,
Map para
