Author: ningjiang
Date: Tue Apr 28 09:49:56 2009
New Revision: 769314
URL: http://svn.apache.org/viewvc?rev=769314&view=rev
Log:
Fixed the build error of OSGiIntegrationTest
Modified:
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/OSGiIntegrationTest.java
Modified:
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/OSGiIntegrationTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/OSGiIntegrationTest.java?rev=769314&r1=769313&r2=769314&view=diff
==============================================================================
---
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/OSGiIntegrationTest.java
(original)
+++
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/OSGiIntegrationTest.java
Tue Apr 28 09:49:56 2009
@@ -30,7 +30,6 @@
import org.ops4j.pax.exam.OptionUtils;
import org.ops4j.pax.exam.junit.Configuration;
import org.ops4j.pax.exam.junit.JUnit4TestRunner;
-import org.ops4j.pax.exam.options.MavenUrlProvisionOption;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
@@ -94,10 +93,10 @@
systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value("DEBUG"),
// lets deploy the bundles we need
- //mavenBundleAsInProject("org.apache.camel", "camel-core"),
+
mavenBundle().groupId("org.apache.camel").artifactId("camel-core").versionAsInProject(),
- scanFeatures(
"file:src/test/resources/features-2.0-SNAPSHOT-features.xml",
- "camel-core"),
+
//scanFeatures("mvn:org.apache.camel.karaf/features/2.0-SNAPSHOT/xml/features",
+ // "camel-core"),
knopflerfish(), felix(), equinox());
@@ -109,11 +108,6 @@
return options;
}
-
- /**
- * TODO we can remove this method when 0.4.1 of Pax Exam comes out!
- */
- public static MavenUrlProvisionOption mavenBundleAsInProject(String
groupId, String artifactId) {
- return
mavenBundle().groupId(groupId).artifactId(artifactId).version(asInProject());
- }
+
+
}
\ No newline at end of file