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/549143d0 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/549143d0 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/549143d0 Branch: refs/heads/master Commit: 549143d003cd1c3899b2ef042c3a2022f6e07f4f Parents: 8eb0a8f ccac187 Author: Melan Nimesh <[email protected]> Authored: Fri Feb 7 09:45:40 2014 +0530 Committer: Melan Nimesh <[email protected]> Committed: Fri Feb 7 09:45:40 2014 +0530 ---------------------------------------------------------------------- .../apache/stratos/autoscaler/Constants.java | 3 + .../stratos/autoscaler/PartitionContext.java | 14 +- .../cloud/controller/CloudControllerClient.java | 2 +- .../controller/InstanceNotificationClient.java | 2 +- .../stratos/autoscaler/util/ConfUtil.java | 20 +- .../stratos/autoscaler/TestMinimumRule.java | 14 +- .../autoscaler/TestObsoletedMemberRule.java | 20 +- .../src/test/resources/autoscaler.xml | 43 ++ .../stratos/cli/RestCommandLineService.java | 308 +++++++--- .../apache/stratos/cli/StratosApplication.java | 3 + .../stratos/cli/beans/cartridge/Cartridge.java | 32 +- .../cli/beans/cartridge/PortMapping.java | 68 +++ .../stratos/cli/beans/topology/Member.java | 10 + .../cli/commands/ListCartridgeInfoCommand.java | 127 ++++ .../stratos/cli/commands/ListCommand.java | 2 +- .../apache/stratos/cli/utils/CliConstants.java | 7 +- .../impl/CloudControllerServiceImpl.java | 4 +- .../controller/topology/TopologyBuilder.java | 5 +- .../topology/TopologyEventPublisher.java | 5 +- .../conf/LoadBalancerConfiguration.java | 32 +- .../load/balancer/conf/domain/MemberIpType.java | 31 + .../balancer/conf/domain/TenantIdentifier.java | 19 + .../load/balancer/conf/util/Constants.java | 1 + .../TenantAwareLoadBalanceEndpoint.java | 41 +- .../sample/configuration/loadbalancer1.conf | 6 + .../sample/configuration/loadbalancer2.conf | 6 + .../sample/configuration/loadbalancer3.conf | 6 + .../console/cartridge_deployments.jag | 18 - .../console/config/console.json | 2 +- .../console/controllers/loginSubmit.jag | 40 +- .../console/controllers/manageTenants.jag | 17 + .../console/login.jag | 7 +- .../console/mt_service_deployments.jag | 9 - .../console/partition_deployments.jag | 14 - .../console/policy_deployments.jag | 16 - .../theme1/partials/cartridge_deployments.hbs | 85 --- .../console/themes/theme1/partials/login.hbs | 12 +- .../theme1/partials/mt_service_deployments.hbs | 89 --- .../theme1/partials/partition_deployments.hbs | 132 ----- .../theme1/partials/policy_deployments.hbs | 131 ----- .../theme1/partials/tenant_management.hbs | 12 +- .../themes/theme1/partials/tenant_new.hbs | 4 +- .../console/themes/theme1/renderers/login.js | 11 +- .../console/themes/theme1/ui/css/main.css | 9 +- .../console/themes/theme1/ui/js/login.js | 68 +++ .../themes/theme1/ui/js/tenant_management.js | 10 +- .../console/util/utility.jag | 9 + .../apache/stratos/manager/dto/Cartridge.java | 18 +- .../manager/CartridgeSubscriptionManager.java | 33 +- .../model/TopologyClusterInformationModel.java | 187 ++---- .../StratosManagerTopologyReceiver.java | 39 ++ .../messaging/domain/topology/Member.java | 12 +- .../event/topology/InstanceSpawnedEvent.java | 19 + .../InstanceSpawnedMessageProcessor.java | 2 + .../rest/endpoint/bean/topology/Member.java | 1 + .../bean/util/converter/PojoConverter.java | 18 +- ...tractAuthenticationAuthorizationHandler.java | 7 +- .../CookieBasedAuthenticationHandler.java | 4 + .../handlers/StratosAuthenticationHandler.java | 4 + .../handlers/StratosAuthorizingHandler.java | 9 +- .../rest/endpoint/mock/StratosTestAdmin.java | 21 + .../rest/endpoint/services/ServiceUtils.java | 55 +- .../rest/endpoint/services/StratosAdmin.java | 36 +- .../main/webapp/stratos/WEB-INF/cxf-servlet.xml | 3 +- .../load-balancer/haproxy-extension/INSTALL.txt | 19 +- .../src/main/bin/haproxy-extension.sh | 7 +- .../stratos/haproxy/extension/Constants.java | 1 + .../haproxy/extension/HAProxyConfigWriter.java | 36 +- .../haproxy/extension/HAProxyContext.java | 8 + .../distribution/src/main/conf/autoscaler.xml | 35 +- .../distribution/src/main/conf/mincheck.drl | 2 +- .../src/main/conf/loadbalancer.conf | 8 +- .../conf/temp-artifacts/carbon/module.xml | 47 ++ .../carbon/scripts/registry/artifacts.js | 574 +++++++++++++++++++ .../carbon/scripts/registry/registry-osgi.js | 445 ++++++++++++++ .../carbon/scripts/registry/registry-ws.js | 56 ++ .../carbon/scripts/registry/registry.js | 24 + .../carbon/scripts/server/config.js | 32 ++ .../carbon/scripts/server/osgi.js | 10 + .../carbon/scripts/server/server.js | 90 +++ .../carbon/scripts/server/tenant.js | 49 ++ .../carbon/scripts/user/registry-space.js | 39 ++ .../temp-artifacts/carbon/scripts/user/space.js | 10 + .../carbon/scripts/user/user-manager.js | 158 +++++ .../temp-artifacts/carbon/scripts/user/user.js | 78 +++ .../modules/distribution/src/assembly/bin.xml | 77 +-- .../puppet/etc/puppet/files/cartridge-agent.sh | 2 +- .../puppet/etc/puppet/files/event-publisher.sh | 28 - .../puppet/etc/puppet/files/event-subscriber.sh | 28 - .../puppet/etc/puppet/files/health-publisher.sh | 33 -- tools/puppet/etc/puppet/files/healthcheck.sh | 31 - tools/stratos-installer/conf/setup.conf | 4 +- tools/stratos-installer/resources/mysql.sql | 485 ++++++++++++++++ tools/stratos-installer/setup.sh | 33 +- tools/stratos-installer/start-servers.sh | 12 +- 95 files changed, 3380 insertions(+), 1075 deletions(-) ----------------------------------------------------------------------
