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 2014/03/21 08:57:26 UTC
[1/2] git commit: Improve error message
Repository: karaf
Updated Branches:
refs/heads/karaf-2.x dd34b8471 -> e7812263a
Improve error message
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/6e27c86f
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/6e27c86f
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/6e27c86f
Branch: refs/heads/karaf-2.x
Commit: 6e27c86f562ff20ad8a9b2b58c75f35745b0208f
Parents: dd34b84
Author: Guillaume Nodet <gn...@gmail.com>
Authored: Thu Mar 20 11:28:11 2014 +0100
Committer: Guillaume Nodet <gn...@gmail.com>
Committed: Fri Mar 21 08:57:03 2014 +0100
----------------------------------------------------------------------
.../org/apache/karaf/tooling/features/AddFeaturesToRepoMojo.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/6e27c86f/tooling/features-maven-plugin/src/main/java/org/apache/karaf/tooling/features/AddFeaturesToRepoMojo.java
----------------------------------------------------------------------
diff --git a/tooling/features-maven-plugin/src/main/java/org/apache/karaf/tooling/features/AddFeaturesToRepoMojo.java b/tooling/features-maven-plugin/src/main/java/org/apache/karaf/tooling/features/AddFeaturesToRepoMojo.java
index e1f4269..9d873f3 100644
--- a/tooling/features-maven-plugin/src/main/java/org/apache/karaf/tooling/features/AddFeaturesToRepoMojo.java
+++ b/tooling/features-maven-plugin/src/main/java/org/apache/karaf/tooling/features/AddFeaturesToRepoMojo.java
@@ -325,7 +325,7 @@ public class AddFeaturesToRepoMojo extends MojoSupport {
}
}
if (f == null) {
- throw new IllegalArgumentException("Unable to find the feature '" + feature + "'");
+ throw new IllegalArgumentException("Unable to find the feature '" + feature + (version != null ? "/" + version : "") + "'");
}
// only add the feature to transitives if it is not
// listed in the features list defined by the config
Re: [2/2] git commit: [KARAF-2840] Creating child container using
admin service should use KARAF_OPTS
Posted by Achim Nierbeck <bc...@googlemail.com>.
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 <gn...@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 <gn...@gmail.com>
> Authored: Fri Mar 21 08:56:27 2014 +0100
> Committer: Guillaume Nodet <gn...@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
[2/2] git commit: [KARAF-2840] Creating child container using admin
service should use KARAF_OPTS
Posted by gn...@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 <gn...@gmail.com>
Authored: Fri Mar 21 08:56:27 2014 +0100
Committer: Guillaume Nodet <gn...@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");