You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2017/06/02 12:40:54 UTC
camel git commit: CAMEL-11373: Add camel-twilio Karaf feature and
update doc
Repository: camel
Updated Branches:
refs/heads/master 5c8fd80ad -> e9996b21b
CAMEL-11373: Add camel-twilio Karaf feature and update doc
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/e9996b21
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/e9996b21
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/e9996b21
Branch: refs/heads/master
Commit: e9996b21b0117967852e15504f22583640115199
Parents: 5c8fd80
Author: Tadayoshi Sato <sa...@gmail.com>
Authored: Fri Jun 2 21:34:46 2017 +0900
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Jun 2 14:40:48 2017 +0200
----------------------------------------------------------------------
.../camel/component/twilio/TwilioEndpoint.java | 2 +-
components/readme.adoc | 2 +-
.../features/src/main/resources/features.xml | 9 ++++++
.../camel/itest/karaf/CamelTwilioTest.java | 33 ++++++++++++++++++++
4 files changed, 44 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/e9996b21/components/camel-twilio/src/main/java/org/apache/camel/component/twilio/TwilioEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-twilio/src/main/java/org/apache/camel/component/twilio/TwilioEndpoint.java b/components/camel-twilio/src/main/java/org/apache/camel/component/twilio/TwilioEndpoint.java
index 83c4d28..0df521b 100644
--- a/components/camel-twilio/src/main/java/org/apache/camel/component/twilio/TwilioEndpoint.java
+++ b/components/camel-twilio/src/main/java/org/apache/camel/component/twilio/TwilioEndpoint.java
@@ -39,7 +39,7 @@ import org.apache.camel.util.component.ApiMethod;
import org.apache.camel.util.component.ApiMethodPropertiesHelper;
/**
- * Represents a Twilio endpoint.
+ * The Twilio component allows you to interact with the Twilio REST APIs using Twilio Java SDK.
*/
@UriEndpoint(firstVersion = "2.20.0", scheme = "twilio", title = "Twilio", syntax = "twilio:apiName/methodName",
consumerClass = TwilioConsumer.class, label = "api,messaging,cloud")
http://git-wip-us.apache.org/repos/asf/camel/blob/e9996b21/components/readme.adoc
----------------------------------------------------------------------
diff --git a/components/readme.adoc b/components/readme.adoc
index 2b69cbf..efb0aa0 100644
--- a/components/readme.adoc
+++ b/components/readme.adoc
@@ -744,7 +744,7 @@ Number of Components: 266 in 186 JAR artifacts (16 deprecated)
`timer:timerName` | 1.0 | The timer component is used for generating message exchanges when a timer fires.
| link:camel-twilio/src/main/docs/twilio-component.adoc[Twilio] (camel-twilio) +
-`twilio:apiName/methodName` | 2.20 | Represents a Twilio endpoint.
+`twilio:apiName/methodName` | 2.20 | The Twilio component allows you to interact with the Twilio REST APIs using Twilio Java SDK.
| link:camel-twitter/src/main/docs/twitter-component.adoc[Twitter] (camel-twitter) +
`twitter:kind` | 2.10 | *deprecated* Use twitter-directmessage twitter-search twitter-streaming and twitter-timeline instead of this component.
http://git-wip-us.apache.org/repos/asf/camel/blob/e9996b21/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 677fd9a..6d556d2 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -1959,6 +1959,15 @@
<feature version='${project.version}'>camel-core</feature>
<bundle>mvn:org.apache.camel/camel-tika/${project.version}</bundle>
</feature>
+ <feature name='camel-twilio' version='${project.version}' resolver='(obr)' start-level='50'>
+ <feature version='${project.version}'>camel-core</feature>
+ <bundle dependency='true'>wrap:mvn:com.twilio.sdk/twilio/${twilio-version}</bundle>
+ <bundle dependency='true'>mvn:joda-time/joda-time/${jodatime2-bundle-version}</bundle>
+ <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-core/${jackson2-version}</bundle>
+ <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-databind/${jackson2-version}</bundle>
+ <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson2-version}</bundle>
+ <bundle>mvn:org.apache.camel/camel-twilio/${project.version}</bundle>
+ </feature>
<feature name='camel-twitter' version='${project.version}' resolver='(obr)' start-level='50'>
<feature version='${project.version}'>camel-core</feature>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.twitter4j/${twitter4j-bundle-version}</bundle>
http://git-wip-us.apache.org/repos/asf/camel/blob/e9996b21/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelTwilioTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelTwilioTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelTwilioTest.java
new file mode 100644
index 0000000..b67178f
--- /dev/null
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelTwilioTest.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.itest.karaf;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.junit.PaxExam;
+
+@RunWith(PaxExam.class)
+public class CamelTwilioTest extends BaseKarafTest {
+
+ public static final String COMPONENT = extractName(CamelTwilioTest.class);
+
+ @Test
+ public void test() throws Exception {
+ testComponent(COMPONENT);
+ }
+
+}