revert the code formatting
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/d1ebdc60 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/d1ebdc60 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/d1ebdc60 Branch: refs/heads/docker-integration Commit: d1ebdc6036b08d44da596dc120932ea3cd2008b4 Parents: 545e657 Author: gayan <[email protected]> Authored: Tue Sep 23 12:55:12 2014 +0530 Committer: Nirmal Fernando <[email protected]> Committed: Tue Sep 23 18:30:17 2014 +0530 ---------------------------------------------------------------------- .../publisher/CartridgeAgentEventPublisher.java | 12 +++---- .../internal/CloudControllerDSComponent.java | 36 ++++++++++---------- .../InstanceStatusEventMessageListener.java | 8 +++-- 3 files changed, 27 insertions(+), 29 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/d1ebdc60/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/event/publisher/CartridgeAgentEventPublisher.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/event/publisher/CartridgeAgentEventPublisher.java b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/event/publisher/CartridgeAgentEventPublisher.java index aa6dbed..c57ec2b 100644 --- a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/event/publisher/CartridgeAgentEventPublisher.java +++ b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/event/publisher/CartridgeAgentEventPublisher.java @@ -52,8 +52,7 @@ public class CartridgeAgentEventPublisher { InstanceStartedEvent event = new InstanceStartedEvent( CartridgeAgentConfiguration.getInstance().getServiceName(), CartridgeAgentConfiguration.getInstance().getClusterId(), - CartridgeAgentConfiguration.getInstance() - .getNetworkPartitionId(), + CartridgeAgentConfiguration.getInstance().getNetworkPartitionId(), CartridgeAgentConfiguration.getInstance().getPartitionId(), CartridgeAgentConfiguration.getInstance().getMemberId()); @@ -80,8 +79,7 @@ public class CartridgeAgentEventPublisher { InstanceActivatedEvent event = new InstanceActivatedEvent( CartridgeAgentConfiguration.getInstance().getServiceName(), CartridgeAgentConfiguration.getInstance().getClusterId(), - CartridgeAgentConfiguration.getInstance() - .getNetworkPartitionId(), + CartridgeAgentConfiguration.getInstance().getNetworkPartitionId(), CartridgeAgentConfiguration.getInstance().getPartitionId(), CartridgeAgentConfiguration.getInstance().getMemberId()); @@ -117,8 +115,7 @@ public class CartridgeAgentEventPublisher { InstanceReadyToShutdownEvent event = new InstanceReadyToShutdownEvent( CartridgeAgentConfiguration.getInstance().getServiceName(), CartridgeAgentConfiguration.getInstance().getClusterId(), - CartridgeAgentConfiguration.getInstance() - .getNetworkPartitionId(), + CartridgeAgentConfiguration.getInstance().getNetworkPartitionId(), CartridgeAgentConfiguration.getInstance().getPartitionId(), CartridgeAgentConfiguration.getInstance().getMemberId()); @@ -144,8 +141,7 @@ public class CartridgeAgentEventPublisher { InstanceMaintenanceModeEvent event = new InstanceMaintenanceModeEvent( CartridgeAgentConfiguration.getInstance().getServiceName(), CartridgeAgentConfiguration.getInstance().getClusterId(), - CartridgeAgentConfiguration.getInstance() - .getNetworkPartitionId(), + CartridgeAgentConfiguration.getInstance().getNetworkPartitionId(), CartridgeAgentConfiguration.getInstance().getPartitionId(), CartridgeAgentConfiguration.getInstance().getMemberId()); http://git-wip-us.apache.org/repos/asf/stratos/blob/d1ebdc60/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/internal/CloudControllerDSComponent.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/internal/CloudControllerDSComponent.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/internal/CloudControllerDSComponent.java index 3f117ce..24ca75c 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/internal/CloudControllerDSComponent.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/internal/CloudControllerDSComponent.java @@ -41,21 +41,21 @@ import org.wso2.carbon.utils.ConfigurationContextService; /** * Registering Cloud Controller Service. - * + * * @scr.component name="org.apache.stratos.cloud.controller" immediate="true" * @scr.reference name="ntask.component" - * interface="org.wso2.carbon.ntask.core.service.TaskService" - * cardinality="1..1" policy="dynamic" bind="setTaskService" - * unbind="unsetTaskService" + * interface="org.wso2.carbon.ntask.core.service.TaskService" + * cardinality="1..1" policy="dynamic" bind="setTaskService" + * unbind="unsetTaskService" * @scr.reference name="registry.service" interface= - * "org.wso2.carbon.registry.core.service.RegistryService" - * cardinality="1..1" policy="dynamic" bind="setRegistryService" - * unbind="unsetRegistryService" + * "org.wso2.carbon.registry.core.service.RegistryService" + * cardinality="1..1" policy="dynamic" bind="setRegistryService" + * unbind="unsetRegistryService" * @scr.reference name="config.context.service" - * interface="org.wso2.carbon.utils.ConfigurationContextService" - * cardinality="1..1" policy="dynamic" - * bind="setConfigurationContextService" - * unbind="unsetConfigurationContextService" + * interface="org.wso2.carbon.utils.ConfigurationContextService" + * cardinality="1..1" policy="dynamic" + * bind="setConfigurationContextService" + * unbind="unsetConfigurationContextService" */ public class CloudControllerDSComponent { @@ -68,28 +68,28 @@ public class CloudControllerDSComponent { // Start instance status event message listener TopicSubscriber subscriber = new TopicSubscriber( CloudControllerConstants.INSTANCE_TOPIC); - subscriber - .setMessageListener(new InstanceStatusEventMessageListener()); + subscriber.setMessageListener( + new InstanceStatusEventMessageListener()); Thread tsubscriber = new Thread(subscriber); tsubscriber.start(); // Start instance status message delegator - InstanceStatusEventMessageDelegator delegator = new InstanceStatusEventMessageDelegator(); + InstanceStatusEventMessageDelegator delegator = + new InstanceStatusEventMessageDelegator(); Thread tdelegator = new Thread(delegator); tdelegator.start(); // Register cloud controller service BundleContext bundleContext = context.getBundleContext(); - bundleContext.registerService( - CloudControllerService.class.getName(), - new CloudControllerServiceImpl(), null); + bundleContext.registerService(CloudControllerService.class.getName(), + new CloudControllerServiceImpl(), null); if (log.isInfoEnabled()) { log.info("Scheduling tasks"); } TopologySynchronizerTaskScheduler.schedule(ServiceReferenceHolder - .getInstance().getTaskService()); + .getInstance().getTaskService()); } catch (Throwable e) { log.error( http://git-wip-us.apache.org/repos/asf/stratos/blob/d1ebdc60/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topic/instance/status/InstanceStatusEventMessageListener.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topic/instance/status/InstanceStatusEventMessageListener.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topic/instance/status/InstanceStatusEventMessageListener.java index 67a560c..b3e4a35 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topic/instance/status/InstanceStatusEventMessageListener.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topic/instance/status/InstanceStatusEventMessageListener.java @@ -33,7 +33,8 @@ import org.eclipse.paho.client.mqttv3.MqttMessage; * this is to handle the topology subscription */ public class InstanceStatusEventMessageListener implements MqttCallback { - public static final String ORG_APACHE_STRATOS_MESSAGING_EVENT = "org.apache.stratos.messaging.event."; + public static final String ORG_APACHE_STRATOS_MESSAGING_EVENT = + "org.apache.stratos.messaging.event."; private static final Log log = LogFactory .getLog(InstanceStatusEventMessageListener.class); @@ -61,8 +62,9 @@ public class InstanceStatusEventMessageListener implements MqttCallback { receivedMessage.setText(new String(message.getPayload())); receivedMessage.setStringProperty(Constants.EVENT_CLASS_NAME, - ORG_APACHE_STRATOS_MESSAGING_EVENT.concat(arg0.replace("/", - "."))); + ORG_APACHE_STRATOS_MESSAGING_EVENT + .concat(arg0.replace("/", + "."))); try { if (log.isDebugEnabled()) {
