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 2014/12/23 13:22:17 UTC
camel git commit: Added karaf features for the new components.
Repository: camel
Updated Branches:
refs/heads/master 720a3e287 -> 06449f471
Added karaf features for the new components.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/06449f47
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/06449f47
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/06449f47
Branch: refs/heads/master
Commit: 06449f471fb701fe36fcb8d52950cbea95460543
Parents: 720a3e2
Author: Claus Ibsen <da...@apache.org>
Authored: Tue Dec 23 13:22:08 2014 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Dec 23 13:22:08 2014 +0100
----------------------------------------------------------------------
.../services/org/apache/camel/component/pgevent | 2 +-
parent/pom.xml | 1 +
.../features/src/main/resources/features.xml | 25 +++++++++++-
.../camel/itest/karaf/CamelCassandraqlTest.java | 40 ++++++++++++++++++++
.../camel/itest/karaf/CamelPgeventTest.java | 40 ++++++++++++++++++++
5 files changed, 105 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/06449f47/components/camel-pgevent/src/main/resources/META-INF/services/org/apache/camel/component/pgevent
----------------------------------------------------------------------
diff --git a/components/camel-pgevent/src/main/resources/META-INF/services/org/apache/camel/component/pgevent b/components/camel-pgevent/src/main/resources/META-INF/services/org/apache/camel/component/pgevent
index d7f7925..216f63c 100644
--- a/components/camel-pgevent/src/main/resources/META-INF/services/org/apache/camel/component/pgevent
+++ b/components/camel-pgevent/src/main/resources/META-INF/services/org/apache/camel/component/pgevent
@@ -15,4 +15,4 @@
# limitations under the License.
#
-class=org.apache.camel.pgevent.PgEventComponent
+class=org.apache.camel.component.pgevent.PgEventComponent
http://git-wip-us.apache.org/repos/asf/camel/blob/06449f47/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 2c229d9..ba7ed31 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -76,6 +76,7 @@
<c3p0-version>0.9.1.2</c3p0-version>
<camel-test-spring-artifactId>camel-test-spring</camel-test-spring-artifactId>
<cassandra-driver-version>2.1.2</cassandra-driver-version>
+ <cassandra-driver-guava-version>16.0.1</cassandra-driver-guava-version>
<cassandra-version>2.1.2</cassandra-version>
<cassandra-unit-version>2.0.2.2</cassandra-unit-version>
<castor-bundle-version>1.3.2_2</castor-bundle-version>
http://git-wip-us.apache.org/repos/asf/camel/blob/06449f47/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 6e04c54..b5ab99b 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -204,9 +204,8 @@
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.bcel/${bcel-bundle-version}</bundle>
<bundle dependency='true'>mvn:commons-collections/commons-collections/${commons-collections-version}</bundle>
<bundle dependency='true'>wrap:mvn:net.sourceforge.nekohtml/nekohtml/1.9.21</bundle>
-
<feature>jetty</feature>
-</feature>
+ </feature>
<feature name='camel-cache' version='${project.version}' resolver='(obr)' start-level='50'>
<feature version='${project.version}'>camel-core</feature>
<feature>transaction</feature>
@@ -214,6 +213,18 @@
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/${jdom-bundle-version}</bundle>
<bundle>mvn:org.apache.camel/camel-cache/${project.version}</bundle>
</feature>
+ <feature name='camel-cassandraql' version='${project.version}' resolver='(obr)' start-level='50'>
+ <feature version='${project.version}'>camel-core</feature>
+ <bundle dependency='true'>mvn:com.google.guava/guava/${cassandra-driver-guava-version}</bundle>
+ <bundle dependency='true'>mvn:io.netty/netty/${netty3-version}</bundle>
+ <bundle dependency='true'>mvn:io.dropwizard.metrics/metrics-core/${metrics-version}</bundle>
+ <bundle dependency='true'>mvn:io.dropwizard.metrics/metrics-json/${metrics-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 dependency='true'>mvn:com.datastax.cassandra/cassandra-driver-core/${cassandra-driver-version}</bundle>
+ <bundle>mvn:org.apache.camel/camel-cassandraql/${project.version}</bundle>
+ </feature>
<feature name='camel-castor' 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.oro/${oro-bundle-version}</bundle>
@@ -1037,6 +1048,16 @@
<feature version='${project.version}'>camel-core</feature>
<bundle>mvn:org.apache.camel/camel-paxlogging/${project.version}</bundle>
</feature>
+ <feature name='camel-pgevent' version='${project.version}' resolver='(obr)' start-level='50'>
+ <feature version='${project.version}'>camel-core</feature>
+ <bundle>mvn:com.impossibl.pgjdbc-ng/pgjdbc-ng/${pgjdbc-ng-driver-version}</bundle>
+ <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>mvn:org.apache.camel/camel-pgevent/${project.version}</bundle>
+ </feature>
<feature name='camel-printer' version='${project.version}' resolver='(obr)' start-level='50'>
<feature version='${project.version}'>camel-core</feature>
<bundle>mvn:org.apache.camel/camel-printer/${project.version}</bundle>
http://git-wip-us.apache.org/repos/asf/camel/blob/06449f47/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCassandraqlTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCassandraqlTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCassandraqlTest.java
new file mode 100644
index 0000000..32be3f6
--- /dev/null
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCassandraqlTest.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 CamelCassandraqlTest extends AbstractFeatureTest {
+
+ public static final String COMPONENT = extractName(CamelCassandraqlTest.class);
+
+ @Test
+ public void test() throws Exception {
+ testComponent("cql");
+ }
+
+ @Configuration
+ public static Option[] configure() {
+ return configure(COMPONENT);
+ }
+
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/06449f47/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelPgeventTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelPgeventTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelPgeventTest.java
new file mode 100644
index 0000000..56e0599
--- /dev/null
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelPgeventTest.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 CamelPgeventTest extends AbstractFeatureTest {
+
+ public static final String COMPONENT = extractName(CamelPgeventTest.class);
+
+ @Test
+ public void test() throws Exception {
+ testComponent(COMPONENT);
+ }
+
+ @Configuration
+ public static Option[] configure() {
+ return configure(COMPONENT);
+ }
+
+}
\ No newline at end of file