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 2016/09/01 11:09:42 UTC
karaf-cellar git commit: [KARAF-4678] Add MBean service provide
capability in Cellar bundles. This closes #30
Repository: karaf-cellar
Updated Branches:
refs/heads/master b2188d28d -> 4565b92ae
[KARAF-4678] Add MBean service provide capability in Cellar bundles. This closes #30
Project: http://git-wip-us.apache.org/repos/asf/karaf-cellar/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf-cellar/commit/4565b92a
Tree: http://git-wip-us.apache.org/repos/asf/karaf-cellar/tree/4565b92a
Diff: http://git-wip-us.apache.org/repos/asf/karaf-cellar/diff/4565b92a
Branch: refs/heads/master
Commit: 4565b92aee4b78391448e0472f15f79d00ca387b
Parents: b2188d2
Author: Jean-Baptiste Onofr� <jb...@apache.org>
Authored: Thu Sep 1 13:08:59 2016 +0200
Committer: Jean-Baptiste Onofr� <jb...@apache.org>
Committed: Thu Sep 1 13:08:59 2016 +0200
----------------------------------------------------------------------
.../apache/karaf/cellar/bundle/internal/osgi/Activator.java | 4 +++-
.../apache/karaf/cellar/config/internal/osgi/Activator.java | 4 +++-
.../apache/karaf/cellar/dosgi/internal/osgi/Activator.java | 4 +++-
.../karaf/cellar/features/internal/osgi/Activator.java | 4 +++-
.../karaf/cellar/hazelcast/internal/osgi/Activator.java | 8 +++++++-
.../karaf/cellar/http/balancer/internal/osgi/Activator.java | 4 +++-
.../org/apache/karaf/cellar/log/internal/osgi/Activator.java | 6 ++++--
.../org/apache/karaf/cellar/obr/internal/osgi/Activator.java | 4 +++-
8 files changed, 29 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/4565b92a/bundle/src/main/java/org/apache/karaf/cellar/bundle/internal/osgi/Activator.java
----------------------------------------------------------------------
diff --git a/bundle/src/main/java/org/apache/karaf/cellar/bundle/internal/osgi/Activator.java b/bundle/src/main/java/org/apache/karaf/cellar/bundle/internal/osgi/Activator.java
index d9559e5..ee023fe 100644
--- a/bundle/src/main/java/org/apache/karaf/cellar/bundle/internal/osgi/Activator.java
+++ b/bundle/src/main/java/org/apache/karaf/cellar/bundle/internal/osgi/Activator.java
@@ -16,6 +16,7 @@ package org.apache.karaf.cellar.bundle.internal.osgi;
import org.apache.karaf.cellar.bundle.BundleEventHandler;
import org.apache.karaf.cellar.bundle.BundleSynchronizer;
import org.apache.karaf.cellar.bundle.LocalBundleListener;
+import org.apache.karaf.cellar.bundle.management.CellarBundleMBean;
import org.apache.karaf.cellar.bundle.management.internal.CellarBundleMBeanImpl;
import org.apache.karaf.cellar.core.ClusterManager;
import org.apache.karaf.cellar.core.GroupManager;
@@ -37,7 +38,8 @@ import java.util.Hashtable;
@Services(
provides = {
@ProvideService(EventHandler.class),
- @ProvideService(Synchronizer.class)
+ @ProvideService(Synchronizer.class),
+ @ProvideService(CellarBundleMBean.class)
},
requires = {
@RequireService(ClusterManager.class),
http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/4565b92a/config/src/main/java/org/apache/karaf/cellar/config/internal/osgi/Activator.java
----------------------------------------------------------------------
diff --git a/config/src/main/java/org/apache/karaf/cellar/config/internal/osgi/Activator.java b/config/src/main/java/org/apache/karaf/cellar/config/internal/osgi/Activator.java
index d52746e..bd4d649 100644
--- a/config/src/main/java/org/apache/karaf/cellar/config/internal/osgi/Activator.java
+++ b/config/src/main/java/org/apache/karaf/cellar/config/internal/osgi/Activator.java
@@ -16,6 +16,7 @@ package org.apache.karaf.cellar.config.internal.osgi;
import org.apache.karaf.cellar.config.ConfigurationEventHandler;
import org.apache.karaf.cellar.config.ConfigurationSynchronizer;
import org.apache.karaf.cellar.config.LocalConfigurationListener;
+import org.apache.karaf.cellar.config.management.CellarConfigMBean;
import org.apache.karaf.cellar.config.management.internal.CellarConfigMBeanImpl;
import org.apache.karaf.cellar.core.ClusterManager;
import org.apache.karaf.cellar.core.GroupManager;
@@ -47,7 +48,8 @@ import java.util.Hashtable;
provides = {
@ProvideService(ConfigurationListener.class),
@ProvideService(Synchronizer.class),
- @ProvideService(EventHandler.class)
+ @ProvideService(EventHandler.class),
+ @ProvideService(CellarConfigMBean.class)
}
)
@Managed("org.apache.karaf.shell.config")
http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/4565b92a/dosgi/src/main/java/org/apache/karaf/cellar/dosgi/internal/osgi/Activator.java
----------------------------------------------------------------------
diff --git a/dosgi/src/main/java/org/apache/karaf/cellar/dosgi/internal/osgi/Activator.java b/dosgi/src/main/java/org/apache/karaf/cellar/dosgi/internal/osgi/Activator.java
index b7b360e..ae0e8d1 100644
--- a/dosgi/src/main/java/org/apache/karaf/cellar/dosgi/internal/osgi/Activator.java
+++ b/dosgi/src/main/java/org/apache/karaf/cellar/dosgi/internal/osgi/Activator.java
@@ -18,6 +18,7 @@ import org.apache.karaf.cellar.core.command.CommandStore;
import org.apache.karaf.cellar.core.event.EventHandler;
import org.apache.karaf.cellar.core.event.EventTransportFactory;
import org.apache.karaf.cellar.dosgi.*;
+import org.apache.karaf.cellar.dosgi.management.ServiceMBean;
import org.apache.karaf.cellar.dosgi.management.internal.ServiceMBeanImpl;
import org.apache.karaf.util.tracker.BaseActivator;
import org.apache.karaf.util.tracker.annotation.ProvideService;
@@ -34,7 +35,8 @@ import java.util.Hashtable;
@Services(
provides = {
@ProvideService(ListenerHook.class),
- @ProvideService(EventHandler.class)
+ @ProvideService(EventHandler.class),
+ @ProvideService(ServiceMBean.class)
},
requires = {
@RequireService(ClusterManager.class),
http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/4565b92a/features/src/main/java/org/apache/karaf/cellar/features/internal/osgi/Activator.java
----------------------------------------------------------------------
diff --git a/features/src/main/java/org/apache/karaf/cellar/features/internal/osgi/Activator.java b/features/src/main/java/org/apache/karaf/cellar/features/internal/osgi/Activator.java
index 9458356..296d309 100644
--- a/features/src/main/java/org/apache/karaf/cellar/features/internal/osgi/Activator.java
+++ b/features/src/main/java/org/apache/karaf/cellar/features/internal/osgi/Activator.java
@@ -22,6 +22,7 @@ import org.apache.karaf.cellar.features.FeaturesEventHandler;
import org.apache.karaf.cellar.features.FeaturesSynchronizer;
import org.apache.karaf.cellar.features.LocalFeaturesListener;
import org.apache.karaf.cellar.features.RepositoryEventHandler;
+import org.apache.karaf.cellar.features.management.CellarFeaturesMBean;
import org.apache.karaf.cellar.features.management.internal.CellarFeaturesMBeanImpl;
import org.apache.karaf.features.FeaturesListener;
import org.apache.karaf.features.FeaturesService;
@@ -40,7 +41,8 @@ import java.util.Hashtable;
provides = {
@ProvideService(FeaturesListener.class),
@ProvideService(Synchronizer.class),
- @ProvideService(EventHandler.class)
+ @ProvideService(EventHandler.class),
+ @ProvideService(CellarFeaturesMBean.class)
},
requires = {
@RequireService(ClusterManager.class),
http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/4565b92a/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/internal/osgi/Activator.java
----------------------------------------------------------------------
diff --git a/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/internal/osgi/Activator.java b/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/internal/osgi/Activator.java
index e5dc387..9ebbfa3 100644
--- a/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/internal/osgi/Activator.java
+++ b/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/internal/osgi/Activator.java
@@ -27,6 +27,9 @@ import org.apache.karaf.cellar.core.control.*;
import org.apache.karaf.cellar.core.discovery.DiscoveryService;
import org.apache.karaf.cellar.core.discovery.DiscoveryTask;
import org.apache.karaf.cellar.core.event.*;
+import org.apache.karaf.cellar.core.management.CellarGroupMBean;
+import org.apache.karaf.cellar.core.management.CellarMBean;
+import org.apache.karaf.cellar.core.management.CellarNodeMBean;
import org.apache.karaf.cellar.core.utils.CombinedClassLoader;
import org.apache.karaf.cellar.hazelcast.*;
import org.apache.karaf.cellar.hazelcast.factory.HazelcastConfigurationManager;
@@ -60,7 +63,10 @@ import java.util.*;
@ProvideService(EventProducer.class),
@ProvideService(ExecutionContext.class),
@ProvideService(EventHandler.class),
- @ProvideService(CommandStore.class)
+ @ProvideService(CommandStore.class),
+ @ProvideService(CellarMBean.class),
+ @ProvideService(CellarNodeMBean.class),
+ @ProvideService(CellarGroupMBean.class)
},
requires = {
@RequireService(ConfigurationAdmin.class),
http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/4565b92a/http/balancer/src/main/java/org/apache/karaf/cellar/http/balancer/internal/osgi/Activator.java
----------------------------------------------------------------------
diff --git a/http/balancer/src/main/java/org/apache/karaf/cellar/http/balancer/internal/osgi/Activator.java b/http/balancer/src/main/java/org/apache/karaf/cellar/http/balancer/internal/osgi/Activator.java
index ee3c8f2..086d74e 100644
--- a/http/balancer/src/main/java/org/apache/karaf/cellar/http/balancer/internal/osgi/Activator.java
+++ b/http/balancer/src/main/java/org/apache/karaf/cellar/http/balancer/internal/osgi/Activator.java
@@ -22,6 +22,7 @@ import org.apache.karaf.cellar.http.balancer.BalancerEventHandler;
import org.apache.karaf.cellar.http.balancer.LocalServletListener;
import org.apache.karaf.cellar.http.balancer.ProxyServletRegistry;
import org.apache.karaf.cellar.http.balancer.ServletSynchronizer;
+import org.apache.karaf.cellar.http.balancer.management.CellarHttpMBean;
import org.apache.karaf.cellar.http.balancer.management.internal.CellarHttpMBeanImpl;
import org.apache.karaf.util.tracker.BaseActivator;
import org.apache.karaf.util.tracker.annotation.ProvideService;
@@ -39,7 +40,8 @@ import java.util.Hashtable;
provides = {
@ProvideService(ServletListener.class),
@ProvideService(EventHandler.class),
- @ProvideService(Synchronizer.class)
+ @ProvideService(Synchronizer.class),
+ @ProvideService(CellarHttpMBean.class)
},
requires = {
@RequireService(ClusterManager.class),
http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/4565b92a/log/src/main/java/org/apache/karaf/cellar/log/internal/osgi/Activator.java
----------------------------------------------------------------------
diff --git a/log/src/main/java/org/apache/karaf/cellar/log/internal/osgi/Activator.java b/log/src/main/java/org/apache/karaf/cellar/log/internal/osgi/Activator.java
index 95a0d6f..aa8c816 100644
--- a/log/src/main/java/org/apache/karaf/cellar/log/internal/osgi/Activator.java
+++ b/log/src/main/java/org/apache/karaf/cellar/log/internal/osgi/Activator.java
@@ -20,6 +20,7 @@ import org.apache.karaf.cellar.core.command.ExecutionContext;
import org.apache.karaf.cellar.core.event.EventHandler;
import org.apache.karaf.cellar.core.event.EventProducer;
import org.apache.karaf.cellar.log.*;
+import org.apache.karaf.cellar.log.management.CellarLogMBean;
import org.apache.karaf.cellar.log.management.internal.CellarLogMBeanImpl;
import org.apache.karaf.log.core.LogService;
import org.apache.karaf.util.tracker.BaseActivator;
@@ -37,7 +38,8 @@ import java.util.Hashtable;
@Services(
provides = {
@ProvideService(PaxAppender.class),
- @ProvideService(EventHandler.class)
+ @ProvideService(EventHandler.class),
+ @ProvideService(CellarLogMBean.class)
},
requires = {
@RequireService(ClusterManager.class),
@@ -123,7 +125,7 @@ public class Activator extends BaseActivator {
setLogResultHandler.setCommandStore(commandStore);
register(EventHandler.class, setLogResultHandler);
- LOGGER.debug("CELLAR LOG: registre MBean");
+ LOGGER.debug("CELLAR LOG: register MBean");
CellarLogMBeanImpl mbean = new CellarLogMBeanImpl();
mbean.setClusterManager(clusterManager);
mbean.setExecutionContext(executionContext);
http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/4565b92a/obr/src/main/java/org/apache/karaf/cellar/obr/internal/osgi/Activator.java
----------------------------------------------------------------------
diff --git a/obr/src/main/java/org/apache/karaf/cellar/obr/internal/osgi/Activator.java b/obr/src/main/java/org/apache/karaf/cellar/obr/internal/osgi/Activator.java
index 6ec3381..c826f3d 100644
--- a/obr/src/main/java/org/apache/karaf/cellar/obr/internal/osgi/Activator.java
+++ b/obr/src/main/java/org/apache/karaf/cellar/obr/internal/osgi/Activator.java
@@ -22,6 +22,7 @@ import org.apache.karaf.cellar.core.event.EventProducer;
import org.apache.karaf.cellar.obr.ObrBundleEventHandler;
import org.apache.karaf.cellar.obr.ObrUrlEventHandler;
import org.apache.karaf.cellar.obr.ObrUrlSynchronizer;
+import org.apache.karaf.cellar.obr.management.CellarOBRMBean;
import org.apache.karaf.cellar.obr.management.internal.CellarOBRMBeanImpl;
import org.apache.karaf.util.tracker.BaseActivator;
import org.apache.karaf.util.tracker.annotation.ProvideService;
@@ -37,7 +38,8 @@ import java.util.Hashtable;
@Services(
provides = {
@ProvideService(EventHandler.class),
- @ProvideService(Synchronizer.class)
+ @ProvideService(Synchronizer.class),
+ @ProvideService(CellarOBRMBean.class)
},
requires = {
@RequireService(RepositoryAdmin.class),