You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ra...@apache.org on 2015/03/06 18:28:25 UTC
[1/2] stratos git commit: changing max to partitionMax in deployment
policy schema
Repository: stratos
Updated Branches:
refs/heads/master a0a437abc -> 8327716ad
changing max to partitionMax in deployment policy schema
k
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/031d0f0f
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/031d0f0f
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/031d0f0f
Branch: refs/heads/master
Commit: 031d0f0f4d92d1ae42de4e18a642d3d79e847d74
Parents: a0a437a
Author: R-Rajkumar <rr...@gmail.com>
Authored: Fri Mar 6 22:56:10 2015 +0530
Committer: R-Rajkumar <rr...@gmail.com>
Committed: Fri Mar 6 22:57:26 2015 +0530
----------------------------------------------------------------------
.../stratos/common/beans/partition/PartitionRefBean.java | 10 +++++-----
.../rest/endpoint/util/converter/ObjectConverter.java | 4 ++--
2 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/031d0f0f/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/partition/PartitionRefBean.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/partition/PartitionRefBean.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/partition/PartitionRefBean.java
index 1cc3e15..9c9fc00 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/partition/PartitionRefBean.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/partition/PartitionRefBean.java
@@ -26,7 +26,7 @@ public class PartitionRefBean {
private String id;
- private int max;
+ private int partitionMax;
public String getId() {
return id;
@@ -36,11 +36,11 @@ public class PartitionRefBean {
this.id = id;
}
- public int getMax() {
- return max;
+ public int getPartitionMax() {
+ return partitionMax;
}
- public void setMax(int max) {
- this.max = max;
+ public void setPartitionMax(int partitionMax) {
+ this.partitionMax = partitionMax;
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/031d0f0f/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 5378b77..203b2e8 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
@@ -295,7 +295,7 @@ public class ObjectConverter {
org.apache.stratos.cloud.controller.stub.domain.PartitionRef();
stubPartition.setId(partition.getId());
- stubPartition.setMax(partition.getMax());
+ stubPartition.setMax(partition.getPartitionMax());
return stubPartition;
}
@@ -745,7 +745,7 @@ public class ObjectConverter {
for (int i = 0; i < partitionRefs.length; i++) {
PartitionRefBean partitionRefBean = new PartitionRefBean();
partitionRefBean.setId(partitionRefs[i].getId());
- partitionRefBean.setMax(partitionRefs[i].getMax());
+ partitionRefBean.setPartitionMax(partitionRefs[i].getMax());
partitionRefBeans.add(partitionRefBean);
}
[2/2] stratos git commit: updating sample deployment policies
Posted by ra...@apache.org.
updating sample deployment policies
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/8327716a
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/8327716a
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/8327716a
Branch: refs/heads/master
Commit: 8327716adfc9f3e67e27be504c2bfefa9c38233d
Parents: 031d0f0
Author: R-Rajkumar <rr...@gmail.com>
Authored: Fri Mar 6 22:58:04 2015 +0530
Committer: R-Rajkumar <rr...@gmail.com>
Committed: Fri Mar 6 22:58:04 2015 +0530
----------------------------------------------------------------------
samples/deployment-policies/deployment-policy-1.json | 2 +-
samples/deployment-policies/deployment-policy-2.json | 6 +++---
samples/deployment-policies/deployment-policy-3.json | 2 +-
samples/deployment-policies/deployment-policy-4.json | 6 +++---
4 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/8327716a/samples/deployment-policies/deployment-policy-1.json
----------------------------------------------------------------------
diff --git a/samples/deployment-policies/deployment-policy-1.json b/samples/deployment-policies/deployment-policy-1.json
index 108d529..af66e5c 100644
--- a/samples/deployment-policies/deployment-policy-1.json
+++ b/samples/deployment-policies/deployment-policy-1.json
@@ -7,7 +7,7 @@
"partitions": [
{
"id": "partition-1",
- "max": 20
+ "partitionMax": 20
}
]
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/8327716a/samples/deployment-policies/deployment-policy-2.json
----------------------------------------------------------------------
diff --git a/samples/deployment-policies/deployment-policy-2.json b/samples/deployment-policies/deployment-policy-2.json
index 7e9ad8d..dcd54ef 100644
--- a/samples/deployment-policies/deployment-policy-2.json
+++ b/samples/deployment-policies/deployment-policy-2.json
@@ -7,7 +7,7 @@
"partitions": [
{
"id": "partition-1",
- "max": 5
+ "partitionMax": 5
}
]
},
@@ -17,11 +17,11 @@
"partitions": [
{
"id": "network-partition-2-partition-1",
- "max": 5
+ "partitionMax": 5
},
{
"id": "network-partition-2-partition-2",
- "max": 5
+ "partitionMax": 5
}
]
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/8327716a/samples/deployment-policies/deployment-policy-3.json
----------------------------------------------------------------------
diff --git a/samples/deployment-policies/deployment-policy-3.json b/samples/deployment-policies/deployment-policy-3.json
index 1a4f2a2..006b01e 100644
--- a/samples/deployment-policies/deployment-policy-3.json
+++ b/samples/deployment-policies/deployment-policy-3.json
@@ -7,7 +7,7 @@
"partitions": [
{
"id": "partition-1",
- "max": 5
+ "partitionMax": 5
}
]
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/8327716a/samples/deployment-policies/deployment-policy-4.json
----------------------------------------------------------------------
diff --git a/samples/deployment-policies/deployment-policy-4.json b/samples/deployment-policies/deployment-policy-4.json
index b21bc42..50f7291 100644
--- a/samples/deployment-policies/deployment-policy-4.json
+++ b/samples/deployment-policies/deployment-policy-4.json
@@ -7,7 +7,7 @@
"partitions": [
{
"id": "partition-1",
- "max": 20
+ "partitionMax": 20
}
]
},
@@ -17,11 +17,11 @@
"partitions": [
{
"id": "network-partition-2-partition-1",
- "max": 20
+ "partitionMax": 20
},
{
"id": "network-partition-2-partition-2",
- "max": 20
+ "partitionMax": 20
}
]
}