Repository: karaf-cellar Updated Branches: refs/heads/master d28cfc29d -> a1ebcc74a
Fix Config event handler registration, improve features definition, fix activators log messages Project: http://git-wip-us.apache.org/repos/asf/karaf-cellar/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf-cellar/commit/a1ebcc74 Tree: http://git-wip-us.apache.org/repos/asf/karaf-cellar/tree/a1ebcc74 Diff: http://git-wip-us.apache.org/repos/asf/karaf-cellar/diff/a1ebcc74 Branch: refs/heads/master Commit: a1ebcc74ae28efbe5633c2b646b93bc7019d754f Parents: d28cfc2 Author: Jean-Baptiste Onofré <[email protected]> Authored: Thu Aug 27 07:18:03 2015 +0200 Committer: Jean-Baptiste Onofré <[email protected]> Committed: Thu Aug 27 07:18:03 2015 +0200 ---------------------------------------------------------------------- assembly/src/main/resources/features.xml | 56 ++++++++------------ .../cellar/bundle/internal/osgi/Activator.java | 8 +-- .../cellar/cloud/internal/osgi/Activator.java | 2 +- .../cellar/config/internal/osgi/Activator.java | 10 ++-- .../cellar/core/internal/osgi/Activator.java | 4 +- .../cellar/dosgi/internal/osgi/Activator.java | 10 ++-- .../cellar/event/internal/osgi/Activator.java | 4 +- .../cellar/features/FeaturesSynchronizer.java | 2 +- .../features/internal/osgi/Activator.java | 10 ++-- .../hazelcast/internal/osgi/Activator.java | 56 ++++++++++---------- .../kubernetes/internal/osgi/Activator.java | 2 +- .../cellar/obr/internal/osgi/Activator.java | 8 +-- .../webconsole/internal/osgi/Activator.java | 2 +- 13 files changed, 80 insertions(+), 94 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/a1ebcc74/assembly/src/main/resources/features.xml ---------------------------------------------------------------------- diff --git a/assembly/src/main/resources/features.xml b/assembly/src/main/resources/features.xml index 017f378..5332cd7 100644 --- a/assembly/src/main/resources/features.xml +++ b/assembly/src/main/resources/features.xml @@ -41,35 +41,27 @@ </feature> <feature name="cellar-config" description="ConfigAdmin cluster support" version="${project.version}"> - <conditional> - <condition>config</condition> - <feature>cellar-hazelcast</feature> - <bundle>mvn:org.apache.karaf.cellar/org.apache.karaf.cellar.config/${project.version}</bundle> - </conditional> + <feature>config</feature> + <feature>cellar-hazelcast</feature> + <bundle>mvn:org.apache.karaf.cellar/org.apache.karaf.cellar.config/${project.version}</bundle> </feature> <feature name="cellar-features" description="Karaf features cluster support" version="${project.version}"> - <conditional> - <condition>feature</condition> - <feature>cellar-hazelcast</feature> - <bundle>mvn:org.apache.karaf.cellar/org.apache.karaf.cellar.features/${project.version}</bundle> - </conditional> + <feature>feature</feature> + <feature>cellar-hazelcast</feature> + <bundle>mvn:org.apache.karaf.cellar/org.apache.karaf.cellar.features/${project.version}</bundle> </feature> <feature name="cellar-bundle" description="Bundle cluster support" version="${project.version}"> - <conditional> - <condition>bundle</condition> - <feature>cellar-hazelcast</feature> - <bundle>mvn:org.apache.karaf.cellar/org.apache.karaf.cellar.bundle/${project.version}</bundle> - </conditional> + <feature>bundle</feature> + <feature>cellar-hazelcast</feature> + <bundle>mvn:org.apache.karaf.cellar/org.apache.karaf.cellar.bundle/${project.version}</bundle> </feature> <feature name="cellar-shell" description="Cellar shell support" version="${project.version}"> - <conditional> - <condition>shell</condition> - <feature>cellar-hazelcast</feature> - <bundle>mvn:org.apache.karaf.cellar/org.apache.karaf.cellar.shell/${project.version}</bundle> - </conditional> + <feature>shell</feature> + <feature>cellar-hazelcast</feature> + <bundle>mvn:org.apache.karaf.cellar/org.apache.karaf.cellar.shell/${project.version}</bundle> </feature> <feature name="cellar" description="Karaf clustering" version="${project.version}"> @@ -86,19 +78,15 @@ </feature> <feature name="cellar-obr" description="OBR cluster support" version="${project.version}"> - <conditional> - <condition>obr</condition> - <feature>cellar-hazelcast</feature> - <bundle>mvn:org.apache.karaf.cellar/org.apache.karaf.cellar.obr/${project.version}</bundle> - </conditional> + <feature>obr</feature> + <feature>cellar-hazelcast</feature> + <bundle>mvn:org.apache.karaf.cellar/org.apache.karaf.cellar.obr/${project.version}</bundle> </feature> <feature name="cellar-eventadmin" description="OSGi events broadcasting in clusters" version="${project.version}"> - <conditional> - <condition>eventadmin</condition> - <feature>cellar-hazelcast</feature> - <bundle>mvn:org.apache.karaf.cellar/org.apache.karaf.cellar.event/${project.version}</bundle> - </conditional> + <feature>eventadmin</feature> + <feature>cellar-hazelcast</feature> + <bundle>mvn:org.apache.karaf.cellar/org.apache.karaf.cellar.event/${project.version}</bundle> </feature> <feature name="cellar-cloud" description="Cloud blobstore support in clusters" version="${project.version}"> @@ -116,11 +104,9 @@ </feature> <feature name="cellar-webconsole" description="Cellar plugin for Karaf WebConsole" version="${project.version}"> - <conditional> - <condition>webconsole</condition> - <feature>cellar-hazelcast</feature> - <bundle>mvn:org.apache.karaf.cellar/org.apache.karaf.cellar.webconsole/${project.version}</bundle> - </conditional> + <feature>webconsole</feature> + <feature>cellar-hazelcast</feature> + <bundle>mvn:org.apache.karaf.cellar/org.apache.karaf.cellar.webconsole/${project.version}</bundle> </feature> </features> http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/a1ebcc74/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 0dbb724..599b0c8 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 @@ -65,7 +65,7 @@ public class Activator extends BaseActivator { EventProducer eventProducer = getTrackedService(EventProducer.class); FeaturesService featuresService = getTrackedService(FeaturesService.class); - LOGGER.debug("[CELLAR BUNDLE] Init even handler"); + LOGGER.debug("CELLAR BUNDLE: init even handler"); eventHandler = new BundleEventHandler(); eventHandler.setConfigurationAdmin(configurationAdmin); eventHandler.setClusterManager(clusterManager); @@ -77,7 +77,7 @@ public class Activator extends BaseActivator { props.put("managed", "true"); register(EventHandler.class, eventHandler, props); - LOGGER.debug("[CELLAR BUNDLE] Init local listener"); + LOGGER.debug("CELLAR BUNDLE: init local listener"); localBundleListener = new LocalBundleListener(); localBundleListener.setClusterManager(clusterManager); localBundleListener.setGroupManager(groupManager); @@ -87,7 +87,7 @@ public class Activator extends BaseActivator { localBundleListener.setBundleContext(bundleContext); localBundleListener.init(); - LOGGER.debug("[CELLAR BUNDLE] Init synchronizer"); + LOGGER.debug("CELLAR BUNDLE: init synchronizer"); synchronizer = new BundleSynchronizer(); synchronizer.setConfigurationAdmin(configurationAdmin); synchronizer.setGroupManager(groupManager); @@ -98,7 +98,7 @@ public class Activator extends BaseActivator { props.put("resource", "bundle"); register(Synchronizer.class, synchronizer, props); - LOGGER.debug("[CELLAR BUNDLE] Register MBean"); + LOGGER.debug("CELLAR BUNDLE: register MBean"); CellarBundleMBeanImpl mbean = new CellarBundleMBeanImpl(); mbean.setClusterManager(clusterManager); mbean.setConfigurationAdmin(configurationAdmin); http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/a1ebcc74/cloud/src/main/java/org/apache/karaf/cellar/cloud/internal/osgi/Activator.java ---------------------------------------------------------------------- diff --git a/cloud/src/main/java/org/apache/karaf/cellar/cloud/internal/osgi/Activator.java b/cloud/src/main/java/org/apache/karaf/cellar/cloud/internal/osgi/Activator.java index 1c240b3..38b6a7d 100644 --- a/cloud/src/main/java/org/apache/karaf/cellar/cloud/internal/osgi/Activator.java +++ b/cloud/src/main/java/org/apache/karaf/cellar/cloud/internal/osgi/Activator.java @@ -37,7 +37,7 @@ public class Activator extends BaseActivator { private final static Logger LOGGER = LoggerFactory.getLogger(Activator.class); public void doStart() throws Exception { - LOGGER.debug("[CELLAR CLOUD] Init discovery service factory"); + LOGGER.debug("CELLAR CLOUD: init discovery service factory"); Hashtable<String, Object> properties = new Hashtable<String, Object>(); properties.put(Constants.SERVICE_PID, "org.apache.karaf.cellar.cloud"); BlobStoreDiscoveryServiceFactory blobStoreDiscoveryServiceFactory = new BlobStoreDiscoveryServiceFactory(bundleContext); http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/a1ebcc74/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 2bf5bfd..a55a89a 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 @@ -70,7 +70,7 @@ public class Activator extends BaseActivator implements ManagedService { File storage = new File(getString("storage", System.getProperty("karaf.etc"))); - LOGGER.debug("[CELLAR CONFIG] Init event handler"); + LOGGER.debug("CELLAR CONFIG: init event handler"); configurationEventHandler = new ConfigurationEventHandler(); configurationEventHandler.setConfigurationAdmin(configurationAdmin); configurationEventHandler.setGroupManager(groupManager); @@ -79,9 +79,9 @@ public class Activator extends BaseActivator implements ManagedService { configurationEventHandler.init(); Hashtable props = new Hashtable(); props.put("managed", "true"); - register(EventHandler.class, configurationEventHandler); + register(EventHandler.class, configurationEventHandler, props); - LOGGER.debug("[CELLAR CONFIG] Init local listener"); + LOGGER.debug("CELLAR CONFIG: init local listener"); localConfigurationListener = new LocalConfigurationListener(); localConfigurationListener.setClusterManager(clusterManager); localConfigurationListener.setGroupManager(groupManager); @@ -90,7 +90,7 @@ public class Activator extends BaseActivator implements ManagedService { localConfigurationListener.init(); register(ConfigurationListener.class, localConfigurationListener); - LOGGER.debug("[CELLAR CONFIG] Init synchronizer"); + LOGGER.debug("CELLAR CONFIG: init synchronizer"); configurationSynchronizer = new ConfigurationSynchronizer(); configurationSynchronizer.setConfigurationAdmin(configurationAdmin); configurationSynchronizer.setGroupManager(groupManager); @@ -101,7 +101,7 @@ public class Activator extends BaseActivator implements ManagedService { props.put("resource", "config"); register(Synchronizer.class, configurationSynchronizer, props); - LOGGER.debug("[CELLAR CONFIG] Register MBean"); + LOGGER.debug("CELLAR CONFIG: register MBean"); CellarConfigMBeanImpl cellarConfigMBean = new CellarConfigMBeanImpl(); cellarConfigMBean.setClusterManager(clusterManager); cellarConfigMBean.setGroupManager(groupManager); http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/a1ebcc74/core/src/main/java/org/apache/karaf/cellar/core/internal/osgi/Activator.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/karaf/cellar/core/internal/osgi/Activator.java b/core/src/main/java/org/apache/karaf/cellar/core/internal/osgi/Activator.java index 7514c66..c356d50 100644 --- a/core/src/main/java/org/apache/karaf/cellar/core/internal/osgi/Activator.java +++ b/core/src/main/java/org/apache/karaf/cellar/core/internal/osgi/Activator.java @@ -38,11 +38,11 @@ public class Activator extends BaseActivator { @Override public void doStart() throws Exception { - LOGGER.debug("[CELLAR CORE] Registering event handler service registry"); + LOGGER.debug("CELLAR CORE: register event handler service registry"); registry = new EventHandlerServiceRegistry(); register(EventHandlerRegistry.class, registry); - LOGGER.debug("[CELLAR CORE] Starting event handler service tracker"); + LOGGER.debug("CELLAR CORE: starting event handler service tracker"); eventHandlerServiceTracker = new ServiceTracker<EventHandler, EventHandler>(bundleContext, EventHandler.class, new ServiceTrackerCustomizer<EventHandler, EventHandler>() { @Override public EventHandler addingService(ServiceReference<EventHandler> serviceReference) { http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/a1ebcc74/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 2a17db2..7b7f2bb 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 @@ -59,7 +59,7 @@ public class Activator extends BaseActivator { CommandStore commandStore = getTrackedService(CommandStore.class); ConfigurationAdmin configurationAdmin = getTrackedService(ConfigurationAdmin.class); - LOGGER.debug("[CELLAR DOSGi] Init remote service call handler"); + LOGGER.debug("CELLAR DOSGI: init remote service call handler"); RemoteServiceCallHandler remoteServiceCallHandler = new RemoteServiceCallHandler(); remoteServiceCallHandler.setEventTransportFactory(eventTransportFactory); remoteServiceCallHandler.setClusterManager(clusterManager); @@ -69,12 +69,12 @@ public class Activator extends BaseActivator { props.put("managed", "true"); register(EventHandler.class, remoteServiceCallHandler, props); - LOGGER.debug("[CELLAR DOSGi] Init remote service result handler"); + LOGGER.debug("CELLAR DOSGI: init remote service result handler"); RemoteServiceResultHandler remoteServiceResultHandler = new RemoteServiceResultHandler(); remoteServiceResultHandler.setCommandStore(commandStore); register(EventHandler.class, remoteServiceCallHandler); - LOGGER.debug("[CELLAR DOSGi] Init import service listener"); + LOGGER.debug("CELLAR DOSGI: init import service listener"); importServiceListener = new ImportServiceListener(); importServiceListener.setClusterManager(clusterManager); importServiceListener.setEventTransportFactory(eventTransportFactory); @@ -83,14 +83,14 @@ public class Activator extends BaseActivator { importServiceListener.init(); register(ListenerHook.class, importServiceListener); - LOGGER.debug("[CELLAR DOSGi] Init export service listener"); + LOGGER.debug("CELLAR DOSGI: init export service listener"); exportServiceListener = new ExportServiceListener(); exportServiceListener.setClusterManager(clusterManager); exportServiceListener.setEventTransportFactory(eventTransportFactory); exportServiceListener.setBundleContext(bundleContext); exportServiceListener.init(); - LOGGER.debug("[CELLAR DOSGi] Register MBean"); + LOGGER.debug("CELLAR DOSGI: register MBean"); ServiceMBeanImpl mbean = new ServiceMBeanImpl(); mbean.setClusterManager(clusterManager); props = new Hashtable(); http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/a1ebcc74/event/src/main/java/org/apache/karaf/cellar/event/internal/osgi/Activator.java ---------------------------------------------------------------------- diff --git a/event/src/main/java/org/apache/karaf/cellar/event/internal/osgi/Activator.java b/event/src/main/java/org/apache/karaf/cellar/event/internal/osgi/Activator.java index e4810f1..8c650ea 100644 --- a/event/src/main/java/org/apache/karaf/cellar/event/internal/osgi/Activator.java +++ b/event/src/main/java/org/apache/karaf/cellar/event/internal/osgi/Activator.java @@ -59,7 +59,7 @@ public class Activator extends BaseActivator { EventAdmin eventAdmin = getTrackedService(EventAdmin.class); EventProducer eventProducer = getTrackedService(EventProducer.class); - LOGGER.debug("[CELLAR EVENTADMIN] Init event handler"); + LOGGER.debug("CELLAR EVENT: init event handler"); clusterEventHandler = new ClusterEventHandler(); clusterEventHandler.setConfigurationAdmin(configurationAdmin); clusterEventHandler.setGroupManager(groupManager); @@ -70,7 +70,7 @@ public class Activator extends BaseActivator { props.put("managed", "true"); register(EventHandler.class, clusterEventHandler, props); - LOGGER.debug("[CELLAR EVENTADMIN] Init local event listener"); + LOGGER.debug("CELLAR EVENT: init local event listener"); localEventListener = new LocalEventListener(); localEventListener.setClusterManager(clusterManager); localEventListener.setGroupManager(groupManager); http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/a1ebcc74/features/src/main/java/org/apache/karaf/cellar/features/FeaturesSynchronizer.java ---------------------------------------------------------------------- diff --git a/features/src/main/java/org/apache/karaf/cellar/features/FeaturesSynchronizer.java b/features/src/main/java/org/apache/karaf/cellar/features/FeaturesSynchronizer.java index 9e22f1f..a981b33 100644 --- a/features/src/main/java/org/apache/karaf/cellar/features/FeaturesSynchronizer.java +++ b/features/src/main/java/org/apache/karaf/cellar/features/FeaturesSynchronizer.java @@ -199,7 +199,7 @@ public class FeaturesSynchronizer extends FeaturesSupport implements Synchronize clusterFeatureState.setVersion(feature.getVersion()); clusterFeatureState.setInstalled(featuresService.isInstalled(feature)); clusterFeatures.put(feature.getName() + "/" + feature.getVersion(), clusterFeatureState); - LOGGER.debug("CELLAR FEATURE : pushing feature {}/{} to cluster group {}", feature.getName(), feature.getVersion(), groupName); + LOGGER.debug("CELLAR FEATURE: pushing feature {}/{} to cluster group {}", feature.getName(), feature.getVersion(), groupName); } else { LOGGER.debug("CELLAR FEATURE: feature {} is marked BLOCKED OUTBOUND for cluster group {}", feature.getName(), groupName); } http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/a1ebcc74/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 6daa17e..3b11244 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 @@ -69,7 +69,7 @@ public class Activator extends BaseActivator { EventProducer eventProducer = getTrackedService(EventProducer.class); FeaturesService featuresService = getTrackedService(FeaturesService.class); - LOGGER.debug("[CELLAR FEATURES] Init repository event handler"); + LOGGER.debug("CELLAR FEATURE: init repository event handler"); repositoryEventHandler = new RepositoryEventHandler(); repositoryEventHandler.setConfigurationAdmin(configurationAdmin); repositoryEventHandler.setFeaturesService(featuresService); @@ -80,7 +80,7 @@ public class Activator extends BaseActivator { props.put("managed", "true"); register(new Class[]{ EventHandler.class }, repositoryEventHandler, props); - LOGGER.debug("[CELLAR FEATURES] Init features event handler"); + LOGGER.debug("CELLAR FEATURE: init features event handler"); featuresEventHandler = new FeaturesEventHandler(); featuresEventHandler.setFeaturesService(featuresService); featuresEventHandler.setClusterManager(clusterManager); @@ -89,7 +89,7 @@ public class Activator extends BaseActivator { featuresEventHandler.init(); register(new Class[]{ EventHandler.class }, featuresEventHandler, props); - LOGGER.debug("[CELLAR FEATURES] Init local features listener"); + LOGGER.debug("CELLAR FEATURE: init local features listener"); localFeaturesListener = new LocalFeaturesListener(); localFeaturesListener.setClusterManager(clusterManager); localFeaturesListener.setGroupManager(groupManager); @@ -99,7 +99,7 @@ public class Activator extends BaseActivator { localFeaturesListener.init(); register(FeaturesListener.class, localFeaturesListener); - LOGGER.debug("[CELLAR FEATURES] Init features synchronizer"); + LOGGER.debug("CELLAR FEATURE: init features synchronizer"); featuresSynchronizer = new FeaturesSynchronizer(); featuresSynchronizer.setClusterManager(clusterManager); featuresSynchronizer.setGroupManager(groupManager); @@ -110,7 +110,7 @@ public class Activator extends BaseActivator { props.put("resource", "feature"); register(Synchronizer.class, featuresSynchronizer, props); - LOGGER.debug("[CELLAR FEATURES] Register MBean"); + LOGGER.debug("CELLAR FEATURE: register MBean"); CellarFeaturesMBeanImpl mbean = new CellarFeaturesMBeanImpl(); mbean.setClusterManager(clusterManager); mbean.setGroupManager(groupManager); http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/a1ebcc74/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 6caa941..f9ef260 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 @@ -96,11 +96,11 @@ public class Activator extends BaseActivator implements ManagedService { ConfigurationAdmin configurationAdmin = getTrackedService(ConfigurationAdmin.class); - LOGGER.debug("[CELLAR HAZELCAST] Init combined class loader"); + LOGGER.debug("CELLAR HAZELCAST: init combined class loader"); combinedClassLoader = new CombinedClassLoader(); combinedClassLoader.init(); - LOGGER.debug("[CELLAR HAZELCAST] Start the discovery service tracker"); + LOGGER.debug("CELLAR HAZELCAST: start the discovery service tracker"); discoveryServiceTracker = new ServiceTracker<DiscoveryService, DiscoveryService>(bundleContext, DiscoveryService.class, new ServiceTrackerCustomizer<DiscoveryService, DiscoveryService>() { @Override public DiscoveryService addingService(ServiceReference<DiscoveryService> serviceReference) { @@ -122,7 +122,7 @@ public class Activator extends BaseActivator implements ManagedService { }); discoveryServiceTracker.open(); - LOGGER.debug("[CELLAR HAZELCAST] Start the synchronizer service tracker"); + LOGGER.debug("CELLAR HAZELCAST: start the synchronizer service tracker"); synchronizerServiceTracker = new ServiceTracker<Synchronizer, Synchronizer>(bundleContext, Synchronizer.class, new ServiceTrackerCustomizer<Synchronizer, Synchronizer>() { @Override public Synchronizer addingService(ServiceReference<Synchronizer> serviceReference) { @@ -144,47 +144,47 @@ public class Activator extends BaseActivator implements ManagedService { }); synchronizerServiceTracker.open(); - LOGGER.debug("[CELLAR HAZELCAST] Init dispatcher"); + LOGGER.debug("CELLAR HAZELCAST: init dispatcher"); EventHandlerRegistryDispatcher dispatcher = new EventHandlerRegistryDispatcher(); dispatcher.setHandlerRegistry(getTrackedService(EventHandlerRegistry.class)); dispatcher.init(); - LOGGER.debug("[CELLAR HAZELCAST] Create Hazelcast configuration manager"); + LOGGER.debug("CELLAR HAZELCAST: create Hazelcast configuration manager"); HazelcastConfigurationManager hazelcastConfigurationManager = new HazelcastConfigurationManager(); hazelcastConfigurationManager.setDiscoveryServices(discoveryServices); - LOGGER.debug("[CELLAR HAZELCAST] Init Hazelcast service factory"); + LOGGER.debug("CELLAR HAZELCAST: init Hazelcast service factory"); hazelcastServiceFactory = new HazelcastServiceFactory(); hazelcastServiceFactory.setCombinedClassLoader(combinedClassLoader); hazelcastServiceFactory.setConfigurationManager(hazelcastConfigurationManager); hazelcastServiceFactory.setBundleContext(bundleContext); hazelcastServiceFactory.init(); - LOGGER.debug("[CELLAR HAZELCAST] Create and register Hazelcast instance"); + LOGGER.debug("CELLAR HAZELCAST: register Hazelcast instance"); hazelcastInstance = hazelcastServiceFactory.getInstance(); register(HazelcastInstance.class, hazelcastInstance); - LOGGER.debug("[CELLAR HAZELCAST] Init discovery task"); + LOGGER.debug("CELLAR HAZELCAST: init discovery task"); discoveryTask = new DiscoveryTask(); discoveryTask.setDiscoveryServices(discoveryServices); discoveryTask.setConfigurationAdmin(configurationAdmin); discoveryTask.init(); - LOGGER.debug("[CELLAR HAZELCAST] Create and register Hazelcast cluster manager"); + LOGGER.debug("CELLAR HAZELCAST: register Hazelcast cluster manager"); HazelcastClusterManager clusterManager = new HazelcastClusterManager(); clusterManager.setInstance(hazelcastInstance); clusterManager.setConfigurationAdmin(configurationAdmin); clusterManager.setCombinedClassLoader(combinedClassLoader); register(ClusterManager.class, clusterManager); - LOGGER.debug("[CELLAR HAZELCAST] Create Hazelcast event transport factory"); + LOGGER.debug("CELLAR HAZELCAST: create Hazelcast event transport factory"); HazelcastEventTransportFactory eventTransportFactory = new HazelcastEventTransportFactory(); eventTransportFactory.setCombinedClassLoader(combinedClassLoader); eventTransportFactory.setConfigurationAdmin(configurationAdmin); eventTransportFactory.setInstance(hazelcastInstance); eventTransportFactory.setDispatcher(dispatcher); - LOGGER.debug("[CELLAR HAZELCAST] Create and register Hazelcast group manager"); + LOGGER.debug("CELLAR HAZELCAST: init Hazelcast group manager"); groupManager = new HazelcastGroupManager(); groupManager.setInstance(hazelcastInstance); groupManager.setCombinedClassLoader(combinedClassLoader); @@ -194,12 +194,12 @@ public class Activator extends BaseActivator implements ManagedService { groupManager.init(); register(new Class[]{GroupManager.class, ConfigurationListener.class}, groupManager); - LOGGER.debug("[CELLAR HAZELCAST] Create Cellar membership listener"); + LOGGER.debug("CELLAR HAZELCAST: create Cellar membership listener"); CellarMembershipListener membershipListener = new CellarMembershipListener(hazelcastInstance); membershipListener.setSynchronizers(synchronizers); membershipListener.setGroupManager(groupManager); - LOGGER.debug("[CELLAR HAZELCAST] Init Cellar extender"); + LOGGER.debug("CELLAR HAZELCAST: init Cellar extender"); extender = new CellarExtender(); extender.setCombinedClassLoader(combinedClassLoader); extender.setBundleContext(bundleContext); @@ -207,7 +207,7 @@ public class Activator extends BaseActivator implements ManagedService { Node node = clusterManager.getNode(); - LOGGER.debug("[CELLAR HAZELCAST] Init topic consumer"); + LOGGER.debug("CELLAR HAZELCAST: init topic consumer"); consumer = new TopicConsumer(); consumer.setInstance(hazelcastInstance); consumer.setDispatcher(dispatcher); @@ -215,7 +215,7 @@ public class Activator extends BaseActivator implements ManagedService { consumer.setConfigurationAdmin(configurationAdmin); consumer.init(); - LOGGER.debug("[CELLAR HAZELCAST] Init topic producer"); + LOGGER.debug("CELLAR HAZELCAST: init topic producer"); producer = new TopicProducer(); producer.setInstance(hazelcastInstance); producer.setNode(node); @@ -223,66 +223,66 @@ public class Activator extends BaseActivator implements ManagedService { producer.init(); register(EventProducer.class, producer); - LOGGER.debug("[CELLAR HAZELCAST] Create and register basic command store"); + LOGGER.debug("CELLAR HAZELCAST: register basic command store"); CommandStore commandStore = new BasicCommandStore(); register(CommandStore.class, commandStore); - LOGGER.debug("[CELLAR HAZELCAST] Create and register clustered execution context"); + LOGGER.debug("CELLAR HAZELCAST: register clustered execution context"); ClusteredExecutionContext executionContext = new ClusteredExecutionContext(); executionContext.setProducer(producer); executionContext.setCommandStore(commandStore); register(ExecutionContext.class, executionContext); - LOGGER.debug("[CELLAR HAZELCAST] Create and register producer switch command handler"); + LOGGER.debug("CELLAR HAZELCAST: register producer switch command handler"); ProducerSwitchCommandHandler producerSwitchCommandHandler = new ProducerSwitchCommandHandler(); producerSwitchCommandHandler.setProducer(producer); producerSwitchCommandHandler.setConfigurationAdmin(configurationAdmin); register(EventHandler.class, producerSwitchCommandHandler); - LOGGER.debug("[CELLAR HAZELCAST] Create and register producer switch result handler"); + LOGGER.debug("CELLAR HAZELCAST: register producer switch result handler"); ProducerSwitchResultHandler producerSwitchResultHandler = new ProducerSwitchResultHandler(); producerSwitchResultHandler.setCommandStore(commandStore); register(EventHandler.class, producerSwitchResultHandler); - LOGGER.debug("[CELLAR HAZELCAST] Create and register consumer switch command handler"); + LOGGER.debug("CELLAR HAZELCAST: register consumer switch command handler"); ConsumerSwitchCommandHandler consumerSwitchCommandHandler = new ConsumerSwitchCommandHandler(); consumerSwitchCommandHandler.setProducer(producer); consumerSwitchCommandHandler.setConsumer(consumer); consumerSwitchCommandHandler.setConfigurationAdmin(configurationAdmin); register(EventHandler.class, consumerSwitchCommandHandler); - LOGGER.debug("[CELLAR HAZELCAST] Create and register consumer switch result handler"); + LOGGER.debug("CELLAR HAZELCAST; register consumer switch result handler"); ConsumerSwitchResultHandler consumerSwitchResultHandler = new ConsumerSwitchResultHandler(); consumerSwitchResultHandler.setCommandStore(commandStore); register(EventHandler.class, consumerSwitchResultHandler); ProxyManager proxyManager = getTrackedService(ProxyManager.class); - LOGGER.debug("[CELLAR HAZELCAST] Create and register manage handlers command handler"); + LOGGER.debug("CELLAR HAZELCAST: register manage handlers command handler"); ManageHandlersCommandHandler manageHandlersCommandHandler = new ManageHandlersCommandHandler(); manageHandlersCommandHandler.setConfigurationAdmin(configurationAdmin); manageHandlersCommandHandler.setProducer(producer); manageHandlersCommandHandler.setProxyManager(proxyManager); register(EventHandler.class, manageHandlersCommandHandler); - LOGGER.debug("[CELLAR HAZELCAST] Create and register manage handlers result handler"); + LOGGER.debug("CELLAR HAZELCAST: register manage handlers result handler"); ManageHandlersResultHandler manageHandlersResultHandler = new ManageHandlersResultHandler(); manageHandlersResultHandler.setCommandStore(commandStore); register(EventHandler.class, manageHandlersResultHandler); - LOGGER.debug("[CELLAR HAZELCAST] Create and register manage group command handler"); + LOGGER.debug("CELLAR HAZELCAST: register manage group command handler"); ManageGroupCommandHandler manageGroupCommandHandler = new ManageGroupCommandHandler(); manageGroupCommandHandler.setProducer(producer); manageGroupCommandHandler.setClusterManager(clusterManager); manageGroupCommandHandler.setGroupManager(groupManager); register(EventHandler.class, manageGroupCommandHandler); - LOGGER.debug("[CELLAR HAZELCAST] Create and register manage group result handler"); + LOGGER.debug("CELLAR HAZELCAST: register manage group result handler"); ManageGroupResultHandler manageGroupResultHandler = new ManageGroupResultHandler(); manageGroupResultHandler.setCommandStore(commandStore); register(EventHandler.class, manageGroupResultHandler); - LOGGER.debug("[CELLAR HAZELCAST] Create and register Cellar Core MBean"); + LOGGER.debug("CELLAR HAZELCAST: register Cellar Core MBean"); CellarMBeanImpl cellarMBean = new CellarMBeanImpl(); cellarMBean.setBundleContext(bundleContext); cellarMBean.setClusterManager(clusterManager); @@ -292,7 +292,7 @@ public class Activator extends BaseActivator implements ManagedService { props.put("jmx.objectname", "org.apache.karaf.cellar:type=core,name=" + System.getProperty("karaf.name")); coreMBeanRegistration = bundleContext.registerService(getInterfaceNames(cellarMBean), cellarMBean, props); - LOGGER.debug("[CELLAR HAZELCAST] Create and register Cellar Node MBean"); + LOGGER.debug("CELLAR HAZELCAST: register Cellar Node MBean"); CellarNodeMBeanImpl cellarNodeMBean = new CellarNodeMBeanImpl(); cellarNodeMBean.setClusterManager(clusterManager); cellarNodeMBean.setExecutionContext(executionContext); @@ -300,7 +300,7 @@ public class Activator extends BaseActivator implements ManagedService { props.put("jmx.objectname", "org.apache.karaf.cellar:type=node,name=" + System.getProperty("karaf.name")); nodeMBeanRegistration = bundleContext.registerService(getInterfaceNames(cellarNodeMBean), cellarNodeMBean, props); - LOGGER.debug("[CELLAR HAZELCAST] Create and register Cellar Group MBean"); + LOGGER.debug("CELLAR HAZELCAST: register Cellar Group MBean"); CellarGroupMBeanImpl cellarGroupMBean = new CellarGroupMBeanImpl(); cellarGroupMBean.setClusterManager(clusterManager); cellarGroupMBean.setExecutionContext(executionContext); http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/a1ebcc74/kubernetes/src/main/java/org/apache/karaf/cellar/kubernetes/internal/osgi/Activator.java ---------------------------------------------------------------------- diff --git a/kubernetes/src/main/java/org/apache/karaf/cellar/kubernetes/internal/osgi/Activator.java b/kubernetes/src/main/java/org/apache/karaf/cellar/kubernetes/internal/osgi/Activator.java index 8d19d34..7e5639c 100644 --- a/kubernetes/src/main/java/org/apache/karaf/cellar/kubernetes/internal/osgi/Activator.java +++ b/kubernetes/src/main/java/org/apache/karaf/cellar/kubernetes/internal/osgi/Activator.java @@ -35,7 +35,7 @@ public class Activator extends BaseActivator { @Override public void doStart() throws Exception { - LOGGER.debug("[CELLAR KUBERNETES] Init discovery service factory"); + LOGGER.debug("CELLAR KUBERNETES: init discovery service factory"); Hashtable props = new Hashtable(); props.put(Constants.SERVICE_PID, "org.apache.karaf.cellar.kubernetes"); KubernetesDiscoveryServiceFactory factory = new KubernetesDiscoveryServiceFactory(bundleContext); http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/a1ebcc74/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 c15cff8..0ff6518 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 @@ -65,7 +65,7 @@ public class Activator extends BaseActivator { ConfigurationAdmin configurationAdmin = getTrackedService(ConfigurationAdmin.class); EventProducer eventProducer = getTrackedService(EventProducer.class); - LOGGER.debug("[CELLAR OBR] Init URL event handler"); + LOGGER.debug("CELLAR OBR: init URL event handler"); urlEventHandler = new ObrUrlEventHandler(); urlEventHandler.setClusterManager(clusterManager); urlEventHandler.setGroupManager(groupManager); @@ -76,7 +76,7 @@ public class Activator extends BaseActivator { props.put("managed", "true"); register(EventHandler.class, urlEventHandler, props); - LOGGER.debug("[CELLAR OBR] Init bundle event handler"); + LOGGER.debug("CELLAR OBR: init bundle event handler"); bundleEventHandler = new ObrBundleEventHandler(); bundleEventHandler.setObrService(repositoryAdmin); bundleEventHandler.setClusterManager(clusterManager); @@ -85,7 +85,7 @@ public class Activator extends BaseActivator { bundleEventHandler.init(); register(EventHandler.class, bundleEventHandler, props); - LOGGER.debug("[CELLAR OBR] Init URL synchronizer"); + LOGGER.debug("CELLAR OBR: init URL synchronizer"); urlSynchronizer = new ObrUrlSynchronizer(); urlSynchronizer.setObrService(repositoryAdmin); urlSynchronizer.setClusterManager(clusterManager); @@ -96,7 +96,7 @@ public class Activator extends BaseActivator { props.put("resource", "obr.urls"); register(Synchronizer.class, urlSynchronizer, props); - LOGGER.debug("[CELLAR OBR] Register MBean"); + LOGGER.debug("CELLAR OBR: register MBean"); CellarOBRMBeanImpl mbean = new CellarOBRMBeanImpl(); mbean.setClusterManager(clusterManager); mbean.setGroupManager(groupManager); http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/a1ebcc74/webconsole/src/main/java/org/apache/karaf/cellar/webconsole/internal/osgi/Activator.java ---------------------------------------------------------------------- diff --git a/webconsole/src/main/java/org/apache/karaf/cellar/webconsole/internal/osgi/Activator.java b/webconsole/src/main/java/org/apache/karaf/cellar/webconsole/internal/osgi/Activator.java index 43c2d48..a9d7a5e 100644 --- a/webconsole/src/main/java/org/apache/karaf/cellar/webconsole/internal/osgi/Activator.java +++ b/webconsole/src/main/java/org/apache/karaf/cellar/webconsole/internal/osgi/Activator.java @@ -47,7 +47,7 @@ public class Activator extends BaseActivator { ClusterManager clusterManager = getTrackedService(ClusterManager.class); GroupManager groupManager = getTrackedService(GroupManager.class); - LOGGER.debug("[CELLAR WEBCONSOLE] Init plugin"); + LOGGER.debug("CELLAR WEBCONSOLE: init plugin"); plugin = new CellarPlugin(); plugin.setClusterManager(clusterManager); plugin.setGroupManager(groupManager);
