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/d07c9e8c
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/d07c9e8c
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/d07c9e8c

Branch: refs/heads/docker-integration
Commit: d07c9e8c66b91c77f98701577011bf5bd155d8c0
Parents: c5497cd
Author: gayan <[email protected]>
Authored: Tue Sep 23 11:57:57 2014 +0530
Committer: Nirmal Fernando <[email protected]>
Committed: Tue Sep 23 18:30:17 2014 +0530

----------------------------------------------------------------------
 .../publisher/CartridgeAgentEventPublisher.java | 351 +++++++++----------
 .../internal/CloudControllerDSComponent.java    |  44 +--
 .../InstanceStatusEventMessageListener.java     |  72 ++--
 .../util/CloudControllerConstants.java          | 112 +++---
 4 files changed, 295 insertions(+), 284 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/stratos/blob/d07c9e8c/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 46c250b..938d1f7 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
@@ -37,180 +37,179 @@ import org.apache.stratos.messaging.util.Util;
  * Cartridge agent event publisher.
  */
 public class CartridgeAgentEventPublisher {
-    private static final Log log = 
LogFactory.getLog(CartridgeAgentEventPublisher.class);
-    private static boolean started;
-    private static boolean activated;
-    private static boolean readyToShutdown;
-    private static boolean maintenance;
-
-    public static void publishInstanceStartedEvent() {
-        if (!isStarted()) {
-            if (log.isInfoEnabled()) {
-                log.info("Publishing instance started event");
-            }
-            InstanceStartedEvent event =
-                    new InstanceStartedEvent(
-                            CartridgeAgentConfiguration.getInstance()
-                                    .getServiceName(),
-                            CartridgeAgentConfiguration.getInstance()
-                                    .getClusterId(),
-                            CartridgeAgentConfiguration.getInstance()
-                                    .getNetworkPartitionId(),
-                            CartridgeAgentConfiguration.getInstance()
-                                    .getPartitionId(),
-                            CartridgeAgentConfiguration.getInstance()
-                                    .getMemberId());
-
-            EventPublisher eventPublisher =
-                    
EventPublisherPool.getPublisher(Constants.INSTANCE_STATUS_TOPIC);
-            eventPublisher.publish(event);
-            setStarted(true);
-            if (log.isInfoEnabled()) {
-                log.info("Instance started event published");
-            }
-
-        } else {
-            if (log.isWarnEnabled()) {
-                log.warn("Instance already started");
-            }
-        }
-    }
-
-    public static void publishInstanceActivatedEvent() {
-        if (!isActivated()) {
-            if (log.isInfoEnabled()) {
-                log.info("Publishing instance activated event");
-            }
-            InstanceActivatedEvent event =
-                    new InstanceActivatedEvent(
-                            CartridgeAgentConfiguration.getInstance()
-                                    .getServiceName(),
-                            CartridgeAgentConfiguration.getInstance()
-                                    .getClusterId(),
-                            CartridgeAgentConfiguration.getInstance()
-                                    .getNetworkPartitionId(),
-                            CartridgeAgentConfiguration.getInstance()
-                                    .getPartitionId(),
-                            CartridgeAgentConfiguration.getInstance()
-                                    .getMemberId());
-
-            // Event publisher connection will
-            EventPublisher eventPublisher =
-                    
EventPublisherPool.getPublisher(Constants.INSTANCE_STATUS_TOPIC);
-            eventPublisher.publish(event);
-            if (log.isInfoEnabled()) {
-                log.info("Instance activated event published");
-            }
-
-            if (log.isInfoEnabled()) {
-                log.info("Starting health statistics notifier");
-            }
-            Thread thread = new Thread(new HealthStatisticsNotifier());
-            thread.start();
-            setActivated(true);
-            if (log.isInfoEnabled()) {
-                log.info("Health statistics notifier started");
-            }
-        } else {
-            if (log.isWarnEnabled()) {
-                log.warn("Instance already activated");
-            }
-        }
-    }
-
-    public static void publishInstanceReadyToShutdownEvent() {
-        if (!isReadyToShutdown()) {
-            if (log.isInfoEnabled()) {
-                log.info("Publishing instance activated event");
-            }
-            InstanceReadyToShutdownEvent event =
-                    new InstanceReadyToShutdownEvent(
-                            CartridgeAgentConfiguration.getInstance()
-                                    .getServiceName(),
-                            CartridgeAgentConfiguration.getInstance()
-                                    .getClusterId(),
-                            CartridgeAgentConfiguration.getInstance()
-                                    .getNetworkPartitionId(),
-                            CartridgeAgentConfiguration.getInstance()
-                                    .getPartitionId(),
-                            CartridgeAgentConfiguration.getInstance()
-                                    .getMemberId());
-
-            EventPublisher eventPublisher =
-                    
EventPublisherPool.getPublisher(Util.getMessageTopicName(event));
-            eventPublisher.publish(event);
-            setReadyToShutdown(true);
-            if (log.isInfoEnabled()) {
-                log.info("Instance ReadyToShutDown event published");
-            }
-        } else {
-            if (log.isWarnEnabled()) {
-                log.warn("Instance already sent ReadyToShutDown event....");
-            }
-        }
-    }
-
-    public static void publishMaintenanceModeEvent() {
-        if (!isMaintenance()) {
-            if (log.isInfoEnabled()) {
-                log.info("Publishing instance maintenance mode event");
-            }
-            InstanceMaintenanceModeEvent event =
-                    new InstanceMaintenanceModeEvent(
-                            CartridgeAgentConfiguration.getInstance()
-                                    .getServiceName(),
-                            CartridgeAgentConfiguration.getInstance()
-                                    .getClusterId(),
-                            CartridgeAgentConfiguration.getInstance()
-                                    .getNetworkPartitionId(),
-                            CartridgeAgentConfiguration.getInstance()
-                                    .getPartitionId(),
-                            CartridgeAgentConfiguration.getInstance()
-                                    .getMemberId());
-
-            EventPublisher eventPublisher =
-                    
EventPublisherPool.getPublisher(Constants.INSTANCE_STATUS_TOPIC);
-            eventPublisher.publish(event);
-            setMaintenance(true);
-            if (log.isInfoEnabled()) {
-                log.info("Instance Maintenance mode event published");
-            }
-        } else {
-            if (log.isWarnEnabled()) {
-                log.warn("Instance already in a Maintenance mode....");
-            }
-        }
-    }
-
-    public static boolean isStarted() {
-        return started;
-    }
-
-    public static void setStarted(boolean started) {
-        CartridgeAgentEventPublisher.started = started;
-    }
-
-    public static boolean isActivated() {
-        return activated;
-    }
-
-    public static void setActivated(boolean activated) {
-        CartridgeAgentEventPublisher.activated = activated;
-    }
-
-    public static boolean isReadyToShutdown() {
-        return readyToShutdown;
-    }
-
-    public static void setReadyToShutdown(boolean readyToShutdown) {
-        CartridgeAgentEventPublisher.readyToShutdown = readyToShutdown;
-    }
-
-    public static boolean isMaintenance() {
-        return maintenance;
-    }
-
-    public static void setMaintenance(boolean maintenance) {
-        CartridgeAgentEventPublisher.maintenance = maintenance;
-    }
+       private static final Log log = 
LogFactory.getLog(CartridgeAgentEventPublisher.class);
+       private static boolean started;
+       private static boolean activated;
+       private static boolean readyToShutdown;
+       private static boolean maintenance;
+
+       public static void publishInstanceStartedEvent() {
+               if (!isStarted()) {
+                       if (log.isInfoEnabled()) {
+                               log.info("Publishing instance started event");
+                       }
+                       InstanceStartedEvent event =
+                                       new InstanceStartedEvent(
+                                                       
CartridgeAgentConfiguration.getInstance().getServiceName(),
+                                                       
CartridgeAgentConfiguration.getInstance().getClusterId(),
+                                                       
CartridgeAgentConfiguration.getInstance().getNetworkPartitionId(),
+                                                       
CartridgeAgentConfiguration.getInstance().getPartitionId(),
+                                                       
CartridgeAgentConfiguration.getInstance().getMemberId());
+
+                       EventPublisher eventPublisher =
+                                       EventPublisherPool.getPublisher(
+                                                       
Constants.INSTANCE_STATUS_TOPIC);
+                       eventPublisher.publish(event);
+                       setStarted(true);
+                       if (log.isInfoEnabled()) {
+                               log.info("Instance started event published");
+                       }
+
+               } else {
+                       if (log.isWarnEnabled()) {
+                               log.warn("Instance already started");
+                       }
+               }
+       }
+
+       public static void publishInstanceActivatedEvent() {
+               if (!isActivated()) {
+                       if (log.isInfoEnabled()) {
+                               log.info("Publishing instance activated event");
+                       }
+                       InstanceActivatedEvent event =
+                                       new InstanceActivatedEvent(
+                                                       
CartridgeAgentConfiguration.getInstance()
+                                                                               
   .getServiceName(),
+                                                       
CartridgeAgentConfiguration.getInstance()
+                                                                               
   .getClusterId(),
+                                                       
CartridgeAgentConfiguration.getInstance()
+                                                                               
   .getNetworkPartitionId(),
+                                                       
CartridgeAgentConfiguration.getInstance()
+                                                                               
   .getPartitionId(),
+                                                       
CartridgeAgentConfiguration.getInstance()
+                                                                               
   .getMemberId());
+
+                       // Event publisher connection will
+                       EventPublisher eventPublisher =
+                                       EventPublisherPool.getPublisher(
+                                                       
Constants.INSTANCE_STATUS_TOPIC);
+                       eventPublisher.publish(event);
+                       if (log.isInfoEnabled()) {
+                               log.info("Instance activated event published");
+                       }
+
+                       if (log.isInfoEnabled()) {
+                               log.info("Starting health statistics notifier");
+                       }
+                       Thread thread = new Thread(new 
HealthStatisticsNotifier());
+                       thread.start();
+                       setActivated(true);
+                       if (log.isInfoEnabled()) {
+                               log.info("Health statistics notifier started");
+                       }
+               } else {
+                       if (log.isWarnEnabled()) {
+                               log.warn("Instance already activated");
+                       }
+               }
+       }
+
+       public static void publishInstanceReadyToShutdownEvent() {
+               if (!isReadyToShutdown()) {
+                       if (log.isInfoEnabled()) {
+                               log.info("Publishing instance activated event");
+                       }
+                       InstanceReadyToShutdownEvent event =
+                                       new InstanceReadyToShutdownEvent(
+                                                       
CartridgeAgentConfiguration.getInstance()
+                                                                               
   .getServiceName(),
+                                                       
CartridgeAgentConfiguration.getInstance()
+                                                                               
   .getClusterId(),
+                                                       
CartridgeAgentConfiguration.getInstance()
+                                                                               
   .getNetworkPartitionId(),
+                                                       
CartridgeAgentConfiguration.getInstance()
+                                                                               
   .getPartitionId(),
+                                                       
CartridgeAgentConfiguration.getInstance()
+                                                                               
   .getMemberId());
+
+                       EventPublisher eventPublisher =
+                                       EventPublisherPool.getPublisher(
+                                                       
Util.getMessageTopicName(event));
+                       eventPublisher.publish(event);
+                       setReadyToShutdown(true);
+                       if (log.isInfoEnabled()) {
+                               log.info("Instance ReadyToShutDown event 
published");
+                       }
+               } else {
+                       if (log.isWarnEnabled()) {
+                               log.warn("Instance already sent ReadyToShutDown 
event....");
+                       }
+               }
+       }
+
+       public static void publishMaintenanceModeEvent() {
+               if (!isMaintenance()) {
+                       if (log.isInfoEnabled()) {
+                               log.info("Publishing instance maintenance mode 
event");
+                       }
+                       InstanceMaintenanceModeEvent event =
+                                       new InstanceMaintenanceModeEvent(
+                                                       
CartridgeAgentConfiguration.getInstance()
+                                                                               
   .getServiceName(),
+                                                       
CartridgeAgentConfiguration.getInstance()
+                                                                               
   .getClusterId(),
+                                                       
CartridgeAgentConfiguration.getInstance()
+                                                                               
   .getNetworkPartitionId(),
+                                                       
CartridgeAgentConfiguration.getInstance()
+                                                                               
   .getPartitionId(),
+                                                       
CartridgeAgentConfiguration.getInstance()
+                                                                               
   .getMemberId());
+
+                       EventPublisher eventPublisher =
+                                       EventPublisherPool.getPublisher(
+                                                       
Constants.INSTANCE_STATUS_TOPIC);
+                       eventPublisher.publish(event);
+                       setMaintenance(true);
+                       if (log.isInfoEnabled()) {
+                               log.info("Instance Maintenance mode event 
published");
+                       }
+               } else {
+                       if (log.isWarnEnabled()) {
+                               log.warn("Instance already in a Maintenance 
mode....");
+                       }
+               }
+       }
+
+       public static boolean isStarted() {
+               return started;
+       }
+
+       public static void setStarted(boolean started) {
+               CartridgeAgentEventPublisher.started = started;
+       }
+
+       public static boolean isActivated() {
+               return activated;
+       }
+
+       public static void setActivated(boolean activated) {
+               CartridgeAgentEventPublisher.activated = activated;
+       }
+
+       public static boolean isReadyToShutdown() {
+               return readyToShutdown;
+       }
+
+       public static void setReadyToShutdown(boolean readyToShutdown) {
+               CartridgeAgentEventPublisher.readyToShutdown = readyToShutdown;
+       }
+
+       public static boolean isMaintenance() {
+               return maintenance;
+       }
+
+       public static void setMaintenance(boolean maintenance) {
+               CartridgeAgentEventPublisher.maintenance = maintenance;
+       }
 }

http://git-wip-us.apache.org/repos/asf/stratos/blob/d07c9e8c/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 8ade514..3f117ce 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
@@ -47,8 +47,7 @@ import org.wso2.carbon.utils.ConfigurationContextService;
  *                interface="org.wso2.carbon.ntask.core.service.TaskService"
  *                cardinality="1..1" policy="dynamic" bind="setTaskService"
  *                unbind="unsetTaskService"
- * @scr.reference name="registry.service"
- *                interface=
+ * @scr.reference name="registry.service" interface=
  *                "org.wso2.carbon.registry.core.service.RegistryService"
  *                cardinality="1..1" policy="dynamic" bind="setRegistryService"
  *                unbind="unsetRegistryService"
@@ -60,39 +59,42 @@ import org.wso2.carbon.utils.ConfigurationContextService;
  */
 public class CloudControllerDSComponent {
 
-       private static final Log log = 
LogFactory.getLog(CloudControllerDSComponent.class);
+       private static final Log log = LogFactory
+                       .getLog(CloudControllerDSComponent.class);
 
        protected void activate(ComponentContext context) {
                try {
 
                        // Start instance status event message listener
-                       TopicSubscriber subscriber =
-                                                    new TopicSubscriber(
-                                                                        
CloudControllerConstants.INSTANCE_TOPIC);
-                       subscriber.setMessageListener(new 
InstanceStatusEventMessageListener());
+                       TopicSubscriber subscriber = new TopicSubscriber(
+                                       
CloudControllerConstants.INSTANCE_TOPIC);
+                       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());
+                       
TopologySynchronizerTaskScheduler.schedule(ServiceReferenceHolder
+                                       .getInstance().getTaskService());
 
                } catch (Throwable e) {
-                       log.error("******* Cloud Controller Service bundle is 
failed to activate ****", e);
+                       log.error(
+                                       "******* Cloud Controller Service 
bundle is failed to activate ****",
+                                       e);
                }
        }
 
@@ -116,7 +118,8 @@ public class CloudControllerDSComponent {
                }
 
                try {
-                       UserRegistry registry = 
registryService.getGovernanceSystemRegistry();
+                       UserRegistry registry = registryService
+                                       .getGovernanceSystemRegistry();
                        
ServiceReferenceHolder.getInstance().setRegistry(registry);
                } catch (RegistryException e) {
                        String msg = "Failed when retrieving Governance System 
Registry.";
@@ -132,13 +135,14 @@ public class CloudControllerDSComponent {
                ServiceReferenceHolder.getInstance().setRegistry(null);
        }
 
-       protected void 
setConfigurationContextService(ConfigurationContextService cfgCtxService) {
-               ServiceReferenceHolder.getInstance()
-                                     
.setAxisConfiguration(cfgCtxService.getServerConfigContext()
-                                                                        
.getAxisConfiguration());
+       protected void setConfigurationContextService(
+                       ConfigurationContextService cfgCtxService) {
+               ServiceReferenceHolder.getInstance().setAxisConfiguration(
+                               
cfgCtxService.getServerConfigContext().getAxisConfiguration());
        }
 
-       protected void 
unsetConfigurationContextService(ConfigurationContextService cfgCtxService) {
+       protected void unsetConfigurationContextService(
+                       ConfigurationContextService cfgCtxService) {
                ServiceReferenceHolder.getInstance().setAxisConfiguration(null);
        }
 

http://git-wip-us.apache.org/repos/asf/stratos/blob/d07c9e8c/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 5f415b5..67a560c 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,47 +33,51 @@ 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.";
-    private static final Log log = 
LogFactory.getLog(InstanceStatusEventMessageListener.class);
+       public static final String ORG_APACHE_STRATOS_MESSAGING_EVENT = 
"org.apache.stratos.messaging.event.";
+       private static final Log log = LogFactory
+                       .getLog(InstanceStatusEventMessageListener.class);
 
-    @Override
-    public void connectionLost(Throwable arg0) {
-        if (log.isDebugEnabled()) {
-            log.debug("Connection lost");
-        }
+       @Override
+       public void connectionLost(Throwable arg0) {
+               if (log.isDebugEnabled()) {
+                       log.debug("Connection lost");
+               }
 
-    }
+       }
 
-    @Override
-    public void deliveryComplete(IMqttDeliveryToken arg0) {
-        if (log.isDebugEnabled()) {
-            log.debug("Delivery completed");
-        }
-    }
+       @Override
+       public void deliveryComplete(IMqttDeliveryToken arg0) {
+               if (log.isDebugEnabled()) {
+                       log.debug("Delivery completed");
+               }
+       }
 
-    @Override
-    public void messageArrived(String arg0, MqttMessage message) throws 
Exception {
-        if (message instanceof MqttMessage) {
+       @Override
+       public void messageArrived(String arg0, MqttMessage message)
+                       throws Exception {
+               if (message instanceof MqttMessage) {
 
-            TextMessage receivedMessage = new ActiveMQTextMessage();
+                       TextMessage receivedMessage = new ActiveMQTextMessage();
 
-            receivedMessage.setText(new String(message.getPayload()));
-            receivedMessage.setStringProperty(Constants.EVENT_CLASS_NAME,
-                    ORG_APACHE_STRATOS_MESSAGING_EVENT.concat(arg0.replace("/",
-                            ".")));
+                       receivedMessage.setText(new 
String(message.getPayload()));
+                       
receivedMessage.setStringProperty(Constants.EVENT_CLASS_NAME,
+                                       
ORG_APACHE_STRATOS_MESSAGING_EVENT.concat(arg0.replace("/",
+                                                       ".")));
 
-            try {
-                if (log.isDebugEnabled()) {
-                    log.debug(String.format("Instance notifier message 
received: %s",
-                            ((TextMessage) message).getText()));
-                }
-                // Add received message to the queue
-                
InstanceStatusEventMessageQueue.getInstance().add(receivedMessage);
+                       try {
+                               if (log.isDebugEnabled()) {
+                                       log.debug(String.format(
+                                                       "Instance notifier 
message received: %s",
+                                                       ((TextMessage) 
message).getText()));
+                               }
+                               // Add received message to the queue
+                               
InstanceStatusEventMessageQueue.getInstance().add(
+                                               receivedMessage);
 
-            } catch (JMSException e) {
-                log.error(e.getMessage(), e);
-            }
-        }
+                       } catch (JMSException e) {
+                               log.error(e.getMessage(), e);
+                       }
+               }
 
-    }
+       }
 }

http://git-wip-us.apache.org/repos/asf/stratos/blob/d07c9e8c/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerConstants.java
----------------------------------------------------------------------
diff --git 
a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerConstants.java
 
b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerConstants.java
index af6e190..deeed37 100644
--- 
a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerConstants.java
+++ 
b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerConstants.java
@@ -93,11 +93,9 @@ public final class CloudControllerConstants {
        public static final String HOST_PORT_ELEMENT = "port";
        public static final String USER_NAME_ELEMENT = "userName";
        public static final String PASSWORD_ELEMENT = "password";
-       public static final String CLOUD_CONTROLLER_EVENT_STREAM =
-                                                                  
"org.apache.stratos.cloud.controller";
-       public static final String CLOUD_CONTROLLER_COL_FAMILY =
-                                                                
CLOUD_CONTROLLER_EVENT_STREAM.replaceAll("[/.]",
-                                                                               
                          "_");
+       public static final String CLOUD_CONTROLLER_EVENT_STREAM = 
"org.apache.stratos.cloud.controller";
+       public static final String CLOUD_CONTROLLER_COL_FAMILY = 
CLOUD_CONTROLLER_EVENT_STREAM
+                       .replaceAll("[/.]", "_");
 
        /**
         * column names
@@ -138,8 +136,7 @@ public final class CloudControllerConstants {
        public static final String CRON_PROPERTY = "cron";
        public static final String AMQP_CONNECTION_URL_PROPERTY = 
"amqpConnectionUrl";
        public static final String AMQP_INITIAL_CONTEXT_FACTORY_PROPERTY = 
"amqpInitialContextFactory";
-       public static final String AMQP_TOPIC_CONNECTION_FACTORY_PROPERTY =
-                                                                           
"amqpTopicConnectionFactory";
+       public static final String AMQP_TOPIC_CONNECTION_FACTORY_PROPERTY = 
"amqpTopicConnectionFactory";
        public static final String INSTANCE_TOPIC = "instance/#";
        // pre define a floating ip
        public static final String FLOATING_IP_PROPERTY = "floatingIp";
@@ -148,53 +145,60 @@ public final class CloudControllerConstants {
        /**
         * XPath expressions
         */
-       public static final String IAAS_PROVIDER_XPATH = "/" + 
CLOUD_CONTROLLER_ELEMENT + "/" +
-                                                        IAAS_PROVIDERS_ELEMENT 
+ "/" +
-                                                        IAAS_PROVIDER_ELEMENT;
-       public static final String PARTITION_XPATH = "/" + 
CLOUD_CONTROLLER_ELEMENT + "/" +
-                                                    PARTITIONS_ELEMENT + "/" + 
PARTITION_ELEMENT;
-       public static final String REGION_XPATH = "/" + 
CLOUD_CONTROLLER_ELEMENT + "/" +
-                                                 IAAS_PROVIDERS_ELEMENT + "/" 
+ IAAS_PROVIDER_ELEMENT +
-                                                 "/" + REGION_ELEMENT;
-       public static final String ZONE_XPATH = "/" + CLOUD_CONTROLLER_ELEMENT 
+ "/" +
-                                               IAAS_PROVIDERS_ELEMENT + "/" + 
IAAS_PROVIDER_ELEMENT +
-                                               "/" + REGION_ELEMENT + "/" + 
ZONE_ELEMENT;
-       public static final String HOST_XPATH = "/" + CLOUD_CONTROLLER_ELEMENT 
+ "/" +
-                                               IAAS_PROVIDERS_ELEMENT + "/" + 
IAAS_PROVIDER_ELEMENT +
-                                               "/" + REGION_ELEMENT + "/" + 
ZONE_ELEMENT + "/" +
-                                               HOST_ELEMENT;
+       public static final String IAAS_PROVIDER_XPATH = "/"
+                       + CLOUD_CONTROLLER_ELEMENT + "/" + 
IAAS_PROVIDERS_ELEMENT + "/"
+                       + IAAS_PROVIDER_ELEMENT;
+       public static final String PARTITION_XPATH = "/" + 
CLOUD_CONTROLLER_ELEMENT
+                       + "/" + PARTITIONS_ELEMENT + "/" + PARTITION_ELEMENT;
+       public static final String REGION_XPATH = "/" + CLOUD_CONTROLLER_ELEMENT
+                       + "/" + IAAS_PROVIDERS_ELEMENT + "/" + 
IAAS_PROVIDER_ELEMENT + "/"
+                       + REGION_ELEMENT;
+       public static final String ZONE_XPATH = "/" + CLOUD_CONTROLLER_ELEMENT
+                       + "/" + IAAS_PROVIDERS_ELEMENT + "/" + 
IAAS_PROVIDER_ELEMENT + "/"
+                       + REGION_ELEMENT + "/" + ZONE_ELEMENT;
+       public static final String HOST_XPATH = "/" + CLOUD_CONTROLLER_ELEMENT
+                       + "/" + IAAS_PROVIDERS_ELEMENT + "/" + 
IAAS_PROVIDER_ELEMENT + "/"
+                       + REGION_ELEMENT + "/" + ZONE_ELEMENT + "/" + 
HOST_ELEMENT;
        public static final String PROPERTY_ELEMENT_XPATH = "/" + 
PROPERTY_ELEMENT;
        public static final String IMAGE_ID_ELEMENT_XPATH = "/" + 
IMAGE_ID_ELEMENT;
-       public static final String SCALE_UP_ORDER_ELEMENT_XPATH = "/" + 
SCALE_UP_ORDER_ELEMENT;
-       public static final String SCALE_DOWN_ORDER_ELEMENT_XPATH = "/" + 
SCALE_DOWN_ORDER_ELEMENT;
+       public static final String SCALE_UP_ORDER_ELEMENT_XPATH = "/"
+                       + SCALE_UP_ORDER_ELEMENT;
+       public static final String SCALE_DOWN_ORDER_ELEMENT_XPATH = "/"
+                       + SCALE_DOWN_ORDER_ELEMENT;
        public static final String PROVIDER_ELEMENT_XPATH = "/" + 
PROPERTY_ELEMENT;
        public static final String IDENTITY_ELEMENT_XPATH = "/" + 
IDENTITY_ELEMENT;
-       public static final String CREDENTIAL_ELEMENT_XPATH = "/" + 
CREDENTIAL_ELEMENT;
-       public static final String SERVICES_ELEMENT_XPATH = "/" + 
SERVICES_ELEMENT + "/" +
-                                                           SERVICE_ELEMENT;
+       public static final String CREDENTIAL_ELEMENT_XPATH = "/"
+                       + CREDENTIAL_ELEMENT;
+       public static final String SERVICES_ELEMENT_XPATH = "/" + 
SERVICES_ELEMENT
+                       + "/" + SERVICE_ELEMENT;
        public static final String SERVICE_ELEMENT_XPATH = "/" + 
SERVICE_ELEMENT;
-       public static final String CARTRIDGE_ELEMENT_XPATH = "/" + 
CARTRIDGE_ELEMENT;
+       public static final String CARTRIDGE_ELEMENT_XPATH = "/"
+                       + CARTRIDGE_ELEMENT;
        public static final String PAYLOAD_ELEMENT_XPATH = "/" + 
PAYLOAD_ELEMENT;
        public static final String HOST_ELEMENT_XPATH = "/" + HOST_ELEMENT;
-       public static final String CARTRIDGES_ELEMENT_XPATH = "/" + 
CARTRIDGES_ELEMENT + "/" +
-                                                             CARTRIDGE_ELEMENT;
-       public static final String IAAS_PROVIDER_ELEMENT_XPATH = "/" + 
IAAS_PROVIDER_ELEMENT;
-       public static final String DEPLOYMENT_ELEMENT_XPATH = "/" + 
DEPLOYMENT_ELEMENT;
-       public static final String PORT_MAPPING_ELEMENT_XPATH = "/" + 
PORT_MAPPING_ELEMENT;
-       public static final String APP_TYPES_ELEMENT_XPATH = "/" + 
APP_TYPES_ELEMENT;
+       public static final String CARTRIDGES_ELEMENT_XPATH = "/"
+                       + CARTRIDGES_ELEMENT + "/" + CARTRIDGE_ELEMENT;
+       public static final String IAAS_PROVIDER_ELEMENT_XPATH = "/"
+                       + IAAS_PROVIDER_ELEMENT;
+       public static final String DEPLOYMENT_ELEMENT_XPATH = "/"
+                       + DEPLOYMENT_ELEMENT;
+       public static final String PORT_MAPPING_ELEMENT_XPATH = "/"
+                       + PORT_MAPPING_ELEMENT;
+       public static final String APP_TYPES_ELEMENT_XPATH = "/"
+                       + APP_TYPES_ELEMENT;
 
-       public static final String DATA_PUBLISHER_XPATH = "/" + 
CLOUD_CONTROLLER_ELEMENT + "/" +
-                                                         
DATA_PUBLISHER_ELEMENT;
-       public static final String TOPOLOGY_SYNC_XPATH = "/" + 
CLOUD_CONTROLLER_ELEMENT + "/" +
-                                                        TOPOLOGY_SYNC_ELEMENT;
-       public static final String DATA_PUBLISHER_CRON_XPATH = "/" + 
CLOUD_CONTROLLER_ELEMENT + "/" +
-                                                              CRON_ELEMENT;
-       public static final String BAM_SERVER_ADMIN_USERNAME_XPATH = "/" + 
CLOUD_CONTROLLER_ELEMENT +
-                                                                    "/" +
-                                                                    
BAM_SERVER_ADMIN_USERNAME_ELEMENT;
-       public static final String BAM_SERVER_ADMIN_PASSWORD_XPATH = "/" + 
CLOUD_CONTROLLER_ELEMENT +
-                                                                    "/" +
-                                                                    
BAM_SERVER_ADMIN_PASSWORD_ELEMENT;
+       public static final String DATA_PUBLISHER_XPATH = "/"
+                       + CLOUD_CONTROLLER_ELEMENT + "/" + 
DATA_PUBLISHER_ELEMENT;
+       public static final String TOPOLOGY_SYNC_XPATH = "/"
+                       + CLOUD_CONTROLLER_ELEMENT + "/" + 
TOPOLOGY_SYNC_ELEMENT;
+       public static final String DATA_PUBLISHER_CRON_XPATH = "/"
+                       + CLOUD_CONTROLLER_ELEMENT + "/" + CRON_ELEMENT;
+       public static final String BAM_SERVER_ADMIN_USERNAME_XPATH = "/"
+                       + CLOUD_CONTROLLER_ELEMENT + "/"
+                       + BAM_SERVER_ADMIN_USERNAME_ELEMENT;
+       public static final String BAM_SERVER_ADMIN_PASSWORD_XPATH = "/"
+                       + CLOUD_CONTROLLER_ELEMENT + "/"
+                       + BAM_SERVER_ADMIN_PASSWORD_ELEMENT;
        // public static final String CASSANDRA_HOST_ADDRESS_XPATH =
        // "/"+CLOUD_CONTROLLER_ELEMENT+
        // "/"+CASSANDRA_HOST_ADDRESS;
@@ -231,21 +235,21 @@ public final class CloudControllerConstants {
        /**
         * Directories
         */
-       public static final String SERVICES_DIR = 
CarbonUtils.getCarbonRepository() + File.separator +
-                                                 "services" + File.separator;
+       public static final String SERVICES_DIR = 
CarbonUtils.getCarbonRepository()
+                       + File.separator + "services" + File.separator;
 
        /**
         * Topology sync related constants
         */
-       public static final String TOPOLOGY_FILE_PATH = 
CarbonUtils.getCarbonConfigDirPath() +
-                                                       File.separator + 
"service-topology.conf";
+       public static final String TOPOLOGY_FILE_PATH = CarbonUtils
+                       .getCarbonConfigDirPath()
+                       + File.separator
+                       + "service-topology.conf";
        public static final String TOPOLOGY_SYNC_CRON = "1 * * * * ? *";
        public static final String TOPOLOGY_SYNC_TASK_NAME = 
"TOPOLOGY_SYNC_TASK";
        public static final String TOPOLOGY_SYNC_TASK_TYPE = 
"TOPOLOGY_SYNC_TASK_TYPE";
-       public static final String AMQP_CONNECTION_URL =
-                                                        
"amqp://admin:admin@clientID/carbon?brokerlist='tcp://localhost:5672'";
-       public static final String AMQP_INITIAL_CONTEXT_FACTORY =
-                                                                 
"org.wso2.andes.jndi.PropertiesFileInitialContextFactory";
+       public static final String AMQP_CONNECTION_URL = 
"amqp://admin:admin@clientID/carbon?brokerlist='tcp://localhost:5672'";
+       public static final String AMQP_INITIAL_CONTEXT_FACTORY = 
"org.wso2.andes.jndi.PropertiesFileInitialContextFactory";
        public static final String AMQP_TOPIC_CONNECTION_FACTORY = 
"qpidConnectionfactory";
 
        /**

Reply via email to