You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by cm...@apache.org on 2014/10/17 10:40:09 UTC
[16/50] git commit: CAMEL-7852 Fixed the issue that camel-msv
component cannot be resolved in OSGi
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/remotes/origin/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
+}