Adding more logs to component activate methods, component synchronizer, changed CEP ports in PCA test to avoid conflicts
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/70b2d64c Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/70b2d64c Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/70b2d64c Branch: refs/heads/master Commit: 70b2d64c63ca15801238d65a0372c529ccd9398b Parents: 028c353 Author: Akila Perera <[email protected]> Authored: Mon Aug 24 00:44:48 2015 +0530 Committer: Akila Perera <[email protected]> Committed: Mon Aug 24 00:44:48 2015 +0530 ---------------------------------------------------------------------- .../internal/AutoscalerServiceComponent.java | 10 +-- .../org.apache.stratos.cartridge.agent/pom.xml | 1 - components/org.apache.stratos.cli/pom.xml | 1 - .../org.apache.stratos.cloud.controller/pom.xml | 1 - .../CloudControllerServiceComponent.java | 8 ++- .../common/internal/CommonServiceComponent.java | 6 +- .../ComponentStartUpSynchronizerImpl.java | 72 +++++++++----------- .../services/ComponentStartUpSynchronizer.java | 2 +- .../SignedJWTAuthenticatorServiceComponent.java | 13 ++-- .../LoadBalancerCommonServiceComponent.java | 10 +-- ...oadBalancerExtensionAPIServiceComponent.java | 3 + .../internal/LoadBalancerServiceComponent.java | 3 + components/org.apache.stratos.manager/pom.xml | 2 - .../StratosManagerServiceComponent.java | 8 ++- components/org.apache.stratos.messaging/pom.xml | 1 - .../org.apache.stratos.metadata.client/pom.xml | 1 - .../org.apache.stratos.mock.iaas.client/pom.xml | 1 - .../iaas/internal/MockIaasServiceComponent.java | 3 + .../test/PythonCartridgeAgentTest.java | 6 +- .../src/test/resources/agent.conf | 4 +- pom.xml | 5 ++ 21 files changed, 86 insertions(+), 75 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/70b2d64c/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/internal/AutoscalerServiceComponent.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/internal/AutoscalerServiceComponent.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/internal/AutoscalerServiceComponent.java index 65d75b2..48ee481 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/internal/AutoscalerServiceComponent.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/internal/AutoscalerServiceComponent.java @@ -77,17 +77,17 @@ import java.util.concurrent.TimeUnit; */ public class AutoscalerServiceComponent { - private static final Log log = LogFactory.getLog(AutoscalerServiceComponent.class); - private static final String AUTOSCALER_COORDINATOR_LOCK = "AUTOSCALER_COORDINATOR_LOCK"; - private AutoscalerTopologyEventReceiver asTopologyReceiver; private AutoscalerHealthStatEventReceiver autoscalerHealthStatEventReceiver; private ExecutorService executorService; private ScheduledExecutorService scheduler; protected void activate(ComponentContext componentContext) throws Exception { + if (log.isDebugEnabled()) { + log.debug("Activating AutoscalerServiceComponent..."); + } try { XMLConfiguration conf = ConfUtil.getInstance(AutoscalerConstants.COMPONENTS_CONFIG).getConfiguration(); int threadPoolSize = conf.getInt(AutoscalerConstants.THREAD_POOL_SIZE_KEY, @@ -136,8 +136,8 @@ public class AutoscalerServiceComponent { } else { executeCoordinatorTasks(); } - - componentStartUpSynchronizer.waitForWebServiceActivation("AutoscalerService"); + componentStartUpSynchronizer.waitForAxisServiceActivation(Component.Autoscaler, + "AutoscalerService"); componentStartUpSynchronizer.setComponentStatus(Component.Autoscaler, true); if (log.isInfoEnabled()) { log.info("Autoscaler service component activated"); http://git-wip-us.apache.org/repos/asf/stratos/blob/70b2d64c/components/org.apache.stratos.cartridge.agent/pom.xml ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cartridge.agent/pom.xml b/components/org.apache.stratos.cartridge.agent/pom.xml index 3bb7b6e..67c2ff7 100644 --- a/components/org.apache.stratos.cartridge.agent/pom.xml +++ b/components/org.apache.stratos.cartridge.agent/pom.xml @@ -73,7 +73,6 @@ <dependency> <groupId>com.google.code.gson</groupId> <artifactId>gson</artifactId> - <version>2.2.4</version> </dependency> <dependency> <groupId>org.apache.stratos</groupId> http://git-wip-us.apache.org/repos/asf/stratos/blob/70b2d64c/components/org.apache.stratos.cli/pom.xml ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cli/pom.xml b/components/org.apache.stratos.cli/pom.xml index 0fa0821..13bdf18 100644 --- a/components/org.apache.stratos.cli/pom.xml +++ b/components/org.apache.stratos.cli/pom.xml @@ -93,7 +93,6 @@ <dependency> <groupId>com.google.code.gson</groupId> <artifactId>gson</artifactId> - <version>2.2.4</version> </dependency> <dependency> <groupId>org.apache.httpcomponents</groupId> http://git-wip-us.apache.org/repos/asf/stratos/blob/70b2d64c/components/org.apache.stratos.cloud.controller/pom.xml ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/pom.xml b/components/org.apache.stratos.cloud.controller/pom.xml index db2114e..a8abc2e 100644 --- a/components/org.apache.stratos.cloud.controller/pom.xml +++ b/components/org.apache.stratos.cloud.controller/pom.xml @@ -131,7 +131,6 @@ <dependency> <groupId>com.google.code.gson</groupId> <artifactId>gson</artifactId> - <version>${gson.version}</version> </dependency> <dependency> <groupId>org.wso2.carbon</groupId> http://git-wip-us.apache.org/repos/asf/stratos/blob/70b2d64c/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/internal/CloudControllerServiceComponent.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/internal/CloudControllerServiceComponent.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/internal/CloudControllerServiceComponent.java index 21eb37a..2e21e8e 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/internal/CloudControllerServiceComponent.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/internal/CloudControllerServiceComponent.java @@ -69,9 +69,7 @@ import java.util.concurrent.TimeUnit; * cardinality="1..1" policy="dynamic" bind="setConfigurationContextService" unbind="unsetConfigurationContextService" */ public class CloudControllerServiceComponent { - private static final Log log = LogFactory.getLog(CloudControllerServiceComponent.class); - private static final String CLOUD_CONTROLLER_COORDINATOR_LOCK = "cloud.controller.coordinator.lock"; private static final String THREAD_POOL_ID = "cloud.controller.thread.pool"; private static final String SCHEDULER_THREAD_POOL_ID = "cloud.controller.scheduler.thread.pool"; @@ -85,6 +83,9 @@ public class CloudControllerServiceComponent { private ScheduledExecutorService scheduler; protected void activate(final ComponentContext context) { + if (log.isDebugEnabled()) { + log.debug("Activating CloudControllerServiceComponent..."); + } try { executorService = StratosThreadPool.getExecutorService(THREAD_POOL_ID, THREAD_POOL_SIZE); scheduler = StratosThreadPool.getScheduledExecutorService(SCHEDULER_THREAD_POOL_ID, @@ -124,7 +125,8 @@ public class CloudControllerServiceComponent { executeCoordinatorTasks(); } - componentStartUpSynchronizer.waitForWebServiceActivation("CloudControllerService"); + componentStartUpSynchronizer.waitForAxisServiceActivation(Component.CloudController, + "CloudControllerService"); componentStartUpSynchronizer.setComponentStatus(Component.CloudController, true); log.info("Cloud controller service component activated"); } catch (Exception e) { http://git-wip-us.apache.org/repos/asf/stratos/blob/70b2d64c/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/internal/CommonServiceComponent.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/internal/CommonServiceComponent.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/internal/CommonServiceComponent.java index e2d6eed..1059988 100644 --- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/internal/CommonServiceComponent.java +++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/internal/CommonServiceComponent.java @@ -53,10 +53,12 @@ import org.wso2.carbon.utils.ConfigurationContextService; * cardinality="1..1" policy="dynamic" bind="setConfigurationContextService" unbind="unsetConfigurationContextService" */ public class CommonServiceComponent { - private static Log log = LogFactory.getLog(CommonServiceComponent.class); protected void activate(ComponentContext context) { + if (log.isDebugEnabled()) { + log.debug("Activating CommonServiceComponent..."); + } try { final BundleContext bundleContext = context.getBundleContext(); if (CommonUtil.getStratosConfig() == null) { @@ -80,6 +82,7 @@ public class CommonServiceComponent { long startTime = System.currentTimeMillis(); log.info("Waiting for the hazelcast instance to be initialized..."); while (ServiceReferenceHolder.getInstance().getHazelcastInstance() == null) { + log.info("Waiting for Hazelcast instance to be initialized..."); Thread.sleep(1000); if ((System.currentTimeMillis() - startTime) >= StratosConstants.HAZELCAST_INSTANCE_INIT_TIMEOUT) { throw new RuntimeException("Hazelcast instance was not initialized within " @@ -97,7 +100,6 @@ public class CommonServiceComponent { thread.setName("Distributed object provider registration thread"); thread.start(); } else { - // Register distributed object provider service registerDistributedObjectProviderService(bundleContext); registerComponentStartUpSynchronizer(bundleContext); } http://git-wip-us.apache.org/repos/asf/stratos/blob/70b2d64c/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/internal/ComponentStartUpSynchronizerImpl.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/internal/ComponentStartUpSynchronizerImpl.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/internal/ComponentStartUpSynchronizerImpl.java index cb4bb1d..39f8364 100644 --- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/internal/ComponentStartUpSynchronizerImpl.java +++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/internal/ComponentStartUpSynchronizerImpl.java @@ -39,11 +39,10 @@ import java.util.Map; * Stratos component startup synchronizer. */ public class ComponentStartUpSynchronizerImpl implements ComponentStartUpSynchronizer { - private static final Log log = LogFactory.getLog(ComponentStartUpSynchronizerImpl.class); - private static final String COMPONENT_STATUS_MAP = "stratos.component.status.map"; - private static final String COMPONENT_STARTUP_SYNCHRONIZER_ENABLED = "stratos.component.startup.synchronizer.enabled"; + private static final String COMPONENT_STARTUP_SYNCHRONIZER_ENABLED = + "stratos.component.startup.synchronizer.enabled"; private static final String COMPONENT_ACTIVATION_CHECK_INTERVAL = "stratos.component.activation.check.interval"; private static final String COMPONENT_ACTIVATION_TIMEOUT = "stratos.component.activation.timeout"; private static final long DEFAULT_COMPONENT_ACTIVATION_CHECK_INTERVAL = 1000; @@ -64,12 +63,12 @@ public class ComponentStartUpSynchronizerImpl implements ComponentStartUpSynchro componentActivationCheckInterval = Long.getLong(COMPONENT_ACTIVATION_CHECK_INTERVAL, DEFAULT_COMPONENT_ACTIVATION_CHECK_INTERVAL); - log.info(String.format("Component activation check interval: %s seconds", + log.info(String.format("Component activation check interval: %s seconds.", (componentActivationCheckInterval / 1000))); componentActivationTimeout = Long.getLong(COMPONENT_ACTIVATION_TIMEOUT, DEFAULT_COMPONENT_ACTIVATION_TIMEOUT); - log.info(String.format("Component activation timeout: %s seconds", (componentActivationTimeout / 1000))); + log.info(String.format("Component activation timeout: %s seconds.", (componentActivationTimeout / 1000))); } /** @@ -86,17 +85,16 @@ public class ComponentStartUpSynchronizerImpl implements ComponentStartUpSynchro * Set the status of a component. * * @param component - * @param active + * @param isActive */ @Override - public void setComponentStatus(Component component, boolean active) { - componentStatusMap.put(component, active); - - if (active) { + public void setComponentStatus(Component component, boolean isActive) { + componentStatusMap.put(component, isActive); + if (isActive) { notifyComponentActivationEventListeners(component); - log.info(String.format("%s activated", component)); + log.info(String.format("%s activated.", component)); } else { - log.info(String.format("%s inactivated", component)); + log.info(String.format("%s inactivated.", component)); } } @@ -112,8 +110,9 @@ public class ComponentStartUpSynchronizerImpl implements ComponentStartUpSynchro ComponentActivationEventListener componentActivationEventListener = (ComponentActivationEventListener) eventListener; componentActivationEventListener.activated(component); - } catch (Exception e) { - log.error("An error occurred while notifying component activation event listener", e); + } + catch (Exception e) { + log.error("An error occurred while notifying component activation event listener.", e); } } } @@ -141,32 +140,28 @@ public class ComponentStartUpSynchronizerImpl implements ComponentStartUpSynchro */ @Override public void waitForComponentActivation(Component owner, Component component) { - if (!componentStartUpSynchronizerEnabled) { - log.debug(String.format("Component activation check is disabled, %s did not wait for %s to be activated", + log.info(String.format("Component activation check is disabled, %s did not wait for %s to be activated.", owner, component)); return; } - long startTime = System.currentTimeMillis(); - boolean logged = false; + log.info(String.format("%s is set to wait for %s to be activated.", owner, component)); while (!isComponentActive(component)) { - if (!logged) { - log.info(String.format("%s is waiting for %s to be activated...", - owner, component)); - logged = true; + if (log.isDebugEnabled()) { + log.debug(String.format("%s is waiting for %s to be activated...", owner, component)); } - try { Thread.sleep(componentActivationCheckInterval); - } catch (InterruptedException ignore) { + } + catch (InterruptedException ignore) { throw new RuntimeException(String.format("Thread interrupted, %s could not wait for " + - "%s to be activated", owner, component)); + "%s to be activated.", owner, component)); } long currentTime = System.currentTimeMillis(); if ((currentTime - startTime) > componentActivationTimeout) { - throw new RuntimeException(String.format("%s did not activated within %d seconds ", + throw new RuntimeException(String.format("%s did not activate within %d seconds.", component, (componentActivationTimeout / 1000))); } } @@ -175,31 +170,32 @@ public class ComponentStartUpSynchronizerImpl implements ComponentStartUpSynchro /** * Wait for a web service to be activated. * - * @param serviceName + * @param axisServiceName * @throws AxisFault */ @Override - public void waitForWebServiceActivation(String serviceName) throws AxisFault { - + public void waitForAxisServiceActivation(Component owner, String axisServiceName) throws AxisFault { if (!componentStartUpSynchronizerEnabled) { - log.debug(String.format("Component activation check is disabled, did not wait for %s to be activated", - serviceName)); + log.info(String.format("Component activation check is disabled, did not wait for %s to be activated.", + axisServiceName)); return; } AxisConfiguration axisConfiguration = CarbonConfigurationContextFactory.getConfigurationContext() .getAxisConfiguration(); - AxisService cloudControllerService = axisConfiguration.getService(serviceName); - if (!cloudControllerService.isActive()) { - while (!cloudControllerService.isActive()) { - log.info(String.format("Waiting for %s web service to be activated...", serviceName)); + AxisService axisService = axisConfiguration.getService(axisServiceName); + log.info(String.format("%s is set to wait for %s Axis service to be activated.", owner, axisServiceName)); + if (!axisService.isActive()) { + while (!axisService.isActive()) { + log.info(String.format("%s is waiting for %s Axis service to be activated...", owner, axisServiceName)); try { Thread.sleep(componentActivationCheckInterval); - } catch (InterruptedException ignore) { + } + catch (InterruptedException ignore) { return; } } - log.info(String.format("%s web service activated", serviceName)); + log.info(String.format("%s Axis service activated.", axisServiceName)); } } @@ -212,4 +208,4 @@ public class ComponentStartUpSynchronizerImpl implements ComponentStartUpSynchro public void addEventListener(ComponentStartUpEventListener eventListener) { eventListeners.add(eventListener); } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/stratos/blob/70b2d64c/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/services/ComponentStartUpSynchronizer.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/services/ComponentStartUpSynchronizer.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/services/ComponentStartUpSynchronizer.java index 1eebdeb..e4320d6 100644 --- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/services/ComponentStartUpSynchronizer.java +++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/services/ComponentStartUpSynchronizer.java @@ -35,7 +35,7 @@ public interface ComponentStartUpSynchronizer { void waitForComponentActivation(Component owner, Component component); - void waitForWebServiceActivation(String serviceName) throws AxisFault; + void waitForAxisServiceActivation(Component owner, String serviceName) throws AxisFault; void addEventListener(ComponentStartUpEventListener eventListener); } http://git-wip-us.apache.org/repos/asf/stratos/blob/70b2d64c/components/org.apache.stratos.custom.handlers/src/main/java/org/apache/stratos/custom/handlers/internal/SignedJWTAuthenticatorServiceComponent.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.custom.handlers/src/main/java/org/apache/stratos/custom/handlers/internal/SignedJWTAuthenticatorServiceComponent.java b/components/org.apache.stratos.custom.handlers/src/main/java/org/apache/stratos/custom/handlers/internal/SignedJWTAuthenticatorServiceComponent.java index 390368b..1caa31c 100644 --- a/components/org.apache.stratos.custom.handlers/src/main/java/org/apache/stratos/custom/handlers/internal/SignedJWTAuthenticatorServiceComponent.java +++ b/components/org.apache.stratos.custom.handlers/src/main/java/org/apache/stratos/custom/handlers/internal/SignedJWTAuthenticatorServiceComponent.java @@ -42,7 +42,6 @@ import java.util.Hashtable; * unbind="unsetRealmService" */ public class SignedJWTAuthenticatorServiceComponent { - private static final Log log = LogFactory.getLog(SignedJWTAuthenticatorServiceComponent.class); private static RealmService realmService = null; private static BundleContext bundleContext = null; @@ -67,6 +66,9 @@ public class SignedJWTAuthenticatorServiceComponent { } protected void activate(ComponentContext cxt) { + if (log.isDebugEnabled()) { + log.debug("Activating SignedJWTAuthenticatorServiceComponent..."); + } try { SignedJWTAuthenticator authenticator = new SignedJWTAuthenticator(); SignedJWTAuthenticatorServiceComponent.setBundleContext(cxt.getBundleContext()); @@ -74,19 +76,18 @@ public class SignedJWTAuthenticatorServiceComponent { props.put(CarbonConstants.AUTHENTICATOR_TYPE, authenticator.getAuthenticatorName()); cxt.getBundleContext().registerService(CarbonServerAuthenticator.class.getName(), authenticator, props); - } catch (Exception e) { + } + catch (Exception e) { log.error(e.getMessage(), e); // throwing so that server will not start throw new RuntimeException("Failed to start the Signed JWT Authenticator Bundle" + e.getMessage(), e); } - log.debug("Signed JWT Authenticator is activated"); + log.info("Signed JWT Authenticator is activated"); } protected void deactivate(ComponentContext context) { - if (log.isDebugEnabled()) { - log.debug("Signed JWT Authenticator is deactivated"); - } + log.debug("Signed JWT Authenticator is deactivated"); } protected void unsetRealmService(RealmService realmService) { http://git-wip-us.apache.org/repos/asf/stratos/blob/70b2d64c/components/org.apache.stratos.load.balancer.common/src/main/java/org/apache/stratos/load/balancer/common/internal/LoadBalancerCommonServiceComponent.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.load.balancer.common/src/main/java/org/apache/stratos/load/balancer/common/internal/LoadBalancerCommonServiceComponent.java b/components/org.apache.stratos.load.balancer.common/src/main/java/org/apache/stratos/load/balancer/common/internal/LoadBalancerCommonServiceComponent.java index e61e0e6..d4cc1e7 100644 --- a/components/org.apache.stratos.load.balancer.common/src/main/java/org/apache/stratos/load/balancer/common/internal/LoadBalancerCommonServiceComponent.java +++ b/components/org.apache.stratos.load.balancer.common/src/main/java/org/apache/stratos/load/balancer/common/internal/LoadBalancerCommonServiceComponent.java @@ -35,11 +35,13 @@ public class LoadBalancerCommonServiceComponent { private static final Log log = LogFactory.getLog(LoadBalancerCommonServiceComponent.class); protected void activate(ComponentContext context) { + if (log.isDebugEnabled()) { + log.debug("Activating LoadBalancerCommonServiceComponent..."); + } try { - if (log.isDebugEnabled()) { - log.debug("Load Balancer Common Service bundle activated"); - } - } catch (Exception e) { + log.debug("Load Balancer Common Service bundle activated"); + } + catch (Exception e) { log.error("Could not activate Load Balancer Common Service bundle", e); } } http://git-wip-us.apache.org/repos/asf/stratos/blob/70b2d64c/components/org.apache.stratos.load.balancer.extension.api/src/main/java/org/apache/stratos/load/balancer/extension/api/internal/LoadBalancerExtensionAPIServiceComponent.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.load.balancer.extension.api/src/main/java/org/apache/stratos/load/balancer/extension/api/internal/LoadBalancerExtensionAPIServiceComponent.java b/components/org.apache.stratos.load.balancer.extension.api/src/main/java/org/apache/stratos/load/balancer/extension/api/internal/LoadBalancerExtensionAPIServiceComponent.java index 10e0496..61ddac3 100644 --- a/components/org.apache.stratos.load.balancer.extension.api/src/main/java/org/apache/stratos/load/balancer/extension/api/internal/LoadBalancerExtensionAPIServiceComponent.java +++ b/components/org.apache.stratos.load.balancer.extension.api/src/main/java/org/apache/stratos/load/balancer/extension/api/internal/LoadBalancerExtensionAPIServiceComponent.java @@ -40,6 +40,9 @@ public class LoadBalancerExtensionAPIServiceComponent { * @param context component context */ protected void activate(ComponentContext context) { + if (log.isDebugEnabled()) { + log.debug("Activating LoadBalancerExtensionAPIServiceComponent..."); + } try { if (log.isDebugEnabled()) { log.debug("Load Balancer Extension API Service bundle activated"); http://git-wip-us.apache.org/repos/asf/stratos/blob/70b2d64c/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/internal/LoadBalancerServiceComponent.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/internal/LoadBalancerServiceComponent.java b/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/internal/LoadBalancerServiceComponent.java index 4577735..a7761cd 100644 --- a/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/internal/LoadBalancerServiceComponent.java +++ b/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/internal/LoadBalancerServiceComponent.java @@ -98,6 +98,9 @@ public class LoadBalancerServiceComponent { private LoadBalancerStatisticsNotifier statisticsNotifier; protected void activate(ComponentContext ctxt) { + if (log.isDebugEnabled()) { + log.debug("Activating LoadBalancerServiceComponent..."); + } try { ClusteringAgent clusteringAgent = ServiceReferenceHolder.getInstance().getAxisConfiguration().getClusteringAgent(); boolean clusteringEnabled = (clusteringAgent != null); http://git-wip-us.apache.org/repos/asf/stratos/blob/70b2d64c/components/org.apache.stratos.manager/pom.xml ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/pom.xml b/components/org.apache.stratos.manager/pom.xml index 58cad4c..0b56f8a 100644 --- a/components/org.apache.stratos.manager/pom.xml +++ b/components/org.apache.stratos.manager/pom.xml @@ -17,7 +17,6 @@ specific language governing permissions and limitations under the License. --> - <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> @@ -46,7 +45,6 @@ <dependency> <groupId>com.google.code.gson</groupId> <artifactId>gson</artifactId> - <version>2.1</version> </dependency> <dependency> <groupId>junit</groupId> http://git-wip-us.apache.org/repos/asf/stratos/blob/70b2d64c/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/internal/StratosManagerServiceComponent.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/internal/StratosManagerServiceComponent.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/internal/StratosManagerServiceComponent.java index 825b068..5f7bd01 100644 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/internal/StratosManagerServiceComponent.java +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/internal/StratosManagerServiceComponent.java @@ -79,9 +79,7 @@ import java.util.concurrent.TimeUnit; * cardinality="1..1" policy="dynamic" bind="setComponentStartUpSynchronizer" unbind="unsetComponentStartUpSynchronizer" */ public class StratosManagerServiceComponent { - private static final Log log = LogFactory.getLog(StratosManagerServiceComponent.class); - private static final String THREAD_POOL_ID = "stratos.manager.thread.pool"; private static final String SCHEDULER_THREAD_POOL_ID = "stratos.manager.scheduler.thread.pool"; private static final String STRATOS_MANAGER_COORDINATOR_LOCK = "stratos.manager.coordinator.lock"; @@ -95,6 +93,9 @@ public class StratosManagerServiceComponent { private ScheduledExecutorService scheduler; protected void activate(final ComponentContext componentContext) throws Exception { + if (log.isDebugEnabled()) { + log.debug("Activating StratosManagerServiceComponent..."); + } try { executorService = StratosThreadPool.getExecutorService(THREAD_POOL_ID, THREAD_POOL_SIZE); scheduler = StratosThreadPool.getScheduledExecutorService(SCHEDULER_THREAD_POOL_ID, @@ -148,7 +149,8 @@ public class StratosManagerServiceComponent { // Initialize application event receiver initializeApplicationEventReceiver(); - componentStartUpSynchronizer.waitForWebServiceActivation("StratosManagerService"); + componentStartUpSynchronizer.waitForAxisServiceActivation(Component.StratosManager, + "StratosManagerService"); componentStartUpSynchronizer.setComponentStatus(Component.StratosManager, true); if (log.isInfoEnabled()) { log.info("Stratos manager component is activated"); http://git-wip-us.apache.org/repos/asf/stratos/blob/70b2d64c/components/org.apache.stratos.messaging/pom.xml ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/pom.xml b/components/org.apache.stratos.messaging/pom.xml index 78a5761..3321efe 100644 --- a/components/org.apache.stratos.messaging/pom.xml +++ b/components/org.apache.stratos.messaging/pom.xml @@ -44,7 +44,6 @@ <dependency> <groupId>com.google.code.gson</groupId> <artifactId>gson</artifactId> - <version>2.2.4</version> </dependency> <dependency> <groupId>org.apache.commons</groupId> http://git-wip-us.apache.org/repos/asf/stratos/blob/70b2d64c/components/org.apache.stratos.metadata.client/pom.xml ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.metadata.client/pom.xml b/components/org.apache.stratos.metadata.client/pom.xml index 184d785..2b805b4 100644 --- a/components/org.apache.stratos.metadata.client/pom.xml +++ b/components/org.apache.stratos.metadata.client/pom.xml @@ -43,7 +43,6 @@ <dependency> <groupId>com.google.code.gson</groupId> <artifactId>gson</artifactId> - <version>2.2.4</version> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/stratos/blob/70b2d64c/components/org.apache.stratos.mock.iaas.client/pom.xml ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.mock.iaas.client/pom.xml b/components/org.apache.stratos.mock.iaas.client/pom.xml index e1b3993..0a1ea8d 100644 --- a/components/org.apache.stratos.mock.iaas.client/pom.xml +++ b/components/org.apache.stratos.mock.iaas.client/pom.xml @@ -49,7 +49,6 @@ <dependency> <groupId>com.google.code.gson</groupId> <artifactId>gson</artifactId> - <version>2.2.4</version> </dependency> <dependency> <groupId>commons-logging</groupId> http://git-wip-us.apache.org/repos/asf/stratos/blob/70b2d64c/components/org.apache.stratos.mock.iaas/src/main/java/org/apache/stratos/mock/iaas/internal/MockIaasServiceComponent.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.mock.iaas/src/main/java/org/apache/stratos/mock/iaas/internal/MockIaasServiceComponent.java b/components/org.apache.stratos.mock.iaas/src/main/java/org/apache/stratos/mock/iaas/internal/MockIaasServiceComponent.java index d4d3879..bc384c6 100644 --- a/components/org.apache.stratos.mock.iaas/src/main/java/org/apache/stratos/mock/iaas/internal/MockIaasServiceComponent.java +++ b/components/org.apache.stratos.mock.iaas/src/main/java/org/apache/stratos/mock/iaas/internal/MockIaasServiceComponent.java @@ -47,6 +47,9 @@ public class MockIaasServiceComponent { private static final Log log = LogFactory.getLog(MockIaasServiceComponent.class); protected void activate(final ComponentContext context) { + if (log.isDebugEnabled()) { + log.debug("Activating MockIaasServiceComponent..."); + } Runnable mockIaasActivator = new Runnable() { @Override public void run() { http://git-wip-us.apache.org/repos/asf/stratos/blob/70b2d64c/components/org.apache.stratos.python.cartridge.agent/src/test/java/org/apache/stratos/python.cartridge.agent/test/PythonCartridgeAgentTest.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.python.cartridge.agent/src/test/java/org/apache/stratos/python.cartridge.agent/test/PythonCartridgeAgentTest.java b/components/org.apache.stratos.python.cartridge.agent/src/test/java/org/apache/stratos/python.cartridge.agent/test/PythonCartridgeAgentTest.java index ea62d97..620e11b 100644 --- a/components/org.apache.stratos.python.cartridge.agent/src/test/java/org/apache/stratos/python.cartridge.agent/test/PythonCartridgeAgentTest.java +++ b/components/org.apache.stratos.python.cartridge.agent/src/test/java/org/apache/stratos/python.cartridge.agent/test/PythonCartridgeAgentTest.java @@ -85,10 +85,10 @@ public class PythonCartridgeAgentTest { private boolean eventReceiverInitiated = false; private TopologyEventReceiver topologyEventReceiver; private InstanceStatusEventReceiver instanceStatusEventReceiver; - private int cepPort = 7711; + private int cepPort = 7712; private BrokerService broker = new BrokerService(); private static final String ACTIVEMQ_AMQP_BIND_ADDRESS = "tcp://localhost:61617"; - private static final String ACTIVEMQ_MQTT_BIND_ADDRESS = "mqtt://localhost:1883"; + private static final String ACTIVEMQ_MQTT_BIND_ADDRESS = "mqtt://localhost:1884"; private static final UUID PYTHON_AGENT_DIR_NAME = UUID.randomUUID(); public PythonCartridgeAgentTest(ArtifactUpdatedEvent artifactUpdatedEvent, Boolean expectedResult) { @@ -161,7 +161,7 @@ public class PythonCartridgeAgentTest { log.info("Starting python cartridge agent..."); this.outputStream = executeCommand( "python " + agentPath + "/agent.py > " + getResourcesFolderPath() + File.separator + ".." + - File.separator + PYTHON_AGENT_DIR_NAME + File.separator + "cartridge-agent-ttttt.log"); + File.separator + PYTHON_AGENT_DIR_NAME + File.separator + "cartridge-agent.log"); } /** http://git-wip-us.apache.org/repos/asf/stratos/blob/70b2d64c/components/org.apache.stratos.python.cartridge.agent/src/test/resources/agent.conf ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.python.cartridge.agent/src/test/resources/agent.conf b/components/org.apache.stratos.python.cartridge.agent/src/test/resources/agent.conf index 86603a0..04f4a0c 100644 --- a/components/org.apache.stratos.python.cartridge.agent/src/test/resources/agent.conf +++ b/components/org.apache.stratos.python.cartridge.agent/src/test/resources/agent.conf @@ -17,10 +17,10 @@ [agent] mb.ip =localhost -mb.port =1883 +mb.port =1884 listen.address =localhost thrift.receiver.ip =localhost -thrift.receiver.port =7711 +thrift.receiver.port =7712 thrift.server.admin.username =admin thrift.server.admin.password =admin cep.stats.publisher.enabled =true http://git-wip-us.apache.org/repos/asf/stratos/blob/70b2d64c/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 3fe343c..5db9779 100644 --- a/pom.xml +++ b/pom.xml @@ -442,6 +442,11 @@ <artifactId>guice</artifactId> <version>${guice.version}</version> </dependency> + <dependency> + <groupId>com.google.code.gson</groupId> + <artifactId>gson</artifactId> + <version>${gson.version}</version> + </dependency> </dependencies> </dependencyManagement>
