You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by bd...@apache.org on 2016/03/02 15:15:44 UTC
svn commit: r1733295 - in /sling/trunk/bundles/extensions/healthcheck/core:
pom.xml src/test/java/org/apache/sling/hc/core/it/U.java
Author: bdelacretaz
Date: Wed Mar 2 14:15:44 2016
New Revision: 1733295
URL: http://svn.apache.org/viewvc?rev=1733295&view=rev
Log:
Get bundle from a file for Pax Exam, getting it from Maven doesn't work when the release plugin builds this
Modified:
sling/trunk/bundles/extensions/healthcheck/core/pom.xml
sling/trunk/bundles/extensions/healthcheck/core/src/test/java/org/apache/sling/hc/core/it/U.java
Modified: sling/trunk/bundles/extensions/healthcheck/core/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/healthcheck/core/pom.xml?rev=1733295&r1=1733294&r2=1733295&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/healthcheck/core/pom.xml (original)
+++ sling/trunk/bundles/extensions/healthcheck/core/pom.xml Wed Mar 2 14:15:44 2016
@@ -45,6 +45,7 @@
<pax-link.version>2.4.3</pax-link.version>
<org.ops4j.pax.logging.DefaultServiceLog.level>INFO</org.ops4j.pax.logging.DefaultServiceLog.level>
<felix.shell>false</felix.shell>
+ <project.bundle.file>${project.build.directory}/${project.build.finalName}.jar</project.bundle.file>
</properties>
<scm>
@@ -93,9 +94,9 @@
<configuration>
<systemProperties>
<org.ops4j.pax.logging.DefaultServiceLog.level>${org.ops4j.pax.logging.DefaultServiceLog.level}</org.ops4j.pax.logging.DefaultServiceLog.level>
- <sling.hc.core.version>${project.version}</sling.hc.core.version>
<felix.shell>${felix.shell}</felix.shell>
<coverage.command>${coverage.command}</coverage.command>
+ <project.bundle.file>${project.bundle.file}</project.bundle.file>
</systemProperties>
</configuration>
</plugin>
Modified: sling/trunk/bundles/extensions/healthcheck/core/src/test/java/org/apache/sling/hc/core/it/U.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/healthcheck/core/src/test/java/org/apache/sling/hc/core/it/U.java?rev=1733295&r1=1733294&r2=1733295&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/healthcheck/core/src/test/java/org/apache/sling/hc/core/it/U.java (original)
+++ sling/trunk/bundles/extensions/healthcheck/core/src/test/java/org/apache/sling/hc/core/it/U.java Wed Mar 2 14:15:44 2016
@@ -25,6 +25,7 @@ import static org.ops4j.pax.exam.CoreOpt
import static org.ops4j.pax.exam.CoreOptions.systemProperty;
import static org.ops4j.pax.exam.CoreOptions.when;
+import java.io.File;
import java.util.Arrays;
import java.util.List;
@@ -37,6 +38,9 @@ import org.ops4j.pax.exam.Option;
/** Test utilities */
public class U {
+ // the name of the system property providing the bundle file to be installed and tested
+ private static final String BUNDLE_JAR_SYS_PROP = "project.bundle.file";
+
/** Wait until the specified number of health checks are seen by supplied executor */
static void expectHealthChecks(int howMany, HealthCheckExecutor executor, String ... tags) {
expectHealthChecks(howMany, executor, new HealthCheckExecutionOptions(), tags);
@@ -62,10 +66,16 @@ public class U {
}
static Option[] config() {
- final String coreVersion = System.getProperty("sling.hc.core.version");
final String localRepo = System.getProperty("maven.repo.local", "");
final boolean felixShell = "true".equals(System.getProperty("felix.shell", "false"));
+ final String bundleFileName = System.getProperty(BUNDLE_JAR_SYS_PROP);
+ final File bundleFile = new File(bundleFileName);
+ if (!bundleFile.canRead()) {
+ throw new IllegalArgumentException( "Cannot read from bundle file " + bundleFileName + " specified in the "
+ + BUNDLE_JAR_SYS_PROP + " system property" );
+ }
+
// As we're using the forked pax exam container, we need to add a VM
// option to activate the jacoco test coverage agent.
final String coverageCommand = System.getProperty("coverage.command");
@@ -87,10 +97,10 @@ public class U {
)
),
provision(
+ CoreOptions.bundle(bundleFile.toURI().toString()),
mavenBundle("org.apache.felix", "org.apache.felix.scr", "1.6.2"),
mavenBundle("org.apache.felix", "org.apache.felix.configadmin", "1.8.8"),
mavenBundle("org.apache.felix", "org.apache.felix.http.servlet-api", "1.1.0"),
- mavenBundle("org.apache.sling", "org.apache.sling.hc.core", coreVersion),
mavenBundle("org.apache.sling", "org.apache.sling.commons.osgi", "2.2.0"),
mavenBundle("org.apache.sling", "org.apache.sling.commons.json", "2.0.10"),
mavenBundle("org.apache.sling", "org.apache.sling.jcr.jcr-wrapper", "2.0.0"),