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 2016/10/03 13:37:28 UTC
[1/7] karaf git commit: [KARAF-4740] Upgrade to pax-logging 1.9.0
Repository: karaf
Updated Branches:
refs/heads/master b59caa283 -> b2be159cc
[KARAF-4740] Upgrade to pax-logging 1.9.0
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/85eaedd8
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/85eaedd8
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/85eaedd8
Branch: refs/heads/master
Commit: 85eaedd858dcd8acf2d79b49fa1654c02e53ccf6
Parents: b59caa2
Author: Guillaume Nodet <gn...@apache.org>
Authored: Thu Sep 29 21:08:18 2016 +0200
Committer: Guillaume Nodet <gn...@apache.org>
Committed: Mon Oct 3 10:07:46 2016 +0200
----------------------------------------------------------------------
.../features/base/src/main/resources/resources/bin/karaf | 2 +-
.../base/src/main/resources/resources/bin/karaf.bat | 2 +-
.../resources/resources/etc/org.ops4j.pax.logging.cfg | 6 ++----
itests/src/test/resources/etc/org.ops4j.pax.logging.cfg | 4 +++-
.../org/apache/karaf/main/util/BootstrapLogManager.java | 11 +++++------
pom.xml | 2 +-
6 files changed, 13 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/85eaedd8/assemblies/features/base/src/main/resources/resources/bin/karaf
----------------------------------------------------------------------
diff --git a/assemblies/features/base/src/main/resources/resources/bin/karaf b/assemblies/features/base/src/main/resources/resources/bin/karaf
index f78f8c7..cc7ae29 100755
--- a/assemblies/features/base/src/main/resources/resources/bin/karaf
+++ b/assemblies/features/base/src/main/resources/resources/bin/karaf
@@ -437,7 +437,7 @@ run() {
shift
;;
'run')
- OPTS="-Dkaraf.startLocalConsole=false -Dkaraf.startRemoteShell=true -Dkaraf.log.console=true"
+ OPTS="-Dkaraf.startLocalConsole=false -Dkaraf.startRemoteShell=true -Dkaraf.log.console=ALL"
shift
;;
'daemon')
http://git-wip-us.apache.org/repos/asf/karaf/blob/85eaedd8/assemblies/features/base/src/main/resources/resources/bin/karaf.bat
----------------------------------------------------------------------
diff --git a/assemblies/features/base/src/main/resources/resources/bin/karaf.bat b/assemblies/features/base/src/main/resources/resources/bin/karaf.bat
index 9effa44..9ebb339 100644
--- a/assemblies/features/base/src/main/resources/resources/bin/karaf.bat
+++ b/assemblies/features/base/src/main/resources/resources/bin/karaf.bat
@@ -335,7 +335,7 @@ if "%KARAF_PROFILER%" == "" goto :RUN
goto :RUN_LOOP
:EXECUTE_RUN
- SET OPTS=-Dkaraf.startLocalConsole=false -Dkaraf.startRemoteShell=true -Dkaraf.log.console=true
+ SET OPTS=-Dkaraf.startLocalConsole=false -Dkaraf.startRemoteShell=true -Dkaraf.log.console=ALL
shift
goto :RUN_LOOP
http://git-wip-us.apache.org/repos/asf/karaf/blob/85eaedd8/assemblies/features/base/src/main/resources/resources/etc/org.ops4j.pax.logging.cfg
----------------------------------------------------------------------
diff --git a/assemblies/features/base/src/main/resources/resources/etc/org.ops4j.pax.logging.cfg b/assemblies/features/base/src/main/resources/resources/etc/org.ops4j.pax.logging.cfg
index 8e12a84..9ee5300 100644
--- a/assemblies/features/base/src/main/resources/resources/etc/org.ops4j.pax.logging.cfg
+++ b/assemblies/features/base/src/main/resources/resources/etc/org.ops4j.pax.logging.cfg
@@ -25,13 +25,13 @@ log4j2.rootLogger.level = INFO
# uncomment to use asynchronous loggers, which require mvn:com.lmax/disruptor/3.3.2 library
#log4j2.rootLogger.type = asyncRoot
#log4j2.rootLogger.includeLocation = false
-log4j2.rootLogger.appenderRefs = RollingFile, PaxOsgi${karaf.log.console:+, Console}
log4j2.rootLogger.appenderRef.RollingFile.ref = RollingFile
log4j2.rootLogger.appenderRef.PaxOsgi.ref = PaxOsgi
log4j2.rootLogger.appenderRef.Console.ref = Console
+log4j2.rootLogger.appenderRef.Console.filter.threshold.type = ThresholdFilter
+log4j2.rootLogger.appenderRef.Console.filter.threshold.level = ${karaf.log.console:-OFF}
# Loggers configuration
-log4j2.loggers = audit, spifly
# Spifly logger
log4j2.logger.spifly.name = org.apache.aries.spifly
@@ -41,11 +41,9 @@ log4j2.logger.spifly.level = WARN
log4j2.logger.audit.name = org.apache.karaf.jaas.modules.audit
log4j2.logger.audit.level = INFO
log4j2.logger.audit.additivity = false
-log4j2.logger.audit.appenderRefs = AuditRollingFile
log4j2.logger.audit.appenderRef.AuditRollingFile.ref = AuditRollingFile
# Appenders configuration
-log4j2.appenders = console, rolling, audit, osgi
# Console appender not used by default (see log4j2.rootLogger.appenderRefs)
log4j2.appender.console.type = Console
http://git-wip-us.apache.org/repos/asf/karaf/blob/85eaedd8/itests/src/test/resources/etc/org.ops4j.pax.logging.cfg
----------------------------------------------------------------------
diff --git a/itests/src/test/resources/etc/org.ops4j.pax.logging.cfg b/itests/src/test/resources/etc/org.ops4j.pax.logging.cfg
index 48e1069..66c1e4f 100644
--- a/itests/src/test/resources/etc/org.ops4j.pax.logging.cfg
+++ b/itests/src/test/resources/etc/org.ops4j.pax.logging.cfg
@@ -25,10 +25,12 @@ log4j2.rootLogger.level = INFO
# uncomment to use asynchronous loggers, which require mvn:com.lmax/disruptor/3.3.2 library
#log4j2.rootLogger.type = asyncRoot
#log4j2.rootLogger.includeLocation = false
-log4j2.rootLogger.appenderRefs = RollingFile, PaxOsgi${karaf.log.console:+, Console}
+log4j2.rootLogger.appenderRefs = RollingFile, PaxOsgi, Console
log4j2.rootLogger.appenderRef.RollingFile.ref = RollingFile
log4j2.rootLogger.appenderRef.PaxOsgi.ref = PaxOsgi
log4j2.rootLogger.appenderRef.Console.ref = Console
+log4j2.rootLogger.appenderRef.Console.filter.threshold.type = ThresholdFilter
+log4j2.rootLogger.appenderRef.Console.filter.threshold.level = ${karaf.log.console:-OFF}
# Appenders configuration
log4j2.appenders = console, rolling, osgi
http://git-wip-us.apache.org/repos/asf/karaf/blob/85eaedd8/main/src/main/java/org/apache/karaf/main/util/BootstrapLogManager.java
----------------------------------------------------------------------
diff --git a/main/src/main/java/org/apache/karaf/main/util/BootstrapLogManager.java b/main/src/main/java/org/apache/karaf/main/util/BootstrapLogManager.java
index 9117525..1f57502 100644
--- a/main/src/main/java/org/apache/karaf/main/util/BootstrapLogManager.java
+++ b/main/src/main/java/org/apache/karaf/main/util/BootstrapLogManager.java
@@ -28,10 +28,10 @@ import org.apache.felix.utils.properties.Properties;
import org.apache.felix.utils.properties.InterpolationHelper;
import java.util.Arrays;
-import java.util.Collections;
import java.util.List;
import java.util.logging.ConsoleHandler;
import java.util.logging.Handler;
+import java.util.logging.Level;
import java.util.logging.LogRecord;
import java.util.logging.Logger;
import java.util.logging.StreamHandler;
@@ -104,11 +104,10 @@ public class BootstrapLogManager {
}
private List<Handler> getDefaultHandlersInternal() {
- if (Boolean.getBoolean("karaf.log.console")) {
- return Arrays.asList(new ConsoleHandler(), getDefaultHandlerInternal());
- } else {
- return Collections.singletonList(getDefaultHandlerInternal());
- }
+ String consoleLevel = System.getProperty("karaf.log.console", "OFF");
+ ConsoleHandler handler = new ConsoleHandler();
+ handler.setLevel(Level.parse(consoleLevel));
+ return Arrays.asList(handler, getDefaultHandlerInternal());
}
private Properties loadPaxLoggingConfig() {
http://git-wip-us.apache.org/repos/asf/karaf/blob/85eaedd8/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index da0401b..a1c8fda 100644
--- a/pom.xml
+++ b/pom.xml
@@ -264,7 +264,7 @@
<pax.cdi.version>0.12.0</pax.cdi.version>
<pax.exam.version>4.10.0-SNAPSHOT</pax.exam.version>
- <pax.logging.version>1.8.5</pax.logging.version>
+ <pax.logging.version>1.9.0</pax.logging.version>
<pax.base.version>1.5.0</pax.base.version>
<pax.url.version>2.4.7</pax.url.version>
<pax.web.version>6.0.0-SNAPSHOT</pax.web.version>
[3/7] karaf git commit: [KARAF-4746] Upgrade to Pax-Web 4.4.0
Posted by gn...@apache.org.
[KARAF-4746] Upgrade to Pax-Web 4.4.0
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/de47c16d
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/de47c16d
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/de47c16d
Branch: refs/heads/master
Commit: de47c16d53712a2033e76f8133791c635521bee7
Parents: f1d685d
Author: Guillaume Nodet <gn...@apache.org>
Authored: Mon Oct 3 15:33:04 2016 +0200
Committer: Guillaume Nodet <gn...@apache.org>
Committed: Mon Oct 3 15:33:04 2016 +0200
----------------------------------------------------------------------
.../http/core/internal/ServletServiceImpl.java | 11 ++++++----
pom.xml | 2 +-
.../web/internal/WebContainerServiceImpl.java | 22 ++++++++++++++++----
.../karaf/web/internal/WebEventHandler.java | 2 +-
.../karaf/webconsole/http/HttpPlugin.java | 14 ++++++++-----
5 files changed, 36 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/de47c16d/http/src/main/java/org/apache/karaf/http/core/internal/ServletServiceImpl.java
----------------------------------------------------------------------
diff --git a/http/src/main/java/org/apache/karaf/http/core/internal/ServletServiceImpl.java b/http/src/main/java/org/apache/karaf/http/core/internal/ServletServiceImpl.java
index 706c64b..9b0c7fd 100644
--- a/http/src/main/java/org/apache/karaf/http/core/internal/ServletServiceImpl.java
+++ b/http/src/main/java/org/apache/karaf/http/core/internal/ServletServiceImpl.java
@@ -38,9 +38,12 @@ public class ServletServiceImpl implements ServletService {
List<ServletInfo> servletInfos = new ArrayList<ServletInfo>();
Collection<ServletEvent> events = servletEventHandler.getServletEvents();
for (ServletEvent event : events) {
- String servletClassName = event.getServletClassName();
- if (servletClassName.contains(".")) {
- servletClassName = servletClassName.substring(servletClassName.lastIndexOf(".") + 1, servletClassName.length());
+ Servlet servlet = event.getServlet();
+ String servletClassName = " ";
+ if (servlet != null) {
+ servletClassName = servlet.getClass().getName();
+ servletClassName = servletClassName.substring(servletClassName.lastIndexOf(".") + 1,
+ servletClassName.length());
}
String servletName = event.getServletName() != null ? event.getServletName() : " ";
if (servletName.contains(".")) {
@@ -51,7 +54,7 @@ public class ServletServiceImpl implements ServletService {
String[] urls = (String[])(event.getUrlParameter() != null ? event.getUrlParameter() : new String[] {""});
ServletInfo info = new ServletInfo();
- info.setBundleId(event.getBundleId());
+ info.setBundleId(event.getBundle().getBundleId());
info.setName(servletName);
info.setClassName(servletClassName);
info.setState(event.getType());
http://git-wip-us.apache.org/repos/asf/karaf/blob/de47c16d/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index a1c8fda..3c2741a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -267,7 +267,7 @@
<pax.logging.version>1.9.0</pax.logging.version>
<pax.base.version>1.5.0</pax.base.version>
<pax.url.version>2.4.7</pax.url.version>
- <pax.web.version>6.0.0-SNAPSHOT</pax.web.version>
+ <pax.web.version>4.4.0-SNAPSHOT</pax.web.version>
<pax.tinybundle.version>2.1.1</pax.tinybundle.version>
<pax.jdbc.version>0.9.0</pax.jdbc.version>
http://git-wip-us.apache.org/repos/asf/karaf/blob/de47c16d/web/src/main/java/org/apache/karaf/web/internal/WebContainerServiceImpl.java
----------------------------------------------------------------------
diff --git a/web/src/main/java/org/apache/karaf/web/internal/WebContainerServiceImpl.java b/web/src/main/java/org/apache/karaf/web/internal/WebContainerServiceImpl.java
index d2e33b6..bab1bdd 100644
--- a/web/src/main/java/org/apache/karaf/web/internal/WebContainerServiceImpl.java
+++ b/web/src/main/java/org/apache/karaf/web/internal/WebContainerServiceImpl.java
@@ -117,8 +117,15 @@ public class WebContainerServiceImpl implements WebContainerService, BundleListe
if (bundleIds != null && !bundleIds.isEmpty()) {
for (long bundleId : bundleIds) {
if (webEventHandler.getBundleEvents().containsKey(bundleId)) {
- // deploy
- warManager.start(bundleId, null);
+ WebEvent webEvent = webEventHandler.getBundleEvents().get(bundleId);
+ Bundle bundle = webEvent.getBundle();
+ if (bundle != null) {
+ // deploy
+ warManager.start(bundleId, null);
+ } else {
+ System.out.println("Bundle ID " + bundleId + " is invalid");
+ LOGGER.warn("Bundle ID {} is invalid", bundleId);
+ }
}
}
}
@@ -128,8 +135,15 @@ public class WebContainerServiceImpl implements WebContainerService, BundleListe
if (bundleIds != null && !bundleIds.isEmpty()) {
for (long bundleId : bundleIds) {
if (webEventHandler.getBundleEvents().containsKey(bundleId)) {
- // undeploy
- warManager.stop(bundleId);
+ WebEvent webEvent = webEventHandler.getBundleEvents().get(bundleId);
+ Bundle bundle = webEvent.getBundle();
+ if (bundle != null) {
+ // deploy
+ warManager.stop(bundleId);
+ } else {
+ System.out.println("Bundle ID " + bundleId + " is invalid");
+ LOGGER.warn("Bundle ID {} is invalid", bundleId);
+ }
}
}
}
http://git-wip-us.apache.org/repos/asf/karaf/blob/de47c16d/web/src/main/java/org/apache/karaf/web/internal/WebEventHandler.java
----------------------------------------------------------------------
diff --git a/web/src/main/java/org/apache/karaf/web/internal/WebEventHandler.java b/web/src/main/java/org/apache/karaf/web/internal/WebEventHandler.java
index 11ad198..01ef52e 100644
--- a/web/src/main/java/org/apache/karaf/web/internal/WebEventHandler.java
+++ b/web/src/main/java/org/apache/karaf/web/internal/WebEventHandler.java
@@ -34,7 +34,7 @@ public class WebEventHandler implements WebListener {
}
public void webEvent(WebEvent event) {
- getBundleEvents().put(event.getBundleId(), event);
+ getBundleEvents().put(event.getBundle().getBundleId(), event);
}
}
http://git-wip-us.apache.org/repos/asf/karaf/blob/de47c16d/webconsole/http/src/main/java/org/apache/karaf/webconsole/http/HttpPlugin.java
----------------------------------------------------------------------
diff --git a/webconsole/http/src/main/java/org/apache/karaf/webconsole/http/HttpPlugin.java b/webconsole/http/src/main/java/org/apache/karaf/webconsole/http/HttpPlugin.java
index 10deb36..b6fb060 100644
--- a/webconsole/http/src/main/java/org/apache/karaf/webconsole/http/HttpPlugin.java
+++ b/webconsole/http/src/main/java/org/apache/karaf/webconsole/http/HttpPlugin.java
@@ -208,8 +208,12 @@ public class HttpPlugin extends AbstractWebConsolePlugin {
List<ServletDetails> result = new ArrayList<ServletDetails>(events.size());
for (ServletEvent event : events) {
- String servletClassName = event.getServletClassName();
- servletClassName = servletClassName.substring(servletClassName.lastIndexOf(".") + 1, servletClassName.length());
+ Servlet servlet = event.getServlet();
+ String servletClassName = " ";
+ if (servlet != null) {
+ servletClassName = servlet.getClass().getName();
+ servletClassName = servletClassName.substring(servletClassName.lastIndexOf(".") + 1, servletClassName.length());
+ }
String servletName = event.getServletName() != null ? event.getServletName() : " ";
if (servletName.contains(".")) {
servletName = servletName.substring(servletName.lastIndexOf(".") + 1, servletName.length());
@@ -220,7 +224,7 @@ public class HttpPlugin extends AbstractWebConsolePlugin {
String[] urls = (String[]) (event.getUrlParameter() != null ? event.getUrlParameter() : new String[]{""});
ServletDetails details = new ServletDetails();
- details.setId(event.getBundleId());
+ details.setId(event.getBundle().getBundleId());
details.setAlias(alias);
details.setServlet(servletClassName);
details.setServletName(servletName);
@@ -239,9 +243,9 @@ public class HttpPlugin extends AbstractWebConsolePlugin {
for (WebEvent event : bundleEvents.values()) {
WebDetail webDetail = new WebDetail();
- webDetail.setBundleId(event.getBundleId());
+ webDetail.setBundleId(event.getBundle().getBundleId());
webDetail.setContextPath(event.getContextPath().trim().concat("/"));
- int state = bundleContext.getBundle(event.getBundleId()).getState();
+ int state = bundleContext.getBundle(event.getBundle().getBundleId()).getState();
String stateStr;
if (state == Bundle.ACTIVE) {
stateStr = "Active";
[5/7] karaf git commit: Fix lost stack trace in integration tests
Posted by gn...@apache.org.
Fix lost stack trace in integration tests
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/bb3f66a1
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/bb3f66a1
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/bb3f66a1
Branch: refs/heads/master
Commit: bb3f66a1c6ac45263168a31deef6290a97c78371
Parents: 0885f0a
Author: Guillaume Nodet <gn...@apache.org>
Authored: Mon Oct 3 15:34:23 2016 +0200
Committer: Guillaume Nodet <gn...@apache.org>
Committed: Mon Oct 3 15:34:23 2016 +0200
----------------------------------------------------------------------
itests/src/test/java/org/apache/karaf/itests/KarafTestSupport.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/bb3f66a1/itests/src/test/java/org/apache/karaf/itests/KarafTestSupport.java
----------------------------------------------------------------------
diff --git a/itests/src/test/java/org/apache/karaf/itests/KarafTestSupport.java b/itests/src/test/java/org/apache/karaf/itests/KarafTestSupport.java
index b6ec3cf..c61cdac 100644
--- a/itests/src/test/java/org/apache/karaf/itests/KarafTestSupport.java
+++ b/itests/src/test/java/org/apache/karaf/itests/KarafTestSupport.java
@@ -152,7 +152,7 @@ public class KarafTestSupport {
LOG.debug(t.getMessage(), t);
if (retry && !(t instanceof org.junit.AssumptionViolatedException)) {
retry = false;
- throw new RerunTestException("rerun this test pls");
+ throw new RerunTestException("rerun this test pls", t);
} else {
throw t;
}
[7/7] karaf git commit: Upgrade maven-sure-plugin to latest version
Posted by gn...@apache.org.
Upgrade maven-sure-plugin to latest version
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/b2be159c
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/b2be159c
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/b2be159c
Branch: refs/heads/master
Commit: b2be159cca594444ec404ac3b72824865ee9ac96
Parents: f6291b9
Author: Guillaume Nodet <gn...@apache.org>
Authored: Mon Oct 3 15:37:11 2016 +0200
Committer: Guillaume Nodet <gn...@apache.org>
Committed: Mon Oct 3 15:37:11 2016 +0200
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/b2be159c/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 3c2741a..15a2739 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1840,7 +1840,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.18.1</version>
+ <version>2.19.1</version>
<configuration>
<forkMode>once</forkMode>
<argLine>${surefire.argLine}</argLine>
[4/7] karaf git commit: [KARAF-4745] MBean may loose all information
when throwing exceptions
Posted by gn...@apache.org.
[KARAF-4745] MBean may loose all information when throwing exceptions
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/0885f0a6
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/0885f0a6
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/0885f0a6
Branch: refs/heads/master
Commit: 0885f0a658f7ade2e9e3224ea36d0ea7519e80f1
Parents: de47c16
Author: Guillaume Nodet <gn...@apache.org>
Authored: Mon Oct 3 15:34:10 2016 +0200
Committer: Guillaume Nodet <gn...@apache.org>
Committed: Mon Oct 3 15:34:10 2016 +0200
----------------------------------------------------------------------
.../bundle/core/internal/BundlesMBeanImpl.java | 26 +++++++++---------
.../karaf/config/core/impl/ConfigMBeanImpl.java | 18 ++++++-------
.../karaf/http/core/internal/HttpMBeanImpl.java | 2 +-
.../core/internal/InstancesMBeanImpl.java | 28 ++++++++++----------
.../karaf/jdbc/internal/JdbcMBeanImpl.java | 14 +++++-----
.../karaf/kar/internal/KarsMBeanImpl.java | 6 ++---
.../karaf/obr/core/internal/ObrMBeanImpl.java | 10 +++----
.../internal/ScrServiceMBeanImpl.java | 2 +-
.../core/internal/ServicesMBeanImpl.java | 8 +++---
.../management/internal/SystemMBeanImpl.java | 18 ++++++-------
.../web/management/internal/WebMBeanImpl.java | 10 +++----
.../management/internal/WrapperMBeanImpl.java | 6 ++---
12 files changed, 74 insertions(+), 74 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/0885f0a6/bundle/core/src/main/java/org/apache/karaf/bundle/core/internal/BundlesMBeanImpl.java
----------------------------------------------------------------------
diff --git a/bundle/core/src/main/java/org/apache/karaf/bundle/core/internal/BundlesMBeanImpl.java b/bundle/core/src/main/java/org/apache/karaf/bundle/core/internal/BundlesMBeanImpl.java
index ba710dc..43dff42 100644
--- a/bundle/core/src/main/java/org/apache/karaf/bundle/core/internal/BundlesMBeanImpl.java
+++ b/bundle/core/src/main/java/org/apache/karaf/bundle/core/internal/BundlesMBeanImpl.java
@@ -91,7 +91,7 @@ public class BundlesMBeanImpl extends StandardMBean implements BundlesMBean {
}
return table;
} catch (Exception e) {
- throw new MBeanException(null, e.getMessage());
+ throw new MBeanException(null, e.toString());
}
}
@@ -105,7 +105,7 @@ public class BundlesMBeanImpl extends StandardMBean implements BundlesMBean {
return getBundleStartLevel(bundles.get(0)).getStartLevel();
} catch (Exception e) {
- throw new MBeanException(null, e.getMessage());
+ throw new MBeanException(null, e.toString());
}
}
@@ -117,7 +117,7 @@ public class BundlesMBeanImpl extends StandardMBean implements BundlesMBean {
getBundleStartLevel(bundle).setStartLevel(bundleStartLevel);
}
} catch (Exception e) {
- throw new MBeanException(null, e.getMessage());
+ throw new MBeanException(null, e.toString());
}
}
@@ -138,7 +138,7 @@ public class BundlesMBeanImpl extends StandardMBean implements BundlesMBean {
getFrameworkWiring().refreshBundles(bundles);
}
} catch (Exception e) {
- throw new MBeanException(null, e.getMessage());
+ throw new MBeanException(null, e.toString());
}
}
@@ -164,7 +164,7 @@ public class BundlesMBeanImpl extends StandardMBean implements BundlesMBean {
InputStream is = new URL(location).openStream();
bundles.get(0).update(is);
} catch (Exception e) {
- throw new MBeanException(null, e.getMessage());
+ throw new MBeanException(null, e.toString());
}
}
@@ -177,7 +177,7 @@ public class BundlesMBeanImpl extends StandardMBean implements BundlesMBean {
List<Bundle> bundles = selectBundles(bundleId);
getFrameworkWiring().resolveBundles(bundles);
} catch (Exception e) {
- throw new MBeanException(null, e.getMessage());
+ throw new MBeanException(null, e.toString());
}
}
@@ -194,7 +194,7 @@ public class BundlesMBeanImpl extends StandardMBean implements BundlesMBean {
bundle.start();
}
} catch (Exception e) {
- throw new MBeanException(null, e.getMessage());
+ throw new MBeanException(null, e.toString());
}
}
@@ -210,7 +210,7 @@ public class BundlesMBeanImpl extends StandardMBean implements BundlesMBean {
}
return bundle.getBundleId();
} catch (Exception e) {
- throw new MBeanException(null, e.getMessage());
+ throw new MBeanException(null, e.toString());
}
}
@@ -222,7 +222,7 @@ public class BundlesMBeanImpl extends StandardMBean implements BundlesMBean {
bundle.start();
}
} catch (Exception e) {
- throw new MBeanException(null, e.getMessage());
+ throw new MBeanException(null, e.toString());
}
}
@@ -234,7 +234,7 @@ public class BundlesMBeanImpl extends StandardMBean implements BundlesMBean {
bundle.stop();
}
} catch (Exception e) {
- throw new MBeanException(null, e.getMessage());
+ throw new MBeanException(null, e.toString());
}
}
@@ -246,7 +246,7 @@ public class BundlesMBeanImpl extends StandardMBean implements BundlesMBean {
bundle.uninstall();
}
} catch (Exception e) {
- throw new MBeanException(null, e.getMessage());
+ throw new MBeanException(null, e.toString());
}
}
@@ -282,7 +282,7 @@ public class BundlesMBeanImpl extends StandardMBean implements BundlesMBean {
return table;
} catch (Exception e) {
- throw new MBeanException(null, e.getMessage());
+ throw new MBeanException(null, e.toString());
}
}
@@ -300,7 +300,7 @@ public class BundlesMBeanImpl extends StandardMBean implements BundlesMBean {
try {
return bundleService.getStatus(bundleId);
} catch (Exception e) {
- throw new MBeanException(null, e.getMessage());
+ throw new MBeanException(null, e.toString());
}
}
http://git-wip-us.apache.org/repos/asf/karaf/blob/0885f0a6/config/src/main/java/org/apache/karaf/config/core/impl/ConfigMBeanImpl.java
----------------------------------------------------------------------
diff --git a/config/src/main/java/org/apache/karaf/config/core/impl/ConfigMBeanImpl.java b/config/src/main/java/org/apache/karaf/config/core/impl/ConfigMBeanImpl.java
index cc30538..8f3a582 100644
--- a/config/src/main/java/org/apache/karaf/config/core/impl/ConfigMBeanImpl.java
+++ b/config/src/main/java/org/apache/karaf/config/core/impl/ConfigMBeanImpl.java
@@ -72,7 +72,7 @@ public class ConfigMBeanImpl extends StandardMBean implements ConfigMBean {
}
return pids;
} catch (Exception e) {
- throw new MBeanException(null, e.getMessage());
+ throw new MBeanException(null, e.toString());
}
}
@@ -81,7 +81,7 @@ public class ConfigMBeanImpl extends StandardMBean implements ConfigMBean {
try {
configRepo.update(pid, new Hashtable());
} catch (Exception e) {
- throw new MBeanException(null, e.getMessage());
+ throw new MBeanException(null, e.toString());
}
}
@@ -89,7 +89,7 @@ public class ConfigMBeanImpl extends StandardMBean implements ConfigMBean {
try {
this.configRepo.delete(pid);
} catch (Exception e) {
- throw new MBeanException(null, e.getMessage());
+ throw new MBeanException(null, e.toString());
}
}
@@ -106,7 +106,7 @@ public class ConfigMBeanImpl extends StandardMBean implements ConfigMBean {
}
return propertiesMap;
} catch (Exception e) {
- throw new MBeanException(null, e.getMessage());
+ throw new MBeanException(null, e.toString());
}
}
@@ -117,7 +117,7 @@ public class ConfigMBeanImpl extends StandardMBean implements ConfigMBean {
dictionary.remove(key);
configRepo.update(pid, dictionary);
} catch (Exception e) {
- throw new MBeanException(null, e.getMessage());
+ throw new MBeanException(null, e.toString());
}
}
@@ -135,7 +135,7 @@ public class ConfigMBeanImpl extends StandardMBean implements ConfigMBean {
}
configRepo.update(pid, dictionary);
} catch (Exception e) {
- throw new MBeanException(null, e.getMessage());
+ throw new MBeanException(null, e.toString());
}
}
@@ -146,7 +146,7 @@ public class ConfigMBeanImpl extends StandardMBean implements ConfigMBean {
dictionary.put(key, value);
configRepo.update(pid, dictionary);
} catch (Exception e) {
- throw new MBeanException(null, e.getMessage());
+ throw new MBeanException(null, e.toString());
}
}
@@ -159,7 +159,7 @@ public class ConfigMBeanImpl extends StandardMBean implements ConfigMBean {
}
return null;
} catch (Exception e) {
- throw new MBeanException(null, e.getMessage());
+ throw new MBeanException(null, e.toString());
}
}
@@ -171,7 +171,7 @@ public class ConfigMBeanImpl extends StandardMBean implements ConfigMBean {
Dictionary<String, String> dictionary = toDictionary(properties);
configRepo.update(pid, dictionary);
} catch (Exception e) {
- throw new MBeanException(null, e.getMessage());
+ throw new MBeanException(null, e.toString());
}
}
http://git-wip-us.apache.org/repos/asf/karaf/blob/0885f0a6/http/src/main/java/org/apache/karaf/http/core/internal/HttpMBeanImpl.java
----------------------------------------------------------------------
diff --git a/http/src/main/java/org/apache/karaf/http/core/internal/HttpMBeanImpl.java b/http/src/main/java/org/apache/karaf/http/core/internal/HttpMBeanImpl.java
index f6c0ef5..f290aef 100644
--- a/http/src/main/java/org/apache/karaf/http/core/internal/HttpMBeanImpl.java
+++ b/http/src/main/java/org/apache/karaf/http/core/internal/HttpMBeanImpl.java
@@ -65,7 +65,7 @@ public class HttpMBeanImpl extends StandardMBean implements HttpMBean {
}
return table;
} catch (Exception e) {
- throw new MBeanException(null, e.getMessage());
+ throw new MBeanException(null, e.toString());
}
}
http://git-wip-us.apache.org/repos/asf/karaf/blob/0885f0a6/instance/src/main/java/org/apache/karaf/instance/core/internal/InstancesMBeanImpl.java
----------------------------------------------------------------------
diff --git a/instance/src/main/java/org/apache/karaf/instance/core/internal/InstancesMBeanImpl.java b/instance/src/main/java/org/apache/karaf/instance/core/internal/InstancesMBeanImpl.java
index f7006fd..378d332 100644
--- a/instance/src/main/java/org/apache/karaf/instance/core/internal/InstancesMBeanImpl.java
+++ b/instance/src/main/java/org/apache/karaf/instance/core/internal/InstancesMBeanImpl.java
@@ -73,7 +73,7 @@ public class InstancesMBeanImpl extends StandardMBean implements InstancesMBean
return -1;
}
} catch (Exception e) {
- throw new MBeanException(null, e.getMessage());
+ throw new MBeanException(null, e.toString());
}
}
@@ -81,7 +81,7 @@ public class InstancesMBeanImpl extends StandardMBean implements InstancesMBean
try {
getExistingInstance(name).changeSshPort(port);
} catch (Exception e) {
- throw new MBeanException(null, e.getMessage());
+ throw new MBeanException(null, e.toString());
}
}
@@ -89,7 +89,7 @@ public class InstancesMBeanImpl extends StandardMBean implements InstancesMBean
try {
getExistingInstance(name).changeSshHost(host);
} catch (Exception e) {
- throw new MBeanException(null, e.getMessage());
+ throw new MBeanException(null, e.toString());
}
}
@@ -97,7 +97,7 @@ public class InstancesMBeanImpl extends StandardMBean implements InstancesMBean
try {
getExistingInstance(name).changeRmiRegistryPort(port);
} catch (Exception e) {
- throw new MBeanException(null, e.getMessage());
+ throw new MBeanException(null, e.toString());
}
}
@@ -105,7 +105,7 @@ public class InstancesMBeanImpl extends StandardMBean implements InstancesMBean
try {
getExistingInstance(name).changeRmiServerPort(port);
} catch (Exception e) {
- throw new MBeanException(null, e.getMessage());
+ throw new MBeanException(null, e.toString());
}
}
@@ -113,7 +113,7 @@ public class InstancesMBeanImpl extends StandardMBean implements InstancesMBean
try {
getExistingInstance(name).changeJavaOpts(javaOpts);
} catch (Exception e) {
- throw new MBeanException(null, e.getMessage());
+ throw new MBeanException(null, e.toString());
}
}
@@ -121,7 +121,7 @@ public class InstancesMBeanImpl extends StandardMBean implements InstancesMBean
try {
getExistingInstance(name).destroy();
} catch (Exception e) {
- throw new MBeanException(null, e.getMessage());
+ throw new MBeanException(null, e.toString());
}
}
@@ -129,7 +129,7 @@ public class InstancesMBeanImpl extends StandardMBean implements InstancesMBean
try {
getExistingInstance(name).start(null);
} catch (Exception e) {
- throw new MBeanException(null, e.getMessage());
+ throw new MBeanException(null, e.toString());
}
}
@@ -137,7 +137,7 @@ public class InstancesMBeanImpl extends StandardMBean implements InstancesMBean
try {
getExistingInstance(name).start(opts);
} catch (Exception e) {
- throw new MBeanException(null, e.getMessage());
+ throw new MBeanException(null, e.toString());
}
}
@@ -169,7 +169,7 @@ public class InstancesMBeanImpl extends StandardMBean implements InstancesMBean
child.start(opts);
}
} catch (Exception e) {
- throw new MBeanException(null, e.getMessage());
+ throw new MBeanException(null, e.toString());
}
}
@@ -177,7 +177,7 @@ public class InstancesMBeanImpl extends StandardMBean implements InstancesMBean
try {
getExistingInstance(name).stop();
} catch (Exception e) {
- throw new MBeanException(null, e.getMessage());
+ throw new MBeanException(null, e.toString());
}
}
@@ -185,7 +185,7 @@ public class InstancesMBeanImpl extends StandardMBean implements InstancesMBean
try {
instanceService.renameInstance(originalName, newName, false);
} catch (Exception e) {
- throw new MBeanException(null, e.getMessage());
+ throw new MBeanException(null, e.toString());
}
}
@@ -193,7 +193,7 @@ public class InstancesMBeanImpl extends StandardMBean implements InstancesMBean
try {
instanceService.renameInstance(originalName, newName, verbose);
} catch (Exception e) {
- throw new MBeanException(null, e.getMessage());
+ throw new MBeanException(null, e.toString());
}
}
@@ -210,7 +210,7 @@ public class InstancesMBeanImpl extends StandardMBean implements InstancesMBean
instanceService.cloneInstance(name, cloneName, settings, false);
} catch (Exception e) {
- throw new MBeanException(null, e.getMessage());
+ throw new MBeanException(null, e.toString());
}
}
http://git-wip-us.apache.org/repos/asf/karaf/blob/0885f0a6/jdbc/src/main/java/org/apache/karaf/jdbc/internal/JdbcMBeanImpl.java
----------------------------------------------------------------------
diff --git a/jdbc/src/main/java/org/apache/karaf/jdbc/internal/JdbcMBeanImpl.java b/jdbc/src/main/java/org/apache/karaf/jdbc/internal/JdbcMBeanImpl.java
index 90edf67..630106c 100644
--- a/jdbc/src/main/java/org/apache/karaf/jdbc/internal/JdbcMBeanImpl.java
+++ b/jdbc/src/main/java/org/apache/karaf/jdbc/internal/JdbcMBeanImpl.java
@@ -59,7 +59,7 @@ public class JdbcMBeanImpl implements JdbcMBean {
}
return table;
} catch (Exception e) {
- throw new MBeanException(null, e.getMessage());
+ throw new MBeanException(null, e.toString());
}
}
@@ -68,7 +68,7 @@ public class JdbcMBeanImpl implements JdbcMBean {
try {
jdbcService.create(name, driverName, driverClass, databaseName, url, user, password, databaseType);
} catch (Exception e) {
- throw new MBeanException(null, e.getMessage());
+ throw new MBeanException(null, e.toString());
}
}
@@ -77,7 +77,7 @@ public class JdbcMBeanImpl implements JdbcMBean {
try {
jdbcService.delete(name);
} catch (Exception e) {
- throw new MBeanException(null, e.getMessage());
+ throw new MBeanException(null, e.toString());
}
}
@@ -86,7 +86,7 @@ public class JdbcMBeanImpl implements JdbcMBean {
try {
return jdbcService.info(datasource);
} catch (Exception e) {
- throw new MBeanException(null, e.getMessage());
+ throw new MBeanException(null, e.toString());
}
}
@@ -120,7 +120,7 @@ public class JdbcMBeanImpl implements JdbcMBean {
return table;
} catch (Exception e) {
e.printStackTrace();
- throw new MBeanException(null, e.getMessage());
+ throw new MBeanException(null, e.toString());
}
}
@@ -129,7 +129,7 @@ public class JdbcMBeanImpl implements JdbcMBean {
try {
jdbcService.execute(datasource, command);
} catch (Exception e) {
- throw new MBeanException(null, e.getMessage());
+ throw new MBeanException(null, e.toString());
}
}
@@ -162,7 +162,7 @@ public class JdbcMBeanImpl implements JdbcMBean {
return table;
} catch (Exception e) {
- throw new MBeanException(null, e.getMessage());
+ throw new MBeanException(null, e.toString());
}
}
http://git-wip-us.apache.org/repos/asf/karaf/blob/0885f0a6/kar/src/main/java/org/apache/karaf/kar/internal/KarsMBeanImpl.java
----------------------------------------------------------------------
diff --git a/kar/src/main/java/org/apache/karaf/kar/internal/KarsMBeanImpl.java b/kar/src/main/java/org/apache/karaf/kar/internal/KarsMBeanImpl.java
index b274e21..9cee12b 100644
--- a/kar/src/main/java/org/apache/karaf/kar/internal/KarsMBeanImpl.java
+++ b/kar/src/main/java/org/apache/karaf/kar/internal/KarsMBeanImpl.java
@@ -37,7 +37,7 @@ public class KarsMBeanImpl extends StandardMBean implements KarsMBean {
try {
return karService.list();
} catch (Exception e) {
- throw new MBeanException(null, e.getMessage());
+ throw new MBeanException(null, e.toString());
}
}
@@ -49,7 +49,7 @@ public class KarsMBeanImpl extends StandardMBean implements KarsMBean {
try {
karService.install(new URI(url));
} catch (Exception e) {
- throw new MBeanException(null, e.getMessage());
+ throw new MBeanException(null, e.toString());
}
}
@@ -57,7 +57,7 @@ public class KarsMBeanImpl extends StandardMBean implements KarsMBean {
try {
karService.uninstall(name);
} catch (Exception e) {
- throw new MBeanException(null, e.getMessage());
+ throw new MBeanException(null, e.toString());
}
}
http://git-wip-us.apache.org/repos/asf/karaf/blob/0885f0a6/obr/src/main/java/org/apache/karaf/obr/core/internal/ObrMBeanImpl.java
----------------------------------------------------------------------
diff --git a/obr/src/main/java/org/apache/karaf/obr/core/internal/ObrMBeanImpl.java b/obr/src/main/java/org/apache/karaf/obr/core/internal/ObrMBeanImpl.java
index c182165..4dbb599 100644
--- a/obr/src/main/java/org/apache/karaf/obr/core/internal/ObrMBeanImpl.java
+++ b/obr/src/main/java/org/apache/karaf/obr/core/internal/ObrMBeanImpl.java
@@ -90,7 +90,7 @@ public class ObrMBeanImpl extends StandardMBean implements ObrMBean {
return table;
} catch (Exception e) {
- throw new MBeanException(null, e.getMessage());
+ throw new MBeanException(null, e.toString());
}
}
@@ -98,7 +98,7 @@ public class ObrMBeanImpl extends StandardMBean implements ObrMBean {
try {
repositoryAdmin.addRepository(url);
} catch (Exception e) {
- throw new MBeanException(null, e.getMessage());
+ throw new MBeanException(null, e.toString());
}
}
@@ -110,7 +110,7 @@ public class ObrMBeanImpl extends StandardMBean implements ObrMBean {
try {
repositoryAdmin.addRepository(url);
} catch (Exception e) {
- throw new MBeanException(null, e.getMessage());
+ throw new MBeanException(null, e.toString());
}
}
@@ -118,7 +118,7 @@ public class ObrMBeanImpl extends StandardMBean implements ObrMBean {
try {
deployBundle(bundle, false, false);
} catch (Exception e) {
- throw new MBeanException(null, e.getMessage());
+ throw new MBeanException(null, e.toString());
}
}
@@ -142,7 +142,7 @@ public class ObrMBeanImpl extends StandardMBean implements ObrMBean {
}
}
} catch (Exception e) {
- throw new MBeanException(null, e.getMessage());
+ throw new MBeanException(null, e.toString());
}
}
http://git-wip-us.apache.org/repos/asf/karaf/blob/0885f0a6/scr/management/src/main/java/org/apache/karaf/scr/management/internal/ScrServiceMBeanImpl.java
----------------------------------------------------------------------
diff --git a/scr/management/src/main/java/org/apache/karaf/scr/management/internal/ScrServiceMBeanImpl.java b/scr/management/src/main/java/org/apache/karaf/scr/management/internal/ScrServiceMBeanImpl.java
index 13ce9f8..cffe7ac 100644
--- a/scr/management/src/main/java/org/apache/karaf/scr/management/internal/ScrServiceMBeanImpl.java
+++ b/scr/management/src/main/java/org/apache/karaf/scr/management/internal/ScrServiceMBeanImpl.java
@@ -130,7 +130,7 @@ public class ScrServiceMBeanImpl extends StandardMBean implements ScrServiceMBea
try {
return (componentState(componentName) == Component.STATE_ACTIVE) ? true : false;
} catch (Exception e) {
- throw new MBeanException(null, e.getMessage());
+ throw new MBeanException(null, e.toString());
}
}
http://git-wip-us.apache.org/repos/asf/karaf/blob/0885f0a6/service/core/src/main/java/org/apache/karaf/service/core/internal/ServicesMBeanImpl.java
----------------------------------------------------------------------
diff --git a/service/core/src/main/java/org/apache/karaf/service/core/internal/ServicesMBeanImpl.java b/service/core/src/main/java/org/apache/karaf/service/core/internal/ServicesMBeanImpl.java
index b0ddf02..97ea0aa 100644
--- a/service/core/src/main/java/org/apache/karaf/service/core/internal/ServicesMBeanImpl.java
+++ b/service/core/src/main/java/org/apache/karaf/service/core/internal/ServicesMBeanImpl.java
@@ -52,7 +52,7 @@ public class ServicesMBeanImpl extends StandardMBean implements ServicesMBean {
try {
return getServices(-1, false);
} catch (Exception e) {
- throw new MBeanException(null, e.getMessage());
+ throw new MBeanException(null, e.toString());
}
}
@@ -60,7 +60,7 @@ public class ServicesMBeanImpl extends StandardMBean implements ServicesMBean {
try {
return getServices(-1, inUse);
} catch (Exception e) {
- throw new MBeanException(null, e.getMessage());
+ throw new MBeanException(null, e.toString());
}
}
@@ -68,7 +68,7 @@ public class ServicesMBeanImpl extends StandardMBean implements ServicesMBean {
try {
return getServices(bundleId, false);
} catch (Exception e) {
- throw new MBeanException(null, e.getMessage());
+ throw new MBeanException(null, e.toString());
}
}
@@ -115,7 +115,7 @@ public class ServicesMBeanImpl extends StandardMBean implements ServicesMBean {
}
return table;
} catch (Exception e) {
- throw new MBeanException(null, e.getMessage());
+ throw new MBeanException(null, e.toString());
}
}
http://git-wip-us.apache.org/repos/asf/karaf/blob/0885f0a6/system/src/main/java/org/apache/karaf/system/management/internal/SystemMBeanImpl.java
----------------------------------------------------------------------
diff --git a/system/src/main/java/org/apache/karaf/system/management/internal/SystemMBeanImpl.java b/system/src/main/java/org/apache/karaf/system/management/internal/SystemMBeanImpl.java
index c0f34cd..5145bf1 100644
--- a/system/src/main/java/org/apache/karaf/system/management/internal/SystemMBeanImpl.java
+++ b/system/src/main/java/org/apache/karaf/system/management/internal/SystemMBeanImpl.java
@@ -58,7 +58,7 @@ public class SystemMBeanImpl extends StandardMBean implements SystemMBean {
try {
systemService.halt();
} catch (Exception e) {
- throw new MBeanException(null, e.getMessage());
+ throw new MBeanException(null, e.toString());
}
}
@@ -66,7 +66,7 @@ public class SystemMBeanImpl extends StandardMBean implements SystemMBean {
try {
systemService.halt(time);
} catch (Exception e) {
- throw new MBeanException(null, e.getMessage());
+ throw new MBeanException(null, e.toString());
}
}
@@ -74,7 +74,7 @@ public class SystemMBeanImpl extends StandardMBean implements SystemMBean {
try {
systemService.reboot();
} catch (Exception e) {
- throw new MBeanException(null, e.getMessage());
+ throw new MBeanException(null, e.toString());
}
}
@@ -82,7 +82,7 @@ public class SystemMBeanImpl extends StandardMBean implements SystemMBean {
try {
systemService.reboot(time, SystemService.Swipe.NONE);
} catch (Exception e) {
- throw new MBeanException(null, e.getMessage());
+ throw new MBeanException(null, e.toString());
}
}
@@ -90,7 +90,7 @@ public class SystemMBeanImpl extends StandardMBean implements SystemMBean {
try {
systemService.reboot(time, SystemService.Swipe.CACHE);
} catch (Exception e) {
- throw new MBeanException(null, e.getMessage());
+ throw new MBeanException(null, e.toString());
}
}
@@ -98,7 +98,7 @@ public class SystemMBeanImpl extends StandardMBean implements SystemMBean {
try {
systemService.reboot(time, SystemService.Swipe.ALL);
} catch (Exception e) {
- throw new MBeanException(null, e.getMessage());
+ throw new MBeanException(null, e.toString());
}
}
@@ -106,7 +106,7 @@ public class SystemMBeanImpl extends StandardMBean implements SystemMBean {
try {
systemService.setStartLevel(startLevel);
} catch (Exception e) {
- throw new MBeanException(null, e.getMessage());
+ throw new MBeanException(null, e.toString());
}
}
@@ -114,7 +114,7 @@ public class SystemMBeanImpl extends StandardMBean implements SystemMBean {
try {
return systemService.getStartLevel();
} catch (Exception e) {
- throw new MBeanException(null, e.getMessage());
+ throw new MBeanException(null, e.toString());
}
}
@@ -205,7 +205,7 @@ public class SystemMBeanImpl extends StandardMBean implements SystemMBean {
return result;
} catch (Exception e) {
- throw new MBeanException(null, e.getMessage());
+ throw new MBeanException(null, e.toString());
}
}
http://git-wip-us.apache.org/repos/asf/karaf/blob/0885f0a6/web/src/main/java/org/apache/karaf/web/management/internal/WebMBeanImpl.java
----------------------------------------------------------------------
diff --git a/web/src/main/java/org/apache/karaf/web/management/internal/WebMBeanImpl.java b/web/src/main/java/org/apache/karaf/web/management/internal/WebMBeanImpl.java
index f1a81bb..dd91579 100644
--- a/web/src/main/java/org/apache/karaf/web/management/internal/WebMBeanImpl.java
+++ b/web/src/main/java/org/apache/karaf/web/management/internal/WebMBeanImpl.java
@@ -73,7 +73,7 @@ public class WebMBeanImpl extends StandardMBean implements WebMBean {
}
return table;
} catch (Exception e) {
- throw new MBeanException(null, e.getMessage());
+ throw new MBeanException(null, e.toString());
}
}
@@ -83,7 +83,7 @@ public class WebMBeanImpl extends StandardMBean implements WebMBean {
list.add(bundleId);
webContainerService.start(list);
} catch (Exception e) {
- throw new MBeanException(null, e.getMessage());
+ throw new MBeanException(null, e.toString());
}
}
@@ -91,7 +91,7 @@ public class WebMBeanImpl extends StandardMBean implements WebMBean {
try {
webContainerService.start(bundleIds);
} catch (Exception e) {
- throw new MBeanException(null, e.getMessage());
+ throw new MBeanException(null, e.toString());
}
}
@@ -101,7 +101,7 @@ public class WebMBeanImpl extends StandardMBean implements WebMBean {
list.add(bundleId);
webContainerService.stop(list);
} catch (Exception e) {
- throw new MBeanException(null, e.getMessage());
+ throw new MBeanException(null, e.toString());
}
}
@@ -109,7 +109,7 @@ public class WebMBeanImpl extends StandardMBean implements WebMBean {
try {
webContainerService.stop(bundleIds);
} catch (Exception e) {
- throw new MBeanException(null, e.getMessage());
+ throw new MBeanException(null, e.toString());
}
}
http://git-wip-us.apache.org/repos/asf/karaf/blob/0885f0a6/wrapper/src/main/java/org/apache/karaf/wrapper/management/internal/WrapperMBeanImpl.java
----------------------------------------------------------------------
diff --git a/wrapper/src/main/java/org/apache/karaf/wrapper/management/internal/WrapperMBeanImpl.java b/wrapper/src/main/java/org/apache/karaf/wrapper/management/internal/WrapperMBeanImpl.java
index 9be5b8e..6f1eeda 100644
--- a/wrapper/src/main/java/org/apache/karaf/wrapper/management/internal/WrapperMBeanImpl.java
+++ b/wrapper/src/main/java/org/apache/karaf/wrapper/management/internal/WrapperMBeanImpl.java
@@ -47,7 +47,7 @@ public class WrapperMBeanImpl extends StandardMBean implements WrapperMBean {
try {
wrapperService.install();
} catch (Exception e) {
- throw new MBeanException(null, e.getMessage());
+ throw new MBeanException(null, e.toString());
}
}
@@ -55,7 +55,7 @@ public class WrapperMBeanImpl extends StandardMBean implements WrapperMBean {
try {
return wrapperService.install(name, displayName, description, startType);
} catch (Exception e) {
- throw new MBeanException(null, e.getMessage());
+ throw new MBeanException(null, e.toString());
}
}
@@ -63,7 +63,7 @@ public class WrapperMBeanImpl extends StandardMBean implements WrapperMBean {
try {
return wrapperService.install(name, displayName, description, startType, envs, includes);
} catch (Exception e) {
- throw new MBeanException(null, e.getMessage());
+ throw new MBeanException(null, e.toString());
}
}
[2/7] karaf git commit: Fix artemis feature repo url
Posted by gn...@apache.org.
Fix artemis feature repo url
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/f1d685db
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/f1d685db
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/f1d685db
Branch: refs/heads/master
Commit: f1d685dbd66623091ca3cb0f4b55e7c6f2566a8d
Parents: 85eaedd
Author: Guillaume Nodet <gn...@apache.org>
Authored: Mon Oct 3 15:29:43 2016 +0200
Committer: Guillaume Nodet <gn...@apache.org>
Committed: Mon Oct 3 15:29:43 2016 +0200
----------------------------------------------------------------------
.../resources/etc/org.apache.karaf.features.repos.cfg | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/f1d685db/assemblies/features/base/src/main/filtered-resources/resources/etc/org.apache.karaf.features.repos.cfg
----------------------------------------------------------------------
diff --git a/assemblies/features/base/src/main/filtered-resources/resources/etc/org.apache.karaf.features.repos.cfg b/assemblies/features/base/src/main/filtered-resources/resources/etc/org.apache.karaf.features.repos.cfg
index 3d4c3b3..d83805b 100644
--- a/assemblies/features/base/src/main/filtered-resources/resources/etc/org.apache.karaf.features.repos.cfg
+++ b/assemblies/features/base/src/main/filtered-resources/resources/etc/org.apache.karaf.features.repos.cfg
@@ -48,7 +48,7 @@ aries-jpa=mvn:org.apache.aries.jpa/jpa-features/RELEASE/xml/features
aries-rsa=mvn:org.apache.aries.rsa/rsa-features/RELEASE/xml/features
hibernate=mvn:org.hibernate/hibernate-osgi/RELEASE/xml/karaf
ignite=mvn:org.apache.ignite/ignite-osgi-karaf/RELEASE/xml/features
-artemis=mvn:org.apache.activemq/artemis-features/RELEASE/xml
openjpa=mvn:org.apache.openjpa/openjpa-features/RELEASE/xml/features
+artemis=mvn:org.apache.activemq/artemis-features/RELEASE/xml/features
[6/7] karaf git commit: Make sure jline reader can see session
variables
Posted by gn...@apache.org.
Make sure jline reader can see session variables
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/f6291b9a
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/f6291b9a
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/f6291b9a
Branch: refs/heads/master
Commit: f6291b9a2ee4f1b50ebcc585a62541d2b6ac68b9
Parents: bb3f66a
Author: Guillaume Nodet <gn...@apache.org>
Authored: Mon Oct 3 15:34:47 2016 +0200
Committer: Guillaume Nodet <gn...@apache.org>
Committed: Mon Oct 3 15:34:47 2016 +0200
----------------------------------------------------------------------
.../shell/impl/console/ConsoleSessionImpl.java | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/f6291b9a/shell/core/src/main/java/org/apache/karaf/shell/impl/console/ConsoleSessionImpl.java
----------------------------------------------------------------------
diff --git a/shell/core/src/main/java/org/apache/karaf/shell/impl/console/ConsoleSessionImpl.java b/shell/core/src/main/java/org/apache/karaf/shell/impl/console/ConsoleSessionImpl.java
index f390b27..ff3cbfd 100644
--- a/shell/core/src/main/java/org/apache/karaf/shell/impl/console/ConsoleSessionImpl.java
+++ b/shell/core/src/main/java/org/apache/karaf/shell/impl/console/ConsoleSessionImpl.java
@@ -35,6 +35,7 @@ import java.util.regex.Pattern;
import org.apache.felix.gogo.api.Job;
import org.apache.felix.gogo.api.Job.Status;
+import org.apache.felix.gogo.runtime.CommandSessionImpl;
import org.apache.felix.service.command.CommandProcessor;
import org.apache.felix.service.command.CommandSession;
import org.apache.felix.service.command.Converter;
@@ -125,14 +126,16 @@ public class ConsoleSessionImpl implements Session {
}
}
+ // Create session
+ session = processor.createSession(jlineTerminal.input(),
+ jlineTerminal.output(),
+ jlineTerminal.output());
+
// Console reader
- try {
- reader = new LineReaderImpl(
- jlineTerminal,
- "karaf");
- } catch (IOException e) {
- throw new RuntimeException("Error opening console reader", e);
- }
+ reader = new LineReaderImpl(
+ jlineTerminal,
+ "karaf",
+ ((CommandSessionImpl) session).getVariables());
// History
final File file = getHistoryFile();
@@ -168,9 +171,6 @@ public class ConsoleSessionImpl implements Session {
registry.register(new FileOrUriCompleter());
// Session
- session = processor.createSession(jlineTerminal.input(),
- jlineTerminal.output(),
- jlineTerminal.output());
Properties sysProps = System.getProperties();
for (Object key : sysProps.keySet()) {
session.put(key.toString(), sysProps.get(key));