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/22 15:47:12 UTC
svn commit: r1544556 - in /karaf/trunk/kar/core/src/main:
java/org/apache/karaf/kar/KarsMBean.java
java/org/apache/karaf/kar/internal/Kars.java
java/org/apache/karaf/kar/internal/KarsMBeanImpl.java
resources/OSGI-INF/blueprint/kar-core.xml
Author: jbonofre
Date: Fri Nov 22 14:47:11 2013
New Revision: 1544556
URL: http://svn.apache.org/r1544556
Log:
[KARAF-2264] Rename Kars to KarsMBeanImpl and wrap exceptions as MBeanException
Added:
karaf/trunk/kar/core/src/main/java/org/apache/karaf/kar/internal/KarsMBeanImpl.java
- copied, changed from r1544554, karaf/trunk/kar/core/src/main/java/org/apache/karaf/kar/internal/Kars.java
Removed:
karaf/trunk/kar/core/src/main/java/org/apache/karaf/kar/internal/Kars.java
Modified:
karaf/trunk/kar/core/src/main/java/org/apache/karaf/kar/KarsMBean.java
karaf/trunk/kar/core/src/main/resources/OSGI-INF/blueprint/kar-core.xml
Modified: karaf/trunk/kar/core/src/main/java/org/apache/karaf/kar/KarsMBean.java
URL: http://svn.apache.org/viewvc/karaf/trunk/kar/core/src/main/java/org/apache/karaf/kar/KarsMBean.java?rev=1544556&r1=1544555&r2=1544556&view=diff
==============================================================================
--- karaf/trunk/kar/core/src/main/java/org/apache/karaf/kar/KarsMBean.java (original)
+++ karaf/trunk/kar/core/src/main/java/org/apache/karaf/kar/KarsMBean.java Fri Nov 22 14:47:11 2013
@@ -16,6 +16,7 @@
*/
package org.apache.karaf.kar;
+import javax.management.MBeanException;
import java.util.List;
public interface KarsMBean {
@@ -26,7 +27,7 @@ public interface KarsMBean {
* @return the list of KAR files.
* @throws Exception in case of listing failure.
*/
- List<String> getKars() throws Exception;
+ List<String> getKars() throws MBeanException;
/**
* Create a kar file for a list of feature repos
@@ -35,7 +36,7 @@ public interface KarsMBean {
* @param features the features to include in the kar
* @throws Exception in case of creation failure
*/
- void create(String repoName, List<String> features) throws Exception;
+ void create(String repoName, List<String> features);
/**
* Install a KAR file from the given URL.
@@ -43,7 +44,7 @@ public interface KarsMBean {
* @param url the JAR URL.
* @throws Exception in case of installation failure.
*/
- void install(String url) throws Exception;
+ void install(String url) throws MBeanException;
/**
* Uninstall a KAR file.
@@ -51,6 +52,6 @@ public interface KarsMBean {
* @param name the name of the KAR file.
* @throws Exception in case of uninstall failure.
*/
- void uninstall(String name) throws Exception;
+ void uninstall(String name) throws MBeanException;
}
Copied: karaf/trunk/kar/core/src/main/java/org/apache/karaf/kar/internal/KarsMBeanImpl.java (from r1544554, karaf/trunk/kar/core/src/main/java/org/apache/karaf/kar/internal/Kars.java)
URL: http://svn.apache.org/viewvc/karaf/trunk/kar/core/src/main/java/org/apache/karaf/kar/internal/KarsMBeanImpl.java?p2=karaf/trunk/kar/core/src/main/java/org/apache/karaf/kar/internal/KarsMBeanImpl.java&p1=karaf/trunk/kar/core/src/main/java/org/apache/karaf/kar/internal/Kars.java&r1=1544554&r2=1544556&rev=1544556&view=diff
==============================================================================
--- karaf/trunk/kar/core/src/main/java/org/apache/karaf/kar/internal/Kars.java (original)
+++ karaf/trunk/kar/core/src/main/java/org/apache/karaf/kar/internal/KarsMBeanImpl.java Fri Nov 22 14:47:11 2013
@@ -19,33 +19,46 @@ package org.apache.karaf.kar.internal;
import org.apache.karaf.kar.KarService;
import org.apache.karaf.kar.KarsMBean;
+import javax.management.MBeanException;
import javax.management.NotCompliantMBeanException;
import javax.management.StandardMBean;
import java.net.URI;
import java.util.List;
-public class Kars extends StandardMBean implements KarsMBean {
-
+public class KarsMBeanImpl extends StandardMBean implements KarsMBean {
+
private KarService karService;
-
- public Kars() throws NotCompliantMBeanException {
+
+ public KarsMBeanImpl() throws NotCompliantMBeanException {
super(KarsMBean.class);
}
-
- public List<String> getKars() throws Exception {
- return karService.list();
+
+ public List<String> getKars() throws MBeanException {
+ try {
+ return karService.list();
+ } catch (Exception e) {
+ throw new MBeanException(null, e.getMessage());
+ }
}
- public void create(String repoName, List<String> features) throws Exception {
+ public void create(String repoName, List<String> features) {
karService.create(repoName, features, null);
}
-
- public void install(String url) throws Exception {
- karService.install(new URI(url));
- }
-
- public void uninstall(String name) throws Exception {
- karService.uninstall(name);
+
+ public void install(String url) throws MBeanException {
+ try {
+ karService.install(new URI(url));
+ } catch (Exception e) {
+ throw new MBeanException(null, e.getMessage());
+ }
+ }
+
+ public void uninstall(String name) throws MBeanException {
+ try {
+ karService.uninstall(name);
+ } catch (Exception e) {
+ throw new MBeanException(null, e.getMessage());
+ }
}
public KarService getKarService() {
@@ -55,5 +68,5 @@ public class Kars extends StandardMBean
public void setKarService(KarService karService) {
this.karService = karService;
}
-
+
}
Modified: karaf/trunk/kar/core/src/main/resources/OSGI-INF/blueprint/kar-core.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/kar/core/src/main/resources/OSGI-INF/blueprint/kar-core.xml?rev=1544556&r1=1544555&r2=1544556&view=diff
==============================================================================
--- karaf/trunk/kar/core/src/main/resources/OSGI-INF/blueprint/kar-core.xml (original)
+++ karaf/trunk/kar/core/src/main/resources/OSGI-INF/blueprint/kar-core.xml Fri Nov 22 14:47:11 2013
@@ -40,7 +40,7 @@
<service ref="karService" interface="org.apache.karaf.kar.KarService"/>
- <bean id="mbeanImpl" class="org.apache.karaf.kar.internal.Kars">
+ <bean id="mbeanImpl" class="org.apache.karaf.kar.internal.KarsMBeanImpl">
<property name="karService" ref="karService"/>
</bean>