You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2016/06/17 08:17:35 UTC

[3/3] camel git commit: CAMEL-10061: Add JSON Johnzon DataFormat - Added Karaf feature and test

CAMEL-10061: Add JSON Johnzon DataFormat - Added Karaf feature and test


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

Branch: refs/heads/master
Commit: d30d78429ca367f2dbbb64d7a31463d2312d5b67
Parents: bcd145a
Author: Andrea Cosentino <an...@gmail.com>
Authored: Fri Jun 17 09:55:23 2016 +0200
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Fri Jun 17 09:55:23 2016 +0200

----------------------------------------------------------------------
 .../features/src/main/resources/features.xml    |  7 ++++
 .../camel/itest/karaf/CamelJohnzonTest.java     | 34 ++++++++++++++++++++
 2 files changed, 41 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/d30d7842/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 3b85470..c0ef0a1 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -941,6 +941,13 @@
     <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.bazaarvoice-jolt/${jolt-bundle-version}</bundle>
     <bundle>mvn:org.apache.camel/camel-jolt/${project.version}</bundle>
   </feature>
+  <feature name='camel-johnzon' version='${project.version}' resolver='(obr)' start-level='50'>
+    <feature version='${project.version}'>camel-core</feature>
+    <bundle dependency='true'>mvn:org.apache.johnzon/johnzon-core/${johnzon-version}</bundle>
+    <bundle dependency='true'>mvn:org.apache.johnzon/johnzon-mapper/${johnzon-version}</bundle>
+    <bundle dependency='true'>mvn:org.apache.geronimo.specs/geronimo-json_1.0_spec/${geronimo-json-spec-version}</bundle>
+    <bundle>mvn:org.apache.camel/camel-johnzon/${project.version}</bundle>
+  </feature>
   <feature name='camel-josql' 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.josql/${josql-bundle-version}</bundle>

http://git-wip-us.apache.org/repos/asf/camel/blob/d30d7842/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJohnzonTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJohnzonTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJohnzonTest.java
new file mode 100644
index 0000000..af939be
--- /dev/null
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJohnzonTest.java
@@ -0,0 +1,34 @@
+/**
+ * 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 CamelJohnzonTest extends BaseKarafTest {
+
+    public static final String COMPONENT = extractName(CamelJohnzonTest.class);
+
+    @Test
+    public void test() throws Exception {
+        testDataFormat(COMPONENT, "json-johnzon");
+    }
+
+
+}
\ No newline at end of file