You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2020/01/05 10:24:17 UTC
[karaf] branch karaf-4.2.x updated: [KARAF-6570] Introduce
getKarafDistribution() method in KarafTestSupport in order for use to
define his own Karaf distributuion
This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch karaf-4.2.x
in repository https://gitbox.apache.org/repos/asf/karaf.git
The following commit(s) were added to refs/heads/karaf-4.2.x by this push:
new a130273 [KARAF-6570] Introduce getKarafDistribution() method in KarafTestSupport in order for use to define his own Karaf distributuion
a130273 is described below
commit a130273462e9b43ddead2809d7d183f787b2b0e4
Author: Jean-Baptiste Onofré <jb...@apache.org>
AuthorDate: Sun Jan 5 07:52:40 2020 +0100
[KARAF-6570] Introduce getKarafDistribution() method in KarafTestSupport in order for use to define his own Karaf distributuion
(cherry picked from commit 890a70493330889cffddd80d2addc2b4e4f8dc7a)
---
.../java/org/apache/karaf/itests/KarafTestSupport.java | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/itests/common/src/main/java/org/apache/karaf/itests/KarafTestSupport.java b/itests/common/src/main/java/org/apache/karaf/itests/KarafTestSupport.java
index da8e810..10f3b71 100644
--- a/itests/common/src/main/java/org/apache/karaf/itests/KarafTestSupport.java
+++ b/itests/common/src/main/java/org/apache/karaf/itests/KarafTestSupport.java
@@ -170,9 +170,15 @@ public class KarafTestSupport {
return new File(res.getFile());
}
+ /**
+ * Override this method if you want to change the Karaf distribution in use.
+ */
+ public MavenArtifactUrlReference getKarafDistribution() {
+ return CoreOptions.maven().groupId("org.apache.karaf").artifactId("apache-karaf").versionAsInProject().type("tar.gz");
+ }
+
@Configuration
public Option[] config() {
- MavenArtifactUrlReference karafUrl = CoreOptions.maven().groupId("org.apache.karaf").artifactId("apache-karaf").versionAsInProject().type("tar.gz");
String httpPort = Integer.toString(getAvailablePort(Integer.parseInt(MIN_HTTP_PORT), Integer.parseInt(MAX_HTTP_PORT)));
String rmiRegistryPort = Integer.toString(getAvailablePort(Integer.parseInt(MIN_RMI_REG_PORT), Integer.parseInt(MAX_RMI_REG_PORT)));
String rmiServerPort = Integer.toString(getAvailablePort(Integer.parseInt(MIN_RMI_SERVER_PORT), Integer.parseInt(MAX_RMI_SERVER_PORT)));
@@ -183,8 +189,8 @@ public class KarafTestSupport {
}
if (JavaVersionUtil.getMajorVersion() >= 9) {
return new Option[]{
- //debugConfiguration("8889", true),
- KarafDistributionOption.karafDistributionConfiguration().frameworkUrl(karafUrl).name("Apache Karaf").unpackDirectory(new File("target/exam")),
+ // debugConfiguration("8889", true),
+ KarafDistributionOption.karafDistributionConfiguration().frameworkUrl(getKarafDistribution()).name("Apache Karaf").unpackDirectory(new File("target/exam")),
// enable JMX RBAC security, thanks to the KarafMBeanServerBuilder
KarafDistributionOption.configureSecurity().disableKarafMBeanServerBuilder(),
KarafDistributionOption.configureConsole().ignoreLocalConsole(),
@@ -235,7 +241,7 @@ public class KarafTestSupport {
} else {
return new Option[]{
//debugConfiguration("8889", true),
- KarafDistributionOption.karafDistributionConfiguration().frameworkUrl(karafUrl).name("Apache Karaf").unpackDirectory(new File("target/exam")),
+ KarafDistributionOption.karafDistributionConfiguration().frameworkUrl(getKarafDistribution()).name("Apache Karaf").unpackDirectory(new File("target/exam")),
// enable JMX RBAC security, thanks to the KarafMBeanServerBuilder
KarafDistributionOption.configureSecurity().disableKarafMBeanServerBuilder(),
KarafDistributionOption.configureConsole().ignoreLocalConsole(),