Author: ningjiang
Date: Thu Apr 23 05:04:15 2009
New Revision: 767795
URL: http://svn.apache.org/viewvc?rev=767795&view=rev
Log:
CAMEL-1561 Upgraded the PAX-Exam's version to 0.5.0-SNAPSHOT
Modified:
camel/trunk/tests/camel-itest-osgi/pom.xml (contents, props changed)
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/OSGiIntegrationTest.java
(contents, props changed)
Modified: camel/trunk/tests/camel-itest-osgi/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/pom.xml?rev=767795&r1=767794&r2=767795&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-osgi/pom.xml (original)
+++ camel/trunk/tests/camel-itest-osgi/pom.xml Thu Apr 23 05:04:15 2009
@@ -34,8 +34,8 @@
<description>Performs OSGi compliance integration tests</description>
<properties>
- <!--<pax-exam-version>0.4.1-SNAPSHOT</pax-exam-version>-->
- <pax-exam-version>0.4.0</pax-exam-version>
+ <pax-exam-version>0.5.0-SNAPSHOT</pax-exam-version>
+ <!-- <pax-exam-version>0.4.0</pax-exam-version>-->
</properties>
<repositories>
Propchange: camel/trunk/tests/camel-itest-osgi/pom.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: camel/trunk/tests/camel-itest-osgi/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
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=767795&r1=767794&r2=767795&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
Thu Apr 23 05:04:15 2009
@@ -18,10 +18,6 @@
package org.apache.camel.itest.osgi;
-import static org.ops4j.pax.exam.CoreOptions.*;
-import static org.ops4j.pax.exam.MavenUtils.*;
-import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.*;
-
import org.apache.camel.CamelContext;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.impl.DefaultCamelContext;
@@ -38,9 +34,17 @@
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
-
+import static org.ops4j.pax.exam.CoreOptions.equinox;
+import static org.ops4j.pax.exam.CoreOptions.felix;
+import static org.ops4j.pax.exam.CoreOptions.knopflerfish;
+import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
+import static org.ops4j.pax.exam.CoreOptions.mavenConfiguration;
+import static org.ops4j.pax.exam.CoreOptions.options;
+import static org.ops4j.pax.exam.CoreOptions.systemProperty;
+import static org.ops4j.pax.exam.MavenUtils.asInProject;
+import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.logProfile;
/**
- * @version $Revision: 1.1 $
+ * @version $Revision$
*/
@RunWith(JUnit4TestRunner.class)
public class OSGiIntegrationTest {
@@ -91,11 +95,11 @@
// lets deploy the bundles we need
mavenBundleAsInProject("org.apache.camel", "camel-core"),
- felix(), equinox());
+ knopflerfish(), felix(), equinox());
// use config generated by the Maven plugin (until PAXEXAM-62/64 get
resolved)
if
(OSGiIntegrationTest.class.getClassLoader().getResource("META-INF/maven/paxexam-config.args")
!= null) {
- options = OptionUtils.combine(options, mavenConfiguration());
+ options = OptionUtils.combine(options, mavenConfiguration());
}
return options;
Propchange:
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/OSGiIntegrationTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
