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 11:01:21 UTC
svn commit: r1545200 - in /karaf/trunk/package/core/src:
main/java/org/apache/karaf/packages/core/
main/java/org/apache/karaf/packages/core/internal/
main/resources/OSGI-INF/blueprint/ test/java/org/apache/karaf/packages/core/
Author: jbonofre
Date: Mon Nov 25 10:01:20 2013
New Revision: 1545200
URL: http://svn.apache.org/r1545200
Log:
[KARAF-2264] Rename Packages to PackagesMBeanImpl.
Added:
karaf/trunk/package/core/src/main/java/org/apache/karaf/packages/core/internal/PackagesMBeanImpl.java
- copied, changed from r1545197, karaf/trunk/package/core/src/main/java/org/apache/karaf/packages/core/internal/Packages.java
Removed:
karaf/trunk/package/core/src/main/java/org/apache/karaf/packages/core/internal/Packages.java
Modified:
karaf/trunk/package/core/src/main/java/org/apache/karaf/packages/core/PackagesMBean.java
karaf/trunk/package/core/src/main/resources/OSGI-INF/blueprint/blueprint.xml
karaf/trunk/package/core/src/test/java/org/apache/karaf/packages/core/InstallMBeantest.java
Modified: karaf/trunk/package/core/src/main/java/org/apache/karaf/packages/core/PackagesMBean.java
URL: http://svn.apache.org/viewvc/karaf/trunk/package/core/src/main/java/org/apache/karaf/packages/core/PackagesMBean.java?rev=1545200&r1=1545199&r2=1545200&view=diff
==============================================================================
--- karaf/trunk/package/core/src/main/java/org/apache/karaf/packages/core/PackagesMBean.java (original)
+++ karaf/trunk/package/core/src/main/java/org/apache/karaf/packages/core/PackagesMBean.java Mon Nov 25 10:01:20 2013
@@ -21,7 +21,7 @@ import java.util.List;
import javax.management.openmbean.TabularData;
/**
- * Package MBean.
+ * Packages MBean.
*/
public interface PackagesMBean {
Copied: karaf/trunk/package/core/src/main/java/org/apache/karaf/packages/core/internal/PackagesMBeanImpl.java (from r1545197, karaf/trunk/package/core/src/main/java/org/apache/karaf/packages/core/internal/Packages.java)
URL: http://svn.apache.org/viewvc/karaf/trunk/package/core/src/main/java/org/apache/karaf/packages/core/internal/PackagesMBeanImpl.java?p2=karaf/trunk/package/core/src/main/java/org/apache/karaf/packages/core/internal/PackagesMBeanImpl.java&p1=karaf/trunk/package/core/src/main/java/org/apache/karaf/packages/core/internal/Packages.java&r1=1545197&r2=1545200&rev=1545200&view=diff
==============================================================================
--- karaf/trunk/package/core/src/main/java/org/apache/karaf/packages/core/internal/Packages.java (original)
+++ karaf/trunk/package/core/src/main/java/org/apache/karaf/packages/core/internal/PackagesMBeanImpl.java Mon Nov 25 10:01:20 2013
@@ -40,14 +40,15 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
- * Bundles MBean implementation.
+ * Implementation of the Packages MBean.
*/
-public class Packages extends StandardMBean implements PackagesMBean {
- private Logger log = LoggerFactory.getLogger(this.getClass());
+public class PackagesMBeanImpl extends StandardMBean implements PackagesMBean {
+
+ private final static Logger LOGGER = LoggerFactory.getLogger(PackagesMBeanImpl.class);
private final PackageService packageService;
- public Packages(PackageService packageService) throws NotCompliantMBeanException {
+ public PackagesMBeanImpl(PackageService packageService) throws NotCompliantMBeanException {
super(PackagesMBean.class);
this.packageService = packageService;
}
@@ -75,17 +76,17 @@ public class Packages extends StandardMB
bundle.getBundleId(),
bundle.getSymbolicName()};
CompositeData comp = new CompositeDataSupport(bundleType, names, data);
- log.debug("Adding CompositeDataSupport {} for key: {}", comp, key);
+ LOGGER.debug("Adding CompositeDataSupport {} for key: {}", comp, key);
table.put(comp);
}
}
return table;
} catch (RuntimeException e) {
// To avoid the exception gets swallowed by jmx
- log.error(e.getMessage(), e);
+ LOGGER.error(e.getMessage(), e);
throw e;
} catch (OpenDataException e) {
- log.error(e.getMessage(), e);
+ LOGGER.error(e.getMessage(), e);
throw new RuntimeException(e.getMessage(), e);
}
}
@@ -120,10 +121,10 @@ public class Packages extends StandardMB
return table;
} catch (RuntimeException e) {
// To avoid the exception gets swallowed by jmx
- log.error(e.getMessage(), e);
+ LOGGER.error(e.getMessage(), e);
throw e;
} catch (OpenDataException e) {
- log.error(e.getMessage(), e);
+ LOGGER.error(e.getMessage(), e);
throw new RuntimeException(e.getMessage(), e);
}
}
Modified: karaf/trunk/package/core/src/main/resources/OSGI-INF/blueprint/blueprint.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/package/core/src/main/resources/OSGI-INF/blueprint/blueprint.xml?rev=1545200&r1=1545199&r2=1545200&view=diff
==============================================================================
--- karaf/trunk/package/core/src/main/resources/OSGI-INF/blueprint/blueprint.xml (original)
+++ karaf/trunk/package/core/src/main/resources/OSGI-INF/blueprint/blueprint.xml Mon Nov 25 10:01:20 2013
@@ -27,7 +27,7 @@
</bean>
<service interface="org.apache.karaf.packages.core.PackageService" ref="packageService"/>
- <bean id="packageMBean" class="org.apache.karaf.packages.core.internal.Packages">
+ <bean id="packageMBean" class="org.apache.karaf.packages.core.internal.PackagesMBeanImpl">
<argument ref="packageService" />
</bean>
Modified: karaf/trunk/package/core/src/test/java/org/apache/karaf/packages/core/InstallMBeantest.java
URL: http://svn.apache.org/viewvc/karaf/trunk/package/core/src/test/java/org/apache/karaf/packages/core/InstallMBeantest.java?rev=1545200&r1=1545199&r2=1545200&view=diff
==============================================================================
--- karaf/trunk/package/core/src/test/java/org/apache/karaf/packages/core/InstallMBeantest.java (original)
+++ karaf/trunk/package/core/src/test/java/org/apache/karaf/packages/core/InstallMBeantest.java Mon Nov 25 10:01:20 2013
@@ -23,7 +23,7 @@ import java.lang.management.ManagementFa
import javax.management.MBeanServer;
import javax.management.ObjectName;
-import org.apache.karaf.packages.core.internal.Packages;
+import org.apache.karaf.packages.core.internal.PackagesMBeanImpl;
import org.junit.Test;
/**
@@ -35,7 +35,7 @@ public class InstallMBeantest {
@Test
public void test() throws Exception {
MBeanServer server = ManagementFactory.getPlatformMBeanServer();
- Packages pack = new Packages(null);
+ PackagesMBeanImpl pack = new PackagesMBeanImpl(null);
ObjectName oName = new ObjectName("org.apache.karaf:type=package,name=root");
server.registerMBean(pack, oName);
server.unregisterMBean(oName);