You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by pr...@apache.org on 2014/01/08 08:32:45 UTC
[2/4] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-stratos
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/0d04cb4f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/0d04cb4f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/0d04cb4f
Branch: refs/heads/master
Commit: 0d04cb4fc0095496f4f68574b805dfa4cea1b462
Parents: 57a001a a6f2fb3
Author: Pradeep Fernando <pr...@gmail.com>
Authored: Wed Jan 8 11:53:25 2014 +0530
Committer: Pradeep Fernando <pr...@gmail.com>
Committed: Wed Jan 8 11:53:25 2014 +0530
----------------------------------------------------------------------
components/org.apache.stratos.adc.mgt/pom.xml | 155 --
.../src/conf/tenant-resource-policy.xml | 22 -
.../adc/mgt/client/AutoscalerServiceClient.java | 308 ----
.../adc/mgt/client/CartridgeAgentClient.java | 44 -
.../client/CloudControllerServiceClient.java | 171 ---
.../stratos/adc/mgt/client/RegistryClient.java | 109 --
.../CartridgeSubscriptionConnector.java | 45 -
.../CartridgeSubscriptionConnectorFactory.java | 41 -
.../DataCartridgeSubscriptionConnector.java | 92 --
.../adc/mgt/custom/domain/RegistryManager.java | 109 --
.../adc/mgt/dao/CartridgeSubscriptionInfo.java | 200 ---
.../org/apache/stratos/adc/mgt/dao/Cluster.java | 77 -
.../stratos/adc/mgt/dao/DataCartridge.java | 62 -
.../apache/stratos/adc/mgt/dao/PortMapping.java | 59 -
.../adc/mgt/dao/RepositoryCredentials.java | 48 -
.../stratos/adc/mgt/deploy/service/Service.java | 138 --
.../service/ServiceDeploymentManager.java | 330 ----
.../service/multitenant/MultiTenantService.java | 53 -
.../apache/stratos/adc/mgt/dns/DNSManager.java | 89 --
.../org/apache/stratos/adc/mgt/dto/AppRepo.java | 88 --
.../apache/stratos/adc/mgt/dto/Cartridge.java | 202 ---
.../stratos/adc/mgt/dto/CartridgeDetail.java | 22 -
.../adc/mgt/dto/CartridgeInformation.java | 22 -
.../stratos/adc/mgt/dto/CartridgeWrapper.java | 52 -
.../org/apache/stratos/adc/mgt/dto/Policy.java | 148 --
.../stratos/adc/mgt/dto/PolicyDefinition.java | 83 --
.../adc/mgt/dto/RepositoryInformation.java | 46 -
.../stratos/adc/mgt/dto/SubscriptionInfo.java | 48 -
.../stratos/adc/mgt/exception/ADCException.java | 49 -
.../exception/AlreadySubscribedException.java | 48 -
.../exception/DomainMappingExistsException.java | 48 -
.../DuplicateCartridgeAliasException.java | 56 -
.../InvalidCartridgeAliasException.java | 67 -
.../exception/InvalidRepositoryException.java | 35 -
.../mgt/exception/NotSubscribedException.java | 49 -
.../exception/PersistenceManagerException.java | 49 -
.../adc/mgt/exception/PolicyException.java | 41 -
.../RepositoryCredentialsRequiredException.java | 40 -
.../exception/RepositoryRequiredException.java | 40 -
.../exception/RepositoryTransportException.java | 40 -
.../UnregisteredCartridgeException.java | 48 -
.../internal/ADCManagementServerComponent.java | 188 ---
.../stratos/adc/mgt/internal/DataHolder.java | 91 --
.../adc/mgt/internal/HostingConstants.java | 40 -
.../internal/HostingManagementActivator.java | 63 -
.../mgt/internal/ServiceReferenceHolder.java | 51 -
.../mgt/listener/InstanceStatusListener.java | 92 --
.../adc/mgt/listener/TenantStatusListner.java | 42 -
.../adc/mgt/lookup/ClusterIdToSubscription.java | 59 -
.../adc/mgt/lookup/LookupDataHolder.java | 151 --
.../adc/mgt/lookup/SubscriptionContext.java | 131 --
.../lookup/TenantIdToSubscriptionContext.java | 64 -
.../manager/CartridgeSubscriptionManager.java | 628 --------
.../ApplicationCartridgePayloadData.java | 27 -
.../adc/mgt/payload/BasicPayloadData.java | 224 ---
.../stratos/adc/mgt/payload/CarbonPayload.java | 43 -
.../mgt/payload/DataCartridgePayloadData.java | 27 -
.../stratos/adc/mgt/payload/DataPayload.java | 40 -
.../payload/FramewrokCartridgePayloadData.java | 27 -
.../LoadBalancerCartridgePayloadData.java | 27 -
.../adc/mgt/payload/NonCarbonPayload.java | 125 --
.../apache/stratos/adc/mgt/payload/Payload.java | 224 ---
.../stratos/adc/mgt/payload/PayloadArg.java | 194 ---
.../stratos/adc/mgt/payload/PayloadData.java | 74 -
.../stratos/adc/mgt/payload/PayloadFactory.java | 60 -
.../DatabaseBasedPersistenceManager.java | 1408 ------------------
.../adc/mgt/persistence/PersistenceManager.java | 92 --
.../RegistryBasedPersistenceManager.java | 567 -------
.../mgt/publisher/ArtifactUpdatePublisher.java | 65 -
.../adc/mgt/publisher/TenantEventPublisher.java | 114 --
.../TenantSynchronizerTaskScheduler.java | 76 -
.../mgt/publisher/TenantSynzhronizerTask.java | 94 --
.../adc/mgt/registry/RegistryManager.java | 337 -----
.../stratos/adc/mgt/repository/Repository.java | 78 -
.../DataInsertionAndRetrievalManager.java | 349 -----
.../service/ApplicationManagementService.java | 679 ---------
.../InstanceInformationManagementService.java | 58 -
.../mgt/service/RepoNotificationService.java | 127 --
.../adc/mgt/service/RepositoryInfoBean.java | 98 --
.../stratos/adc/mgt/subscriber/Subscriber.java | 68 -
.../ApplicationCartridgeSubscription.java | 50 -
.../mgt/subscription/CartridgeSubscription.java | 467 ------
.../subscription/CartridgeSubscription_old.java | 431 ------
.../subscription/DataCartridgeSubscription.java | 117 --
.../DataCartridgeSubscription_old.java | 127 --
.../FrameworkCartridgeSubscription.java | 43 -
.../subscription/LBCartridgeSubscription.java | 53 -
.../MultiTenantCartridgeSubscription.java | 134 --
.../SingleTenantCartridgeSubscription.java | 136 --
.../cache/CartridgeInstanceCache.java | 119 --
.../cache/CartridgeInstanceCacheKey.java | 59 -
.../factory/CartridgeSubscriptionFactory.java | 89 --
.../ServiceDeploymentMultiTenantBehaviour.java | 109 --
.../SubscriptionMultiTenantBehaviour.java | 110 --
.../SubscriptionSingleTenantBehaviour.java | 97 --
.../tenancy/SubscriptionTenancyBehaviour.java | 43 -
.../utils/CartridgeSubscriptionUtils.java | 172 ---
.../model/TopologyClusterInformationModel.java | 502 -------
.../StratosManagerTopologyReceiver.java | 310 ----
.../mgt/utils/ApplicationManagementUtil.java | 1102 --------------
.../stratos/adc/mgt/utils/CartridgeAppType.java | 44 -
.../mgt/utils/CartridgeConfigFileReader.java | 62 -
.../adc/mgt/utils/CartridgeConstants.java | 95 --
.../stratos/adc/mgt/utils/CartridgeDomain.java | 146 --
.../stratos/adc/mgt/utils/Deserializer.java | 52 -
.../stratos/adc/mgt/utils/DomainInfo.java | 43 -
.../adc/mgt/utils/PersistenceManager.java | 892 -----------
.../stratos/adc/mgt/utils/PolicyHolder.java | 292 ----
.../adc/mgt/utils/RepoPasswordMgtUtil.java | 117 --
.../adc/mgt/utils/RepositoryCreator.java | 286 ----
.../adc/mgt/utils/RepositoryFactory.java | 131 --
.../stratos/adc/mgt/utils/Serializer.java | 104 --
.../stratos/adc/mgt/utils/StratosDBUtils.java | 213 ---
.../mgt/utils/SynchronizeRepositoryRequest.java | 146 --
.../src/main/resources/META-INF/services.xml | 76 -
.../src/main/resources/policies.xsd | 54 -
.../src/scripts/append_zone_file.sh | 44 -
.../adc/mgt/test/CartridgeSubscriptionTest.java | 85 --
.../stratos/adc/mgt/test/PayloadTest.java | 196 ---
.../stratos/adc/mgt/test/PolicyHolderTest.java | 84 --
.../src/test/resources/log4j.properties | 29 -
.../src/test/resources/policies-1.xml | 44 -
.../org.apache.stratos.cartridge.mgt.ui/pom.xml | 4 +-
.../cartridge/mgt/ui/CartridgeAdminClient.java | 34 +-
.../web/cartridge-mgt/available_cartridges.jsp | 6 +-
.../cartridge-mgt/map_domain_ajaxprocessor.jsp | 2 +-
.../remove_domain_ajaxprocessor.jsp | 2 +-
.../resources/web/cartridge-mgt/subscribe.jsp | 2 +-
.../cartridge-mgt/subscribe_ajaxprocessor.jsp | 4 +-
.../web/cartridge-mgt/subscribed_cartridges.jsp | 4 +-
.../subscribed_cartridges_ajaxprocessor.jsp | 4 +-
.../cartridge-mgt/sync_repo_ajaxprocessor.jsp | 2 +-
.../cartridge-mgt/test_git_ajaxprocessor.jsp | 2 +-
.../cartridge-mgt/unsubscribe_ajaxprocessor.jsp | 2 +-
components/org.apache.stratos.cli/pom.xml | 2 +-
.../apache/stratos/cli/CommandLineService.java | 32 +-
.../org.apache.stratos.logging.view.ui/pom.xml | 2 +-
.../logging/view/ui/LogViewerClient.java | 2 +-
components/org.apache.stratos.manager/pom.xml | 155 ++
.../src/conf/tenant-resource-policy.xml | 22 +
.../manager/client/AutoscalerServiceClient.java | 308 ++++
.../manager/client/CartridgeAgentClient.java | 44 +
.../client/CloudControllerServiceClient.java | 171 +++
.../stratos/manager/client/RegistryClient.java | 109 ++
.../CartridgeSubscriptionConnector.java | 45 +
.../CartridgeSubscriptionConnectorFactory.java | 41 +
.../DataCartridgeSubscriptionConnector.java | 92 ++
.../manager/dao/CartridgeSubscriptionInfo.java | 200 +++
.../org/apache/stratos/manager/dao/Cluster.java | 77 +
.../stratos/manager/dao/DataCartridge.java | 62 +
.../apache/stratos/manager/dao/PortMapping.java | 59 +
.../manager/dao/RepositoryCredentials.java | 48 +
.../stratos/manager/deploy/service/Service.java | 138 ++
.../service/ServiceDeploymentManager.java | 330 ++++
.../service/multitenant/MultiTenantService.java | 53 +
.../apache/stratos/manager/dns/DNSManager.java | 89 ++
.../stratos/manager/domain/RegistryManager.java | 109 ++
.../org/apache/stratos/manager/dto/AppRepo.java | 88 ++
.../apache/stratos/manager/dto/Cartridge.java | 202 +++
.../stratos/manager/dto/CartridgeDetail.java | 22 +
.../manager/dto/CartridgeInformation.java | 22 +
.../stratos/manager/dto/CartridgeWrapper.java | 52 +
.../org/apache/stratos/manager/dto/Policy.java | 148 ++
.../stratos/manager/dto/PolicyDefinition.java | 83 ++
.../manager/dto/RepositoryInformation.java | 46 +
.../stratos/manager/dto/SubscriptionInfo.java | 48 +
.../stratos/manager/exception/ADCException.java | 49 +
.../exception/AlreadySubscribedException.java | 48 +
.../exception/DomainMappingExistsException.java | 48 +
.../DuplicateCartridgeAliasException.java | 56 +
.../InvalidCartridgeAliasException.java | 67 +
.../exception/InvalidRepositoryException.java | 35 +
.../exception/NotSubscribedException.java | 49 +
.../exception/PersistenceManagerException.java | 49 +
.../manager/exception/PolicyException.java | 41 +
.../RepositoryCredentialsRequiredException.java | 40 +
.../exception/RepositoryRequiredException.java | 40 +
.../exception/RepositoryTransportException.java | 40 +
.../UnregisteredCartridgeException.java | 48 +
.../internal/ADCManagementServerComponent.java | 188 +++
.../stratos/manager/internal/DataHolder.java | 91 ++
.../manager/internal/HostingConstants.java | 40 +
.../internal/HostingManagementActivator.java | 63 +
.../internal/ServiceReferenceHolder.java | 51 +
.../listener/InstanceStatusListener.java | 92 ++
.../manager/listener/TenantStatusListner.java | 42 +
.../manager/lookup/ClusterIdToSubscription.java | 59 +
.../manager/lookup/LookupDataHolder.java | 151 ++
.../manager/lookup/SubscriptionContext.java | 131 ++
.../lookup/TenantIdToSubscriptionContext.java | 64 +
.../manager/CartridgeSubscriptionManager.java | 628 ++++++++
.../ApplicationCartridgePayloadData.java | 27 +
.../manager/payload/BasicPayloadData.java | 224 +++
.../stratos/manager/payload/CarbonPayload.java | 43 +
.../payload/DataCartridgePayloadData.java | 27 +
.../stratos/manager/payload/DataPayload.java | 40 +
.../payload/FramewrokCartridgePayloadData.java | 27 +
.../LoadBalancerCartridgePayloadData.java | 27 +
.../manager/payload/NonCarbonPayload.java | 125 ++
.../apache/stratos/manager/payload/Payload.java | 224 +++
.../stratos/manager/payload/PayloadArg.java | 194 +++
.../stratos/manager/payload/PayloadData.java | 74 +
.../stratos/manager/payload/PayloadFactory.java | 60 +
.../DatabaseBasedPersistenceManager.java | 1408 ++++++++++++++++++
.../manager/persistence/PersistenceManager.java | 92 ++
.../RegistryBasedPersistenceManager.java | 567 +++++++
.../publisher/ArtifactUpdatePublisher.java | 65 +
.../manager/publisher/TenantEventPublisher.java | 114 ++
.../TenantSynchronizerTaskScheduler.java | 76 +
.../publisher/TenantSynzhronizerTask.java | 94 ++
.../manager/registry/RegistryManager.java | 337 +++++
.../stratos/manager/repository/Repository.java | 78 +
.../DataInsertionAndRetrievalManager.java | 349 +++++
.../service/ApplicationManagementService.java | 679 +++++++++
.../InstanceInformationManagementService.java | 58 +
.../service/RepoNotificationService.java | 127 ++
.../manager/service/RepositoryInfoBean.java | 98 ++
.../stratos/manager/subscriber/Subscriber.java | 68 +
.../ApplicationCartridgeSubscription.java | 50 +
.../subscription/CartridgeSubscription.java | 467 ++++++
.../subscription/CartridgeSubscription_old.java | 431 ++++++
.../subscription/DataCartridgeSubscription.java | 117 ++
.../DataCartridgeSubscription_old.java | 127 ++
.../FrameworkCartridgeSubscription.java | 43 +
.../subscription/LBCartridgeSubscription.java | 53 +
.../MultiTenantCartridgeSubscription.java | 134 ++
.../SingleTenantCartridgeSubscription.java | 136 ++
.../cache/CartridgeInstanceCache.java | 119 ++
.../cache/CartridgeInstanceCacheKey.java | 59 +
.../factory/CartridgeSubscriptionFactory.java | 89 ++
.../ServiceDeploymentMultiTenantBehaviour.java | 109 ++
.../SubscriptionMultiTenantBehaviour.java | 110 ++
.../SubscriptionSingleTenantBehaviour.java | 97 ++
.../tenancy/SubscriptionTenancyBehaviour.java | 43 +
.../utils/CartridgeSubscriptionUtils.java | 172 +++
.../model/TopologyClusterInformationModel.java | 502 +++++++
.../StratosManagerTopologyReceiver.java | 310 ++++
.../utils/ApplicationManagementUtil.java | 1102 ++++++++++++++
.../stratos/manager/utils/CartridgeAppType.java | 44 +
.../utils/CartridgeConfigFileReader.java | 62 +
.../manager/utils/CartridgeConstants.java | 95 ++
.../stratos/manager/utils/CartridgeDomain.java | 146 ++
.../stratos/manager/utils/Deserializer.java | 52 +
.../stratos/manager/utils/DomainInfo.java | 43 +
.../manager/utils/PersistenceManager.java | 892 +++++++++++
.../stratos/manager/utils/PolicyHolder.java | 292 ++++
.../manager/utils/RepoPasswordMgtUtil.java | 108 ++
.../manager/utils/RepositoryCreator.java | 286 ++++
.../manager/utils/RepositoryFactory.java | 131 ++
.../stratos/manager/utils/Serializer.java | 104 ++
.../stratos/manager/utils/StratosDBUtils.java | 213 +++
.../utils/SynchronizeRepositoryRequest.java | 138 ++
.../src/main/resources/META-INF/services.xml | 76 +
.../src/main/resources/policies.xsd | 54 +
.../src/scripts/append_zone_file.sh | 44 +
.../manager/test/CartridgeSubscriptionTest.java | 85 ++
.../stratos/manager/test/PayloadTest.java | 196 +++
.../stratos/manager/test/PolicyHolderTest.java | 84 ++
.../src/test/resources/log4j.properties | 29 +
.../src/test/resources/policies-1.xml | 44 +
.../org.apache.stratos.rest.endpoint/pom.xml | 2 +-
.../stratos/rest/endpoint/mock/MockContext.java | 4 +-
.../rest/endpoint/mock/StratosTestAdmin.java | 6 +-
.../rest/endpoint/services/ServiceUtils.java | 24 +-
.../rest/endpoint/services/StratosAdmin.java | 6 +-
components/pom.xml | 2 +-
.../org.apache.stratos.adc.mgt.feature/pom.xml | 79 -
.../pom.xml | 145 --
.../src/main/resources/build.properties | 22 -
.../resources/conf/cartridge-config.properties | 64 -
.../src/main/resources/conf/etc/policies.xsd | 54 -
.../src/main/resources/conf/policies.xml | 44 -
.../src/main/resources/p2.inf | 22 -
.../pom.xml | 83 --
features/adc/pom.xml | 44 -
.../pom.xml | 4 +-
features/manager/cartridge-mgt/pom.xml | 2 +-
features/manager/pom.xml | 1 +
.../pom.xml | 83 ++
.../org.apache.stratos.manager.feature/pom.xml | 79 +
.../pom.xml | 145 ++
.../src/main/resources/build.properties | 22 +
.../resources/conf/cartridge-config.properties | 64 +
.../src/main/resources/conf/etc/policies.xsd | 54 +
.../src/main/resources/conf/policies.xml | 44 +
.../src/main/resources/p2.inf | 22 +
features/manager/stratos-mgt/pom.xml | 43 +
features/pom.xml | 2 -
products/autoscaler/modules/integration/pom.xml | 2 +-
.../tests/AutoscalerTestServerManager.java | 5 +-
.../distribution/src/main/license/LICENSE | 2 +-
.../distribution/src/main/license/LICENSE | 4 +-
.../modules/p2-profile-gen/pom.xml | 4 +-
.../org.apache.stratos.adc.mgt.stub/pom.xml | 143 --
.../resources/ApplicationManagementService.wsdl | 1211 ---------------
.../pom.xml | 6 +-
.../org.apache.stratos.manager.stub/pom.xml | 143 ++
.../resources/ApplicationManagementService.wsdl | 1211 +++++++++++++++
service-stubs/pom.xml | 2 +-
299 files changed, 19866 insertions(+), 19882 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/0d04cb4f/products/stratos-manager/modules/p2-profile-gen/pom.xml
----------------------------------------------------------------------