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/19 12:16:24 UTC
[1/3] stratos git commit: Removing lowerLimit from threshold classes
Repository: stratos
Updated Branches:
refs/heads/master 9628368e5 -> 62ff2f02b
Removing lowerLimit from threshold classes
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/b723c62d
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/b723c62d
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/b723c62d
Branch: refs/heads/master
Commit: b723c62d3b22bec0cecbdbe05e5fe84c4a245139
Parents: 9628368
Author: Lahiru Sandaruwan <la...@apache.org>
Authored: Fri Dec 19 15:10:40 2014 +0530
Committer: Lahiru Sandaruwan <la...@apache.org>
Committed: Fri Dec 19 15:10:40 2014 +0530
----------------------------------------------------------------------
.../pojo/policy/autoscale/LoadAverageThresholds.java | 11 +----------
.../policy/autoscale/MemoryConsumptionThresholds.java | 10 +---------
.../policy/autoscale/RequestsInFlightThresholds.java | 12 ++----------
3 files changed, 4 insertions(+), 29 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/b723c62d/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/pojo/policy/autoscale/LoadAverageThresholds.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/pojo/policy/autoscale/LoadAverageThresholds.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/pojo/policy/autoscale/LoadAverageThresholds.java
index 5d6b19f..7c17a48 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/pojo/policy/autoscale/LoadAverageThresholds.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/pojo/policy/autoscale/LoadAverageThresholds.java
@@ -28,7 +28,6 @@ public class LoadAverageThresholds implements Serializable{
private static final long serialVersionUID = -2109860338694123343L;
private float upperLimit = 80.0F;
- private float lowerLimit = 20.0F;
public float getUpperLimit() {
return upperLimit;
@@ -36,17 +35,9 @@ public class LoadAverageThresholds implements Serializable{
public void setUpperLimit(float upperLimit) {
this.upperLimit = upperLimit;
}
- public float getLowerLimit() {
- return lowerLimit;
- }
- public void setLowerLimit(float lowerLimit) {
- this.lowerLimit = lowerLimit;
- }
-
@Override
public String toString() {
- return "LoadAverage [upperLimit=" + upperLimit + ", lowerLimit="
- + lowerLimit + "]";
+ return "LoadAverage [upperLimit=" + upperLimit + "]";
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/b723c62d/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/pojo/policy/autoscale/MemoryConsumptionThresholds.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/pojo/policy/autoscale/MemoryConsumptionThresholds.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/pojo/policy/autoscale/MemoryConsumptionThresholds.java
index dc6a3e8..74eaf84 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/pojo/policy/autoscale/MemoryConsumptionThresholds.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/pojo/policy/autoscale/MemoryConsumptionThresholds.java
@@ -28,7 +28,6 @@ public class MemoryConsumptionThresholds implements Serializable {
private static final long serialVersionUID = 5755634390464664663L;
private float upperLimit = 80.0F;
- private float lowerLimit = 20.0F;
public float getUpperLimit() {
return upperLimit;
@@ -36,17 +35,10 @@ public class MemoryConsumptionThresholds implements Serializable {
public void setUpperLimit(float upperLimit) {
this.upperLimit = upperLimit;
}
- public float getLowerLimit() {
- return lowerLimit;
- }
- public void setLowerLimit(float lowerLimit) {
- this.lowerLimit = lowerLimit;
- }
@Override
public String toString() {
- return "MemoryConsumption [upperLimit=" + upperLimit + ", lowerLimit="
- + lowerLimit + "]";
+ return "MemoryConsumption [upperLimit=" + upperLimit + "]";
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/b723c62d/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/pojo/policy/autoscale/RequestsInFlightThresholds.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/pojo/policy/autoscale/RequestsInFlightThresholds.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/pojo/policy/autoscale/RequestsInFlightThresholds.java
index a4c30d4..431384e 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/pojo/policy/autoscale/RequestsInFlightThresholds.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/pojo/policy/autoscale/RequestsInFlightThresholds.java
@@ -28,14 +28,7 @@ public class RequestsInFlightThresholds implements Serializable{
private static final long serialVersionUID = 8113964958155294290L;
private float upperLimit = 80.0F;
- private float lowerLimit = 20.0F;
-
- public float getLowerLimit() {
- return lowerLimit;
- }
- public void setLowerLimit(float lowerLimit) {
- this.lowerLimit = lowerLimit;
- }
+
public float getUpperLimit() {
return upperLimit;
}
@@ -44,8 +37,7 @@ public class RequestsInFlightThresholds implements Serializable{
}
@Override
public String toString() {
- return "RequestsInFlight [upperLimit=" + upperLimit + ", lowerLimit="
- + lowerLimit + "]";
+ return "RequestsInFlight [upperLimit=" + upperLimit + "]";
}
[3/3] stratos git commit: Removing lowerLimit at client side
Posted by la...@apache.org.
Removing lowerLimit at client side
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/62ff2f02
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/62ff2f02
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/62ff2f02
Branch: refs/heads/master
Commit: 62ff2f02b11d8d5070c895e3e43a9a16ea0dd103
Parents: ebb4dc7
Author: Lahiru Sandaruwan <la...@apache.org>
Authored: Fri Dec 19 16:48:33 2014 +0530
Committer: Lahiru Sandaruwan <la...@apache.org>
Committed: Fri Dec 19 16:48:33 2014 +0530
----------------------------------------------------------------------
.../autoscaler/policy/autoscale/LoadAverageThresholds.java | 9 ---------
.../policy/autoscale/MemoryConsumptionThresholds.java | 8 --------
.../policy/autoscale/RequestsInFlightThresholds.java | 8 --------
.../rest/endpoint/util/converter/ObjectConverter.java | 6 ------
4 files changed, 31 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/62ff2f02/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/autoscaler/policy/autoscale/LoadAverageThresholds.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/autoscaler/policy/autoscale/LoadAverageThresholds.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/autoscaler/policy/autoscale/LoadAverageThresholds.java
index 9919137..ead0106 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/autoscaler/policy/autoscale/LoadAverageThresholds.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/autoscaler/policy/autoscale/LoadAverageThresholds.java
@@ -25,7 +25,6 @@ import javax.xml.bind.annotation.XmlRootElement;
public class LoadAverageThresholds {
private float threshold;
- private float lowerLimit;
public float getThreshold() {
return threshold;
@@ -34,12 +33,4 @@ public class LoadAverageThresholds {
public void setThreshold(float threshold) {
this.threshold = threshold;
}
-
- public float getLowerLimit() {
- return lowerLimit;
- }
-
- public void setLowerLimit(float lowerLimit) {
- this.lowerLimit = lowerLimit;
- }
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/62ff2f02/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/autoscaler/policy/autoscale/MemoryConsumptionThresholds.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/autoscaler/policy/autoscale/MemoryConsumptionThresholds.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/autoscaler/policy/autoscale/MemoryConsumptionThresholds.java
index 431700b..6eec829 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/autoscaler/policy/autoscale/MemoryConsumptionThresholds.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/autoscaler/policy/autoscale/MemoryConsumptionThresholds.java
@@ -25,7 +25,6 @@ import javax.xml.bind.annotation.XmlRootElement;
public class MemoryConsumptionThresholds {
private float threshold;
- private float lowerLimit;
public float getThreshold() {
return threshold;
@@ -35,11 +34,4 @@ public class MemoryConsumptionThresholds {
this.threshold = threshold;
}
- public float getLowerLimit() {
- return lowerLimit;
- }
-
- public void setLowerLimit(float lowerLimit) {
- this.lowerLimit = lowerLimit;
- }
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/62ff2f02/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/autoscaler/policy/autoscale/RequestsInFlightThresholds.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/autoscaler/policy/autoscale/RequestsInFlightThresholds.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/autoscaler/policy/autoscale/RequestsInFlightThresholds.java
index 64bf721..0232174 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/autoscaler/policy/autoscale/RequestsInFlightThresholds.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/autoscaler/policy/autoscale/RequestsInFlightThresholds.java
@@ -25,7 +25,6 @@ import javax.xml.bind.annotation.XmlRootElement;
public class RequestsInFlightThresholds {
private float threshold;
- private float lowerLimit;
public float getThreshold() {
return threshold;
@@ -35,11 +34,4 @@ public class RequestsInFlightThresholds {
this.threshold = threshold;
}
- public float getLowerLimit() {
- return lowerLimit;
- }
-
- public void setLowerLimit(float lowerLimit) {
- this.lowerLimit = lowerLimit;
- }
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/62ff2f02/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java
index 1bf1398..b5a7d5d 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java
@@ -344,7 +344,6 @@ public class ObjectConverter {
org.apache.stratos.autoscaler.stub.autoscale.policy.LoadAverageThresholds loadAverage = new
org.apache.stratos.autoscaler.stub.autoscale.policy.LoadAverageThresholds();
loadAverage.setUpperLimit(autoscalePolicyBean.getLoadThresholds().getLoadAverage().getThreshold());
- loadAverage.setLowerLimit(autoscalePolicyBean.getLoadThresholds().getLoadAverage().getLowerLimit());
//set load average
loadThresholds.setLoadAverage(loadAverage);
}
@@ -354,7 +353,6 @@ public class ObjectConverter {
org.apache.stratos.autoscaler.stub.autoscale.policy.RequestsInFlightThresholds();
//set request in flight information
requestsInFlight.setUpperLimit(autoscalePolicyBean.getLoadThresholds().getRequestsInFlight().getThreshold());
- requestsInFlight.setLowerLimit(autoscalePolicyBean.getLoadThresholds().getRequestsInFlight().getLowerLimit());
//set request in flight
loadThresholds.setRequestsInFlight(requestsInFlight);
}
@@ -365,7 +363,6 @@ public class ObjectConverter {
//set memory consumption information
memoryConsumption.setUpperLimit(autoscalePolicyBean.getLoadThresholds().getMemoryConsumption().getThreshold());
- memoryConsumption.setLowerLimit(autoscalePolicyBean.getLoadThresholds().getMemoryConsumption().getLowerLimit());
//set memory consumption
loadThresholds.setMemoryConsumption(memoryConsumption);
}
@@ -806,19 +803,16 @@ public class ObjectConverter {
if (loadThresholds.getLoadAverage() != null) {
LoadAverageThresholds loadAverage = new LoadAverageThresholds();
loadAverage.setThreshold(loadThresholds.getLoadAverage().getUpperLimit());
- loadAverage.setLowerLimit(loadThresholds.getLoadAverage().getLowerLimit());
loadThresholdBean.setLoadAverage(loadAverage);
}
if (loadThresholds.getMemoryConsumption() != null) {
MemoryConsumptionThresholds memoryConsumption = new MemoryConsumptionThresholds();
memoryConsumption.setThreshold(loadThresholds.getMemoryConsumption().getUpperLimit());
- memoryConsumption.setLowerLimit(loadThresholds.getMemoryConsumption().getLowerLimit());
loadThresholdBean.setMemoryConsumption(memoryConsumption);
}
if (loadThresholds.getRequestsInFlight() != null) {
RequestsInFlightThresholds requestsInFlight = new RequestsInFlightThresholds();
requestsInFlight.setThreshold(loadThresholds.getRequestsInFlight().getUpperLimit());
- requestsInFlight.setLowerLimit(loadThresholds.getRequestsInFlight().getLowerLimit());
loadThresholdBean.setRequestsInFlight(requestsInFlight);
}
[2/3] stratos git commit: Updating the wsdl to remove lowerLimit
Posted by la...@apache.org.
Updating the wsdl to remove lowerLimit
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/ebb4dc71
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/ebb4dc71
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/ebb4dc71
Branch: refs/heads/master
Commit: ebb4dc7130a7bd751a6bd6bfa868c5fb7b794ce3
Parents: b723c62
Author: Lahiru Sandaruwan <la...@apache.org>
Authored: Fri Dec 19 15:11:06 2014 +0530
Committer: Lahiru Sandaruwan <la...@apache.org>
Committed: Fri Dec 19 15:11:06 2014 +0530
----------------------------------------------------------------------
.../src/main/resources/AutoScalerService.wsdl | 3 ---
1 file changed, 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/ebb4dc71/service-stubs/org.apache.stratos.autoscaler.service.stub/src/main/resources/AutoScalerService.wsdl
----------------------------------------------------------------------
diff --git a/service-stubs/org.apache.stratos.autoscaler.service.stub/src/main/resources/AutoScalerService.wsdl b/service-stubs/org.apache.stratos.autoscaler.service.stub/src/main/resources/AutoScalerService.wsdl
index 5480d63..11ea4a2 100644
--- a/service-stubs/org.apache.stratos.autoscaler.service.stub/src/main/resources/AutoScalerService.wsdl
+++ b/service-stubs/org.apache.stratos.autoscaler.service.stub/src/main/resources/AutoScalerService.wsdl
@@ -21,19 +21,16 @@
</xs:complexType>
<xs:complexType name="LoadAverageThresholds">
<xs:sequence>
- <xs:element minOccurs="0" name="lowerLimit" type="xs:float"/>
<xs:element minOccurs="0" name="upperLimit" type="xs:float"/>
</xs:sequence>
</xs:complexType>
<xs:complexType name="MemoryConsumptionThresholds">
<xs:sequence>
- <xs:element minOccurs="0" name="lowerLimit" type="xs:float"/>
<xs:element minOccurs="0" name="upperLimit" type="xs:float"/>
</xs:sequence>
</xs:complexType>
<xs:complexType name="RequestsInFlightThresholds">
<xs:sequence>
- <xs:element minOccurs="0" name="lowerLimit" type="xs:float"/>
<xs:element minOccurs="0" name="upperLimit" type="xs:float"/>
</xs:sequence>
</xs:complexType>