Repository: stratos Updated Branches: refs/heads/master 5a8c11f55 -> 09fe4b5e4
Fix formatting issues Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/09fe4b5e Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/09fe4b5e Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/09fe4b5e Branch: refs/heads/master Commit: 09fe4b5e4ff4845e391686caedd6732ab6cbb4ca Parents: 5a8c11f Author: Lahiru Sandaruwan <[email protected]> Authored: Tue Jul 28 15:55:10 2015 -0400 Committer: Lahiru Sandaruwan <[email protected]> Committed: Tue Jul 28 15:55:10 2015 -0400 ---------------------------------------------------------------------- .../manager/context/StratosManagerContext.java | 36 +++++++++----------- .../internal/ServiceReferenceHolder.java | 28 +++++++-------- .../manager/registry/RegistryManager.java | 6 ++-- .../CartridgeSubscriptionDataPublisher.java | 2 +- .../management/StratosUserManagerUtils.java | 3 +- .../utils/CartridgeConfigFileReader.java | 3 +- .../manager/utils/PermissionConstants.java | 2 +- 7 files changed, 37 insertions(+), 43 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/09fe4b5e/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/context/StratosManagerContext.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/context/StratosManagerContext.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/context/StratosManagerContext.java index 299f2fd..e4fa435 100644 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/context/StratosManagerContext.java +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/context/StratosManagerContext.java @@ -38,8 +38,7 @@ import java.util.concurrent.locks.Lock; */ public class StratosManagerContext implements Serializable { - private static volatile StratosManagerContext instance; - + public static final String DATA_RESOURCE = "/stratos.manager/data"; private static final String SM_CARTRIDGE_TYPE_TO_CARTIDGE_GROUPS_MAP = "SM_CARTRIDGE_TYPE_TO_CARTIDGE_GROUPS_MAP"; private static final String SM_CARTRIDGE_TYPE_TO_APPLICATIONS_MAP = "SM_CARTRIDGE_TYPE_TO_APPLICATIONS_MAP"; private static final String SM_CARTRIDGE_GROUP_TO_CARTIDGE_GROUPS_MAP = "SM_CARTRIDGE_GROUP_TO_CARTIDGE_GROUPS_MAP"; @@ -49,12 +48,9 @@ public class StratosManagerContext implements Serializable { private static final String SM_CARTRIDGES_APPLICATIONS_WRITE_LOCK = "SM_CARTRIDGES_APPLICATIONS_WRITE_LOCK"; private static final String SM_CARTRIDGEGROUPS_CARTRIDGESUBGROUPS_WRITE_LOCK = "SM_CARTRIDGEGROUPS_CARTRIDGESUBGROUPS_WRITE_LOCK"; private static final String SM_CARTRIDGEGROUPS_APPLICATIONS_WRITE_LOCK = "SM_CARTRIDGEGROUPS_APPLICATIONS_WRITE_LOCK"; - - public static final String DATA_RESOURCE = "/stratos.manager/data"; - - private final transient DistributedObjectProvider distributedObjectProvider; private static final Log log = LogFactory.getLog(StratosManagerContext.class); - + private static volatile StratosManagerContext instance; + private final transient DistributedObjectProvider distributedObjectProvider; /** * Key - cartridge type * Value - list of cartridgeGroupNames @@ -82,17 +78,6 @@ public class StratosManagerContext implements Serializable { private boolean clustered; private boolean coordinator; - public static StratosManagerContext getInstance() { - if (instance == null) { - synchronized (StratosManagerContext.class) { - if (instance == null) { - instance = new StratosManagerContext(); - } - } - } - return instance; - } - private StratosManagerContext() { // Initialize clustering status AxisConfiguration axisConfiguration = ServiceReferenceHolder.getInstance().getAxisConfiguration(); @@ -113,14 +98,25 @@ public class StratosManagerContext implements Serializable { updateContextFromRegistry(); } - public void setCoordinator(boolean coordinator) { - this.coordinator = coordinator; + public static StratosManagerContext getInstance() { + if (instance == null) { + synchronized (StratosManagerContext.class) { + if (instance == null) { + instance = new StratosManagerContext(); + } + } + } + return instance; } public boolean isCoordinator() { return coordinator; } + public void setCoordinator(boolean coordinator) { + this.coordinator = coordinator; + } + public boolean isClustered() { return clustered; } http://git-wip-us.apache.org/repos/asf/stratos/blob/09fe4b5e/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/internal/ServiceReferenceHolder.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/internal/ServiceReferenceHolder.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/internal/ServiceReferenceHolder.java index c03ba09..c55be8c 100644 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/internal/ServiceReferenceHolder.java +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/internal/ServiceReferenceHolder.java @@ -71,6 +71,10 @@ public class ServiceReferenceHolder { return registryService; } + public static void setRegistryService(RegistryService registryService) { + ServiceReferenceHolder.registryService = registryService; + } + public static ConfigurationContext getClientConfigContext() { CarbonUtils.checkSecurity(); return clientConfigContext; @@ -89,47 +93,43 @@ public class ServiceReferenceHolder { ServiceReferenceHolder.serverConfigContext = serverConfigContext; } - public static void setRegistryService(RegistryService registryService) { - ServiceReferenceHolder.registryService = registryService; + public TaskService getTaskService() { + return taskService; } public void setTaskService(TaskService taskService) { this.taskService = taskService; } - public TaskService getTaskService() { - return taskService; + public HazelcastInstance getHazelcastInstance() { + return hazelcastInstance; } public void setHazelcastInstance(HazelcastInstance hazelcastInstance) { this.hazelcastInstance = hazelcastInstance; } - public HazelcastInstance getHazelcastInstance() { - return hazelcastInstance; + public AxisConfiguration getAxisConfiguration() { + return axisConfiguration; } public void setAxisConfiguration(AxisConfiguration axisConfiguration) { this.axisConfiguration = axisConfiguration; } - public AxisConfiguration getAxisConfiguration() { - return axisConfiguration; + public DistributedObjectProvider getDistributedObjectProvider() { + return distributedObjectProvider; } public void setDistributedObjectProvider(DistributedObjectProvider distributedObjectProvider) { this.distributedObjectProvider = distributedObjectProvider; } - public DistributedObjectProvider getDistributedObjectProvider() { - return distributedObjectProvider; + public ComponentStartUpSynchronizer getComponentStartUpSynchronizer() { + return componentStartUpSynchronizer; } public void setComponentStartUpSynchronizer(ComponentStartUpSynchronizer componentStartUpSynchronizer) { this.componentStartUpSynchronizer = componentStartUpSynchronizer; } - - public ComponentStartUpSynchronizer getComponentStartUpSynchronizer() { - return componentStartUpSynchronizer; - } } http://git-wip-us.apache.org/repos/asf/stratos/blob/09fe4b5e/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/registry/RegistryManager.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/registry/RegistryManager.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/registry/RegistryManager.java index 3a86e79..f06939f 100644 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/registry/RegistryManager.java +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/registry/RegistryManager.java @@ -42,11 +42,11 @@ public class RegistryManager { private static final RegistryManager instance = new RegistryManager(); - public static RegistryManager getInstance() { - return instance; + private RegistryManager() { } - private RegistryManager() { + public static RegistryManager getInstance() { + return instance; } /** http://git-wip-us.apache.org/repos/asf/stratos/blob/09fe4b5e/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/statistics/publisher/CartridgeSubscriptionDataPublisher.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/statistics/publisher/CartridgeSubscriptionDataPublisher.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/statistics/publisher/CartridgeSubscriptionDataPublisher.java index caac6e6..3aab2fe 100644 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/statistics/publisher/CartridgeSubscriptionDataPublisher.java +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/statistics/publisher/CartridgeSubscriptionDataPublisher.java @@ -44,9 +44,9 @@ public class CartridgeSubscriptionDataPublisher { private static final Log log = LogFactory .getLog(CartridgeSubscriptionDataPublisher.class); + private static final String stratosManagerEventStreamVersion = "1.0.0"; private static AsyncDataPublisher dataPublisher; private static StreamDefinition streamDefinition; - private static final String stratosManagerEventStreamVersion = "1.0.0"; @SuppressWarnings("deprecation") public static void publish(int tenantID, String adminUser, http://git-wip-us.apache.org/repos/asf/stratos/blob/09fe4b5e/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/user/management/StratosUserManagerUtils.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/user/management/StratosUserManagerUtils.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/user/management/StratosUserManagerUtils.java index dcfcdf4..06fcfb7 100644 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/user/management/StratosUserManagerUtils.java +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/user/management/StratosUserManagerUtils.java @@ -166,8 +166,7 @@ public class StratosUserManagerUtils { //TODO : Should support multiple roles for user if (refinedListOfRolesOfUser.length != 0) { userInfoBean.setRole(getRefinedListOfRolesOfUser(userStoreManager, user)[0]); - } - else{ + } else { userInfoBean.setRole(INTERNAL_EVERYONE_ROLE); } userList.add(userInfoBean); http://git-wip-us.apache.org/repos/asf/stratos/blob/09fe4b5e/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/utils/CartridgeConfigFileReader.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/utils/CartridgeConfigFileReader.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/utils/CartridgeConfigFileReader.java index 223e158..ab25406 100644 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/utils/CartridgeConfigFileReader.java +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/utils/CartridgeConfigFileReader.java @@ -31,9 +31,8 @@ import java.util.Properties; public class CartridgeConfigFileReader { - private static String carbonHome = CarbonUtils.getCarbonHome(); - private static final Log log = LogFactory.getLog(CartridgeConfigFileReader.class); + private static String carbonHome = CarbonUtils.getCarbonHome(); /** * Reads cartridge-config.properties file and assign properties to system http://git-wip-us.apache.org/repos/asf/stratos/blob/09fe4b5e/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/utils/PermissionConstants.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/utils/PermissionConstants.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/utils/PermissionConstants.java index e41a6c2..438f5c6 100644 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/utils/PermissionConstants.java +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/utils/PermissionConstants.java @@ -21,7 +21,7 @@ package org.apache.stratos.manager.utils; public class PermissionConstants { - public static final String[] STRATOS_PERMISSIONS = new String[] { + public static final String[] STRATOS_PERMISSIONS = new String[]{ "/permission/admin/login", "/permission/admin/stratos", "/permission/admin/stratos/autoscalingPolicies",
