You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2009/05/04 10:30:18 UTC
svn commit: r771235 - in /camel/trunk/tests/camel-itest-osgi: pom.xml
src/test/java/org/apache/camel/itest/osgi/OSGiIntegrationTestSupport.java
Author: ningjiang
Date: Mon May 4 08:30:17 2009
New Revision: 771235
URL: http://svn.apache.org/viewvc?rev=771235&view=rev
Log:
Speed up the OSGi integration tests
Modified:
camel/trunk/tests/camel-itest-osgi/pom.xml
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/OSGiIntegrationTestSupport.java
Modified: camel/trunk/tests/camel-itest-osgi/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/pom.xml?rev=771235&r1=771234&r2=771235&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-osgi/pom.xml (original)
+++ camel/trunk/tests/camel-itest-osgi/pom.xml Mon May 4 08:30:17 2009
@@ -150,36 +150,26 @@
</build>
<profiles>
- <profile>
- <id>ci-build-profile</id>
- <activation>
- <property>
- <name>maven.repo.local</name>
- </property>
- </activation>
- <build>
- <plugins>
- <!-- use Pax Exam Maven plugin to get around PAXEXAM-62/64 -->
- <plugin>
- <groupId>org.ops4j.pax.exam</groupId>
- <artifactId>maven-paxexam-plugin</artifactId>
- <executions>
- <execution>
- <id>generate-config</id>
- <goals>
- <goal>generate-config</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <settings>
- <localRepository>${maven.repo.local}</localRepository>
- </settings>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
+ <profile>
+ <id>ci-build-profile</id>
+ <activation>
+ <property>
+ <name>maven.repo.local</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <!-- when the local repo location has been specified, we need to pass on this information to PAX mvn url -->
+ <argLine>-Dorg.ops4j.pax.url.mvn.localRepository=${maven.repo.local}</argLine>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
Modified: camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/OSGiIntegrationTestSupport.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/OSGiIntegrationTestSupport.java?rev=771235&r1=771234&r2=771235&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/OSGiIntegrationTestSupport.java (original)
+++ camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/OSGiIntegrationTestSupport.java Mon May 4 08:30:17 2009
@@ -85,11 +85,6 @@
"camel-core", "camel-osgi", "camel-spring", "camel-test"),
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());
- }
return options;
}