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/21 14:45:14 UTC
[1/4] stratos git commit: removing unused dependencies
Repository: stratos
Updated Branches:
refs/heads/master 1387b2855 -> eb765f7fe
removing unused dependencies
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/eb765f7f
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/eb765f7f
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/eb765f7f
Branch: refs/heads/master
Commit: eb765f7fec6a815195b0f9ef21a916c93756a2c6
Parents: 8967147
Author: reka <rt...@gmail.com>
Authored: Thu May 21 18:02:08 2015 +0530
Committer: reka <rt...@gmail.com>
Committed: Thu May 21 18:15:00 2015 +0530
----------------------------------------------------------------------
products/stratos/pom.xml | 11 -----------
1 file changed, 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/eb765f7f/products/stratos/pom.xml
----------------------------------------------------------------------
diff --git a/products/stratos/pom.xml b/products/stratos/pom.xml
index 3c7d621..103fdd4 100755
--- a/products/stratos/pom.xml
+++ b/products/stratos/pom.xml
@@ -185,16 +185,6 @@
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.admin.mgt.ui</artifactId>
- <version>${carbon.version}</version>
- </dependency>
- <dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.account.mgt</artifactId>
- <version>${stratos.component.version}</version>
- </dependency>
- <dependency>
- <groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.tenant.mgt</artifactId>
<version>2.2.2</version>
</dependency>
@@ -228,7 +218,6 @@
<artifactId>org.apache.stratos.redirector.servlet</artifactId>
<version>${project.version}</version>
</dependency>
-
<dependency>
<groupId>org.apache.batik.wso2</groupId>
<artifactId>batik</artifactId>
[3/4] stratos git commit: adding validation for the integer in
autoscaling policy Threshold values
Posted by re...@apache.org.
adding validation for the integer in autoscaling policy Threshold values
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/8967147e
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/8967147e
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/8967147e
Branch: refs/heads/master
Commit: 8967147e73ceaa9ca09bb9e45b0d5c258db8e3b5
Parents: 5ca86e9
Author: reka <rt...@gmail.com>
Authored: Thu May 21 17:57:00 2015 +0530
Committer: reka <rt...@gmail.com>
Committed: Thu May 21 18:15:00 2015 +0530
----------------------------------------------------------------------
.../schema/configure/autoscaling-policies.json | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/8967147e/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/autoscaling-policies.json
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/autoscaling-policies.json b/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/autoscaling-policies.json
index d880c9f..4c086d8 100644
--- a/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/autoscaling-policies.json
+++ b/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/autoscaling-policies.json
@@ -56,12 +56,14 @@
},
"properties":{
"threshold": {
- "type":"number",
+ "type":"string",
"id": "root/loadThresholds/requestsInFlight/threshold",
"title": "Threshold",
"name": "Threshold",
+ "description" : "You need to enter number for the Requests In Flight Threshold",
+ "format" : "number",
"default":30,
- "format": "number",
+ "pattern": "^[0-9]+$",
"required":false
}
}
@@ -78,12 +80,14 @@
},
"properties":{
"threshold": {
- "type":"number",
+ "type":"string",
"id": "root/loadThresholds/memoryConsumption/threshold",
"title": "Threshold",
+ "description" : "You need to enter number for the Memory Consumption Threshold",
+ "format" : "number",
+ "pattern": "^[0-9]+$",
"name": "Threshold",
"default":80,
- "format": "number",
"required":false
}
}
@@ -100,12 +104,14 @@
},
"properties":{
"threshold": {
- "type":"number",
+ "type":"string",
"id": "root/loadThresholds/loadAverage/threshold",
"title": "Threshold",
+ "format" : "number",
+ "description" : "You need to enter number for the Load Average Threshold",
+ "pattern": "^[0-9]+$",
"name": "Threshold",
"default":100,
- "format": "number",
"required":false
}
}
[4/4] stratos git commit: Handling network partitions without
partitions case
Posted by re...@apache.org.
Handling network partitions without partitions case
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/26509b49
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/26509b49
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/26509b49
Branch: refs/heads/master
Commit: 26509b49ffa8b0bedbe5655bab65f13f5ed1f4c3
Parents: 1387b28
Author: reka <rt...@gmail.com>
Authored: Thu May 21 17:48:22 2015 +0530
Committer: reka <rt...@gmail.com>
Committed: Thu May 21 18:15:00 2015 +0530
----------------------------------------------------------------------
.../services/impl/CloudControllerServiceImpl.java | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/26509b49/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java
index b9e0983..6a6f988 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java
@@ -1436,7 +1436,8 @@ public class CloudControllerServiceImpl implements CloudControllerService {
}
@Override
- public boolean addNetworkPartition(NetworkPartition networkPartition) throws NetworkPartitionAlreadyExistsException,
+ public boolean addNetworkPartition(NetworkPartition networkPartition) throws
+ NetworkPartitionAlreadyExistsException,
InvalidNetworkPartitionException {
handleNullObject(networkPartition, "Network Partition is null");
@@ -1453,7 +1454,7 @@ public class CloudControllerServiceImpl implements CloudControllerService {
throw new NetworkPartitionAlreadyExistsException(message);
}
- if (networkPartition.getPartitions() != null) {
+ if (networkPartition.getPartitions() != null && networkPartition.getPartitions().length != 0) {
for (Partition partition : networkPartition.getPartitions()) {
if (partition != null) {
if (log.isInfoEnabled()) {
@@ -1476,6 +1477,10 @@ public class CloudControllerServiceImpl implements CloudControllerService {
}
}
}
+ } else {
+ //Following message is shown to the end user in all the the API clients(GUI/CLI/Rest API)
+ throw new InvalidNetworkPartitionException(String.format("Network partition: " +
+ "%s doesn't not have any partitions ", networkPartition.getId()));
}
// adding network partition to CC-Context
[2/4] stratos git commit: Fixing NPE when no partitions is there in
network partition
Posted by re...@apache.org.
Fixing NPE when no partitions is there in network partition
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/5ca86e91
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/5ca86e91
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/5ca86e91
Branch: refs/heads/master
Commit: 5ca86e91868947e6b2df790c7392ee99ce79cc94
Parents: 26509b4
Author: reka <rt...@gmail.com>
Authored: Thu May 21 17:48:50 2015 +0530
Committer: reka <rt...@gmail.com>
Committed: Thu May 21 18:15:00 2015 +0530
----------------------------------------------------------------------
.../stratos/rest/endpoint/util/converter/ObjectConverter.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/5ca86e91/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 c86dee1..7db6ccb 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
@@ -2110,8 +2110,10 @@ public class ObjectConverter {
NetworkPartitionRef networkPartitionRef = new NetworkPartitionRef();
networkPartitionRef.setId(networkPartitionReferenceBean.getId());
networkPartitionRef.setPartitionAlgo(networkPartitionReferenceBean.getPartitionAlgo());
- networkPartitionRef.setPartitionRefs(convertToASStubPartitions(
- networkPartitionReferenceBean.getPartitions()));
+ if(networkPartitionReferenceBean.getPartitions() != null) {
+ networkPartitionRef.setPartitionRefs(convertToASStubPartitions(
+ networkPartitionReferenceBean.getPartitions()));
+ }
networkPartitionRefList.add(networkPartitionRef);
}
return networkPartitionRefList.toArray(new NetworkPartitionRef[networkPartitionRefList.size()]);