stratos-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ud...@apache.org
Subject [3/4] git commit: Merge branch 'tenant-isolation-feature_wip' of https://github.com/lasinducharith/stratos
Date Wed, 01 Oct 2014 12:34:48 GMT
Merge branch 'tenant-isolation-feature_wip' of https://github.com/lasinducharith/stratos

This closes #76


Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/5447592a
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/5447592a
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/5447592a

Branch: refs/heads/master
Commit: 5447592ad1ef2f9bd1ca7b2fb780b944921d88d8
Parents: 8cbf8a9 e1eb346
Author: Udara Liyanage <udara@wso2.com>
Authored: Wed Oct 1 18:03:18 2014 +0530
Committer: Udara Liyanage <udara@wso2.com>
Committed: Wed Oct 1 18:03:18 2014 +0530

----------------------------------------------------------------------
 .../org.apache.stratos.autoscaler/pom.xml       |   24 +-
 .../stratos/autoscaler/AutoscalerContext.java   |   75 +-
 .../autoscaler/KubernetesClusterContext.java    |  500 ++++
 .../stratos/autoscaler/MemberStatsContext.java  |    9 -
 .../stratos/autoscaler/PartitionContext.java    |   83 +-
 .../autoscaler/api/AutoScalerServiceImpl.java   |  308 ++-
 .../cloud/controller/CloudControllerClient.java |   74 +-
 .../deployment/policy/DeploymentPolicy.java     |   46 +-
 .../InvalidKubernetesGroupException.java        |   49 +
 .../InvalidKubernetesHostException.java         |   49 +
 .../InvalidKubernetesMasterException.java       |   27 +
 .../KubernetesEndpointValidationException.java  |   52 +
 .../NonExistingKubernetesGroupException.java    |   49 +
 .../NonExistingKubernetesHostException.java     |   48 +
 .../NonExistingKubernetesMasterException.java   |   48 +
 .../interfaces/AutoScalerServiceInterface.java  |  197 +-
 .../internal/AutoscalerServerComponent.java     |   10 +
 .../kubernetes/KubernetesManager.java           |  465 ++++
 .../AutoscalerHealthStatEventReceiver.java      |  611 +++--
 .../AutoscalerTopologyEventReceiver.java        |  385 +--
 .../monitor/AbstractClusterMonitor.java         |  127 +
 .../autoscaler/monitor/AbstractMonitor.java     |  203 --
 .../autoscaler/monitor/ClusterMonitor.java      |  223 --
 .../monitor/ClusterMonitorFactory.java          |  352 +++
 .../monitor/ContainerClusterMonitor.java        |   38 +
 .../monitor/DockerServiceClusterMonitor.java    |  156 ++
 .../autoscaler/monitor/LbClusterMonitor.java    |  126 -
 .../autoscaler/monitor/VMClusterMonitor.java    |  120 +
 .../autoscaler/monitor/VMLbClusterMonitor.java  |  135 +
 .../monitor/VMServiceClusterMonitor.java        |  231 ++
 .../autoscaler/partition/PartitionManager.java  |  146 +-
 .../policy/model/AutoscalePolicy.java           |   44 +-
 .../autoscaler/registry/RegistryManager.java    |  197 +-
 .../autoscaler/util/AutoScalerConstants.java    |    8 +-
 .../stratos/autoscaler/util/AutoscalerUtil.java |  537 ++--
 .../src/main/resources/META-INF/component.xml   |   38 +
 .../src/main/resources/META-INF/services.xml    |   71 +
 .../stratos/autoscaler/TestDelegator.java       |   16 +-
 .../autoscaler/TestObsoletedMemberRule.java     |   48 +-
 .../test-terminating-obsoleted-members-rule.drl |    7 +-
 .../stratos/cartridge/agent/CartridgeAgent.java |  147 +-
 .../config/CartridgeAgentConfiguration.java     |   82 +-
 .../publisher/CartridgeAgentEventPublisher.java |  326 +--
 .../extensions/DefaultExtensionHandler.java     |   31 +-
 .../agent/extensions/ExtensionHandler.java      |    3 +
 .../agent/util/CartridgeAgentConstants.java     |    3 +
 .../cartridge/agent/util/ExtensionUtils.java    |   28 -
 .../org.apache.stratos.cartridge.mgt.ui/pom.xml |   93 -
 .../cartridge/mgt/ui/CartridgeAdminClient.java  |  278 --
 .../cartridge/mgt/ui/CartridgeConstans.java     |   21 -
 .../stratos/cartridge/mgt/ui/Payload.java       |   35 -
 .../mgt/ui/RepoNotificationClient.java          |   73 -
 .../mgt/ui/RepoNotificationServlet.java         |   78 -
 .../stratos/cartridge/mgt/ui/Repository.java    |   35 -
 .../CartridgeManagementUIActivator.java         |   59 -
 .../src/main/resources/META-INF/component.xml   |  103 -
 .../cartridge/mgt/ui/i18n/Resources.properties  |  113 -
 .../web/cartridge-mgt/available_cartridges.jsp  |  188 --
 .../web/cartridge-mgt/docs/userguide.html       |   42 -
 .../web/cartridge-mgt/images/ajax-loading.gif   |  Bin 1849 -> 0 bytes
 .../web/cartridge-mgt/images/cartridge.png      |  Bin 463 -> 0 bytes
 .../resources/web/cartridge-mgt/images/list.gif |  Bin 216 -> 0 bytes
 .../web/cartridge-mgt/images/search.gif         |  Bin 578 -> 0 bytes
 .../web/cartridge-mgt/images/subscribe.gif      |  Bin 718 -> 0 bytes
 .../web/cartridge-mgt/images/unsubscribe.png    |  Bin 742 -> 0 bytes
 .../resources/web/cartridge-mgt/js/common.js    |   79 -
 .../web/cartridge-mgt/js/jquery.blockUI-1.33.js |  361 ---
 .../resources/web/cartridge-mgt/map_domain.jsp  |  120 -
 .../cartridge-mgt/map_domain_ajaxprocessor.jsp  |   69 -
 .../remove_domain_ajaxprocessor.jsp             |   62 -
 .../web/cartridge-mgt/styles/XMLSchema.dtd      |  420 ---
 .../web/cartridge-mgt/styles/XMLSchema.xsd      | 2385 ------------------
 .../web/cartridge-mgt/styles/annotated-wsdl.xsl |  704 ------
 .../cartridge-mgt/styles/annotated-wsdl2.xsl    |  723 ------
 .../web/cartridge-mgt/styles/annotated-xsd.xsl  |  852 -------
 .../resources/web/cartridge-mgt/styles/atom.xsl |  132 -
 .../web/cartridge-mgt/styles/datatypes.dtd      |  218 --
 .../resources/web/cartridge-mgt/styles/rss.xsl  |  118 -
 .../resources/web/cartridge-mgt/subscribe.jsp   |  305 ---
 .../cartridge-mgt/subscribe_ajaxprocessor.jsp   |   90 -
 .../web/cartridge-mgt/subscribed_cartridges.jsp |  176 --
 .../subscribed_cartridges_ajaxprocessor.jsp     |  281 ---
 .../cartridge-mgt/sync_repo_ajaxprocessor.jsp   |   62 -
 .../cartridge-mgt/test_git_ajaxprocessor.jsp    |   73 -
 .../cartridge-mgt/unsubscribe_ajaxprocessor.jsp |   66 -
 .../stratos/cli/RestCommandLineService.java     |  223 +-
 .../apache/stratos/cli/StratosApplication.java  |   13 +
 .../apache/stratos/cli/beans/UserInfoBean.java  |   88 +
 .../beans/autoscaler/partition/Partition.java   |   20 +
 .../policy/autoscale/AutoscalePolicy.java       |   13 +-
 .../policy/deployment/DeploymentPolicy.java     |   22 +-
 .../stratos/cli/beans/cartridge/Cartridge.java  |    9 +
 .../beans/cartridge/ServiceDefinitionBean.java  |    9 +
 .../stratos/cli/commands/AddUserCommand.java    |  191 ++
 .../stratos/cli/commands/DeleteUserCommand.java |   70 +
 .../stratos/cli/commands/ListAllUsers.java      |   65 +
 .../apache/stratos/cli/utils/CliConstants.java  |   22 +
 .../org.apache.stratos.cloud.controller/pom.xml |   24 +-
 .../deployment/partition/Partition.java         |   24 +-
 .../MemberContextToKubernetesContainer.java     |  154 ++
 .../MemberContextToKubernetesService.java       |   64 +
 .../MemberContextToReplicationController.java   |   89 +
 .../controller/iaases/OpenstackNovaIaas.java    |    3 -
 .../impl/CloudControllerServiceImpl.java        |  673 +++--
 .../interfaces/CloudControllerService.java      |   47 +-
 .../internal/CloudControllerDSComponent.java    |  203 +-
 .../cloud/controller/pojo/Cartridge.java        |   20 +
 .../cloud/controller/pojo/CartridgeConfig.java  |   41 +-
 .../cloud/controller/pojo/CartridgeInfo.java    |   18 +-
 .../cloud/controller/pojo/ClusterContext.java   |   27 +-
 .../cloud/controller/pojo/Container.java        |   59 +
 .../cloud/controller/pojo/IaasConfig.java       |    4 +-
 .../cloud/controller/pojo/IaasProvider.java     |    5 +-
 .../pojo/KubernetesClusterContext.java          |  187 ++
 .../cloud/controller/pojo/MemberContext.java    |    1 +
 .../cloud/controller/pojo/Properties.java       |    4 +-
 .../runtime/FasterLookUpDataHolder.java         |   24 +
 .../InstanceStatusEventMessageListener.java     |   91 +-
 .../controller/topology/TopologyBuilder.java    |   18 +-
 .../topology/TopologyEventPublisher.java        |  384 +--
 .../util/CloudControllerConstants.java          |  474 ++--
 .../controller/util/CloudControllerUtil.java    |   32 +
 .../src/main/resources/META-INF/component.xml   |   22 +
 .../src/main/resources/META-INF/services.xml    |   18 +
 .../common/constants/StratosConstants.java      |   18 +-
 .../stratos/common/enums/ClusterType.java       |    5 +
 .../common/kubernetes/KubernetesGroup.java      |  163 ++
 .../common/kubernetes/KubernetesHost.java       |  144 ++
 .../common/kubernetes/KubernetesMaster.java     |   88 +
 .../stratos/common/kubernetes/PortRange.java    |   50 +
 .../stratos/common/kubernetes/Properties.java   |   76 +
 .../stratos/common/kubernetes/Property.java     |  101 +
 .../pom.xml                                     |   43 +-
 .../kubernetes/client/KubernetesApiClient.java  |  324 ++-
 .../KubernetesAPIClientInterface.java           |    8 +
 .../kubernetes/client/model/Container.java      |   11 +-
 .../stratos/kubernetes/client/model/Label.java  |    3 -
 .../kubernetes/client/model/Manifest.java       |    7 +-
 .../stratos/kubernetes/client/model/Pod.java    |    3 -
 .../kubernetes/client/model/PodList.java        |    5 +-
 .../stratos/kubernetes/client/model/Policy.java |    3 -
 .../stratos/kubernetes/client/model/Port.java   |    3 -
 .../client/model/ReplicationController.java     |   25 +-
 .../client/model/ReplicationControllerList.java |    5 +-
 .../kubernetes/client/model/Service.java        |    3 -
 .../kubernetes/client/model/ServiceList.java    |    5 +-
 .../stratos/kubernetes/client/model/State.java  |    4 -
 .../stratos/kubernetes/client/model/Volume.java |    3 -
 .../kubernetes/client/model/VolumeMount.java    |    3 -
 .../kubernetes/client/rest/RestClient.java      |  185 ++
 .../stratos/load/balancer/RequestDelegator.java |    7 +-
 .../console/util/utility.jag                    |   16 +-
 components/org.apache.stratos.manager/pom.xml   |    6 +
 .../behaviour/CartridgeMgtBehaviour.java        |   27 -
 .../manager/client/AutoscalerServiceClient.java |  261 +-
 .../deploy/cartridge/CartridgeDeployer.java     |   38 +
 .../cartridge/CartridgeDeploymentManager.java   |   33 +
 .../cartridge/DefaultCartridgeDeployer.java     |   54 +
 .../cartridge/DockerCartridgeDeployer.java      |   39 +
 .../stratos/manager/deploy/service/Service.java |   12 +-
 .../service/ServiceDeploymentManager.java       |   10 +-
 .../service/multitenant/MultiTenantService.java |    4 +-
 .../multitenant/lb/DefaultLBService.java        |    4 +-
 .../multitenant/lb/ExistingLBService.java       |    4 +-
 .../service/multitenant/lb/LBService.java       |    4 +-
 .../multitenant/lb/MultiTenantLBService.java    |    4 +-
 .../multitenant/lb/ServiceAwareLBService.java   |    4 +-
 .../internal/ADCManagementServerComponent.java  |   15 +
 .../listener/InstanceStatusListener.java        |  186 +-
 .../manager/listener/TenantUserRoleCreator.java |  118 +
 .../manager/CartridgeSubscriptionManager.java   |   24 +-
 .../InstanceNotificationPublisher.java          |  103 +-
 .../manager/publisher/TenantEventPublisher.java |  151 +-
 .../publisher/TenantSynzhronizerTask.java       |  169 +-
 .../filter/LBCreationSubscriptionFilter.java    |   14 +-
 .../utils/CartridgeSubscriptionUtils.java       |  117 +-
 .../manager/user/mgt/StratosUserManager.java    |  201 ++
 .../manager/user/mgt/beans/UserInfoBean.java    |  103 +
 .../mgt/exception/UserManagementException.java  |   28 +
 .../manager/utils/PermissionConstants.java      |   38 +
 .../stratos/manager/utils/UserRoleCreator.java  |   74 +
 .../src/main/resources/META-INF/component.xml   |   62 +
 components/org.apache.stratos.messaging/pom.xml |   16 +-
 .../messaging/broker/connect/MQTTConnector.java |  108 +
 .../broker/connect/TopicConnector.java          |   96 -
 .../broker/heartbeat/TopicHealthChecker.java    |   63 +-
 .../broker/publish/EventPublisher.java          |   64 +-
 .../broker/publish/TopicPublisher.java          |  227 +-
 .../broker/subscribe/TopicSubscriber.java       |  233 +-
 .../messaging/domain/topology/Cluster.java      |   15 +-
 .../event/topology/ClusterRemovedEvent.java     |    1 +
 .../topology/MemberMaintenanceModeEvent.java    |    2 +-
 .../stat/HealthStatEventMessageListener.java    |  106 +-
 .../health/stat/HealthStatEventReceiver.java    |  110 +-
 .../InstanceNotifierEventMessageListener.java   |  108 +-
 .../notifier/InstanceNotifierEventReceiver.java |  116 +-
 .../tenant/TenantEventMessageListener.java      |  102 +-
 .../topology/TopologyEventMessageListener.java  |  101 +-
 .../stratos/messaging/util/Constants.java       |  101 +-
 .../stratos/messaging/util/Properties.java      |   35 +-
 .../org/apache/stratos/messaging/util/Util.java |  239 +-
 .../web/tenant-register/select_domain.jsp       |   36 +-
 .../web/tenant-register/select_usage_plan.jsp   |   56 +-
 .../org.apache.stratos.rest.endpoint/pom.xml    |    2 +-
 .../definition/CartridgeDefinitionBean.java     |    4 +
 .../cartridge/definition/ContainerBean.java     |   14 +
 .../bean/kubernetes/KubernetesGroup.java        |   84 +
 .../bean/kubernetes/KubernetesHost.java         |   67 +
 .../bean/kubernetes/KubernetesMaster.java       |   76 +
 .../endpoint/bean/kubernetes/PortRange.java     |   44 +
 .../endpoint/bean/kubernetes/Properties.java    |   46 +
 .../rest/endpoint/bean/kubernetes/Property.java |   62 +
 .../bean/util/converter/PojoConverter.java      |  496 ++--
 .../KubernetesGroupAlreadyExistException.java   |   65 +
 .../KubernetesGroupDoesNotExistException.java   |   65 +
 .../KubernetesHostAlreadyDeployedException.java |   65 +
 .../KubernetesHostDoesNotExistException.java    |   67 +
 .../KubernetesMasterDoesNotExistException.java  |   68 +
 .../endpoint/handlers/StratosMockHandler.java   |   41 -
 .../stratos/rest/endpoint/mock/MockContext.java |   55 +-
 .../rest/endpoint/mock/StratosTestAdmin.java    |   47 +
 .../rest/endpoint/services/ServiceUtils.java    |  440 +++-
 .../rest/endpoint/services/StratosAdmin.java    |  544 ++--
 .../stratos-test/WEB-INF/schemas/schema.xsd     |   24 +-
 .../main/webapp/stratos/WEB-INF/cxf-servlet.xml |    3 +-
 .../webapp/stratos/WEB-INF/schemas/schema.xsd   |   36 +
 .../TenantActivityUIServiceComponent.java       |    2 +-
 .../TenantActivityServiceComponent.java         |    2 +-
 .../resources/web/tenant-mgt/add_tenant.jsp     |   26 +-
 components/pom.xml                              |    1 -
 .../cep/extension/CEPTopologyEventReceiver.java |  125 +
 .../extension/FaultHandlingWindowProcessor.java |  200 +-
 .../src/main/bin/haproxy-extension.sh           |    6 +-
 .../stratos/haproxy/extension/Constants.java    |   12 +
 .../haproxy/extension/HAProxyConfigWriter.java  |  168 +-
 .../haproxy/extension/HAProxyContext.java       |   26 +-
 .../extension/HAProxyStatisticsReader.java      |   32 +-
 .../pom.xml                                     |   20 +
 .../pom.xml                                     |   87 -
 features/manager/cartridge-mgt/pom.xml          |   60 -
 features/manager/pom.xml                        |    1 -
 pom.xml                                         |    5 +-
 .../distribution/src/main/assembly/bin.xml      |   16 +
 .../src/main/conf/mqtttopic.properties          |   21 +
 products/stratos/conf/cloud-services-desc.xml   |   10 +
 products/stratos/conf/features-dashboard.xml    |   27 -
 products/stratos/conf/mqtttopic.properties      |   21 +
 products/stratos/modules/distribution/pom.xml   |   36 +
 .../modules/distribution/src/assembly/bin.xml   |   39 +-
 .../distribution/src/main/conf/mincheck.drl     |    5 +-
 products/stratos/modules/p2-profile-gen/pom.xml |  107 +-
 products/stratos/pom.xml                        |    4 +
 .../pom.xml                                     |   48 +-
 .../src/main/resources/AutoScalerService.wsdl   |  819 +++++-
 .../pom.xml                                     |   37 +-
 .../main/resources/CloudControllerService.wsdl  |  361 ++-
 tools/.gitmodules                               |    3 +
 tools/puppet3/manifests/nodes/base.pp           |    2 +-
 tools/puppet3/modules/agent/manifests/init.pp   |    1 +
 .../templates/conf/mqtttopic.properties.erb     |   21 +
 tools/puppet3/modules/haproxy/manifests/init.pp |    3 +
 .../templates/bin/haproxy-extension.sh.erb      |    6 +-
 .../cartridge-agent/agent.properties            |   47 +
 .../cartridge-agent/agent.py                    |  272 ++
 .../cartridge-agent/agent.sh                    |    8 +
 .../cartridge-agent/agent1.py                   |   15 +
 .../cartridge-agent/extensionhandler.py         |   44 +
 .../cartridge-agent/extensionhandler.pyc        |  Bin 0 -> 1987 bytes
 .../cartridge-agent/readme.txt                  |    2 +
 .../cartridge-agent/script.sh                   |    0
 .../cartridge-agent/util.py                     |   22 +
 .../cartridge-agent/util.pyc                    |  Bin 0 -> 762 bytes
 tools/stratos-installer/conf/setup.conf         |    3 +-
 tools/stratos-installer/demo.sh                 |   35 +-
 tools/stratos-installer/ec2.sh                  |   33 +-
 tools/stratos-installer/openstack.sh            |   31 +-
 .../scripts/add_entry_zone_file.sh              |   11 +-
 .../scripts/remove_entry_zone_file.sh           |   11 +-
 tools/stratos-installer/setup.sh                |   57 +-
 tools/stratos-installer/vcloud.sh               |   27 +-
 280 files changed, 15180 insertions(+), 13787 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/stratos/blob/5447592a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/manager/CartridgeSubscriptionManager.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/stratos/blob/5447592a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/ServiceUtils.java
----------------------------------------------------------------------


Mime
View raw message