Repository: karaf Updated Branches: refs/heads/karaf-2.x 2a25ee3df -> a2345f689
Child instances are broken due to karaf.name not being substituted Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/5333c8dc Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/5333c8dc Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/5333c8dc Branch: refs/heads/karaf-2.x Commit: 5333c8dc4c1715be748a44777f4e55efb2836eb5 Parents: 2a25ee3 Author: Guillaume Nodet <[email protected]> Authored: Thu Jun 12 23:10:39 2014 +0200 Committer: Guillaume Nodet <[email protected]> Committed: Thu Jun 12 23:10:39 2014 +0200 ---------------------------------------------------------------------- .../main/java/org/apache/karaf/admin/internal/AdminServiceImpl.java | 1 - 1 file changed, 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/5333c8dc/admin/core/src/main/java/org/apache/karaf/admin/internal/AdminServiceImpl.java ---------------------------------------------------------------------- diff --git a/admin/core/src/main/java/org/apache/karaf/admin/internal/AdminServiceImpl.java b/admin/core/src/main/java/org/apache/karaf/admin/internal/AdminServiceImpl.java index 5613ef5..3fa2430 100644 --- a/admin/core/src/main/java/org/apache/karaf/admin/internal/AdminServiceImpl.java +++ b/admin/core/src/main/java/org/apache/karaf/admin/internal/AdminServiceImpl.java @@ -287,7 +287,6 @@ public class AdminServiceImpl implements AdminService { copyResourceToDir(karafBase, "etc/org.ops4j.pax.url.mvn.cfg", true); copyResourceToDir(karafBase, "etc/shell.init.script", true); copyResourceToDir(karafBase, "etc/startup.properties", true); - copyResourceToDir(karafBase, "etc/system.properties", true); copyResourceToDir(karafBase, "etc/users.properties", true); HashMap<String, String> props = new HashMap<String, String>();
