Repository: stratos Updated Branches: refs/heads/4.1.0-test 647f4d3d2 -> 65e6c0ea5
s/inActive/inactive and s/in-active/inactive Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/65e6c0ea Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/65e6c0ea Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/65e6c0ea Branch: refs/heads/4.1.0-test Commit: 65e6c0ea57451a5333675a252eb2837db50f5aa3 Parents: 647f4d3 Author: Lahiru Sandaruwan <[email protected]> Authored: Thu Dec 11 08:16:08 2014 +0530 Committer: Lahiru Sandaruwan <[email protected]> Committed: Thu Dec 11 08:16:08 2014 +0530 ---------------------------------------------------------------------- .../autoscaler/applications/topic/ApplicationBuilder.java | 2 +- .../applications/topic/ApplicationsEventPublisher.java | 4 ++-- .../autoscaler/monitor/component/ApplicationMonitor.java | 6 +++--- .../stratos/autoscaler/monitor/component/GroupMonitor.java | 4 ++-- .../autoscaler/monitor/component/ParentComponentMonitor.java | 2 +- .../processor/cluster/ClusterStatusInActiveProcessor.java | 4 ++-- .../status/processor/group/GroupStatusInActiveProcessor.java | 8 ++++---- .../src/main/resources/web/tenant-activity/find-tenant.jsp | 4 ++-- 8 files changed, 17 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/65e6c0ea/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/topic/ApplicationBuilder.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/topic/ApplicationBuilder.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/topic/ApplicationBuilder.java index 1af78a0..d46a232 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/topic/ApplicationBuilder.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/topic/ApplicationBuilder.java @@ -501,7 +501,7 @@ public class ApplicationBuilder { public static void handleGroupInActivateEvent(String appId, String groupId, String instanceId) { if (log.isDebugEnabled()) { - log.debug("Handling group in-active event: [group]: " + groupId + + log.debug("Handling group inactive event: [group]: " + groupId + " [application-id] " + appId); } http://git-wip-us.apache.org/repos/asf/stratos/blob/65e6c0ea/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/topic/ApplicationsEventPublisher.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/topic/ApplicationsEventPublisher.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/topic/ApplicationsEventPublisher.java index 93841a9..52e8c55 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/topic/ApplicationsEventPublisher.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/topic/ApplicationsEventPublisher.java @@ -61,7 +61,7 @@ public class ApplicationsEventPublisher { public static void sendGroupInstanceInActivateEvent(String appId, String groupId, String instanceId) { if (log.isInfoEnabled()) { - log.info("Publishing Group in-activate event for [application]: " + appId + + log.info("Publishing Group inactivate event for [application]: " + appId + " [group]: " + groupId); } GroupInstanceInactivatedEvent groupInactivateEvent = new GroupInstanceInactivatedEvent(appId, groupId, instanceId); @@ -102,7 +102,7 @@ public class ApplicationsEventPublisher { public static void sendApplicationInstanceInactivatedEvent(String appId, String instanceId) { if (log.isInfoEnabled()) { - log.info("Publishing Application In-activated event for [application]: " + appId); + log.info("Publishing Application Inactivated event for [application]: " + appId); } ApplicationInstanceInactivatedEvent applicationInActivatedEvent = new ApplicationInstanceInactivatedEvent(appId, instanceId); http://git-wip-us.apache.org/repos/asf/stratos/blob/65e6c0ea/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/ApplicationMonitor.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/ApplicationMonitor.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/ApplicationMonitor.java index 565a5d8..9026966 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/ApplicationMonitor.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/ApplicationMonitor.java @@ -141,7 +141,7 @@ public class ApplicationMonitor extends ParentComponentMonitor { onChildInactiveEvent(id, instanceId); } else if (status1 == ClusterStatus.Terminating || status1 == GroupStatus.Terminating) { - //mark the child monitor as inActive in the map + //mark the child monitor as inactive in the map this.markMonitorAsTerminating(id); } else if (status1 == ClusterStatus.Terminated || status1 == GroupStatus.Terminated) { @@ -150,7 +150,7 @@ public class ApplicationMonitor extends ParentComponentMonitor { this.terminatingMonitorsList.remove(id); this.aliasToActiveMonitorsMap.remove(id); } else { - log.warn("[monitor] " + id + " cannot be found in the inActive monitors list"); + log.warn("[monitor] " + id + " cannot be found in the inactive monitors list"); } ApplicationInstance instance = (ApplicationInstance) instanceIdToInstanceMap.get(instanceId); if (instance != null) { @@ -273,7 +273,7 @@ public class ApplicationMonitor extends ParentComponentMonitor { boolean burstNPFound = false; DeploymentPolicy deploymentPolicy = getDeploymentPolicy(application); String instanceId = null; - //Find out the inActive network partition + //Find out the inactive network partition if (deploymentPolicy == null) { //FIXME for docker with deployment policy ApplicationInstance appInstance = createApplicationInstance(application, null); http://git-wip-us.apache.org/repos/asf/stratos/blob/65e6c0ea/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/GroupMonitor.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/GroupMonitor.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/GroupMonitor.java index 96ca04d..8ba999b 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/GroupMonitor.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/GroupMonitor.java @@ -192,7 +192,7 @@ public class GroupMonitor extends ParentComponentMonitor implements Runnable { } else if (status1 == ClusterStatus.Terminating || status1 == GroupStatus.Terminating) { - //mark the child monitor as inActive in the map + //mark the child monitor as inactive in the map this.markMonitorAsTerminating(instanceId); } else if (status1 == ClusterStatus.Terminated || status1 == GroupStatus.Terminated) { @@ -201,7 +201,7 @@ public class GroupMonitor extends ParentComponentMonitor implements Runnable { this.terminatingMonitorsList.remove(id); this.aliasToActiveMonitorsMap.remove(id); } else { - log.warn("[monitor] " + id + " cannot be found in the inActive monitors list"); + log.warn("[monitor] " + id + " cannot be found in the inactive monitors list"); } GroupInstance instance = (GroupInstance) this.instanceIdToInstanceMap.get(instanceId); if (instance != null) { http://git-wip-us.apache.org/repos/asf/stratos/blob/65e6c0ea/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/ParentComponentMonitor.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/ParentComponentMonitor.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/ParentComponentMonitor.java index f893b80..a0e552c 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/ParentComponentMonitor.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/ParentComponentMonitor.java @@ -314,7 +314,7 @@ public abstract class ParentComponentMonitor extends Monitor { //start to kill it if (monitor != null) { if (monitor instanceof GroupMonitor) { - //it is a group, so not sending terminating as it can be in inActive. If group needs terminating, + //it is a group, so not sending terminating as it can be in inactive. If group needs terminating, //it will be handled by the terminating case of its children if (terminateAll || !notifier.equals(monitor.getId())) { ApplicationBuilder.handleGroupTerminatingEvent(this.appId, http://git-wip-us.apache.org/repos/asf/stratos/blob/65e6c0ea/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/processor/cluster/ClusterStatusInActiveProcessor.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/processor/cluster/ClusterStatusInActiveProcessor.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/processor/cluster/ClusterStatusInActiveProcessor.java index 84d79fa..dc55c3b 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/processor/cluster/ClusterStatusInActiveProcessor.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/processor/cluster/ClusterStatusInActiveProcessor.java @@ -29,7 +29,7 @@ import org.apache.stratos.autoscaler.monitor.cluster.VMClusterMonitor; import org.apache.stratos.autoscaler.status.processor.StatusProcessor; /** - * Cluster inActive checking processor + * Cluster inactive checking processor */ public class ClusterStatusInActiveProcessor extends ClusterStatusProcessor { private static final Log log = LogFactory.getLog(ClusterStatusInActiveProcessor.class); @@ -73,7 +73,7 @@ public class ClusterStatusInActiveProcessor extends ClusterStatusProcessor { monitor.setHasFaultyMember(true); } if (log.isInfoEnabled()) { - log.info("Publishing Cluster in-activate event for [application]: " + log.info("Publishing Cluster inactivate event for [application]: " + monitor.getAppId() + " [cluster]: " + clusterId); } //send cluster In-Active event to cluster status topic http://git-wip-us.apache.org/repos/asf/stratos/blob/65e6c0ea/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/processor/group/GroupStatusInActiveProcessor.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/processor/group/GroupStatusInActiveProcessor.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/processor/group/GroupStatusInActiveProcessor.java index a35bae7..e86be1c 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/processor/group/GroupStatusInActiveProcessor.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/processor/group/GroupStatusInActiveProcessor.java @@ -105,7 +105,7 @@ public class GroupStatusInActiveProcessor extends GroupStatusProcessor { } else if (component instanceof Group) { //send activation to the parent if (((Group) component).getStatus(instanceId) != GroupStatus.Inactive) { - log.info("sending group in-active: " + component.getUniqueIdentifier()); + log.info("sending group inactive: " + component.getUniqueIdentifier()); ApplicationBuilder.handleGroupInActivateEvent(appId, component.getUniqueIdentifier(), instanceId); return true; } @@ -127,7 +127,7 @@ public class GroupStatusInActiveProcessor extends GroupStatusProcessor { * Find out whether any of the clusters of a group in the InActive state * * @param clusterData clusters of the group - * @return whether inActive or not + * @return whether inactive or not */ private boolean getAllClusterInactive(Map<String, ClusterDataHolder> clusterData, String instanceId) { @@ -154,10 +154,10 @@ public class GroupStatusInActiveProcessor extends GroupStatusProcessor { /** - * Find out whether all the any group is inActive + * Find out whether all the any group is inactive * * @param groups groups of a group/application - * @return whether inActive or not + * @return whether inactive or not */ private boolean getAllGroupInActive(Map<String, Group> groups, String instanceId) { boolean groupStat = false; http://git-wip-us.apache.org/repos/asf/stratos/blob/65e6c0ea/components/org.apache.stratos.tenant.activity.ui/src/main/resources/web/tenant-activity/find-tenant.jsp ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.tenant.activity.ui/src/main/resources/web/tenant-activity/find-tenant.jsp b/components/org.apache.stratos.tenant.activity.ui/src/main/resources/web/tenant-activity/find-tenant.jsp index 0bab514..dcf8d7f 100644 --- a/components/org.apache.stratos.tenant.activity.ui/src/main/resources/web/tenant-activity/find-tenant.jsp +++ b/components/org.apache.stratos.tenant.activity.ui/src/main/resources/web/tenant-activity/find-tenant.jsp @@ -87,12 +87,12 @@ success: function(msg) { var resp = msg; var active = 'Active'; - var inActive = 'Inactive'; + var inactive = 'Inactive'; if (resp.isActive === true) { document.getElementById('activeStateTable').innerHTML += '<tr><td>' + resp.service + '</td><td>' + active + '</td></tr>'; } else { - document.getElementById('activeStateTable').innerHTML += '<tr><td>' + resp.service + '</td><td>' + inActive + '</td></tr>'; + document.getElementById('activeStateTable').innerHTML += '<tr><td>' + resp.service + '</td><td>' + inactive + '</td></tr>'; } }, error:function () {
