camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject [12/14] camel git commit: CAMEL-9799: Add karaf feature and test
Date Sat, 07 Oct 2017 08:59:40 GMT
CAMEL-9799: Add 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/a6172f80
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a6172f80
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a6172f80

Branch: refs/heads/master
Commit: a6172f807fb1d5fd8d7e36e73f7bbce57604aab8
Parents: 1fa64e6
Author: Claus Ibsen <davsclaus@apache.org>
Authored: Sat Oct 7 10:19:52 2017 +0200
Committer: Claus Ibsen <davsclaus@apache.org>
Committed: Sat Oct 7 10:19:52 2017 +0200

----------------------------------------------------------------------
 .../features/src/main/resources/features.xml    | 26 +++++++--------
 .../itest/karaf/CamelEveritJsonSchemaTest.java  | 33 --------------------
 .../itest/karaf/CamelJsonValidatorTest.java     | 33 ++++++++++++++++++++
 3 files changed, 46 insertions(+), 46 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/a6172f80/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 9fb3cee..39f2336 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -622,19 +622,6 @@
     <feature>eventadmin</feature>
     <bundle>mvn:org.apache.camel/camel-eventadmin/${project.version}</bundle>
   </feature>
-  <feature name='camel-everit-json-schema' version='${project.version}' resolver='(obr)'
start-level='50'>
-    <feature version='${project.version}'>camel-core</feature>
-    <bundle dependency='true'>mvn:com.github.everit-org.json-schema/org.everit.json.schema/${everit-org-json-schema-version}</bundle>
-    <bundle dependency='true'>mvn:org.json/json/20170516</bundle>
-    <bundle dependency='true'>mvn:com.damnhandy/handy-uri-templates/2.1.6</bundle>
-    <bundle dependency='true'>mvn:joda-time/joda-time/${jodatime2-bundle-version}</bundle>
-    <bundle dependency='true'>mvn:com.google.guava/guava/22.0</bundle>
-    <bundle dependency='true'>mvn:commons-collections/commons-collections/${commons-collections-version}</bundle>
-    <bundle dependency='true'>mvn:commons-validator/commons-validator/1.6</bundle>
-    <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-beanutils/${commons-beanutils-bundle-version}</bundle>
-    <bundle dependency='true'>mvn:commons-digester/commons-digester/${commons-digester-version}</bundle>
-    <bundle>mvn:org.apache.camel/camel-everit-json-schema/${project.version}</bundle>
-  </feature>
   <feature name='camel-exec' version='${project.version}' resolver='(obr)' start-level='50'>
     <feature version='${project.version}'>camel-core</feature>
     <bundle dependency='true'>mvn:org.apache.commons/commons-exec/${commons-exec-version}</bundle>
@@ -1238,6 +1225,19 @@
     <feature version='${project.version}'>camel-ftp</feature>
     <bundle>mvn:org.apache.camel/camel-jsch/${project.version}</bundle>
   </feature>
+  <feature name='camel-json-validator' version='${project.version}' resolver='(obr)' start-level='50'>
+    <feature version='${project.version}'>camel-core</feature>
+    <bundle dependency='true'>mvn:com.github.everit-org.json-schema/org.everit.json.schema/${everit-org-json-schema-version}</bundle>
+    <bundle dependency='true'>mvn:org.json/json/20170516</bundle>
+    <bundle dependency='true'>mvn:com.damnhandy/handy-uri-templates/2.1.6</bundle>
+    <bundle dependency='true'>mvn:joda-time/joda-time/${jodatime2-bundle-version}</bundle>
+    <bundle dependency='true'>mvn:com.google.guava/guava/22.0</bundle>
+    <bundle dependency='true'>mvn:commons-collections/commons-collections/${commons-collections-version}</bundle>
+    <bundle dependency='true'>mvn:commons-validator/commons-validator/1.6</bundle>
+    <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-beanutils/${commons-beanutils-bundle-version}</bundle>
+    <bundle dependency='true'>mvn:commons-digester/commons-digester/${commons-digester-version}</bundle>
+    <bundle>mvn:org.apache.camel/camel-json-validator/${project.version}</bundle>
+  </feature>
   <feature name='camel-jsonpath' version='${project.version}' resolver='(obr)' start-level='50'>
     <feature version='${project.version}'>camel-core</feature>
     <bundle>mvn:com.jayway.jsonpath/json-path/${json-path-version}</bundle>

http://git-wip-us.apache.org/repos/asf/camel/blob/a6172f80/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelEveritJsonSchemaTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelEveritJsonSchemaTest.java
b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelEveritJsonSchemaTest.java
deleted file mode 100644
index 7288b55..0000000
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelEveritJsonSchemaTest.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.itest.karaf;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.junit.PaxExam;
-
-@RunWith(PaxExam.class)
-public class CamelEveritJsonSchemaTest extends BaseKarafTest {
-
-    public static final String COMPONENT = "json-validator";
-
-    @Test
-    public void test() throws Exception {
-        testComponent("camel-everit-json-schema", COMPONENT);
-    }
-
-}
\ No newline at end of file

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


Mime
View raw message