You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2013/11/25 15:00:38 UTC
svn commit: r1545287 - in /karaf/trunk/wrapper/core/src/main:
java/org/apache/karaf/wrapper/management/
java/org/apache/karaf/wrapper/management/internal/
resources/OSGI-INF/blueprint/
Author: jbonofre
Date: Mon Nov 25 14:00:37 2013
New Revision: 1545287
URL: http://svn.apache.org/r1545287
Log:
[KARAF-2264] Rename Wrapper to WrapperMBeanImpl and wrap exceptions as MBeanException
Added:
karaf/trunk/wrapper/core/src/main/java/org/apache/karaf/wrapper/management/internal/WrapperMBeanImpl.java
- copied, changed from r1545265, karaf/trunk/wrapper/core/src/main/java/org/apache/karaf/wrapper/management/internal/Wrapper.java
Removed:
karaf/trunk/wrapper/core/src/main/java/org/apache/karaf/wrapper/management/internal/Wrapper.java
Modified:
karaf/trunk/wrapper/core/src/main/java/org/apache/karaf/wrapper/management/WrapperMBean.java
karaf/trunk/wrapper/core/src/main/resources/OSGI-INF/blueprint/wrapper-core.xml
Modified: karaf/trunk/wrapper/core/src/main/java/org/apache/karaf/wrapper/management/WrapperMBean.java
URL: http://svn.apache.org/viewvc/karaf/trunk/wrapper/core/src/main/java/org/apache/karaf/wrapper/management/WrapperMBean.java?rev=1545287&r1=1545286&r2=1545287&view=diff
==============================================================================
--- karaf/trunk/wrapper/core/src/main/java/org/apache/karaf/wrapper/management/WrapperMBean.java (original)
+++ karaf/trunk/wrapper/core/src/main/java/org/apache/karaf/wrapper/management/WrapperMBean.java Mon Nov 25 14:00:37 2013
@@ -16,6 +16,7 @@
*/
package org.apache.karaf.wrapper.management;
+import javax.management.MBeanException;
import java.io.File;
/**
@@ -26,9 +27,9 @@ public interface WrapperMBean {
/**
* Install the service wrapper.
*
- * @throws Exception in case of installation failure.
+ * @throws MBeanException in case of installation failure.
*/
- void install() throws Exception;
+ void install() throws MBeanException;
/**
* Install the service wrapper.
@@ -38,8 +39,8 @@ public interface WrapperMBean {
* @param description the service description.
* @param startType the start type.
* @return the wrapper configuration (index 0) and service files (index 1).
- * @throws Exception in case of installation failure.
+ * @throws MBeanException in case of installation failure.
*/
- File[] install(String name, String displayName, String description, String startType) throws Exception;
+ File[] install(String name, String displayName, String description, String startType) throws MBeanException;
}
Copied: karaf/trunk/wrapper/core/src/main/java/org/apache/karaf/wrapper/management/internal/WrapperMBeanImpl.java (from r1545265, karaf/trunk/wrapper/core/src/main/java/org/apache/karaf/wrapper/management/internal/Wrapper.java)
URL: http://svn.apache.org/viewvc/karaf/trunk/wrapper/core/src/main/java/org/apache/karaf/wrapper/management/internal/WrapperMBeanImpl.java?p2=karaf/trunk/wrapper/core/src/main/java/org/apache/karaf/wrapper/management/internal/WrapperMBeanImpl.java&p1=karaf/trunk/wrapper/core/src/main/java/org/apache/karaf/wrapper/management/internal/Wrapper.java&r1=1545265&r2=1545287&rev=1545287&view=diff
==============================================================================
--- karaf/trunk/wrapper/core/src/main/java/org/apache/karaf/wrapper/management/internal/Wrapper.java (original)
+++ karaf/trunk/wrapper/core/src/main/java/org/apache/karaf/wrapper/management/internal/WrapperMBeanImpl.java Mon Nov 25 14:00:37 2013
@@ -19,6 +19,7 @@ package org.apache.karaf.wrapper.managem
import org.apache.karaf.wrapper.WrapperService;
import org.apache.karaf.wrapper.management.WrapperMBean;
+import javax.management.MBeanException;
import javax.management.NotCompliantMBeanException;
import javax.management.StandardMBean;
import java.io.File;
@@ -26,11 +27,11 @@ import java.io.File;
/**
* Implementation of the wrapper MBean.
*/
-public class Wrapper extends StandardMBean implements WrapperMBean {
+public class WrapperMBeanImpl extends StandardMBean implements WrapperMBean {
private WrapperService wrapperService;
- public Wrapper() throws NotCompliantMBeanException {
+ public WrapperMBeanImpl() throws NotCompliantMBeanException {
super(WrapperMBean.class);
}
@@ -42,12 +43,20 @@ public class Wrapper extends StandardMBe
return this.wrapperService;
}
- public void install() throws Exception {
- wrapperService.install();
+ public void install() throws MBeanException {
+ try {
+ wrapperService.install();
+ } catch (Exception e) {
+ throw new MBeanException(null, e.getMessage());
+ }
}
- public File[] install(String name, String displayName, String description, String startType) throws Exception {
- return wrapperService.install(name, displayName, description, startType);
+ public File[] install(String name, String displayName, String description, String startType) throws MBeanException {
+ try {
+ return wrapperService.install(name, displayName, description, startType);
+ } catch (Exception e) {
+ throw new MBeanException(null, e.getMessage());
+ }
}
}
Modified: karaf/trunk/wrapper/core/src/main/resources/OSGI-INF/blueprint/wrapper-core.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/wrapper/core/src/main/resources/OSGI-INF/blueprint/wrapper-core.xml?rev=1545287&r1=1545286&r2=1545287&view=diff
==============================================================================
--- karaf/trunk/wrapper/core/src/main/resources/OSGI-INF/blueprint/wrapper-core.xml (original)
+++ karaf/trunk/wrapper/core/src/main/resources/OSGI-INF/blueprint/wrapper-core.xml Mon Nov 25 14:00:37 2013
@@ -27,7 +27,7 @@
<service ref="wrapperService" interface="org.apache.karaf.wrapper.WrapperService"/>
- <bean id="wrapperMBean" class="org.apache.karaf.wrapper.management.internal.Wrapper">
+ <bean id="wrapperMBean" class="org.apache.karaf.wrapper.management.internal.WrapperMBeanImpl">
<property name="wrapperService" ref="wrapperService" />
</bean>