karaf-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Achim Nierbeck <bcanh...@googlemail.com>
Subject Re: [2/2] git commit: [KARAF-2840] Creating child container using admin service should use KARAF_OPTS
Date Fri, 21 Mar 2014 08:00:53 GMT
Hi,
I'm not vetoing on this, but as I stated at the Jira issue, isn't this the
purpose of the clone command, to make sure all configurations are taken
also for the "child" instances?

regards, Achim


2014-03-21 8:57 GMT+01:00 <gnodet@apache.org>:

> [KARAF-2840] Creating child container using admin service should use
> KARAF_OPTS
>
>
> Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
> Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/e7812263
> Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/e7812263
> Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/e7812263
>
> Branch: refs/heads/karaf-2.x
> Commit: e7812263af1fcb4d4ba41fc407b045e0970847a1
> Parents: 6e27c86
> Author: Guillaume Nodet <gnodet@gmail.com>
> Authored: Fri Mar 21 08:56:27 2014 +0100
> Committer: Guillaume Nodet <gnodet@gmail.com>
> Committed: Fri Mar 21 08:57:18 2014 +0100
>
> ----------------------------------------------------------------------
>  .../java/org/apache/karaf/admin/internal/AdminServiceImpl.java   | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> ----------------------------------------------------------------------
>
>
>
> http://git-wip-us.apache.org/repos/asf/karaf/blob/e7812263/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 845f699..dfc3b96 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
> @@ -393,7 +393,9 @@ public class AdminServiceImpl implements AdminService {
>                  if (opts == null || opts.length() == 0) {
>                      opts = DEFAULT_JAVA_OPTS;
>                  }
> -                String karafOpts = System.getProperty("karaf.opts", "");
> +
> +                // fallback and read karafOpts from KARAF_OPTS
> environment if no System property present
> +                String karafOpts = System.getProperty("karaf.opts",
> System.getenv("KARAF_OPTS"));
>                  String location = instance.loc;
>
>                  File libDir = new File(System.getProperty("karaf.home"),
> "lib");
>
>


-- 

Apache Karaf <http://karaf.apache.org/> Committer & PMC
OPS4J Pax Web <http://wiki.ops4j.org/display/paxweb/Pax+Web/> Committer &
Project Lead
blog <http://notizblog.nierbeck.de/>

Software Architect / Project Manager / Scrum Master

Mime
  • Unnamed multipart/alternative (inline, None, 0 bytes)
View raw message