You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by re...@apache.org on 2015/05/01 09:01:55 UTC
[1/2] stratos git commit: using LinkedHasSet in order to preserve the
startupOrder
Repository: stratos
Updated Branches:
refs/heads/master 9ec061f44 -> ae89ba094
using LinkedHasSet in order to preserve the startupOrder
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/ae89ba09
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/ae89ba09
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/ae89ba09
Branch: refs/heads/master
Commit: ae89ba09491891512a9bc89e080577c565ebe8b7
Parents: 8128e40
Author: reka <rt...@gmail.com>
Authored: Fri May 1 12:30:55 2015 +0530
Committer: reka <rt...@gmail.com>
Committed: Fri May 1 12:31:39 2015 +0530
----------------------------------------------------------------------
.../autoscaler/applications/parser/DefaultApplicationParser.java | 2 +-
.../stratos/autoscaler/applications/parser/ParserUtils.java | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/ae89ba09/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/DefaultApplicationParser.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/DefaultApplicationParser.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/DefaultApplicationParser.java
index 67d2342..fd88d06 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/DefaultApplicationParser.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/DefaultApplicationParser.java
@@ -250,7 +250,7 @@ public class DefaultApplicationParser implements ApplicationParser {
application.setTenantDomain(applicationContext.getTenantDomain());
application.setTenantAdminUserName(applicationContext.getTenantAdminUsername());
- Set<StartupOrder> startupOrderSet = new HashSet<StartupOrder>();
+ Set<StartupOrder> startupOrderSet = new LinkedHashSet<StartupOrder>();
DependencyOrder dependencyOrder = new DependencyOrder();
dependencyOrder.setStartupOrders(startupOrderSet);
application.setDependencyOrder(dependencyOrder);
http://git-wip-us.apache.org/repos/asf/stratos/blob/ae89ba09/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/ParserUtils.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/ParserUtils.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/ParserUtils.java
index a43aee1..460a57b 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/ParserUtils.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/ParserUtils.java
@@ -31,7 +31,7 @@ public class ParserUtils {
public static Set<StartupOrder> convertStartupOrder(String[] startupOrderArr) throws ApplicationDefinitionException {
- Set<StartupOrder> startupOrders = new HashSet<StartupOrder>();
+ Set<StartupOrder> startupOrders = new LinkedHashSet<StartupOrder>();
if (startupOrderArr == null) {
return startupOrders;
@@ -61,7 +61,7 @@ public class ParserUtils {
public static Set<StartupOrder> convertStartupOrder(String[] startupOrderArr, GroupContext groupContext)
throws ApplicationDefinitionException {
- Set<StartupOrder> startupOrders = new HashSet<StartupOrder>();
+ Set<StartupOrder> startupOrders = new LinkedHashSet<StartupOrder>();
if (startupOrderArr == null) {
return startupOrders;
[2/2] stratos git commit: updating the relative path for group
scaling samples
Posted by re...@apache.org.
updating the relative path for group scaling samples
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/8128e40a
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/8128e40a
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/8128e40a
Branch: refs/heads/master
Commit: 8128e40adf05ca202bf5aba990da693f2b6d4969
Parents: 9ec061f
Author: reka <rt...@gmail.com>
Authored: Thu Apr 30 17:59:31 2015 +0530
Committer: reka <rt...@gmail.com>
Committed: Fri May 1 12:31:39 2015 +0530
----------------------------------------------------------------------
.../single-group-group-scaling/scripts/common/deploy.sh | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/8128e40a/samples/applications/scaling/group-scaling/single-group-group-scaling/scripts/common/deploy.sh
----------------------------------------------------------------------
diff --git a/samples/applications/scaling/group-scaling/single-group-group-scaling/scripts/common/deploy.sh b/samples/applications/scaling/group-scaling/single-group-group-scaling/scripts/common/deploy.sh
index b55e113..ebacb3a 100755
--- a/samples/applications/scaling/group-scaling/single-group-group-scaling/scripts/common/deploy.sh
+++ b/samples/applications/scaling/group-scaling/single-group-group-scaling/scripts/common/deploy.sh
@@ -9,12 +9,12 @@ script_path=`cd "$prgdir"; pwd`
artifacts_path=`cd "${script_path}/../../artifacts"; pwd`
iaas_artifacts_path=`cd "${script_path}/../../artifacts/${iaas}"; pwd`
-cartridges_path=`cd "${script_path}/../../../../../cartridges/${iaas}"; pwd`
-cartridges_groups_path=`cd "${script_path}/../../../../../cartridges-groups"; pwd`
-autoscaling_policies_path=`cd "${script_path}/../../../../../autoscaling-policies"; pwd`
-network_partitions_path=`cd "${script_path}/../../../../../network-partitions/${iaas}"; pwd`
-deployment_policies_path=`cd "${script_path}/../../../../../deployment-policies"; pwd`
-application_policies_path=`cd "${script_path}/../../../../../application-policies"; pwd`
+cartridges_path=`cd "${script_path}/../../../../../../cartridges/${iaas}"; pwd`
+cartridges_groups_path=`cd "${script_path}/../../../../../../cartridges-groups"; pwd`
+autoscaling_policies_path=`cd "${script_path}/../../../../../../autoscaling-policies"; pwd`
+network_partitions_path=`cd "${script_path}/../../../../../../network-partitions/${iaas}"; pwd`
+deployment_policies_path=`cd "${script_path}/../../../../../../deployment-policies"; pwd`
+application_policies_path=`cd "${script_path}/../../../../../../application-policies"; pwd`
set -e