You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ud...@apache.org on 2013/11/25 09:01:30 UTC
[1/2] git commit: Refactoring Deployement policy and its deployer
Updated Branches:
refs/heads/master 224f2007f -> ba20d4b6f
Refactoring Deployement policy and its deployer
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/5a80c805
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/5a80c805
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/5a80c805
Branch: refs/heads/master
Commit: 5a80c80585782f6e5b38e1032703fd238904b8e4
Parents: fe32cc5
Author: Udara Liyanage <ud...@wso2.com>
Authored: Mon Nov 25 13:19:36 2013 -0500
Committer: Udara Liyanage <ud...@wso2.com>
Committed: Mon Nov 25 13:19:36 2013 -0500
----------------------------------------------------------------------
.../policy/deployers/DeploymentPolicyReader.java | 17 +++++++++++++----
.../deployment-policies/economy-deployment.xml | 6 ++----
2 files changed, 15 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/5a80c805/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/policy/deployers/DeploymentPolicyReader.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/policy/deployers/DeploymentPolicyReader.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/policy/deployers/DeploymentPolicyReader.java
index 24e98fc..ab8f106 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/policy/deployers/DeploymentPolicyReader.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/policy/deployers/DeploymentPolicyReader.java
@@ -52,23 +52,32 @@ public class DeploymentPolicyReader extends AbstractPolicyReader<DeploymentPoli
OMElement docEle = getDocument();
if("deploymentPolicy".equalsIgnoreCase(docEle.getLocalName())){
policy.setId(docEle.getAttributeValue(new QName("id")));
+
//Partition-Groups
- OMElement partitionGroupsEle = docEle.getFirstChildWithName(new QName("partitionGroups"));
- Iterator<?> partitionGroupItr = partitionGroupsEle.getChildrenWithLocalName("partitionGroup");
+ Iterator<?> partitionGroupItr = docEle.getChildrenWithLocalName("partitionGroup");
while(partitionGroupItr.hasNext()){
Object nextGroup = partitionGroupItr.next();
if(nextGroup instanceof OMElement){
OMElement groupEle = (OMElement) nextGroup;
PartitionGroup group = new PartitionGroup();
+ group.setId(groupEle.getAttributeValue(new QName("id")));
group.setPartitionAlgo(readValue(groupEle, "partitionAlgo"));
+
//Partitions
- OMElement partitionsEle = groupEle.getFirstChildWithName(new QName("partitions"));
- Iterator<?> partitionItr = partitionsEle.getChildrenWithLocalName("partition");
+ Iterator<?> partitionItr = groupEle.getChildrenWithLocalName("partition");
while(partitionItr.hasNext()){
Object next = partitionItr.next();
if(next instanceof OMElement){
OMElement partitionEle = (OMElement) next;
Partition partition = new Partition();
+ Iterator<?> partitionPropItr = partitionEle.getChildrenWithLocalName("property");
+ while(partitionPropItr.hasNext())
+ {
+ Object nextProperty = partitionPropItr.next();
+ if(nextProperty instanceof OMElement){
+ OMElement property = (OMElement)nextProperty;
+ }
+ }
partition.setId(partitionEle.getAttributeValue(new QName("id")));
partition.setPartitionMax(Integer.valueOf(readValue(partitionEle, "max")));
partition.setPartitionMin(Integer.valueOf(readValue(partitionEle, "min")));
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/5a80c805/products/autoscaler/modules/distribution/src/main/deployment-policies/economy-deployment.xml
----------------------------------------------------------------------
diff --git a/products/autoscaler/modules/distribution/src/main/deployment-policies/economy-deployment.xml b/products/autoscaler/modules/distribution/src/main/deployment-policies/economy-deployment.xml
index 74c9dfa..ab9fb0e 100644
--- a/products/autoscaler/modules/distribution/src/main/deployment-policies/economy-deployment.xml
+++ b/products/autoscaler/modules/distribution/src/main/deployment-policies/economy-deployment.xml
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<deploymentPolicy id ="economy-deployment">
- <partitionGroups>
<partitionGroup id="group1" >
- <partitionAlgo>OneAfterAnother</partitionAlgo>
+ <partitionAlgo>one-after-another</partitionAlgo>
<partition id="partition1" >
<max>3</max>
<min>1</min>
@@ -17,7 +16,7 @@
</partition>
</partitionGroup>
<partitionGroup id="group2" >
- <partitionAlgo>RoundRobin</partitionAlgo>
+ <partitionAlgo>round-robin</partitionAlgo>
<partition id="partition4" >
<max>3</max>
<min>1</min>
@@ -31,5 +30,4 @@
<min>1</min>
</partition>
</partitionGroup>
- </partitionGroups>
</deploymentPolicy>
[2/2] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-stratos
Posted by ud...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-stratos
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/ba20d4b6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/ba20d4b6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/ba20d4b6
Branch: refs/heads/master
Commit: ba20d4b6ff5909cc309accdfc3832c6b2b2a8d64
Parents: 5a80c80 224f200
Author: Udara Liyanage <ud...@wso2.com>
Authored: Mon Nov 25 13:23:53 2013 -0500
Committer: Udara Liyanage <ud...@wso2.com>
Committed: Mon Nov 25 13:23:53 2013 -0500
----------------------------------------------------------------------
components/org.apache.stratos.adc.mgt/pom.xml | 5 +
.../adc/mgt/dao/CartridgeSubscriptionInfo.java | 9 ++
.../internal/ADCManagementServerComponent.java | 2 +-
.../manager/CartridgeSubscriptionManager.java | 12 +-
.../adc/mgt/payload/NonCarbonPayload.java | 5 +-
.../apache/stratos/adc/mgt/payload/Payload.java | 4 +-
.../stratos/adc/mgt/payload/PayloadArg.java | 9 ++
.../service/RepositoryInformationService.java | 6 +-
.../mgt/subscription/CartridgeSubscription.java | 12 +-
.../subscription/DataCartridgeSubscription.java | 3 +-
.../MultiTenantCartridgeSubscription.java | 2 +-
.../SingleTenantCartridgeSubscription.java | 2 +-
.../mgt/utils/ApplicationManagementUtil.java | 50 +++++---
.../adc/mgt/utils/PersistenceManager.java | 13 +-
.../adc/mgt/utils/RepoPasswordMgtUtil.java | 16 ++-
.../distribution/src/main/conf/log4j.properties | 2 +-
.../src/main/resources/log4j.properties | 4 +-
.../cartridge-agent/ec2/php/cartridge-agent.sh | 123 -------------------
.../src/main/resources/log4j.properties | 6 +-
.../resources/stratos_foundation.sql | 1 +
20 files changed, 116 insertions(+), 170 deletions(-)
----------------------------------------------------------------------