Merge the changes of stratos-4.1.x
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/aece0c4a Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/aece0c4a Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/aece0c4a Branch: refs/heads/master Commit: aece0c4aefc687319b649a0a47e0390e45fd253d Parents: 1afe6ae b80bfc4 Author: gayangunarathne <[email protected]> Authored: Mon Nov 2 17:39:23 2015 +0530 Committer: gayangunarathne <[email protected]> Committed: Mon Nov 2 20:55:02 2015 +0530 ---------------------------------------------------------------------- .gitignore | 1 + README.md | 27 +- .../org.apache.stratos.autoscaler/pom.xml | 15 +- .../applications/topic/ApplicationBuilder.java | 54 +- .../topic/ApplicationsEventPublisher.java | 20 + .../client/AutoscalerCloudControllerClient.java | 9 +- .../partition/ClusterLevelPartitionContext.java | 5 +- .../AutoscalerTopologyEventReceiver.java | 2 +- .../UnremovableApplicationException.java | 27 + .../stratos/autoscaler/monitor/Monitor.java | 3 +- .../monitor/cluster/ClusterMonitor.java | 72 +- .../monitor/component/ApplicationMonitor.java | 45 +- .../monitor/component/GroupMonitor.java | 71 +- .../component/ParentComponentMonitor.java | 4 + .../autoscaler/pojo/policy/PolicyManager.java | 2 +- .../autoscaler/registry/RegistryManager.java | 97 +- .../autoscaler/rule/RuleTasksDelegator.java | 5 +- .../autoscaler/services/AutoscalerService.java | 2 +- .../services/impl/AutoscalerServiceImpl.java | 409 +- .../publisher/AutoscalerPublisherFactory.java | 37 + .../publisher/DASScalingDecisionPublisher.java | 161 + .../publisher/ScalingDecisionPublisher.java | 57 + .../group/GroupStatusTerminatingProcessor.java | 119 - .../autoscaler/util/AutoscalerConstants.java | 20 + .../stratos/autoscaler/util/AutoscalerUtil.java | 108 +- .../org.apache.stratos.cartridge.agent/pom.xml | 2 +- .../agent/test/JavaCartridgeAgentTest.java | 4 +- components/org.apache.stratos.cli/pom.xml | 2 +- .../src/test/python/README.md | 2 +- .../org.apache.stratos.cloud.controller/pom.xml | 17 +- .../context/CloudControllerContext.java | 123 +- .../cloud/controller/domain/ClusterContext.java | 35 +- .../controller/domain/ClusterPortMapping.java | 11 +- .../cloud/controller/domain/IaasProvider.java | 13 +- .../controller/domain/InstanceMetadata.java | 12 +- .../cloud/controller/domain/MemberContext.java | 12 +- .../cloud/controller/domain/PortMapping.java | 8 +- .../kubernetes/KubernetesClusterContext.java | 118 +- .../stratos/cloud/controller/iaases/Iaas.java | 9 +- .../cloud/controller/iaases/JcloudsIaas.java | 109 +- .../controller/iaases/JcloudsIaasUtil.java | 3 +- .../CloudStackPartitionValidator.java | 12 +- .../iaases/docker/DockerPartitionValidator.java | 46 +- .../cloud/controller/iaases/ec2/EC2Iaas.java | 225 +- .../iaases/ec2/EC2PartitionValidator.java | 54 +- .../iaases/gce/GCEPartitionValidator.java | 47 +- .../iaases/kubernetes/KubernetesIaas.java | 717 +- .../iaases/kubernetes/KubernetesIaasUtil.java | 2 +- .../KubernetesPartitionValidator.java | 4 - .../cloud/controller/iaases/mock/MockIaas.java | 67 +- .../iaases/mock/MockIaasPartitionValidator.java | 1 - .../iaases/openstack/OpenstackIaas.java | 195 +- .../openstack/OpenstackPartitionValidator.java | 61 +- .../publisher/TopologyEventPublisher.java | 3 +- .../application/ApplicationEventReceiver.java | 19 +- .../status/ClusterStatusTopicReceiver.java | 31 +- .../status/InstanceStatusTopicReceiver.java | 46 +- .../messaging/topology/TopologyBuilder.java | 761 +- .../messaging/topology/TopologyManager.java | 12 +- .../controller/registry/RegistryManager.java | 17 +- .../impl/CloudControllerServiceImpl.java | 571 +- .../impl/CloudControllerServiceUtil.java | 40 +- .../services/impl/InstanceCreator.java | 20 +- .../publisher/BAMUsageDataPublisher.java | 213 - .../CloudControllerPublisherFactory.java | 55 + .../DASMemberInformationPublisher.java | 162 + .../publisher/DASMemberStatusPublisher.java | 127 + .../publisher/MemberInformationPublisher.java | 38 + .../publisher/MemberStatusPublisher.java | 45 + .../util/CloudControllerConstants.java | 91 +- .../controller/util/CloudControllerUtil.java | 110 +- .../stratos/cloud/controller/util/Scope.java | 16 +- components/org.apache.stratos.common/pom.xml | 2 +- .../beans/topology/ClusterInstanceBean.java | 9 + .../common/beans/topology/MemberBean.java | 10 + .../common/client/AutoscalerServiceClient.java | 25 +- .../common/constants/StratosConstants.java | 1 + .../publisher/StatisticsPublisherType.java | 2 +- .../publisher/ThriftClientConfig.java | 103 + .../publisher/ThriftClientConfigParser.java | 184 + .../statistics/publisher/ThriftClientInfo.java | 82 + .../publisher/ThriftStatisticsPublisher.java | 153 + .../publisher/wso2/cep/ThriftClientConfig.java | 81 - .../wso2/cep/ThriftClientConfigParser.java | 139 - .../publisher/wso2/cep/ThriftClientInfo.java | 63 - .../cep/WSO2CEPHealthStatisticsPublisher.java | 28 +- .../cep/WSO2CEPInFlightRequestPublisher.java | 18 +- .../wso2/cep/WSO2CEPStatisticsPublisher.java | 114 - .../test/ThriftClientConfigParserTest.java | 52 +- .../src/test/resources/thrift-client-config.xml | 33 +- .../org.apache.stratos.custom.handlers/pom.xml | 2 +- .../pom.xml | 2 +- .../kubernetes/client/KubernetesApiClient.java | 83 +- .../kubernetes/client/KubernetesConstants.java | 3 +- .../KubernetesAPIClientInterface.java | 32 +- .../client/live/AbstractLiveTest.java | 29 +- .../live/KubernetesApiClientLiveTest.java | 37 +- .../pom.xml | 2 +- .../load/balancer/common/domain/Member.java | 11 +- ...alancerCommonDomainMappingEventReceiver.java | 12 +- ...LoadBalancerCommonTopologyEventReceiver.java | 22 +- .../pom.xml | 2 +- .../extension/api/LoadBalancerExtension.java | 45 +- .../org.apache.stratos.load.balancer/pom.xml | 2 +- .../console/applications_form.jag | 59 +- .../console/configure_form.jag | 50 +- .../applications/application_requests.jag | 3 + .../console/controllers/login/login.jag | 30 +- .../console/controllers/rest/rest_calls.jag | 4 + .../console/themes/theme0/css/custom.css | 7 +- .../theme0/js/custom/applications-signup.js | 3 +- .../theme0/js/custom/applications_topology.js | 350 +- .../theme0/partials/applications_form.hbs | 259 +- .../theme0/partials/applications_topology.hbs | 228 +- .../theme0/renderers/applications_form.js | 164 +- .../themes/theme0/renderers/configure_form.js | 2 +- .../themes/theme0/renderers/users_form.js | 2 +- .../console/themes/theme0/theme.js | 8 + .../console/users_form.jag | 20 +- .../org.apache.stratos.manager.styles/pom.xml | 2 +- .../src/main/resources/META-INF/product.xml | 2 +- .../src/main/resources/web/favicon.ico | Bin 17542 -> 0 bytes .../src/main/resources/web/styles/css/main.css | 12 - .../resources/web/styles/images/powered.gif | Bin 1773 -> 0 bytes .../resources/web/styles/images/right-logo.gif | Bin 6102 -> 0 bytes .../web/styles/images/t-right-logo.gif | Bin 3629 -> 0 bytes components/org.apache.stratos.manager/pom.xml | 2 +- .../manager/registry/RegistryManager.java | 17 +- components/org.apache.stratos.messaging/pom.xml | 2 +- .../broker/connect/amqp/AmqpTopicConnector.java | 12 +- .../messaging/domain/topology/Cluster.java | 38 +- .../domain/topology/KubernetesService.java | 9 + .../messaging/domain/topology/Member.java | 10 + .../application/ApplicationUpdatedEvent.java | 43 + .../topology/ClusterInstanceActivatedEvent.java | 10 + .../event/topology/MemberInitializedEvent.java | 8 +- .../ApplicationUpdatedEventListener.java | 27 + .../ApplicationUpdatedMessageProcessor.java | 152 + .../ApplicationsMessageProcessorChain.java | 6 + ...pleteApplicationSignUpsMessageProcessor.java | 18 + .../DomainMappingAddedMessageProcessor.java | 2 +- .../DomainMappingRemovedMessageProcessor.java | 2 +- .../ClusterInstanceActivatedProcessor.java | 42 +- .../ClusterInstanceCreatedMessageProcessor.java | 10 +- .../ClusterRemovedMessageProcessor.java | 7 + .../MemberInitializedMessageProcessor.java | 6 +- .../org.apache.stratos.metadata.client/pom.xml | 2 +- .../org.apache.stratos.metadata.service/pom.xml | 2 +- .../service/MetadataTopologyEventReceiver.java | 95 + .../apache/stratos/metadata/service/Utils.java | 18 +- .../metadata/service/api/MetadataApi.java | 58 +- .../service/registry/CarbonRegistry.java | 307 - .../metadata/service/registry/DataStore.java | 2 - .../service/registry/MetadataApiRegistry.java | 370 + .../org.apache.stratos.mock.iaas.api/pom.xml | 2 +- .../stratos/mock/iaas/api/MockIaasApi.java | 15 +- .../org.apache.stratos.mock.iaas.client/pom.xml | 2 +- .../mock/iaas/client/MockIaasApiClient.java | 28 +- components/org.apache.stratos.mock.iaas/pom.xml | 5 +- .../mock/iaas/domain/MockInstanceContext.java | 15 +- .../mock/iaas/domain/MockInstanceMetadata.java | 16 +- .../mock/iaas/persistence/RegistryManager.java | 16 +- .../iaas/services/impl/MockIaasServiceImpl.java | 90 +- .../mock/iaas/services/impl/MockInstance.java | 90 +- .../pom.xml | 6 +- .../cartridge.agent/cartridge.agent/agent.conf | 5 +- .../cartridge.agent/cartridge.agent/agent.py | 54 +- .../cartridge.agent/cartridge.agent/config.py | 118 +- .../cartridge.agent/constants.py | 9 +- .../cartridge.agent/cartridge.agent/entity.py | 1 - .../extensions/py/ExtensionExecutor.py | 6 +- .../cartridge.agent/healthstats.py | 118 +- .../modules/artifactmgt/git/agentgithandler.py | 308 +- .../modules/event/eventhandler.py | 294 +- .../modules/util/cartridgeagentutils.py | 9 +- .../plugins/DefaultArtifactCheckout.py | 103 + .../DefaultArtifactCheckout.yapsy-plugin | 25 + .../plugins/DefaultArtifactCommit.py | 129 + .../plugins/DefaultArtifactCommit.yapsy-plugin | 25 + .../plugins/DefaultHealthStatisticsReader.py | 50 + .../DefaultHealthStatisticsReader.yapsy-plugin | 25 + .../cartridge.agent/plugins/contracts.py | 16 +- .../cartridge.agent/publisher.py | 64 +- .../cartridge.agent/subscriber.py | 7 +- .../python/cartridge.agent/tests/test_git.py | 2 +- .../org.apache.stratos.python.cli/README.md | 1 + .../org.apache.stratos.python.cli/pom.xml | 32 + .../src/main/python/.gitignore | 21 + .../src/main/python/README.md | 46 + .../src/main/python/README.rst | 75 + .../src/main/python/cli/CLI.py | 1530 ++ .../src/main/python/cli/Configs.py | 32 + .../src/main/python/cli/Exceptions.py | 25 + .../src/main/python/cli/Logging.py | 29 + .../src/main/python/cli/Main.py | 66 + .../src/main/python/cli/Stratos.py | 489 + .../src/main/python/cli/Utils.py | 99 + .../src/main/python/cli/__init__.py | 17 + .../src/main/python/setup.cfg | 2 + .../src/main/python/setup.py | 47 + .../src/main/python/tests/CLITest.py | 29 + .../src/main/python/tests/__init__.py | 17 + .../src/main/python/tests/test_stratos_utils.py | 97 + .../src/main/python/tox.ini | 24 + .../org.apache.stratos.rest.endpoint/pom.xml | 3 +- .../rest/endpoint/api/StratosApiV41.java | 867 +- .../rest/endpoint/api/StratosApiV41Utils.java | 84 +- .../util/converter/ObjectConverter.java | 20 +- components/pom.xml | 3 +- dependencies/fabric8/kubernetes-api/pom.xml | 2 +- dependencies/fabric8/pom.xml | 2 +- dependencies/guice-assistedinject/pom.xml | 2 +- dependencies/guice-multibindings/pom.xml | 2 +- dependencies/guice/pom.xml | 2 +- dependencies/jclouds/cloudstack/pom.xml | 2 +- dependencies/jclouds/ec2/pom.xml | 2 +- .../google-cloud-storage/pom.xml | 2 +- .../google-compute-engine/pom.xml | 2 +- .../google-jclouds-labs/googlecloud/pom.xml | 2 +- .../jclouds/google-jclouds-labs/oauth/pom.xml | 2 +- .../jclouds/google-jclouds-labs/pom.xml | 2 +- dependencies/jclouds/jclouds-blobstore/pom.xml | 2 +- .../jclouds/jclouds-bouncycastle/pom.xml | 2 +- dependencies/jclouds/jclouds-compute/pom.xml | 2 +- dependencies/jclouds/jclouds-core/pom.xml | 2 +- dependencies/jclouds/jclouds-enterprise/pom.xml | 2 +- dependencies/jclouds/jclouds-joda/pom.xml | 2 +- dependencies/jclouds/jclouds-netty/pom.xml | 2 +- dependencies/jclouds/jclouds-sshj/pom.xml | 2 +- dependencies/jclouds/openstack-common/pom.xml | 2 +- dependencies/jclouds/openstack-keystone/pom.xml | 2 +- dependencies/jclouds/openstack-neutron/pom.xml | 2 +- dependencies/jclouds/openstack-nova/pom.xml | 2 +- dependencies/jclouds/pom.xml | 2 +- dependencies/jclouds/sts/pom.xml | 2 +- dependencies/org.wso2.carbon.ui/pom.xml | 11 +- dependencies/pom.xml | 2 +- dependencies/rocoto/pom.xml | 2 +- dependencies/sshj/pom.xml | 2 +- .../HealthStatisticsEventBuilder.xml | 31 - .../LoadBalancerStatisticsEventBuilder.xml | 31 - .../AverageInFlightRequestsEventFormatter.xml | 32 - .../AverageLoadAverageEventFormatter.xml | 32 - .../AverageMemoryConsumptionEventFormatter.xml | 32 - .../FaultMessageEventFormatter.xml | 32 - .../GradientInFlightRequestsEventFormatter.xml | 32 - .../GradientLoadAverageEventFormatter.xml | 32 - .../GradientMemoryConsumptionEventFormatter.xml | 32 - .../MemberAverageLoadAverageEventFormatter.xml | 32 - ...erAverageMemoryConsumptionEventFormatter.xml | 32 - .../MemberGradientLoadAverageEventFormatter.xml | 32 - ...rGradientMemoryConsumptionEventFormatter.xml | 32 - ...econdDerivativeLoadAverageEventFormatter.xml | 32 - ...erivativeMemoryConsumptionEventFormatter.xml | 32 - ...DerivativeInFlightRequestsEventFormatter.xml | 32 - ...econdDerivativeLoadAverageEventFormatter.xml | 32 - ...erivativeMemoryConsumptionEventFormatter.xml | 32 - .../executionplans/AverageHeathRequest.xml | 71 - .../AverageInFlightRequestsFinder.xml | 48 - .../executionplans/GradientOfHealthRequest.xml | 71 - .../GradientOfRequestsInFlightFinder.xml | 48 - .../SecondDerivativeOfHealthRequest.xml | 68 - ...SecondDerivativeOfRequestsInFlightFinder.xml | 48 - .../DefaultWSO2EventInputAdaptor.xml | 24 - .../DefaultWSO2EventOutputAdaptor.xml | 29 - .../outputeventadaptors/JMSOutputAdaptor.xml | 30 - .../streamdefinitions/stream-manager-config.xml | 309 - .../HealthStatisticsEventBuilder.xml | 31 + .../LoadBalancerStatisticsEventBuilder.xml | 31 + .../AverageInFlightRequestsEventFormatter.xml | 32 + .../AverageLoadAverageEventFormatter.xml | 32 + .../AverageMemoryConsumptionEventFormatter.xml | 32 + .../FaultMessageEventFormatter.xml | 32 + .../GradientInFlightRequestsEventFormatter.xml | 32 + .../GradientLoadAverageEventFormatter.xml | 32 + .../GradientMemoryConsumptionEventFormatter.xml | 32 + .../MemberAverageLoadAverageEventFormatter.xml | 32 + ...erAverageMemoryConsumptionEventFormatter.xml | 32 + .../MemberGradientLoadAverageEventFormatter.xml | 32 + ...rGradientMemoryConsumptionEventFormatter.xml | 32 + ...econdDerivativeLoadAverageEventFormatter.xml | 32 + ...erivativeMemoryConsumptionEventFormatter.xml | 32 + ...DerivativeInFlightRequestsEventFormatter.xml | 32 + ...econdDerivativeLoadAverageEventFormatter.xml | 32 + ...erivativeMemoryConsumptionEventFormatter.xml | 32 + .../executionplans/AverageHeathRequest.xml | 71 + .../AverageInFlightRequestsFinder.xml | 48 + .../executionplans/GradientOfHealthRequest.xml | 71 + .../GradientOfRequestsInFlightFinder.xml | 48 + .../SecondDerivativeOfHealthRequest.xml | 68 + ...SecondDerivativeOfRequestsInFlightFinder.xml | 48 + .../DefaultWSO2EventInputAdaptor.xml | 24 + .../DefaultWSO2EventOutputAdaptor.xml | 29 + .../outputeventadaptors/JMSOutputAdaptor.xml | 30 + .../streamdefinitions/stream-manager-config.xml | 309 + .../HealthStatisticsEventBuilder.xml | 31 + .../LoadBalancerStatisticsEventBuilder.xml | 31 + .../AverageInFlightRequestsEventFormatter.xml | 32 + .../AverageLoadAverageEventFormatter.xml | 32 + .../AverageMemoryConsumptionEventFormatter.xml | 32 + .../FaultMessageEventFormatter.xml | 32 + .../GradientInFlightRequestsEventFormatter.xml | 32 + .../GradientLoadAverageEventFormatter.xml | 32 + .../GradientMemoryConsumptionEventFormatter.xml | 32 + .../MemberAverageLoadAverageEventFormatter.xml | 32 + ...erAverageMemoryConsumptionEventFormatter.xml | 32 + .../MemberGradientLoadAverageEventFormatter.xml | 32 + ...rGradientMemoryConsumptionEventFormatter.xml | 32 + ...econdDerivativeLoadAverageEventFormatter.xml | 32 + ...erivativeMemoryConsumptionEventFormatter.xml | 32 + ...DerivativeInFlightRequestsEventFormatter.xml | 32 + ...econdDerivativeLoadAverageEventFormatter.xml | 32 + ...erivativeMemoryConsumptionEventFormatter.xml | 32 + .../executionplans/AverageHeathRequest.xml | 63 + .../AverageInFlightRequestsFinder.xml | 40 + .../executionplans/GradientOfHealthRequest.xml | 63 + .../GradientOfRequestsInFlightFinder.xml | 40 + .../SecondDerivativeOfHealthRequest.xml | 60 + ...SecondDerivativeOfRequestsInFlightFinder.xml | 40 + .../DefaultWSO2EventInputAdaptor.xml | 24 + .../DefaultWSO2EventOutputAdaptor.xml | 29 + .../outputeventadaptors/JMSOutputAdaptor.xml | 30 + .../streamdefinitions/stream-manager-config.xml | 309 + extensions/cep/modules/distribution/pom.xml | 4 +- .../cep/modules/stratos-cep-extension/pom.xml | 63 - .../cep/extension/CEPTopologyEventReceiver.java | 99 - .../cep/extension/ConcatWindowProcessor.java | 54 - .../extension/FaultHandlingWindowProcessor.java | 349 - .../GradientFinderWindowProcessor.java | 283 - ...equestHandlingCapabilityWindowProcessor.java | 68 - .../SecondDerivativeFinderWindowProcessor.java | 301 - .../stratos-cep-extension/wso2cep-3.0.0/pom.xml | 63 + .../cep/extension/CEPTopologyEventReceiver.java | 99 + .../cep/extension/ConcatWindowProcessor.java | 54 + .../extension/FaultHandlingWindowProcessor.java | 348 + .../GradientFinderWindowProcessor.java | 277 + ...equestHandlingCapabilityWindowProcessor.java | 68 + .../SecondDerivativeFinderWindowProcessor.java | 295 + .../stratos-cep-extension/wso2cep-3.1.0/pom.xml | 57 + .../cep/extension/CEPTopologyEventReceiver.java | 99 + .../cep/extension/ConcatWindowProcessor.java | 54 + .../extension/FaultHandlingWindowProcessor.java | 341 + .../GradientFinderWindowProcessor.java | 276 + ...equestHandlingCapabilityWindowProcessor.java | 68 + .../SecondDerivativeFinderWindowProcessor.java | 294 + extensions/cep/pom.xml | 5 +- .../artifacts/metering-dashboard/README.md | 13 + .../metering-dashboard/capps/build.xml | 40 + .../artifacts/metering-dashboard/capps/pom.xml | 74 + .../Dashboard/artifact.xml | 24 + .../Dashboard/stratos-metering-dashboard.json | 267 + .../EventreceiverMemberInfo/artifact.xml | 24 + .../member_info_receiver.xml | 29 + .../EventreceiverMemberLifecycle/artifact.xml | 24 + .../member_lifecycle_receiver.xml | 29 + .../EventstoreMemberInfo/artifact.xml | 24 + .../EventstoreMemberInfo/member_info.xml | 148 + .../EventstoreMemberLifecycle/artifact.xml | 24 + .../member_lifecycle.xml | 99 + .../EventstreamMemberInfo/artifact.xml | 24 + .../member_info_1.0.0.json | 76 + .../EventstreamMemberLifecycle/artifact.xml | 24 + .../member_lifecycle_1.0.0.json | 48 + .../Member_Count/css/bootstrap.min.css | 5935 ++++++ .../Member_Count/css/d3.geomap.css | 48 + .../Member_Count/css/igviz.css | 86 + .../GadgetMemberCount/Member_Count/gadget.json | 19 + .../GadgetMemberCount/Member_Count/index.xml | 85 + .../js/d3.geomap.dependencies.min.js | 8249 ++++++++ .../Member_Count/js/d3.geomap.min.js | 538 + .../GadgetMemberCount/Member_Count/js/d3.min.js | 6332 +++++++ .../Member_Count/js/excanvas.min.js | 954 + .../Member_Count/js/gadgetconf.js | 55 + .../GadgetMemberCount/Member_Count/js/igviz.js | 3585 ++++ .../GadgetMemberCount/Member_Count/js/jquery.js | 9496 ++++++++++ .../GadgetMemberCount/Member_Count/js/main.js | 167 + .../Member_Count/js/outputAdapterUiLibrary.js | 275 + .../GadgetMemberCount/Member_Count/js/vega.js | 8006 ++++++++ .../GadgetMemberCount/artifact.xml | 24 + .../Member_Details_Filter/css/jquery-ui.css | 1225 ++ .../Member_Details_Filter/css/style.css | 221 + .../Member_Details_Filter/gadget.json | 23 + .../Member_Details_Filter/index.png | Bin 0 -> 6754 bytes .../Member_Details_Filter/index.xml | 67 + .../Member_Details_Filter/js/jquery-ui.js | 16617 +++++++++++++++++ .../js/member-details-filter.js | 138 + .../GadgetMemberDetailsFilter/artifact.xml | 24 + .../Member_Information/css/bootstrap.min.css | 5935 ++++++ .../Member_Information/css/d3.geomap.css | 48 + .../Member_Information/css/igviz.css | 86 + .../Member_Information/gadget.json | 19 + .../Member_Information/index.xml | 88 + .../js/d3.geomap.dependencies.min.js | 8249 ++++++++ .../Member_Information/js/d3.geomap.min.js | 538 + .../Member_Information/js/d3.min.js | 6332 +++++++ .../Member_Information/js/excanvas.min.js | 954 + .../Member_Information/js/gadgetconf.js | 88 + .../Member_Information/js/igviz.js | 3565 ++++ .../Member_Information/js/jquery.js | 9496 ++++++++++ .../Member_Information/js/main.js | 165 + .../js/outputAdapterUiLibrary.js | 276 + .../Member_Information/js/vega.js | 8006 ++++++++ .../GadgetMemberInformation/artifact.xml | 24 + .../Member_Status/css/bootstrap.min.css | 5935 ++++++ .../Member_Status/css/d3.geomap.css | 67 + .../Member_Status/css/igviz.css | 86 + .../Member_Status/gadget.json | 19 + .../GadgetMemberStatus/Member_Status/index.xml | 87 + .../js/d3.geomap.dependencies.min.js | 8249 ++++++++ .../Member_Status/js/d3.geomap.min.js | 538 + .../Member_Status/js/d3.min.js | 6332 +++++++ .../Member_Status/js/excanvas.min.js | 954 + .../Member_Status/js/gadgetconf.js | 49 + .../Member_Status/js/igviz.js | 3565 ++++ .../Member_Status/js/jquery.js | 9496 ++++++++++ .../GadgetMemberStatus/Member_Status/js/main.js | 167 + .../Member_Status/js/outputAdapterUiLibrary.js | 276 + .../GadgetMemberStatus/Member_Status/js/vega.js | 8006 ++++++++ .../GadgetMemberStatus/artifact.xml | 24 + .../Member_Status_Filter/css/jquery-ui.css | 1225 ++ .../Member_Status_Filter/css/style.css | 253 + .../Member_Status_Filter/gadget.json | 23 + .../Member_Status_Filter/index.png | Bin 0 -> 12554 bytes .../Member_Status_Filter/index.xml | 72 + .../Member_Status_Filter/js/jquery-ui.js | 16617 +++++++++++++++++ .../js/member-status-filter.js | 140 + .../GadgetMemberStatusFilter/artifact.xml | 24 + .../SparkscriptsMemberInfo/artifact.xml | 24 + .../member_information.xml | 36 + .../SparkscriptsMemberLifecycle/artifact.xml | 24 + .../member_count.xml | 55 + .../stratos-metering-service/artifacts.xml | 47 + .../jaggery-files/applications.jag | 40 + .../jaggery-files/clusters.jag | 41 + .../jaggery-files/member-count.jag | 90 + .../jaggery-files/member-info.jag | 57 + .../jaggery-files/member-status.jag | 77 + .../jaggery-files/metering-authentication.jag | 75 + .../metering-dashboard/metering-mysqlscript.sql | 24 + .../metering-dashboard/ues-patch/README.md | 8 + .../metering-dashboard/ues-patch/dashboard.jag | 105 + .../ues-patch/ues-dashboards.js | 207 + .../metering-dashboard/ues-patch/ues-pubsub.js | 46 + extensions/das/modules/distribution/README.md | 9 + extensions/das/modules/distribution/pom.xml | 66 + .../modules/distribution/src/assembly/bin.xml | 69 + .../distribution/src/main/license/LICENSE | 204 + .../modules/distribution/src/main/notice/NOTICE | 7 + .../stratos-das-extension/spark-udfs/README.md | 8 + .../stratos-das-extension/spark-udfs/pom.xml | 41 + .../spark-udfs/spark-time-udf/pom.xml | 36 + .../das/extension/spark/udf/TimeUDF.java | 49 + extensions/das/pom.xml | 41 + .../modules/aws-extension/INSTALL.md | 51 + .../modules/aws-extension/README.md | 5 + .../load-balancer/modules/aws-extension/pom.xml | 124 + .../aws-extension/src/main/assembly/bin.xml | 91 + .../aws-extension/src/main/bin/aws-extension.sh | 44 + .../aws-extension/src/main/conf/aws.properties | 40 + .../aws-extension/src/main/conf/jndi.properties | 22 + .../src/main/conf/log4j.properties | 40 + .../src/main/conf/thrift-client-config.xml | 27 + .../aws/extension/AWSExtensionContext.java | 101 + .../apache/stratos/aws/extension/AWSHelper.java | 948 + .../stratos/aws/extension/AWSLoadBalancer.java | 305 + .../aws/extension/AWSStatisticsReader.java | 89 + .../apache/stratos/aws/extension/Constants.java | 57 + .../org/apache/stratos/aws/extension/Main.java | 90 + .../aws-extension/src/main/license/LICENSE | 481 + .../aws-extension/src/main/notice/NOTICE | 395 + .../src/main/security/client-truststore.jks | Bin 0 -> 35240 bytes .../modules/haproxy-extension/pom.xml | 2 +- .../haproxy-extension/src/main/license/LICENSE | 8 +- .../load-balancer/modules/lvs-extension/pom.xml | 2 +- .../modules/nginx-extension/INSTALL.md | 35 +- .../modules/nginx-extension/pom.xml | 2 +- .../nginx/extension/NginxConfigWriter.java | 205 +- .../nginx-extension/src/main/license/LICENSE | 8 +- .../src/main/templates/nginx.cfg.template | 57 +- extensions/load-balancer/pom.xml | 3 +- extensions/pom.xml | 3 +- .../pom.xml | 2 +- features/autoscaler/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- features/cep/pom.xml | 2 +- .../pom.xml | 2 +- features/cloud-controller/pom.xml | 2 +- .../org.apache.stratos.common.feature/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- features/common/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- features/load-balancer/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- features/manager/pom.xml | 2 +- .../pom.xml | 2 +- .../org.apache.stratos.manager.feature/pom.xml | 2 +- .../pom.xml | 2 +- features/manager/stratos-mgt/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- features/messaging/pom.xml | 2 +- .../pom.xml | 2 +- features/mock-iaas/pom.xml | 2 +- features/pom.xml | 2 +- pom.xml | 412 +- .../modules/distribution/INSTALL.txt | 2 +- .../modules/distribution/README.txt | 4 +- .../modules/distribution/pom.xml | 2 +- .../distribution/src/main/license/LICENSE | 14 +- products/cartridge-agent/pom.xml | 2 +- .../modules/distribution/INSTALL.txt | 2 +- .../load-balancer/modules/distribution/pom.xml | 2 +- .../src/main/conf/thrift-client-config.xml | 2 +- .../distribution/src/main/license/LICENSE | 8 +- .../modules/p2-profile-gen/pom.xml | 2 +- products/load-balancer/pom.xml | 2 +- products/pom.xml | 3 +- .../modules/distribution/pom.xml | 2 +- .../distribution/src/main/assembly/bin.xml | 3 + .../modules/integration/pom.xml | 234 +- .../test/ADCMTAppTenantUserTest.java | 213 - .../test/ADCMTAppTest.java | 213 - .../python.cartridge.agent/test/ADCTest.java | 235 - .../test/AgentStartupTest.java | 154 - .../test/PythonAgentTestManager.java | 497 - .../src/test/resources/common/log4j.properties | 41 - .../src/test/resources/pca-testing1.xml | 29 - .../src/test/resources/pca-testing2.xml | 29 - .../src/test/resources/pca-testing3.xml | 29 - .../src/test/resources/pca-testing4.xml | 29 - .../resources/suite-1/payload/launch-params | 1 - .../src/test/resources/suite-2/agent.conf | 45 - .../src/test/resources/suite-2/jndi.properties | 22 - .../src/test/resources/suite-2/logging.ini | 52 - .../resources/suite-2/payload/launch-params | 1 - .../src/test/resources/suite-3/jndi.properties | 22 - .../src/test/resources/suite-3/logging.ini | 52 - .../resources/suite-3/payload/launch-params | 1 - .../src/test/resources/suite-4/agent.conf | 45 - .../src/test/resources/suite-4/jndi.properties | 22 - .../src/test/resources/suite-4/logging.ini | 52 - .../resources/suite-4/payload/launch-params | 1 - .../test-conf/integration-test.properties | 26 - .../modules/integration/test-common/pom.xml | 94 + .../common/DataPublisherTestUtil.java | 54 + .../integration/common/ThriftTestServer.java | 225 + .../integration/test-integration/pom.xml | 173 + .../integration/tests/ADCExtensionTestCase.java | 157 + .../tests/ADCMTAppTenantUserTestCase.java | 217 + .../integration/tests/ADCMTAppTestCase.java | 218 + .../agent/integration/tests/ADCTestCase.java | 280 + .../integration/tests/AgentStartupTestCase.java | 209 + .../tests/PythonAgentIntegrationTest.java | 515 + .../resources/ADCExtensionTestCase/agent.conf | 46 + .../extensions/py/checkout-job-handler.py | 34 + .../py/checkout-job-handler.yapsy-plugin | 27 + .../extensions/py/commit-job-handler.py | 27 + .../py/commit-job-handler.yapsy-plugin | 27 + .../resources/ADCExtensionTestCase/logging.ini | 52 + .../ADCExtensionTestCase/payload/launch-params | 1 + .../ADCMTAppTenantUserTestCase/agent.conf | 46 + .../ADCMTAppTenantUserTestCase/logging.ini | 52 + .../payload/launch-params | 1 + .../test/resources/ADCMTAppTestCase/agent.conf | 46 + .../test/resources/ADCMTAppTestCase/logging.ini | 52 + .../ADCMTAppTestCase/payload/launch-params | 1 + .../src/test/resources/ADCTestCase/agent.conf | 46 + .../src/test/resources/ADCTestCase/logging.ini | 52 + .../resources/ADCTestCase/payload/launch-params | 1 + .../resources/AgentStartupTestCase/agent.conf | 46 + .../extensions/py/checkout-job-handler.py | 34 + .../py/checkout-job-handler.yapsy-plugin | 27 + .../extensions/py/commit-job-handler.py | 27 + .../py/commit-job-handler.yapsy-plugin | 27 + .../extensions/py/startup-test-handler.py | 60 + .../py/startup-test-handler.yapsy-plugin | 27 + .../resources/AgentStartupTestCase/logging.ini | 52 + .../AgentStartupTestCase/payload/launch-params | 1 + .../test/resources/common/client-truststore.jks | Bin 0 -> 37935 bytes .../resources/common/data-bridge-config.xml | 75 + .../src/test/resources/common/jndi.properties | 24 + .../src/test/resources/common/log4j.properties | 41 + .../common/stratos-health-stream-def.json | 1 + .../resources/common/thrift-agent-config.xml | 64 + .../src/test/resources/common/wso2carbon.jks | Bin 0 -> 33260 bytes .../test-conf/integration-test.properties | 27 + .../src/test/resources/test-suite-all.xml | 36 + .../src/test/resources/test-suite-smoke.xml | 37 + products/python-cartridge-agent/pom.xml | 4 +- .../python-cli/modules/distribution/pom.xml | 59 + .../distribution/src/main/assembly/bin.xml | 60 + .../distribution/src/main/license/LICENSE | 202 + .../modules/distribution/src/main/notice/NOTICE | 5 + .../modules/distribution/src/main/readme/README | 25 + products/python-cli/pom.xml | 38 + .../stratos-cli/modules/distribution/README.txt | 2 +- .../stratos-cli/modules/distribution/pom.xml | 2 +- .../distribution/src/main/license/LICENSE | 14 +- products/stratos-cli/pom.xml | 3 +- .../stratos/modules/distribution/INSTALL.txt | 2 +- .../stratos/modules/distribution/README.txt | 4 +- products/stratos/modules/distribution/pom.xml | 4 +- .../modules/distribution/src/assembly/bin.xml | 175 +- .../distribution/src/bin/add_entry_zone_file.sh | 70 - .../src/bin/git-folder-structure.sh | 67 - .../distribution/src/bin/manage-git-repo.sh | 138 - .../src/bin/remove_entry_zone_file.sh | 75 - .../distribution/src/bin/set-mysql-password.sh | 65 - .../modules/distribution/src/bin/stratos.bat | 172 - .../modules/distribution/src/bin/stratos.sh | 307 - .../distribution/src/bin/update-instance.sh | 54 - .../distribution/src/main/bin/stratos.bat | 172 + .../distribution/src/main/bin/stratos.sh | 307 + .../src/main/conf/cartridge-config.properties | 5 +- .../src/main/conf/drools/dependent-scaling.drl | 21 +- .../src/main/conf/drools/mincheck.drl | 22 +- .../src/main/conf/drools/scaling.drl | 24 +- .../distribution/src/main/conf/log4j.properties | 8 + .../src/main/conf/thrift-client-config.xml | 42 +- .../distribution/src/main/license/LICENSE | 31 +- .../resources/allthemes/Dark/admin/logo.gif | Bin 3476 -> 0 bytes .../resources/allthemes/Dark/admin/main.css | 253 - .../allthemes/Dark/admin/powered-stratos.gif | Bin 1515 -> 0 bytes .../allthemes/Dark/admin/right-logo.gif | Bin 2325 -> 0 bytes .../allthemes/Dark/admin/theme-header-bg.gif | Bin 4245 -> 0 bytes .../Dark/admin/theme-header-region-bg.gif | Bin 793 -> 0 bytes .../allthemes/Dark/admin/theme-menu-header.gif | Bin 261 -> 0 bytes .../Dark/admin/theme-menu-panel-l-bg.gif | Bin 312 -> 0 bytes .../Dark/admin/theme-menu-table-bg.gif | Bin 5671 -> 0 bytes .../Dark/admin/theme-right-links-bg.gif | Bin 1005 -> 0 bytes .../src/main/resources/allthemes/Dark/thumb.png | Bin 19546 -> 0 bytes .../allthemes/Default/admin/def-body-bg.gif | Bin 419 -> 0 bytes .../allthemes/Default/admin/def-header-bg.gif | Bin 17875 -> 0 bytes .../Default/admin/def-header-region-bg.gif | Bin 22784 -> 0 bytes .../resources/allthemes/Default/admin/logo.gif | Bin 3476 -> 0 bytes .../resources/allthemes/Default/admin/main.css | 250 - .../allthemes/Default/admin/powered-stratos.gif | Bin 1515 -> 0 bytes .../allthemes/Default/admin/right-logo.gif | Bin 3629 -> 0 bytes .../main/resources/allthemes/Default/thumb.png | Bin 24432 -> 0 bytes .../resources/allthemes/Light/admin/logo.gif | Bin 3476 -> 0 bytes .../resources/allthemes/Light/admin/main.css | 250 - .../allthemes/Light/admin/menu_header.gif | Bin 243 -> 0 bytes .../allthemes/Light/admin/powered-stratos.gif | Bin 1515 -> 0 bytes .../allthemes/Light/admin/right-links-bg.gif | Bin 1191 -> 0 bytes .../allthemes/Light/admin/right-logo.gif | Bin 2325 -> 0 bytes .../allthemes/Light/admin/theme-header-bg.gif | Bin 3792 -> 0 bytes .../Light/admin/theme-header-region-b-bg.gif | Bin 121 -> 0 bytes .../Light/admin/theme-header-region-bg.gif | Bin 534 -> 0 bytes .../Light/admin/theme-menu-panel-l-bg.gif | Bin 772 -> 0 bytes .../Light/admin/theme-menu-table-bg.gif | Bin 5991 -> 0 bytes .../main/resources/allthemes/Light/thumb.png | Bin 18102 -> 0 bytes .../powerded-by-logos/appserver-logo.gif | Bin 1473 -> 0 bytes .../resources/powerded-by-logos/bam-logo.gif | Bin 1690 -> 0 bytes .../resources/powerded-by-logos/bps-logo.gif | Bin 1606 -> 0 bytes .../resources/powerded-by-logos/brs-logo.gif | Bin 1596 -> 0 bytes .../resources/powerded-by-logos/csg-logo.gif | Bin 2030 -> 0 bytes .../resources/powerded-by-logos/ds-logo.gif | Bin 1528 -> 0 bytes .../resources/powerded-by-logos/esb-logo.gif | Bin 1598 -> 0 bytes .../resources/powerded-by-logos/gadget-logo.gif | Bin 1368 -> 0 bytes .../powerded-by-logos/governance-logo.gif | Bin 1525 -> 0 bytes .../powerded-by-logos/identity-logo.gif | Bin 1398 -> 0 bytes .../resources/powerded-by-logos/mashup-logo.gif | Bin 1440 -> 0 bytes products/stratos/modules/integration/pom.xml | 171 +- .../integration/tests/RestConstants.java | 55 - .../tests/StratosTestServerManager.java | 282 - .../integration/tests/TopologyHandler.java | 666 - .../application/GroupStartupOrderTest.java | 362 - .../GroupTerminationBehaviorTest.java | 402 - .../PartitionOneAfterAnotherClusterTest.java | 298 - .../PartitionRoundRobinClusterTest.java | 311 - .../application/SampleApplicationsTest.java | 252 - .../application/SingleClusterScalingTest.java | 359 - .../tests/group/CartridgeGroupTest.java | 150 - .../integration/tests/group/CartridgeTest.java | 191 - .../tests/policies/ApplicationPolicyTest.java | 190 - .../tests/policies/AutoscalingPolicyTest.java | 138 - .../tests/policies/DeploymentPolicyTest.java | 230 - .../tests/policies/NetworkPartitionTest.java | 124 - .../integration/tests/rest/ErrorResponse.java | 56 - .../integration/tests/rest/HttpResponse.java | 59 - .../tests/rest/HttpResponseHandler.java | 68 - .../tests/rest/IntegrationMockClient.java | 102 - .../integration/tests/rest/RestClient.java | 387 - .../tests/rest/WebClientWrapper.java | 62 - .../integration/tests/users/TenantTest.java | 44 - .../integration/tests/users/UserTest.java | 115 - ...cation-policy-application-bursting-test.json | 18 - .../app-bursting-single-cartriddge-group.json | 70 - ...caling-policy-application-bursting-test.json | 14 - ...esb-php-group-application-bursting-test.json | 19 - .../mock/esb-application-bursting-test.json | 50 - .../mock/php-application-bursting-test.json | 51 - .../mock/tomcat-application-bursting-test.json | 53 - ...oyment-policy-application-bursting-test.json | 32 - ...k-partition-application-bursting-test-1.json | 15 - ...k-partition-application-bursting-test-2.json | 24 - ...cation-policy-application-policy-test-1.json | 18 - ...cation-policy-application-policy-test-2.json | 18 - ...lication-policy-application-policy-test.json | 18 - ...ork-partition-application-policy-test-1.json | 24 - ...ork-partition-application-policy-test-2.json | 15 - ...lication-policy-application-update-test.json | 18 - .../g-sc-G123-1-application-update-test-v1.json | 86 - .../g-sc-G123-1-application-update-test.json | 86 - ...oscaling-policy-application-update-test.json | 14 - ...rdige-nested-application-update-test-v1.json | 50 - ...artrdige-nested-application-update-test.json | 50 - .../mock/c1-application-update-test.json | 45 - .../mock/c2-application-update-test.json | 45 - .../mock/c3-application-update-test.json | 45 - ...yment-policy-application-update-test-v1.json | 36 - ...ployment-policy-application-update-test.json | 32 - ...-partition-application-update-test-1-v1.json | 28 - ...ork-partition-application-update-test-1.json | 15 - ...ork-partition-application-update-test-2.json | 24 - ...caling-policy-autoscaling-policy-test-1.json | 14 - ...caling-policy-autoscaling-policy-test-2.json | 14 - ...aling-policy-autoscaling-policy-test-v1.json | 14 - ...oscaling-policy-autoscaling-policy-test.json | 14 - .../g4-g5-g6-cartridge-group-test-v1.json | 50 - .../g4-g5-g6-cartridge-group-test.json | 50 - .../group-1-cartridge-group-test.json | 50 - .../group-2-cartridge-group-test.json | 50 - .../mock/c4-cartridge-group-test.json | 45 - .../mock/c5-cartridge-group-test.json | 124 - .../mock/c6-cartridge-group-test.json | 45 - .../cartridges/mock/c0-cartridge-test-v1.json | 124 - .../cartridges/mock/c0-cartridge-test.json | 124 - .../cartridges/mock/c1-cartridge-test.json | 124 - .../cartridges/mock/c2-cartridge-test.json | 124 - .../test/resources/common/JMSOutputAdaptor.xml | 30 - .../src/test/resources/common/jndi.properties | 22 - .../src/test/resources/common/mock-iaas.xml | 123 - .../src/test/resources/common/scaling.drl | 311 - ...loyment-policy-deployment-policy-test-1.json | 32 - ...loyment-policy-deployment-policy-test-2.json | 32 - ...oyment-policy-deployment-policy-test-v1.json | 36 - ...eployment-policy-deployment-policy-test.json | 32 - ...k-partition-deployment-policy-test-1-v1.json | 28 - ...work-partition-deployment-policy-test-1.json | 15 - ...work-partition-deployment-policy-test-2.json | 24 - ...ication-policy-group-startup-order-test.json | 13 - .../applications/group-startup-order-test.json | 206 - ...caling-policy-application-bursting-test.json | 14 - .../group6-group-startup-order-test.json | 44 - .../group8-group-startup-order-test.json | 18 - .../mock/esb-application-bursting-test.json | 50 - .../mock/php-application-bursting-test.json | 51 - .../stratos-lb-group-startup-order-test.json | 44 - .../mock/tomcat-application-bursting-test.json | 53 - .../mock/tomcat1-group-startup-order-test.json | 45 - .../mock/tomcat2-group-startup-order-test.json | 49 - .../mock/tomcat3-group-startup-order-test.json | 31 - ...loyment-policy-group-startup-order-test.json | 18 - ...k-partition-application-bursting-test-1.json | 15 - ...k-partition-application-bursting-test-2.json | 24 - ...-policy-group-termination-behavior-test.json | 17 - .../group-termination-behavior-test.json | 101 - ...-policy-group-termination-behavior-test.json | 14 - ...-groups-group-termination-behavior-test.json | 58 - .../c1-group-termination-behavior-test.json | 45 - .../c2-group-termination-behavior-test.json | 45 - .../c3-group-termination-behavior-test.json | 45 - .../c4-group-termination-behavior-test.json | 45 - ...-policy-group-termination-behavior-test.json | 18 - ...ition-group-termination-behavior-test-1.json | 15 - .../src/test/resources/instrumentation.txt | 1 - .../src/test/resources/keys/wso2carbon.jks | Bin 33260 -> 0 bytes ...work-partition-network-partition-test-1.json | 15 - ...work-partition-network-partition-test-2.json | 15 - ...ork-partition-network-partition-test-v1.json | 28 - ...etwork-partition-network-partition-test.json | 15 - ...ation-policy-partition-round-robin-test.json | 13 - .../partition-round-robin-test.json | 28 - ...aling-policy-partition-round-robin-test.json | 14 - .../mock/c7-partition-round-robin-test.json | 45 - ...yment-policy-partition-round-robin-test.json | 22 - ...rk-partition-partition-round-robin-test.json | 24 - ...ication-policy-sample-applications-test.json | 18 - ...g-sc-G123-1-sample-applications-test-v1.json | 86 - .../g-sc-G123-1-sample-applications-test.json | 86 - .../sample-applications-test-1.json | 86 - .../sample-applications-test-2.json | 86 - ...scaling-policy-sample-applications-test.json | 14 - ...dige-nested-sample-applications-test-v1.json | 50 - ...rtrdige-nested-sample-applications-test.json | 50 - .../mock/c1-sample-applications-test.json | 45 - .../mock/c2-sample-applications-test.json | 45 - .../mock/c3-sample-applications-test.json | 45 - ...ment-policy-sample-applications-test-v1.json | 36 - ...loyment-policy-sample-applications-test.json | 32 - ...partition-sample-applications-test-1-v1.json | 28 - ...rk-partition-sample-applications-test-1.json | 15 - ...rk-partition-sample-applications-test-2.json | 24 - ...tion-policy-single-cluster-scaling-test.json | 13 - .../single-cluster-scaling-test.json | 28 - ...ling-policy-single-cluster-scaling-test.json | 14 - .../mock/c7-single-cluster-scaling-test.json | 45 - ...ment-policy-single-cluster-scaling-test.json | 22 - ...k-partition-single-cluster-scaling-test.json | 24 - .../test-conf/integration-test.properties | 30 - .../src/test/resources/user-test/tenant-1.json | 9 - .../src/test/resources/user-test/user-1-v1.json | 8 - .../src/test/resources/user-test/user-1.json | 8 - .../modules/integration/test-common/pom.xml | 131 + .../integration/common/RestConstants.java | 54 + .../common/StratosTestServerManager.java | 623 + .../integration/common/TopologyHandler.java | 700 + .../apache/stratos/integration/common/Util.java | 83 + .../extensions/StratosServerExtension.java | 200 + .../integration/common/rest/ErrorResponse.java | 54 + .../integration/common/rest/HttpResponse.java | 54 + .../common/rest/HttpResponseHandler.java | 66 + .../common/rest/IntegrationMockClient.java | 101 + .../integration/common/rest/RestClient.java | 458 + .../common/rest/WebClientWrapper.java | 60 + .../integration/test-integration/pom.xml | 229 + .../test-integration/run-smoke-test.sh | 24 + .../tests/StratosIntegrationTest.java | 59 + .../ApplicationBurstingTestCase.java | 225 + .../application/ApplicationUpdateTestCase.java | 257 + .../application/GroupStartupOrderTestCase.java | 364 + .../GroupTerminationBehaviorTestCase.java | 416 + ...PartitionOneAfterAnotherClusterTestCase.java | 279 + .../PartitionRoundRobinClusterTestCase.java | 286 + .../SampleApplicationStartupTestCase.java | 280 + .../application/SampleApplicationsTestCase.java | 404 + .../SingleClusterScalingTestCase.java | 7 + .../tests/group/CartridgeGroupTestCase.java | 251 + .../tests/group/CartridgeTestCase.java | 183 + .../policies/ApplicationPolicyTestCase.java | 222 + .../policies/AutoscalingPolicyTestCase.java | 155 + .../policies/DeploymentPolicyTestCase.java | 261 + .../policies/NetworkPartitionTestCase.java | 147 + .../integration/tests/users/TenantTestCase.java | 42 + .../integration/tests/users/UserTestCase.java | 104 + ...cation-policy-application-bursting-test.json | 18 + .../app-bursting-single-cartriddge-group.json | 70 + ...caling-policy-application-bursting-test.json | 14 + ...esb-php-group-application-bursting-test.json | 19 + .../mock/esb-application-bursting-test.json | 50 + .../mock/php-application-bursting-test.json | 51 + .../mock/tomcat-application-bursting-test.json | 53 + ...oyment-policy-application-bursting-test.json | 32 + ...k-partition-application-bursting-test-1.json | 15 + ...k-partition-application-bursting-test-2.json | 24 + ...cation-policy-application-policy-test-1.json | 18 + ...cation-policy-application-policy-test-2.json | 18 + ...lication-policy-application-policy-test.json | 18 + ...ork-partition-application-policy-test-1.json | 24 + ...ork-partition-application-policy-test-2.json | 15 + ...lication-policy-application-update-test.json | 18 + .../g-sc-G123-1-application-update-test-v1.json | 86 + .../g-sc-G123-1-application-update-test.json | 86 + ...oscaling-policy-application-update-test.json | 14 + ...rdige-nested-application-update-test-v1.json | 50 + ...artrdige-nested-application-update-test.json | 50 + .../mock/c1-application-update-test.json | 45 + .../mock/c2-application-update-test.json | 45 + .../mock/c3-application-update-test.json | 45 + ...yment-policy-application-update-test-v1.json | 36 + ...ployment-policy-application-update-test.json | 32 + ...-partition-application-update-test-1-v1.json | 28 + ...ork-partition-application-update-test-1.json | 15 + ...ork-partition-application-update-test-2.json | 24 + .../src/test/resources/automation.xml | 234 + .../src/test/resources/automationSchema.xsd | 592 + ...caling-policy-autoscaling-policy-test-1.json | 14 + ...caling-policy-autoscaling-policy-test-2.json | 14 + ...aling-policy-autoscaling-policy-test-v1.json | 14 + ...oscaling-policy-autoscaling-policy-test.json | 14 + .../g4-g5-g6-cartridge-group-test-v1.json | 50 + .../g4-g5-g6-cartridge-group-test.json | 50 + .../group-1-cartridge-group-test.json | 50 + .../group-2-cartridge-group-test.json | 50 + .../mock/c4-cartridge-group-test.json | 45 + .../mock/c5-cartridge-group-test.json | 124 + .../mock/c6-cartridge-group-test.json | 45 + .../cartridges/mock/c0-cartridge-test-v1.json | 124 + .../cartridges/mock/c0-cartridge-test.json | 124 + .../cartridges/mock/c1-cartridge-test.json | 124 + .../cartridges/mock/c2-cartridge-test.json | 124 + .../test/resources/common/JMSOutputAdaptor.xml | 30 + .../src/test/resources/common/autoscaler.xml | 57 + .../common/cartridge-config.properties | 27 + .../test/resources/common/cloud-controller.xml | 81 + .../src/test/resources/common/identity.xml | 260 + .../src/test/resources/common/jndi.properties | 0 .../src/test/resources/common/log4j.properties | 210 + .../src/test/resources/common/mock-iaas.xml | 123 + .../src/test/resources/common/scaling.drl | 332 + .../resources/common/thrift-client-config.xml | 43 + ...loyment-policy-deployment-policy-test-1.json | 32 + ...loyment-policy-deployment-policy-test-2.json | 32 + ...oyment-policy-deployment-policy-test-v1.json | 36 + ...eployment-policy-deployment-policy-test.json | 32 + ...k-partition-deployment-policy-test-1-v1.json | 28 + ...work-partition-deployment-policy-test-1.json | 15 + ...work-partition-deployment-policy-test-2.json | 24 + .../src/test/resources/filters.txt | 16 + ...ication-policy-group-startup-order-test.json | 13 + .../applications/group-startup-order-test.json | 206 + ...scaling-policy-group-startup-order-test.json | 14 + .../group6-group-startup-order-test.json | 44 + .../group8-group-startup-order-test.json | 18 + .../mock/esb-group-startup-order-test.json | 50 + .../mock/php-group-startup-order-test.json | 51 + .../stratos-lb-group-startup-order-test.json | 44 + .../mock/tomcat-group-startup-order-test.json | 53 + .../mock/tomcat1-group-startup-order-test.json | 45 + .../mock/tomcat2-group-startup-order-test.json | 49 + .../mock/tomcat3-group-startup-order-test.json | 31 + ...loyment-policy-group-startup-order-test.json | 18 + ...rk-partition-group-startup-order-test-1.json | 15 + ...rk-partition-group-startup-order-test-2.json | 24 + ...-policy-group-termination-behavior-test.json | 17 + .../group-termination-behavior-test.json | 101 + ...-policy-group-termination-behavior-test.json | 14 + ...-groups-group-termination-behavior-test.json | 58 + .../c1-group-termination-behavior-test.json | 45 + .../c2-group-termination-behavior-test.json | 45 + .../c3-group-termination-behavior-test.json | 45 + .../c4-group-termination-behavior-test.json | 45 + ...-policy-group-termination-behavior-test.json | 18 + ...ition-group-termination-behavior-test-1.json | 15 + .../src/test/resources/instrumentation.txt | 1 + .../keystores/products/client-truststore.jks | Bin 0 -> 37935 bytes .../resources/keystores/products/userRP.jks | Bin 0 -> 33278 bytes .../resources/keystores/products/wso2carbon.jks | Bin 0 -> 33260 bytes .../src/test/resources/log4j.properties | 52 + ...work-partition-network-partition-test-1.json | 15 + ...work-partition-network-partition-test-2.json | 15 + ...ork-partition-network-partition-test-v1.json | 28 + ...etwork-partition-network-partition-test.json | 15 + ...ation-policy-partition-round-robin-test.json | 13 + .../partition-round-robin-test.json | 28 + ...aling-policy-partition-round-robin-test.json | 14 + .../mock/c7-partition-round-robin-test.json | 45 + ...yment-policy-partition-round-robin-test.json | 22 + ...rk-partition-partition-round-robin-test.json | 24 + ...-policy-sample-application-startup-test.json | 17 + .../sample-application-startup-test.json | 24 + ...-policy-sample-application-startup-test.json | 14 + .../c1-sample-application-startup-test.json | 45 + ...-policy-sample-application-startup-test.json | 18 + ...rtition-sample-application-startup-test.json | 15 + ...ication-policy-sample-applications-test.json | 18 + ...g-sc-G123-1-sample-applications-test-v1.json | 86 + .../g-sc-G123-1-sample-applications-test.json | 86 + .../sample-applications-test-1.json | 86 + .../sample-applications-test-2.json | 86 + ...scaling-policy-sample-applications-test.json | 14 + ...dige-nested-sample-applications-test-v1.json | 50 + ...rtrdige-nested-sample-applications-test.json | 50 + .../mock/c1-sample-applications-test.json | 45 + .../mock/c2-sample-applications-test.json | 45 + .../mock/c3-sample-applications-test.json | 45 + ...ment-policy-sample-applications-test-v1.json | 36 + ...loyment-policy-sample-applications-test.json | 32 + ...partition-sample-applications-test-1-v1.json | 28 + ...rk-partition-sample-applications-test-1.json | 15 + ...rk-partition-sample-applications-test-2.json | 24 + ...tion-policy-single-cluster-scaling-test.json | 13 + .../single-cluster-scaling-test.json | 28 + ...ling-policy-single-cluster-scaling-test.json | 14 + .../mock/c7-single-cluster-scaling-test.json | 45 + ...ment-policy-single-cluster-scaling-test.json | 22 + ...k-partition-single-cluster-scaling-test.json | 24 + .../src/test/resources/test-suite-all.xml | 44 + .../src/test/resources/test-suite-smoke.xml | 45 + .../src/test/resources/user-test/tenant-1.json | 9 + .../src/test/resources/user-test/user-1-v1.json | 8 + .../src/test/resources/user-test/user-1.json | 8 + products/stratos/modules/p2-profile-gen/pom.xml | 29 +- products/stratos/pom.xml | 2 +- samples/cartridges/kubernetes/esb.json | 35 - samples/cartridges/kubernetes/php.json | 2 +- samples/cartridges/kubernetes/tomcat.json | 2 +- samples/cartridges/kubernetes/tomcat1.json | 35 - samples/cartridges/kubernetes/tomcat2.json | 35 - samples/cartridges/kubernetes/tomcat3.json | 32 - samples/cartridges/kubernetes/wso2-is.json | 29 - .../kubernetes-cluster-1.json | 116 +- .../kubernetes-cluster-2.json | 116 +- .../kubernetes-cluster-ec2.json | 132 +- .../pom.xml | 2 +- .../src/main/resources/AutoscalerService.wsdl | 746 +- .../pom.xml | 2 +- .../main/resources/CloudControllerService.wsdl | 916 +- .../pom.xml | 2 +- service-stubs/pom.xml | 2 +- .../base-image/Dockerfile | 2 +- .../base-image/files/run | 29 +- .../cartridge-docker-images/build.sh | 10 +- .../service-images/php/Dockerfile | 4 +- .../service-images/tomcat-saml-sso/Dockerfile | 2 +- .../service-images/tomcat/Dockerfile | 2 +- .../service-images/wso2is-saml-sso/Dockerfile | 2 +- .../stratos-docker-images/run-example.sh | 2 +- tools/puppet3/manifests/nodes/base.pp | 50 +- .../python_agent/templates/agent.conf.erb | 3 +- tools/stratos-installer/README.md | 2 +- tools/stratos-installer/conf/setup.conf | 2 +- 1007 files changed, 207927 insertions(+), 22991 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/aece0c4a/README.md ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/aece0c4a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/impl/AutoscalerServiceImpl.java ---------------------------------------------------------------------- diff --cc components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/impl/AutoscalerServiceImpl.java index f0e797f,e6a97a9..b9f436a --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/impl/AutoscalerServiceImpl.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/impl/AutoscalerServiceImpl.java @@@ -74,9 -72,9 +77,10 @@@ import org.apache.stratos.manager.servi import org.apache.stratos.messaging.domain.application.Application; import org.apache.stratos.messaging.domain.application.ClusterDataHolder; import org.apache.stratos.messaging.domain.instance.ClusterInstance; + import org.apache.stratos.messaging.domain.instance.Instance; import org.apache.stratos.messaging.domain.topology.Cluster; import org.apache.stratos.messaging.domain.topology.Member; +import org.apache.stratos.messaging.message.receiver.application.ApplicationManager; import org.apache.stratos.messaging.message.receiver.topology.TopologyManager; import org.wso2.carbon.registry.api.RegistryException; @@@ -899,12 -919,13 +921,13 @@@ public class AutoscalerServiceImpl impl } Application application; - ApplicationHolder.acquireReadLock(); try { - application = ApplicationHolder.getApplications().getApplication(applicationId); + ApplicationManager.acquireReadLockForApplication(applicationId); + application = ApplicationManager.getApplications().getApplication(applicationId); if (application == null) { - log.warn(String.format("Could not find application, thus no members to be terminated " + - "[application-id] %s", applicationId)); + log.warn(String.format( + "Could not find application, thus no members to be terminated " + "[application-id] %s", + applicationId)); return; } } finally { @@@ -1166,9 -1230,10 +1231,9 @@@ } private void removeOldPartitionsFromClusterMonitor(NetworkPartitionContext clusterLevelNetworkPartitionContext, - NetworkPartitionRef networkPartition) { + NetworkPartitionRef networkPartition) { - for (InstanceContext instanceContext : clusterLevelNetworkPartitionContext.getInstanceIdToInstanceContextMap() - .values()) { + for (InstanceContext instanceContext : clusterLevelNetworkPartitionContext.getInstanceIdToInstanceContextMap().values()) { ClusterInstanceContext clusterInstanceContext = (ClusterInstanceContext) instanceContext; http://git-wip-us.apache.org/repos/asf/stratos/blob/aece0c4a/components/org.apache.stratos.cartridge.agent/src/test/java/org/apache/stratos/cartridge/agent/test/JavaCartridgeAgentTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/aece0c4a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/receiver/cluster/status/ClusterStatusTopicReceiver.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/aece0c4a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/receiver/instance/status/InstanceStatusTopicReceiver.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/aece0c4a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/topology/TopologyManager.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/aece0c4a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/aece0c4a/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/config.py ---------------------------------------------------------------------- diff --cc components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/config.py index 983c4c4,e50c47d..b44cad4 --- a/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/config.py +++ b/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/config.py @@@ -17,9 -17,10 +17,12 @@@ import ConfigParser import os + import sys + + from yapsy.PluginManager import PluginManager +from yapsy.PluginManager import PluginManager + from modules.util.log import LogFactory from exception import ParameterNotFoundException import constants http://git-wip-us.apache.org/repos/asf/stratos/blob/aece0c4a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/aece0c4a/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/aece0c4a/products/python-cartridge-agent/modules/integration/pom.xml ---------------------------------------------------------------------- diff --cc products/python-cartridge-agent/modules/integration/pom.xml index 81ef628,f16d8a3..f16d8a3 mode 100755,100755..100644 --- a/products/python-cartridge-agent/modules/integration/pom.xml +++ b/products/python-cartridge-agent/modules/integration/pom.xml
