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/09/28 07:10:49 UTC
[1/2] camel git commit: Add camel-master karaf feature
Repository: camel
Updated Branches:
refs/heads/master dec7238a6 -> 20de42cfa
Add camel-master karaf feature
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/ad670ec5
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ad670ec5
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ad670ec5
Branch: refs/heads/master
Commit: ad670ec5cd7ace3085600bdc2c884c9c8cb602be
Parents: dec7238
Author: Claus Ibsen <da...@apache.org>
Authored: Thu Sep 28 09:07:51 2017 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Sep 28 09:07:51 2017 +0200
----------------------------------------------------------------------
.../features/src/main/resources/features.xml | 4 +++
.../camel/itest/karaf/CamelMasterTest.java | 33 ++++++++++++++++++++
2 files changed, 37 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/ad670ec5/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 2748419..d7ecb20 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -1402,6 +1402,10 @@
<bundle dependency='true'>mvn:com.sun.mail/javax.mail/${javax-mail-version}</bundle>
<bundle>mvn:org.apache.camel/camel-mail/${project.version}</bundle>
</feature>
+ <feature name='camel-master' version='${project.version}' resolver='(obr)' start-level='50'>
+ <feature version='${project.version}'>camel-core</feature>
+ <bundle>mvn:org.apache.camel/camel-master/${project.version}</bundle>
+ </feature>
<feature name='camel-metrics' version='${project.version}' resolver='(obr)' start-level='50'>
<feature version='${project.version}'>camel-core</feature>
<bundle dependency='true'>mvn:io.dropwizard.metrics/metrics-core/${metrics-version}</bundle>
http://git-wip-us.apache.org/repos/asf/camel/blob/ad670ec5/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMasterTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMasterTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMasterTest.java
new file mode 100644
index 0000000..af427a2
--- /dev/null
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMasterTest.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 CamelMasterTest extends BaseKarafTest {
+
+ public static final String COMPONENT = extractName(CamelMasterTest.class);
+
+ @Test
+ public void test() throws Exception {
+ testComponent(COMPONENT);
+ }
+
+}
[2/2] camel git commit: Polish pom.xml
Posted by da...@apache.org.
Polish pom.xml
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/20de42cf
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/20de42cf
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/20de42cf
Branch: refs/heads/master
Commit: 20de42cfad5264063741281b608612a636a5e068
Parents: ad670ec
Author: Claus Ibsen <da...@apache.org>
Authored: Thu Sep 28 09:10:38 2017 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Sep 28 09:10:38 2017 +0200
----------------------------------------------------------------------
components/camel-master/pom.xml | 11 +++--------
1 file changed, 3 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/20de42cf/components/camel-master/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-master/pom.xml b/components/camel-master/pom.xml
index f103c8e..e9fda30 100644
--- a/components/camel-master/pom.xml
+++ b/components/camel-master/pom.xml
@@ -17,7 +17,8 @@
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -33,13 +34,7 @@
<description>Camel Master Support</description>
<properties>
- <camel.osgi.import>
- !org.apache.camel.component.master,
- *
- </camel.osgi.import>
- <camel.osgi.export.pkg>
- org.apache.camel.component.master
- </camel.osgi.export.pkg>
+ <camel.osgi.export.pkg>org.apache.camel.component.master</camel.osgi.export.pkg>
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=master</camel.osgi.export.service>
</properties>