fixing merge issue
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/873f0969 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/873f0969 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/873f0969 Branch: refs/heads/master Commit: 873f0969a8faebb18bed98929028cfa96f0090ef Parents: 5024493 c8bba8d Author: reka <[email protected]> Authored: Thu Nov 20 23:50:57 2014 +0530 Committer: reka <[email protected]> Committed: Thu Nov 20 23:50:57 2014 +0530 ---------------------------------------------------------------------- .../dependency/DependencyBuilder.java | 2 +- .../context/ApplicationChildContext.java | 10 +- .../parser/DefaultApplicationParser.java | 61 +- .../stratos/autoscaler/monitor/Monitor.java | 10 +- .../application/ApplicationMonitorFactory.java | 6 +- .../cluster/VMServiceClusterMonitor.java | 2 +- .../autoscaler/monitor/group/GroupMonitor.java | 6 +- .../stratos/autoscaler/pojo/Dependencies.java | 4 +- .../stratos/autoscaler/pojo/ServiceGroup.java | 10 + .../console/applications_form.jag | 5 +- .../console/configure_form.jag | 11 + .../console/controllers/rest/rest_calls.jag | 4 + .../console/errorhtml/error-404.html | 16 +- .../console/errorhtml/error.html | 18 +- .../console/themes/theme0/css/custom.css | 2 +- .../theme0/partials/applications_form.hbs | 11 + .../themes/theme0/partials/configure_form.hbs | 8 +- .../themes/theme0/renderers/configure_form.js | 1 + .../definitions/ServiceGroupDefinition.java | 10 + .../deployer/DefaultServiceGroupDeployer.java | 2 +- .../domain/applications/ClusterDataHolder.java | 26 - .../messaging/domain/applications/Group.java | 36 +- .../applications/GroupInstanceContext.java | 55 - .../cartridgeagent/cartridgeagent/agent.conf | 2 - .../config/cartridgeagentconfiguration.py | 8 + .../cartridgeagent/modules/databridge/agent.py | 6 +- .../exception/parameternotfoundexception.py | 1 + .../exception/thriftreceiverofflineexception.py | 35 + .../modules/healthstatspublisher/healthstats.py | 20 +- .../publisher/cartridgeagentpublisher.py | 2 +- .../src/main/webapp/api/WEB-INF/cxf-servlet.xml | 2 + .../src/main/resources/AutoScalerService.wsdl | 1584 +++++++++--------- 32 files changed, 1008 insertions(+), 968 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/873f0969/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/Monitor.java ---------------------------------------------------------------------- diff --cc components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/Monitor.java index 989ba21,6880e77..30b015d --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/Monitor.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/Monitor.java @@@ -28,16 -31,21 +28,16 @@@ public abstract class Monitor implement protected String appId; //Parent monitor of this monitor, for appMonitor parent will be none. protected ParentComponentMonitor parent; - //monitors map, key=GroupAlias/clusterId and value=GroupMonitor/AbstractClusterMonitor - protected Map<String, Monitor> aliasToActiveMonitorsMap; - //monitors map, stopped monitors - protected List<String> inactiveMonitorsList; - - protected List<String> terminatingMonitorsList; - - //flag will get set to true in MonitorTerminateAllEvent when termination of - // this monitor decided by its parent - protected boolean terminateChildren = false; - + //has startup dependents protected boolean hasStartupDependents; - + //has scaling dependents - protected boolean hasScalingDependents; + protected boolean isGroupScalingEnabled; + /** + * Return the id of the monitor + * + * @return id + */ public String getId() { return id; } @@@ -97,30 -96,42 +97,30 @@@ return hasStartupDependents; } + /** + * Return whether this monitor has scaling dependencies + * + * @return startup dependencies exist or not + */ - public boolean hasScalingDependents() { - return hasScalingDependents; + public boolean isGroupScalingEnabled() { + return isGroupScalingEnabled; } + /** + * To set whether monitor has any startup dependencies + * + * @param hasDependent + */ public void setHasStartupDependents(boolean hasDependent) { this.hasStartupDependents = hasDependent; } + /** + * To set whether monitor has any scaling dependencies + * + * @param hasDependent + */ - public void setHasScalingDependents(boolean hasDependent) { - this.hasScalingDependents = hasDependent; + public void setGroupScalingEnabled(boolean hasDependent) { + this.isGroupScalingEnabled = hasDependent; } - - public boolean hasIndependentChild() { - boolean hasInDepChild = false; - for (Monitor monitor : this.aliasToActiveMonitorsMap.values()) { - if (!monitor.hasStartupDependents()) { - hasInDepChild = true; - break; - } - } - return hasInDepChild; - } - - public List<String> getAliasToInActiveMonitorsMap() { - return this.inactiveMonitorsList; - } - - public void setAliasToInActiveMonitorsMap(List<String> inactiveMonitorsList) { - this.inactiveMonitorsList = inactiveMonitorsList; - } - - public List<String> getTerminatingMonitorsList() { - return terminatingMonitorsList; - } - - public void setTerminatingMonitorsList(List<String> terminatingMonitorsList) { - this.terminatingMonitorsList = terminatingMonitorsList; - } } http://git-wip-us.apache.org/repos/asf/stratos/blob/873f0969/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/group/GroupMonitor.java ----------------------------------------------------------------------
