You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by im...@apache.org on 2015/05/19 13:26:15 UTC
[3/3] stratos git commit: Modified service group into cartridge group
Modified service group into cartridge group
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/36c0e120
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/36c0e120
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/36c0e120
Branch: refs/heads/master
Commit: 36c0e120dbfdb63c5af85da6dbbd7f33126c0e4b
Parents: a60cedf
Author: Dinithi <di...@wso2.com>
Authored: Tue May 19 13:35:33 2015 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Tue May 19 16:56:07 2015 +0530
----------------------------------------------------------------------
.../org/apache/stratos/autoscaler/util/AutoscalerUtil.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/36c0e120/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/AutoscalerUtil.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/AutoscalerUtil.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/AutoscalerUtil.java
index fc3e6a6..8200b3b 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/AutoscalerUtil.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/AutoscalerUtil.java
@@ -870,7 +870,8 @@ public class AutoscalerUtil {
for (String splittedStartupOrder : splittedStartupOrders) {
if (!splittedStartupOrder.trim().startsWith("cartridge.") && !splittedStartupOrder.trim().startsWith("group.")) {
// invalid startup order; should prefixed by either 'cartridge.' or 'group.'
- throw new InvalidServiceGroupException("Invalid Service Group: startup order [" + startupOrder + "] for group " + groupName +
+ throw new InvalidServiceGroupException("Invalid cartridge group: startup order [" + startupOrder +
+ "] for group " + groupName +
", should prefixed by either 'cartridge.' or 'group.'");
}
}
@@ -892,7 +893,8 @@ public class AutoscalerUtil {
for (String splittedDependent : splittedDependents) {
if (!splittedDependent.trim().startsWith("cartridge.") && !splittedDependent.trim().startsWith("group.")) {
// invalid startup order; should prefixed by either 'cartridge.' or 'group.'
- throw new InvalidServiceGroupException("Invalid Service Group: Scaling Dependency [" + scalingDependent + "] for group " + groupName +
+ throw new InvalidServiceGroupException("Invalid cartridge group: Scaling Dependency [" +
+ scalingDependent + "] for group " + groupName +
", should prefixed by either 'cartridge.' or 'group.'");
}
}