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/b5287567 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/b5287567 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/b5287567 Branch: refs/heads/master Commit: b52875671cd4f06a36b3212cacd7b346bcae8026 Parents: b0f7e04 163f0fe Author: Pradeep Fernando <[email protected]> Authored: Thu Apr 24 11:33:41 2014 +0530 Committer: Pradeep Fernando <[email protected]> Committed: Thu Apr 24 11:33:41 2014 +0530 ---------------------------------------------------------------------- .../org.apache.stratos.account.mgt.ui/pom.xml | 192 +++--- .../org.apache.stratos.account.mgt/pom.xml | 184 +++--- .../org.apache.stratos.activation/pom.xml | 4 +- .../org.apache.stratos.autoscaler/pom.xml | 3 +- .../org.apache.stratos.cartridge.agent/pom.xml | 3 +- .../org.apache.stratos.cartridge.mgt.ui/pom.xml | 3 +- components/org.apache.stratos.cli/pom.xml | 3 +- .../org.apache.stratos.cloud.controller/pom.xml | 12 +- .../impl/CloudControllerServiceImpl.java | 6 + components/org.apache.stratos.common/pom.xml | 4 +- .../org.apache.stratos.deployment/pom.xml | 4 +- .../org.apache.stratos.email.sender/pom.xml | 4 +- .../org.apache.stratos.keystore.mgt/pom.xml | 4 +- .../pom.xml | 3 +- .../pom.xml | 4 +- .../org.apache.stratos.load.balancer/pom.xml | 3 +- .../org.apache.stratos.manager.styles/pom.xml | 4 +- components/org.apache.stratos.manager/pom.xml | 5 +- components/org.apache.stratos.messaging/pom.xml | 3 +- .../pom.xml | 218 +++---- .../pom.xml | 200 +++--- .../org.apache.stratos.register.ui/pom.xml | 4 +- .../org.apache.stratos.rest.endpoint/pom.xml | 4 +- .../pom.xml | 154 +++-- .../pom.xml | 202 +++--- .../pom.xml | 160 +++-- .../pom.xml | 170 +++-- .../org.apache.stratos.status.monitor/pom.xml | 162 +++-- .../pom.xml | 4 +- .../org.apache.stratos.tenant.activity/pom.xml | 4 +- .../pom.xml | 4 +- .../org.apache.stratos.tenant.mgt.core/pom.xml | 4 +- .../pom.xml | 4 +- .../org.apache.stratos.tenant.mgt.ui/pom.xml | 4 +- .../org.apache.stratos.tenant.mgt/pom.xml | 4 +- .../org.apache.stratos.theme.mgt.ui/pom.xml | 284 ++++---- components/org.apache.stratos.theme.mgt/pom.xml | 212 +++--- .../pom.xml | 210 +++--- .../org.apache.stratos.validate.domain/pom.xml | 166 +++-- components/pom.xml | 3 +- .../jclouds/apis/ec2/1.7.1-stratos/pom.xml | 1 - .../apis/openstack-nova/1.7.1-stratos/pom.xml | 2 - .../jclouds/apis/vcloud/1.7.1-stratos/pom.xml | 2 - .../provider/aws-ec2/1.7.1-stratos/pom.xml | 2 - dependencies/org.wso2.carbon.ui/pom.xml | 48 +- dependencies/pom.xml | 4 +- extensions/cep/stratos-cep-extension/pom.xml | 6 +- .../load-balancer/haproxy-extension/pom.xml | 4 +- .../haproxy-extension/src/main/assembly/bin.xml | 9 +- extensions/load-balancer/pom.xml | 4 +- extensions/pom.xml | 4 +- .../pom.xml | 4 +- features/autoscaler/pom.xml | 4 +- .../pom.xml | 22 +- features/cloud-controller/pom.xml | 4 +- .../pom.xml | 4 +- .../pom.xml | 4 +- features/load-balancer/pom.xml | 4 +- .../pom.xml | 4 +- features/manager/cartridge-mgt/pom.xml | 4 +- .../org.apache.stratos.common.feature/pom.xml | 4 +- .../pom.xml | 4 +- .../pom.xml | 4 +- features/manager/common/pom.xml | 4 +- features/manager/deployment/pom.xml | 4 +- .../org.apache.stratos.gapp.feature/pom.xml | 4 +- .../pom.xml | 4 +- .../org.apache.stratos.gapp.ui.feature/pom.xml | 4 +- features/manager/gapp/pom.xml | 4 +- .../pom.xml | 4 +- features/manager/logging-mgt/pom.xml | 4 +- features/manager/pom.xml | 20 +- .../pom.xml | 4 +- .../pom.xml | 4 +- .../pom.xml | 4 +- .../pom.xml | 4 +- .../pom.xml | 4 +- features/manager/status-monitor/pom.xml | 4 +- .../org.apache.stratos.manager.feature/pom.xml | 6 +- .../pom.xml | 6 +- features/manager/stratos-mgt/pom.xml | 4 +- .../pom.xml | 6 +- .../pom.xml | 4 +- .../pom.xml | 4 +- features/manager/tenant-activity/pom.xml | 4 +- .../pom.xml | 4 +- .../pom.xml | 4 +- features/manager/tenant-mgt/pom.xml | 4 +- .../pom.xml | 6 +- features/messaging/pom.xml | 4 +- features/pom.xml | 4 +- pom.xml | 19 +- .../modules/distribution/pom.xml | 4 +- .../distribution/src/main/license/LICENSE | 3 +- products/cartridge-agent/pom.xml | 4 +- .../load-balancer/modules/distribution/pom.xml | 14 +- .../load-balancer/modules/p2-profile/pom.xml | 9 +- products/load-balancer/pom.xml | 17 +- products/pom.xml | 4 +- products/stratos-cli/distribution/pom.xml | 3 +- products/stratos-cli/pom.xml | 4 +- products/stratos/modules/distribution/pom.xml | 58 +- .../modules/distribution/src/assembly/bin.xml | 6 - .../distribution/src/main/conf/scaling.drl | 2 +- products/stratos/modules/p2-profile-gen/pom.xml | 11 +- products/stratos/pom.xml | 653 +++++++++---------- .../org.apache.stratos.account.mgt.stub/pom.xml | 30 +- .../pom.xml | 12 +- .../pom.xml | 16 +- .../pom.xml | 8 +- .../org.apache.stratos.billing.mgt.stub/pom.xml | 10 +- .../pom.xml | 18 +- .../pom.xml | 8 +- .../org.apache.stratos.common.stub/pom.xml | 14 +- .../pom.xml | 16 +- .../pom.xml | 10 +- .../org.apache.stratos.manager.stub/pom.xml | 16 +- .../pom.xml | 10 +- .../pom.xml | 10 +- .../org.apache.stratos.tenant.mgt.stub/pom.xml | 10 +- .../pom.xml | 25 +- .../pom.xml | 10 +- .../org.apache.stratos.theme.mgt.stub/pom.xml | 258 ++++---- .../org.apache.stratos.throttle.stub/pom.xml | 16 +- .../pom.xml | 6 +- .../org.apache.stratos.throttling.stub/pom.xml | 10 +- .../pom.xml | 10 +- .../pom.xml | 16 +- .../org.apache.stratos.usage.stub/pom.xml | 10 +- .../pom.xml | 38 +- tools/stratos-installer/README.txt | 2 +- tools/stratos-installer/conf/setup.conf | 2 +- 132 files changed, 2014 insertions(+), 2301 deletions(-) ----------------------------------------------------------------------
