You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by sa...@apache.org on 2014/01/06 13:52:55 UTC
[08/11] git commit: Merging 4.2.0 changes from branch to master
Merging 4.2.0 changes from branch to master
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/2cf22762
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/2cf22762
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/2cf22762
Branch: refs/heads/master
Commit: 2cf22762e88fa9c0b6eb86d317298b3c78dc4331
Parents: df8e5cc 500eaf5
Author: Sajith Kariyawasam <sa...@wso2.com>
Authored: Mon Jan 6 16:27:48 2014 +0530
Committer: Sajith Kariyawasam <sa...@wso2.com>
Committed: Mon Jan 6 16:27:48 2014 +0530
----------------------------------------------------------------------
components/org.apache.stratos.adc.mgt/pom.xml | 2 +-
.../service/ServiceDeploymentManager.java | 218 +++-
.../manager/CartridgeSubscriptionManager.java | 2 +
.../org.apache.stratos.autoscaler/pom.xml | 2 +-
.../internal/CloudControllerDSComponent.java | 21 +-
.../TopologySynchronizerTaskScheduler.java | 7 +-
.../controller/registry/RegistryManager.java | 20 +-
.../topology/TopologySynchronizerTask.java | 6 +-
.../controller/util/CloudControllerUtil.java | 5 +-
.../common/util/StratosConfiguration.java | 1 -
.../rest/endpoint/services/ServiceUtils.java | 4 +-
.../rest/endpoint/services/StratosAdmin.java | 2 +-
.../org.apache.stratos.tenant.mgt.core/pom.xml | 5 +
.../tenant/mgt/core/DefaultTenantPersistor.java | 343 -----
.../tenant/mgt/core/TenantPersistor.java | 347 +++++
.../internal/TenantMgtCoreServiceComponent.java | 5 -
.../mgt/internal/TenantMgtServiceComponent.java | 35 +-
.../services/GAppTenantRegistrationService.java | 4 +-
.../mgt/services/TenantMgtAdminService.java | 90 +-
.../services/TenantSelfRegistrationService.java | 6 +-
.../stratos/tenant/mgt/util/TenantMgtUtil.java | 4 +
.../src/main/resources/META-INF/services.xml | 4 +
components/pom.xml | 8 +-
.../src/main/resources/p2.inf | 6 +-
.../src/main/resources/p2.inf | 14 +-
.../pom.xml | 4 +-
.../src/main/resources/p2.inf | 16 +-
.../pom.xml | 2 +-
features/manager/pom.xml | 2 +-
.../src/main/resources/p2.inf | 10 +-
features/pom.xml | 6 +-
pom.xml | 6 +-
.../distribution/src/main/assembly/bin.xml | 5 +-
.../distribution/src/main/license/LICENSE | 2 +-
products/autoscaler/modules/integration/pom.xml | 2 +-
products/autoscaler/modules/p2-profile/pom.xml | 20 +-
products/autoscaler/pom.xml | 10 +-
.../distribution/src/main/assembly/bin.xml | 2 +-
.../distribution/src/main/assembly/bin.xml | 11 +-
.../distribution/src/main/conf/axis2.xml | 1227 ++++++++++--------
.../distribution/src/main/license/LICENSE | 2 +-
.../distribution/src/main/resources/launch.ini | 25 +-
.../cloud-controller/modules/p2-profile/pom.xml | 17 +-
products/cloud-controller/pom.xml | 12 +-
.../load-balancer/modules/distribution/pom.xml | 16 +-
.../distribution/src/main/assembly/bin.xml | 14 +-
.../distribution/src/main/license/LICENSE | 2 +-
.../load-balancer/modules/p2-profile/pom.xml | 52 +-
products/load-balancer/pom.xml | 12 +-
.../ui/clients/CloudManagerServiceClient.java | 9 +-
.../modules/distribution/src/assembly/bin.xml | 4 +-
.../distribution/src/main/license/LICENSE | 2 +-
.../modules/features/service/pom.xml | 2 +-
.../modules/p2-profile-gen/pom.xml | 50 +-
.../stratos-controller/modules/styles/pom.xml | 2 +-
products/stratos-controller/pom.xml | 8 +-
56 files changed, 1596 insertions(+), 1119 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/2cf22762/components/org.apache.stratos.adc.mgt/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/2cf22762/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/manager/CartridgeSubscriptionManager.java
----------------------------------------------------------------------
diff --cc components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/manager/CartridgeSubscriptionManager.java
index b8c622a,2a22c82..0d3be61
--- a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/manager/CartridgeSubscriptionManager.java
+++ b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/manager/CartridgeSubscriptionManager.java
@@@ -215,8 -217,13 +215,10 @@@ public class CartridgeSubscriptionManag
CartridgeSubscriptionUtils.publishTenantSubscribedEvent(cartridgeSubscription.getSubscriber().getTenantId(),
cartridgeSubscription.getCartridgeInfo().getType());
- // publish artifact-deployment event for multi-tenant subscription
- //CartridgeSubscriptionInfo subscription = PersistenceManager.getSubscriptionFromClusterId(clusterId);
-
if(cartridgeInfo.getMultiTenant()) {
log.info(" Multitenant --> Publishing Artifact update event -- ");
+ log.info(" Values : cluster id - " + cartridgeSubscription.getClusterDomain() + " tenant - " +
+ cartridgeSubscription.getSubscriber().getTenantId());
ArtifactUpdatePublisher publisher = new ArtifactUpdatePublisher(cartridgeSubscription.getRepository(),
cartridgeSubscription.getClusterDomain(), // clusterId
String.valueOf(cartridgeSubscription.getSubscriber().getTenantId()));
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/2cf22762/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/ServiceUtils.java
----------------------------------------------------------------------