camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ningji...@apache.org
Subject [4/4] git commit: CAMEL-7852 Fixed the issue that camel-msv component cannot be resolved in OSGi
Date Tue, 23 Sep 2014 12:28:56 GMT
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 <willem.jiang@gmail.com>
Authored: Tue Sep 23 20:16:47 2014 +0800
Committer: Willem Jiang <willem.jiang@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
+}


Mime
View raw message