Repository: stratos Updated Branches: refs/heads/master 602beae7d -> 3ff271d84
Remove partitionMin from references Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/3ff271d8 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/3ff271d8 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/3ff271d8 Branch: refs/heads/master Commit: 3ff271d843813c158d639bf355c5d3ec22b3d092 Parents: 602beae Author: Lahiru Sandaruwan <[email protected]> Authored: Mon Apr 27 14:12:08 2015 +0530 Committer: Lahiru Sandaruwan <[email protected]> Committed: Mon Apr 27 14:12:08 2015 +0530 ---------------------------------------------------------------------- .../stratos/rest/endpoint/util/converter/ObjectConverter.java | 1 - .../src/main/webapp/api-test/WEB-INF/schemas/schema.xsd | 2 -- .../src/main/webapp/api/WEB-INF/schemas/schema.xsd | 2 -- .../m1-samples/ec2/deployment-policy.json | 3 +-- .../m1-samples/os/deployment-policy.json | 3 +-- .../samples/ec2/deployment-policy 2.json | 3 +-- .../grouping-automation-script/samples/ec2/deployment-policy.json | 3 +-- .../grouping-automation-script/samples/os/deployment-policy.json | 3 +-- 8 files changed, 5 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/3ff271d8/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 85de306..73891a3 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 @@ -837,7 +837,6 @@ public class ObjectConverter { partitionBeans.setId(partition.getId()); partitionBeans.setDescription(partition.getDescription()); partitionBeans.setPublic(partition.getIsPublic()); -// partitionBeans.partitionMin = partition.getPartitionMin(); partitionBeans.setPartitionMax(partition.getPartitionMax()); //properties if (partition.getProperties() != null) { http://git-wip-us.apache.org/repos/asf/stratos/blob/3ff271d8/components/org.apache.stratos.rest.endpoint/src/main/webapp/api-test/WEB-INF/schemas/schema.xsd ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/webapp/api-test/WEB-INF/schemas/schema.xsd b/components/org.apache.stratos.rest.endpoint/src/main/webapp/api-test/WEB-INF/schemas/schema.xsd index 66f5c10..08cccca 100644 --- a/components/org.apache.stratos.rest.endpoint/src/main/webapp/api-test/WEB-INF/schemas/schema.xsd +++ b/components/org.apache.stratos.rest.endpoint/src/main/webapp/api-test/WEB-INF/schemas/schema.xsd @@ -96,8 +96,6 @@ nillable="true"/> <xs:element name="partitionMax" type="xs:int" minOccurs="1" maxOccurs="1" nillable="false"/> - <xs:element name="partitionMin" type="xs:int" minOccurs="1" maxOccurs="1" - nillable="false"/> </xs:all> </xs:complexType> </xs:element> http://git-wip-us.apache.org/repos/asf/stratos/blob/3ff271d8/components/org.apache.stratos.rest.endpoint/src/main/webapp/api/WEB-INF/schemas/schema.xsd ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/webapp/api/WEB-INF/schemas/schema.xsd b/components/org.apache.stratos.rest.endpoint/src/main/webapp/api/WEB-INF/schemas/schema.xsd index 275a0ef..0785720 100644 --- a/components/org.apache.stratos.rest.endpoint/src/main/webapp/api/WEB-INF/schemas/schema.xsd +++ b/components/org.apache.stratos.rest.endpoint/src/main/webapp/api/WEB-INF/schemas/schema.xsd @@ -96,8 +96,6 @@ nillable="true"/> <xs:element name="partitionMax" type="xs:int" minOccurs="1" maxOccurs="1" nillable="false"/> - <xs:element name="partitionMin" type="xs:int" minOccurs="1" maxOccurs="1" - nillable="false"/> </xs:all> </xs:complexType> </xs:element> http://git-wip-us.apache.org/repos/asf/stratos/blob/3ff271d8/tools/automation-scripts/grouping-automation-script/m1-samples/ec2/deployment-policy.json ---------------------------------------------------------------------- diff --git a/tools/automation-scripts/grouping-automation-script/m1-samples/ec2/deployment-policy.json b/tools/automation-scripts/grouping-automation-script/m1-samples/ec2/deployment-policy.json index 30d62b4..8fd3296 100755 --- a/tools/automation-scripts/grouping-automation-script/m1-samples/ec2/deployment-policy.json +++ b/tools/automation-scripts/grouping-automation-script/m1-samples/ec2/deployment-policy.json @@ -6,8 +6,7 @@ "partition": [ { "id": "P1", - "partitionMax": "10", - "partitionMin": "1" + "partitionMax": "10" } ] } http://git-wip-us.apache.org/repos/asf/stratos/blob/3ff271d8/tools/automation-scripts/grouping-automation-script/m1-samples/os/deployment-policy.json ---------------------------------------------------------------------- diff --git a/tools/automation-scripts/grouping-automation-script/m1-samples/os/deployment-policy.json b/tools/automation-scripts/grouping-automation-script/m1-samples/os/deployment-policy.json index 30d62b4..8fd3296 100755 --- a/tools/automation-scripts/grouping-automation-script/m1-samples/os/deployment-policy.json +++ b/tools/automation-scripts/grouping-automation-script/m1-samples/os/deployment-policy.json @@ -6,8 +6,7 @@ "partition": [ { "id": "P1", - "partitionMax": "10", - "partitionMin": "1" + "partitionMax": "10" } ] } http://git-wip-us.apache.org/repos/asf/stratos/blob/3ff271d8/tools/automation-scripts/grouping-automation-script/samples/ec2/deployment-policy 2.json ---------------------------------------------------------------------- diff --git a/tools/automation-scripts/grouping-automation-script/samples/ec2/deployment-policy 2.json b/tools/automation-scripts/grouping-automation-script/samples/ec2/deployment-policy 2.json index 9cceeb7..726a05e 100755 --- a/tools/automation-scripts/grouping-automation-script/samples/ec2/deployment-policy 2.json +++ b/tools/automation-scripts/grouping-automation-script/samples/ec2/deployment-policy 2.json @@ -6,8 +6,7 @@ "partition": [ { "id": "P1", - "partitionMax": "10", - "partitionMin": "1" + "partitionMax": "10" } ] } http://git-wip-us.apache.org/repos/asf/stratos/blob/3ff271d8/tools/automation-scripts/grouping-automation-script/samples/ec2/deployment-policy.json ---------------------------------------------------------------------- diff --git a/tools/automation-scripts/grouping-automation-script/samples/ec2/deployment-policy.json b/tools/automation-scripts/grouping-automation-script/samples/ec2/deployment-policy.json index 2a24807..ae2e202 100755 --- a/tools/automation-scripts/grouping-automation-script/samples/ec2/deployment-policy.json +++ b/tools/automation-scripts/grouping-automation-script/samples/ec2/deployment-policy.json @@ -6,8 +6,7 @@ "partition": [ { "id": "P1", - "partitionMax": "10", - "partitionMin": "1" + "partitionMax": "10" } ] } http://git-wip-us.apache.org/repos/asf/stratos/blob/3ff271d8/tools/automation-scripts/grouping-automation-script/samples/os/deployment-policy.json ---------------------------------------------------------------------- diff --git a/tools/automation-scripts/grouping-automation-script/samples/os/deployment-policy.json b/tools/automation-scripts/grouping-automation-script/samples/os/deployment-policy.json index 30d62b4..8fd3296 100755 --- a/tools/automation-scripts/grouping-automation-script/samples/os/deployment-policy.json +++ b/tools/automation-scripts/grouping-automation-script/samples/os/deployment-policy.json @@ -6,8 +6,7 @@ "partition": [ { "id": "P1", - "partitionMax": "10", - "partitionMin": "1" + "partitionMax": "10" } ] }
