You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by la...@apache.org on 2014/12/03 14:55:19 UTC
stratos git commit: s/ScalingOrder/ScalingDependentList
Repository: stratos
Updated Branches:
refs/heads/master b59adf8f9 -> 94839c61e
s/ScalingOrder/ScalingDependentList
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/94839c61
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/94839c61
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/94839c61
Branch: refs/heads/master
Commit: 94839c61e8563fb86a3b16c23410fa17d4c3d6ea
Parents: b59adf8
Author: Lahiru Sandaruwan <la...@apache.org>
Authored: Wed Dec 3 19:26:53 2014 +0530
Committer: Lahiru Sandaruwan <la...@apache.org>
Committed: Wed Dec 3 19:26:53 2014 +0530
----------------------------------------------------------------------
.../dependency/DependencyBuilder.java | 8 ++--
.../domain/applications/DependencyOrder.java | 10 ++---
.../applications/ScalingDependentList.java | 40 ++++++++++++++++++++
.../domain/applications/ScalingOrder.java | 40 --------------------
4 files changed, 49 insertions(+), 49 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/94839c61/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/dependency/DependencyBuilder.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/dependency/DependencyBuilder.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/dependency/DependencyBuilder.java
index 752d947..7c9f792 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/dependency/DependencyBuilder.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/dependency/DependencyBuilder.java
@@ -132,15 +132,15 @@ public class DependencyBuilder {
}
//Parsing the scaling order
- Set<ScalingOrder> scalingOrders = dependencyOrder.getScalingOrders();
+ Set<ScalingDependentList> scalingDependentLists = dependencyOrder.getScalingDependentLists();
- if (scalingOrders != null) {
- for (ScalingOrder scalingOrder : scalingOrders) {
+ if (scalingDependentLists != null) {
+ for (ScalingDependentList scalingDependentList : scalingDependentLists) {
foundContext = null;
parentContext = null;
- for (String scalingOrderComponent : scalingOrder.getScalingOrderComponentsList()) {
+ for (String scalingOrderComponent : scalingDependentList.getScalingDependentListComponents()) {
if (scalingOrderComponent != null){
http://git-wip-us.apache.org/repos/asf/stratos/blob/94839c61/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/applications/DependencyOrder.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/applications/DependencyOrder.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/applications/DependencyOrder.java
index be52666..127cd4f 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/applications/DependencyOrder.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/applications/DependencyOrder.java
@@ -28,7 +28,7 @@ public class DependencyOrder implements Serializable {
private Set<StartupOrder> startupOrders;
- private Set<ScalingOrder> scalingOrders;
+ private Set<ScalingDependentList> scalingDependentLists;
private String terminationBehaviour;
@@ -52,11 +52,11 @@ public class DependencyOrder implements Serializable {
this.startupOrders = startupOrders;
}
- public Set<ScalingOrder> getScalingOrders() {
- return scalingOrders;
+ public Set<ScalingDependentList> getScalingDependentLists() {
+ return scalingDependentLists;
}
- public void setScalingOrders(Set<ScalingOrder> scalingOrders) {
- this.scalingOrders = scalingOrders;
+ public void setScalingDependentLists(Set<ScalingDependentList> scalingDependentLists) {
+ this.scalingDependentLists = scalingDependentLists;
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/94839c61/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/applications/ScalingDependentList.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/applications/ScalingDependentList.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/applications/ScalingDependentList.java
new file mode 100644
index 0000000..456a14a
--- /dev/null
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/applications/ScalingDependentList.java
@@ -0,0 +1,40 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.stratos.messaging.domain.applications;
+
+import java.io.Serializable;
+import java.util.List;
+
+public class ScalingDependentList implements Serializable {
+
+ private List<String> scalingDependentListComponents;
+
+ public ScalingDependentList(List<String> scalingOrderList) {
+ this.scalingDependentListComponents = scalingOrderList;
+ }
+
+ public List<String> getScalingDependentListComponents() {
+ return scalingDependentListComponents;
+ }
+
+ public void setScalingDependentListComponents(List<String> scalingDependentListComponents) {
+ this.scalingDependentListComponents = scalingDependentListComponents;
+ }
+}
http://git-wip-us.apache.org/repos/asf/stratos/blob/94839c61/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/applications/ScalingOrder.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/applications/ScalingOrder.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/applications/ScalingOrder.java
deleted file mode 100644
index a88c1a6..0000000
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/applications/ScalingOrder.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.stratos.messaging.domain.applications;
-
-import java.io.Serializable;
-import java.util.List;
-
-public class ScalingOrder implements Serializable {
-
- private List<String> scalingOrderComponentsList;
-
- public ScalingOrder(List<String> scalingOrderList) {
- this.scalingOrderComponentsList = scalingOrderList;
- }
-
- public List<String> getScalingOrderComponentsList() {
- return scalingOrderComponentsList;
- }
-
- public void setScalingOrderComponentsList(List<String> scalingOrderComponentsList) {
- this.scalingOrderComponentsList = scalingOrderComponentsList;
- }
-}