You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by ja...@apache.org on 2015/06/01 21:18:45 UTC
[1/2] karaf git commit: KARAF-3753 - include child system dir as
default repo
Repository: karaf
Updated Branches:
refs/heads/karaf-3.0.x 3b30c906e -> bca5d44df
KARAF-3753 - include child system dir as default repo
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/5b8538a4
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/5b8538a4
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/5b8538a4
Branch: refs/heads/karaf-3.0.x
Commit: 5b8538a4328a2ae50bb1a1462c7fa50acaf7bbad
Parents: 3b30c90
Author: Jonathan Anstey <ja...@gmail.com>
Authored: Mon Jun 1 16:37:41 2015 -0230
Committer: Jonathan Anstey <ja...@gmail.com>
Committed: Mon Jun 1 16:38:34 2015 -0230
----------------------------------------------------------------------
.../src/main/resources/resources/etc/org.ops4j.pax.url.mvn.cfg | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/5b8538a4/assemblies/features/framework/src/main/resources/resources/etc/org.ops4j.pax.url.mvn.cfg
----------------------------------------------------------------------
diff --git a/assemblies/features/framework/src/main/resources/resources/etc/org.ops4j.pax.url.mvn.cfg b/assemblies/features/framework/src/main/resources/resources/etc/org.ops4j.pax.url.mvn.cfg
index 27f758f..35d6995 100644
--- a/assemblies/features/framework/src/main/resources/resources/etc/org.ops4j.pax.url.mvn.cfg
+++ b/assemblies/features/framework/src/main/resources/resources/etc/org.ops4j.pax.url.mvn.cfg
@@ -68,7 +68,8 @@ org.ops4j.pax.url.mvn.useFallbackRepositories=false
#
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.data}/kar@id=kar.repository@multi@snapshots,\
+ file:${karaf.base}/${karaf.default.repository}@id=child.system.repository@snapshots
# Use the default local repo (e.g.~/.m2/repository) as a "remote" repo
#org.ops4j.pax.url.mvn.defaultLocalRepoAsRemote=false
[2/2] karaf git commit: KARAF-3754 - Child instances should honor
bundle overrides in root
Posted by ja...@apache.org.
KARAF-3754 - Child instances should honor bundle overrides in root
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/bca5d44d
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/bca5d44d
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/bca5d44d
Branch: refs/heads/karaf-3.0.x
Commit: bca5d44df8c6dcfcedbecc5e1fb6c1bed3a6c3fd
Parents: 5b8538a
Author: Jonathan Anstey <ja...@gmail.com>
Authored: Mon Jun 1 16:38:29 2015 -0230
Committer: Jonathan Anstey <ja...@gmail.com>
Committed: Mon Jun 1 16:38:35 2015 -0230
----------------------------------------------------------------------
.../karaf/instance/core/internal/InstanceServiceImpl.java | 6 ++++++
1 file changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/bca5d44d/instance/core/src/main/java/org/apache/karaf/instance/core/internal/InstanceServiceImpl.java
----------------------------------------------------------------------
diff --git a/instance/core/src/main/java/org/apache/karaf/instance/core/internal/InstanceServiceImpl.java b/instance/core/src/main/java/org/apache/karaf/instance/core/internal/InstanceServiceImpl.java
index eff6423..7ed6665 100644
--- a/instance/core/src/main/java/org/apache/karaf/instance/core/internal/InstanceServiceImpl.java
+++ b/instance/core/src/main/java/org/apache/karaf/instance/core/internal/InstanceServiceImpl.java
@@ -315,6 +315,12 @@ public class InstanceServiceImpl implements InstanceService {
File rootEtc = new File(System.getProperty("karaf.etc"));
copy(new File(rootEtc, "startup.properties"), new File(karafBase, "etc/startup.properties"));
+ // align child with any bundles we have overriden in the root instance
+ File rootOverrides = new File(rootEtc, "overrides.properties");
+ if (rootOverrides.exists()) {
+ copy(rootOverrides, new File(karafBase, "etc/overrides.properties"));
+ }
+
HashMap<String, String> props = new HashMap<String, String>();
props.put("${SUBST-KARAF-NAME}", name);
props.put("${SUBST-KARAF-HOME}", System.getProperty("karaf.home"));