You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2014/09/01 16:21:38 UTC
[1/3] git commit: Added karaf feature test for new added component
Repository: camel
Updated Branches:
refs/heads/master b3377b16d -> 43e66e47d
Added karaf feature test for new added component
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/3def77a4
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/3def77a4
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/3def77a4
Branch: refs/heads/master
Commit: 3def77a48ae14ecc3f285f61d5da268ce26f9390
Parents: 5b71570
Author: Willem Jiang <wi...@gmail.com>
Authored: Mon Sep 1 21:59:40 2014 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Mon Sep 1 22:20:51 2014 +0800
----------------------------------------------------------------------
.../features/src/main/resources/features.xml | 10 +++++
.../camel/itest/karaf/CamelBarcodeTest.java | 47 ++++++++++++++++++++
.../apache/camel/itest/karaf/CamelBoxTest.java | 40 +++++++++++++++++
.../camel/itest/karaf/CamelNetty4Test.java | 40 +++++++++++++++++
4 files changed, 137 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/3def77a4/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 f4da7c3..3589167 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -876,6 +876,16 @@
<feature version='${project.version}'>camel-netty</feature>
<bundle>mvn:org.apache.camel/camel-netty-http/${project.version}</bundle>
</feature>
+ <feature name='camel-netty4' version='${project.version}' resolver='(obr)' start-level='50'>
+ <feature version='${project.version}'>camel-core</feature>
+ <bundle dependency='true'>mvn:io.netty/netty-common/${netty-version}</bundle>
+ <bundle dependency='true'>mvn:io.netty/netty-transport/${netty-version}</bundle>
+ <bundle dependency='true'>mvn:io.netty/netty-buffer/${netty-version}</bundle>
+ <bundle dependency='true'>mvn:io.netty/netty-handler/${netty-version}</bundle>
+ <bundle dependency='true'>mvn:io.netty/netty-codec/${netty-version}</bundle>
+ <bundle dependency='true'>mvn:commons-pool/commons-pool/${commons-pool-version}</bundle>
+ <bundle>mvn:org.apache.camel/camel-netty4/${project.version}</bundle>
+ </feature>
<feature name='camel-ognl' 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.ognl/${ognl-version}</bundle>
http://git-wip-us.apache.org/repos/asf/camel/blob/3def77a4/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBarcodeTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBarcodeTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBarcodeTest.java
new file mode 100644
index 0000000..e98e006
--- /dev/null
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBarcodeTest.java
@@ -0,0 +1,47 @@
+/**
+ * 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.apache.camel.model.DataFormatDefinition;
+import org.apache.camel.model.dataformat.BarcodeDataFormat;
+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)
+public class CamelBarcodeTest extends AbstractFeatureTest {
+
+ public static final String COMPONENT = extractName(CamelBarcodeTest.class);
+
+ protected DataFormatDefinition createDataformatDefinition(String format) {
+ BarcodeDataFormat dataformate = new BarcodeDataFormat();
+ return dataformate;
+ }
+
+ @Test
+ public void test() throws Exception {
+ testDataFormat(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/3def77a4/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBoxTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBoxTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBoxTest.java
new file mode 100644
index 0000000..c88e2bc
--- /dev/null
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBoxTest.java
@@ -0,0 +1,40 @@
+/**
+ * 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.Configuration;
+import org.ops4j.pax.exam.Option;
+import org.ops4j.pax.exam.junit.PaxExam;
+
+@RunWith(PaxExam.class)
+public class CamelBoxTest extends AbstractFeatureTest {
+
+ public static final String COMPONENT = extractName(CamelBoxTest.class);
+
+ @Test
+ public void test() throws Exception {
+ 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/3def77a4/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelNetty4Test.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelNetty4Test.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelNetty4Test.java
new file mode 100644
index 0000000..438cf8e
--- /dev/null
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelNetty4Test.java
@@ -0,0 +1,40 @@
+/**
+ * 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.Configuration;
+import org.ops4j.pax.exam.Option;
+import org.ops4j.pax.exam.junit.PaxExam;
+
+@RunWith(PaxExam.class)
+public class CamelNetty4Test extends AbstractFeatureTest {
+
+ public static final String COMPONENT = extractName(CamelNetty4Test.class);
+
+ @Test
+ public void test() throws Exception {
+ testComponent(COMPONENT);
+ }
+
+ @Configuration
+ public static Option[] configure() {
+ return configure(COMPONENT);
+ }
+
+}
\ No newline at end of file
[3/3] git commit: Fixed the camel-box feature validate issue
Posted by ni...@apache.org.
Fixed the camel-box feature validate issue
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/43e66e47
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/43e66e47
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/43e66e47
Branch: refs/heads/master
Commit: 43e66e47d345766f8b73201dbf0b3877a2e21e8c
Parents: 3def77a
Author: Willem Jiang <wi...@gmail.com>
Authored: Mon Sep 1 22:19:30 2014 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Mon Sep 1 22:20:52 2014 +0800
----------------------------------------------------------------------
platforms/karaf/features/src/main/resources/features.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/43e66e47/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 3589167..36c54d3 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -190,8 +190,8 @@
<bundle dependency='true'>wrap:mvn:net.sourceforge.cssparser/cssparser/0.9.14</bundle>
<bundle dependency='true'>wrap:mvn:org.w3c.css/sac/1.3</bundle>
<bundle dependency='true'>mvn:commons-codec/commons-codec/${commons-codec-version}</bundle>
+ <!-- These bundles are endorse lib in karaf
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xalan/${xalan-bundle-version}</bundle>
- <!--
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xerces/${xerces-bundle-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlresolver/${xmlresolver-bundle-version}</bundle>
-->
[2/3] git commit: camel-swagger should only work with scala 2.10.x
Posted by ni...@apache.org.
camel-swagger should only work with scala 2.10.x
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/5b715700
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/5b715700
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/5b715700
Branch: refs/heads/master
Commit: 5b715700cad104699f2d7eabea542a99ea944207
Parents: b3377b1
Author: Willem Jiang <wi...@gmail.com>
Authored: Mon Sep 1 21:52:55 2014 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Mon Sep 1 22:20:51 2014 +0800
----------------------------------------------------------------------
components/camel-swagger/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/5b715700/components/camel-swagger/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-swagger/pom.xml b/components/camel-swagger/pom.xml
index f78defa..c28492d 100644
--- a/components/camel-swagger/pom.xml
+++ b/components/camel-swagger/pom.xml
@@ -32,7 +32,7 @@
<properties>
<camel.osgi.import.before.defaults>
- scala.*;version="[2.10,2.12)"
+ scala.*;version="[2.10,2.11)"
</camel.osgi.import.before.defaults>
<camel.osgi.export.pkg>org.apache.camel.component.swagger.*</camel.osgi.export.pkg>
</properties>