You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by gn...@apache.org on 2018/05/22 11:16:17 UTC
[karaf] branch karaf-4.1.x updated: [KARAF-5422] Add properties for
karaf URI
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch karaf-4.1.x
in repository https://gitbox.apache.org/repos/asf/karaf.git
The following commit(s) were added to refs/heads/karaf-4.1.x by this push:
new 46e0ed1 [KARAF-5422] Add properties for karaf URI
46e0ed1 is described below
commit 46e0ed15bb367ecb17375e006ecd194f89316ab6
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Tue May 22 10:19:48 2018 +0200
[KARAF-5422] Add properties for karaf URI
---
.../resources/resources/etc/org.ops4j.pax.url.mvn.cfg | 6 +++---
itests/src/test/resources/etc/org.ops4j.pax.url.mvn.cfg | 10 +++++-----
.../java/org/apache/karaf/main/ConfigProperties.java | 16 ++++++++++++++++
3 files changed, 24 insertions(+), 8 deletions(-)
diff --git a/assemblies/features/base/src/main/resources/resources/etc/org.ops4j.pax.url.mvn.cfg b/assemblies/features/base/src/main/resources/resources/etc/org.ops4j.pax.url.mvn.cfg
index c23d114..db66035 100644
--- a/assemblies/features/base/src/main/resources/resources/etc/org.ops4j.pax.url.mvn.cfg
+++ b/assemblies/features/base/src/main/resources/resources/etc/org.ops4j.pax.url.mvn.cfg
@@ -80,9 +80,9 @@ org.ops4j.pax.url.mvn.useFallbackRepositories=false
# The following property value will add the system folder as a repo.
#
org.ops4j.pax.url.mvn.defaultRepositories=\
- file:${karaf.home}/${karaf.default.repository}@id=system.repository@snapshots, \
- file:${karaf.data}/kar@id=kar.repository@multi@snapshots, \
- file:${karaf.base}/${karaf.default.repository}@id=child.system.repository@snapshots
+ ${karaf.home.uri}${karaf.default.repository}@id=system.repository@snapshots, \
+ ${karaf.data.uri}kar@id=kar.repository@multi@snapshots, \
+ ${karaf.base.uri}${karaf.default.repository}@id=child.system.repository@snapshots
#
# if "defaultLocalRepoAsRemote" is set do *any* value, localRepository will be
diff --git a/itests/src/test/resources/etc/org.ops4j.pax.url.mvn.cfg b/itests/src/test/resources/etc/org.ops4j.pax.url.mvn.cfg
index 9e1b187..5112194 100644
--- a/itests/src/test/resources/etc/org.ops4j.pax.url.mvn.cfg
+++ b/itests/src/test/resources/etc/org.ops4j.pax.url.mvn.cfg
@@ -77,12 +77,12 @@ org.ops4j.pax.url.mvn.useFallbackRepositories=false
# The following property value will add the system folder as a repo.
#
#org.ops4j.pax.url.mvn.defaultRepositories=\
-# file:${karaf.home}/${karaf.default.repository}@id=system.repository@snapshots, \
-# file:\${user.home}/.m2/repository@snapshots@id=local, \
-# file:${karaf.data}/kar@id=kar.repository@multi@snapshots, \
-# file:${karaf.base}/${karaf.default.repository}@id=child.system.repository@snapshots
+# ${karaf.home.uri}${karaf.default.repository}@id=system.repository@snapshots, \
+# file:${user.home}/.m2/repository@snapshots@id=local, \
+# ${karaf.data.uri}kar@id=kar.repository@multi@snapshots, \
+# ${karaf.base.uri}${karaf.default.repository}@id=child.system.repository@snapshots
org.ops4j.pax.url.mvn.defaultRepositories=\
- file:${karaf.home}/${karaf.default.repository}@id=system.repository@snapshots, \
+ ${karaf.home.uri}${karaf.default.repository}@id=system.repository@snapshots, \
file:${user.home}/.m2/repository@snapshots@id=local
#
diff --git a/main/src/main/java/org/apache/karaf/main/ConfigProperties.java b/main/src/main/java/org/apache/karaf/main/ConfigProperties.java
index e2f083c..d3084dc 100644
--- a/main/src/main/java/org/apache/karaf/main/ConfigProperties.java
+++ b/main/src/main/java/org/apache/karaf/main/ConfigProperties.java
@@ -41,6 +41,8 @@ public class ConfigProperties {
* hold the binary install of Karaf.
*/
public static final String PROP_KARAF_HOME = "karaf.home";
+
+ public static final String PROP_KARAF_HOME_URI = "karaf.home.uri";
/**
* The environment variable for specifying the Karaf home directory. The home directory
* hold the binary install of Karaf.
@@ -51,6 +53,8 @@ public class ConfigProperties {
* holds the configuration and data for a Karaf instance.
*/
public static final String PROP_KARAF_BASE = "karaf.base";
+
+ public static final String PROP_KARAF_BASE_URI = "karaf.base.uri";
/**
* The environment variable for specifying the Karaf base directory. The base directory
* holds the configuration and data for a Karaf instance.
@@ -61,6 +65,8 @@ public class ConfigProperties {
* holds the bundles data and cache for a Karaf instance.
*/
public static final String PROP_KARAF_DATA = "karaf.data";
+
+ public static final String PROP_KARAF_DATA_URI = "karaf.data.uri";
/**
* The environment variable for specifying the Karaf data directory. The data directory
* holds the bundles data and cache for a Karaf instance.
@@ -71,6 +77,8 @@ public class ConfigProperties {
* holds the configuration for a Karaf instance.
*/
public static final String PROP_KARAF_ETC = "karaf.etc";
+
+ public static final String PROP_KARAF_ETC_URI = "karaf.etc.uri";
/**
* The environment variable for specifying the Karaf etc directory. The etc directory
* holds the configuration for a Karaf instance.
@@ -81,6 +89,8 @@ public class ConfigProperties {
* holds the bundles data and cache for a Karaf instance.
*/
public static final String PROP_KARAF_INSTANCES = "karaf.instances";
+
+ public static final String PROP_KARAF_INSTANCES_URI = "karaf.instances.uri";
/**
* The system property for specifying the Karaf data directory. The data directory
* holds the bundles data and cache for a Karaf instance.
@@ -201,6 +211,12 @@ public class ConfigProperties {
System.setProperty(PROP_KARAF_ETC, karafEtc.getPath());
System.setProperty(PROP_KARAF_INSTANCES, karafInstances.getPath());
+ System.setProperty(PROP_KARAF_HOME_URI, karafHome.toURI().toASCIIString());
+ System.setProperty(PROP_KARAF_BASE_URI, karafBase.toURI().toASCIIString());
+ System.setProperty(PROP_KARAF_DATA_URI, karafData.toURI().toASCIIString());
+ System.setProperty(PROP_KARAF_ETC_URI, karafEtc.toURI().toASCIIString());
+ System.setProperty(PROP_KARAF_INSTANCES_URI, karafInstances.toURI().toASCIIString());
+
if (!karafEtc.exists()) {
throw new FileNotFoundException("Karaf etc folder not found: " + karafEtc.getAbsolutePath());
}
--
To stop receiving notification emails like this one, please contact
gnodet@apache.org.