Author: ccustine
Date: Sun Dec 20 17:01:14 2009
New Revision: 892610
URL: http://svn.apache.org/viewvc?rev=892610&view=rev
Log:
Fix broken NMR JBI itests. This Fix is necessary to fix failures on build
servers.
Modified:
servicemix/smx4/nmr/trunk/jbi/itests/src/test/java/org/apache/servicemix/jbi/itests/IntegrationTest.java
Modified:
servicemix/smx4/nmr/trunk/jbi/itests/src/test/java/org/apache/servicemix/jbi/itests/IntegrationTest.java
URL:
http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/itests/src/test/java/org/apache/servicemix/jbi/itests/IntegrationTest.java?rev=892610&r1=892609&r2=892610&view=diff
==============================================================================
---
servicemix/smx4/nmr/trunk/jbi/itests/src/test/java/org/apache/servicemix/jbi/itests/IntegrationTest.java
(original)
+++
servicemix/smx4/nmr/trunk/jbi/itests/src/test/java/org/apache/servicemix/jbi/itests/IntegrationTest.java
Sun Dec 20 17:01:14 2009
@@ -49,6 +49,9 @@
import static org.ops4j.pax.exam.CoreOptions.systemPackages;
import static org.ops4j.pax.exam.CoreOptions.systemProperty;
import static org.ops4j.pax.exam.CoreOptions.equinox;
+import static org.ops4j.pax.exam.CoreOptions.when;
+import static
org.ops4j.pax.exam.container.def.PaxRunnerOptions.localRepository;
+
import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.CoreOptions;
import org.ops4j.pax.exam.options.MavenArtifactProvisionOption;
@@ -231,6 +234,11 @@
systemProperty("karaf.base").value("target/karaf.home"),
systemProperty("karaf.startLocalConsole").value("false"),
systemProperty("karaf.startRemoteShell").value("false"),
+ when ((System.getProperty("maven.repo.local")!=null) ||
(System.getProperty("localRepository")!=null)).useOptions(
+ localRepository(System.getProperty("maven.repo.local",
System.getProperty("localRepository", ""))),
+
systemProperty("localRepository").value(System.getProperty("maven.repo.local",
System.getProperty("localRepository", "")))
+ ),
+
// hack system packages
systemPackages("org.apache.felix.karaf.main.spi;version=1.0.0",
"org.apache.felix.karaf.jaas.boot;version=0.9.0"),
