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/23 14:28:53 UTC
[1/4] git commit: CAMEL-7852 Fixed the issue that camel-msv component
cannot be resolved in OSGi
Repository: camel
Updated Branches:
refs/heads/camel-2.12.x 46efbb671 -> 2809e89cb
refs/heads/camel-2.13.x 61867a060 -> 2b1296e77
refs/heads/camel-2.14.x f7bbcea7f -> 1772cecdf
CAMEL-7852 Fixed the issue that camel-msv component cannot be resolved in OSGi
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c2953e02
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c2953e02
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c2953e02
Branch: refs/heads/camel-2.14.x
Commit: c2953e0214b6d3d81cd1882a608461369e1929fe
Parents: f7bbcea
Author: Willem Jiang <wi...@gmail.com>
Authored: Tue Sep 23 20:16:47 2014 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Tue Sep 23 20:19:45 2014 +0800
----------------------------------------------------------------------
components/camel-msv/pom.xml | 1 +
.../src/test/java/org/apache/camel/itest/karaf/CamelMsvTest.java | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/c2953e02/components/camel-msv/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-msv/pom.xml b/components/camel-msv/pom.xml
index 6fc923a..ba51f2e 100644
--- a/components/camel-msv/pom.xml
+++ b/components/camel-msv/pom.xml
@@ -31,6 +31,7 @@
<properties>
<camel.osgi.export.pkg>org.apache.camel.component.validator.msv.*</camel.osgi.export.pkg>
+ <camel.osgi.import.pkg>org.apache.camel,*</camel.osgi.import.pkg>
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=msv</camel.osgi.export.service>
</properties>
http://git-wip-us.apache.org/repos/asf/camel/blob/c2953e02/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMsvTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMsvTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMsvTest.java
index b79b96f..efffea4 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMsvTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMsvTest.java
@@ -24,13 +24,13 @@ import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)
-@Ignore("Fails for some unknown reason")
public class CamelMsvTest extends AbstractFeatureTest {
public static final String COMPONENT = extractName(CamelMsvTest.class);
@Test
public void test() throws Exception {
+ Thread.sleep(2000);
testComponent(COMPONENT);
}
[3/4] git commit: CAMEL-7852 Fixed the issue that camel-msv component
cannot be resolved in OSGi
Posted by ni...@apache.org.
CAMEL-7852 Fixed the issue that camel-msv component cannot be resolved in OSGi
Conflicts:
tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMsvTest.java
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/2b1296e7
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/2b1296e7
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/2b1296e7
Branch: refs/heads/camel-2.13.x
Commit: 2b1296e7758a1e0377e602796c1d8b23db745a94
Parents: 61867a0
Author: Willem Jiang <wi...@gmail.com>
Authored: Tue Sep 23 20:16:47 2014 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Tue Sep 23 20:27:29 2014 +0800
----------------------------------------------------------------------
components/camel-msv/pom.xml | 1 +
.../src/test/java/org/apache/camel/itest/karaf/CamelMsvTest.java | 4 +---
2 files changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/2b1296e7/components/camel-msv/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-msv/pom.xml b/components/camel-msv/pom.xml
index d7186e2..24a457a 100644
--- a/components/camel-msv/pom.xml
+++ b/components/camel-msv/pom.xml
@@ -31,6 +31,7 @@
<properties>
<camel.osgi.export.pkg>org.apache.camel.component.validator.msv.*</camel.osgi.export.pkg>
+ <camel.osgi.import.pkg>org.apache.camel,*</camel.osgi.import.pkg>
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=msv</camel.osgi.export.service>
</properties>
http://git-wip-us.apache.org/repos/asf/camel/blob/2b1296e7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMsvTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMsvTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMsvTest.java
index 08dbecb..007d927 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMsvTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMsvTest.java
@@ -16,7 +16,6 @@
*/
package org.apache.camel.itest.karaf;
-import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
@@ -24,7 +23,6 @@ import org.ops4j.pax.exam.junit.Configuration;
import org.ops4j.pax.exam.junit.JUnit4TestRunner;
@RunWith(JUnit4TestRunner.class)
-@Ignore("Fails for some unknown reason")
public class CamelMsvTest extends AbstractFeatureTest {
public static final String COMPONENT = extractName(CamelMsvTest.class);
@@ -39,4 +37,4 @@ public class CamelMsvTest extends AbstractFeatureTest {
return configure(COMPONENT);
}
-}
\ No newline at end of file
+}
[4/4] git commit: CAMEL-7852 Fixed the issue that camel-msv component
cannot be resolved in OSGi
Posted by ni...@apache.org.
CAMEL-7852 Fixed the issue that camel-msv component cannot be resolved in OSGi
Conflicts:
tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMsvTest.java
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/2809e89c
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/2809e89c
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/2809e89c
Branch: refs/heads/camel-2.12.x
Commit: 2809e89cbf34a2a72750b7d0885834f807be164d
Parents: 46efbb6
Author: Willem Jiang <wi...@gmail.com>
Authored: Tue Sep 23 20:16:47 2014 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Tue Sep 23 20:28:12 2014 +0800
----------------------------------------------------------------------
components/camel-msv/pom.xml | 1 +
.../src/test/java/org/apache/camel/itest/karaf/CamelMsvTest.java | 4 +---
2 files changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/2809e89c/components/camel-msv/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-msv/pom.xml b/components/camel-msv/pom.xml
index d0ea869..9099f49 100644
--- a/components/camel-msv/pom.xml
+++ b/components/camel-msv/pom.xml
@@ -31,6 +31,7 @@
<properties>
<camel.osgi.export.pkg>org.apache.camel.component.validator.msv.*</camel.osgi.export.pkg>
+ <camel.osgi.import.pkg>org.apache.camel,*</camel.osgi.import.pkg>
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=msv</camel.osgi.export.service>
</properties>
http://git-wip-us.apache.org/repos/asf/camel/blob/2809e89c/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMsvTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMsvTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMsvTest.java
index 08dbecb..007d927 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMsvTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMsvTest.java
@@ -16,7 +16,6 @@
*/
package org.apache.camel.itest.karaf;
-import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
@@ -24,7 +23,6 @@ import org.ops4j.pax.exam.junit.Configuration;
import org.ops4j.pax.exam.junit.JUnit4TestRunner;
@RunWith(JUnit4TestRunner.class)
-@Ignore("Fails for some unknown reason")
public class CamelMsvTest extends AbstractFeatureTest {
public static final String COMPONENT = extractName(CamelMsvTest.class);
@@ -39,4 +37,4 @@ public class CamelMsvTest extends AbstractFeatureTest {
return configure(COMPONENT);
}
-}
\ No newline at end of file
+}
[2/4] git commit: CAMEL-7852 clean up the karaf feature osgi test
Posted by ni...@apache.org.
CAMEL-7852 clean up the karaf feature osgi test
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/1772cecd
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/1772cecd
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/1772cecd
Branch: refs/heads/camel-2.14.x
Commit: 1772cecdff18c5e0f90979b06b01e89b034fbd63
Parents: c2953e0
Author: Willem Jiang <wi...@gmail.com>
Authored: Tue Sep 23 20:24:56 2014 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Tue Sep 23 20:25:55 2014 +0800
----------------------------------------------------------------------
.../src/test/java/org/apache/camel/itest/karaf/CamelMsvTest.java | 2 --
1 file changed, 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/1772cecd/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMsvTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMsvTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMsvTest.java
index efffea4..961ef14 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMsvTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMsvTest.java
@@ -16,7 +16,6 @@
*/
package org.apache.camel.itest.karaf;
-import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Configuration;
@@ -30,7 +29,6 @@ public class CamelMsvTest extends AbstractFeatureTest {
@Test
public void test() throws Exception {
- Thread.sleep(2000);
testComponent(COMPONENT);
}