remove org.apache.stratos.mgt
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/8d473892 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/8d473892 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/8d473892 Branch: refs/heads/apache-4.1.0-test Commit: 8d4738922e97c2f07d83b80eecaff3dc098128b9 Parents: c41e16f Author: Udara Liyanage <[email protected]> Authored: Tue Dec 9 10:47:27 2014 +0530 Committer: Udara Liyanage <[email protected]> Committed: Tue Dec 9 10:47:27 2014 +0530 ---------------------------------------------------------------------- .../org.apache.stratos.account.mgt.ui/pom.xml | 8 ++-- .../org.apache.stratos.account.mgt/pom.xml | 6 +-- .../account/mgt/services/AccountMgtService.java | 2 +- .../apache/stratos/account/mgt/util/Util.java | 10 ++--- .../stratos/common/TenantBillingService.java | 14 +++---- .../exception/ApacheStratosException.java | 42 ++++++++++++++++++++ .../common/exception/StratosException.java | 42 -------------------- .../common/listeners/TenantMgtListener.java | 16 ++++---- .../common/packages/PackageInfoHolder.java | 12 +++--- .../keystore/mgt/KeystoreTenantMgtListener.java | 18 ++++----- components/org.apache.stratos.manager/pom.xml | 6 +-- .../manager/listener/TenantUserRoleCreator.java | 22 +++++----- .../manager/publisher/TenantEventPublisher.java | 16 ++++---- .../publisher/TenantSynzhronizerTask.java | 4 +- .../org.apache.stratos.metadataservice/pom.xml | 6 +-- .../stratos/metadataservice/ServiceHolder.java | 2 +- .../org.apache.stratos.rest.endpoint/pom.xml | 12 ++++-- .../stratos/rest/endpoint/ServiceHolder.java | 2 +- .../rest/endpoint/api/StratosApiV40.java | 9 +++-- .../rest/endpoint/api/StratosApiV41.java | 9 +++-- .../sender/listener/EmailSenderListener.java | 20 +++++----- .../services/GAppTenantRegistrationService.java | 4 +- .../mgt/services/TenantMgtAdminService.java | 14 +++---- .../services/TenantSelfRegistrationService.java | 4 +- .../stratos/tenant/mgt/util/TenantMgtUtil.java | 20 +++++----- .../theme/mgt/util/ThemeLoadingListener.java | 18 ++++----- components/pom.xml | 2 + .../pom.xml | 12 ------ .../pom.xml | 16 ++++---- features/manager/pom.xml | 2 + products/stratos/modules/integration/pom.xml | 6 +-- service-stubs/pom.xml | 1 - 32 files changed, 187 insertions(+), 190 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/8d473892/components/org.apache.stratos.account.mgt.ui/pom.xml ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.account.mgt.ui/pom.xml b/components/org.apache.stratos.account.mgt.ui/pom.xml index 71a4728..fd671fc 100644 --- a/components/org.apache.stratos.account.mgt.ui/pom.xml +++ b/components/org.apache.stratos.account.mgt.ui/pom.xml @@ -46,7 +46,7 @@ org.apache.stratos.account.mgt.ui.*, </Export-Package> <Import-Package> - org.apache.stratos.tenant.mgt.stub.*; version="${project.version}", + org.wso2.carbon.tenant.mgt.stub.*; version="4.2.0", javax.servlet;version="${imp.pkg.version.javax.servlet}", javax.servlet.http;version="${imp.pkg.version.javax.servlet}", org.apache.stratos.account.mgt.stub.*; version="${project.version}", @@ -72,9 +72,9 @@ <version>${project.version}</version> </dependency> <dependency> - <groupId>org.apache.stratos</groupId> - <artifactId>org.apache.stratos.tenant.mgt.stub</artifactId> - <version>${project.version}</version> + <groupId>org.wso2.carbon</groupId> + <artifactId>org.wso2.carbon.tenant.mgt.stub</artifactId> + <version>4.2.0</version> </dependency> <dependency> <groupId>org.apache.stratos</groupId> http://git-wip-us.apache.org/repos/asf/stratos/blob/8d473892/components/org.apache.stratos.account.mgt/pom.xml ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.account.mgt/pom.xml b/components/org.apache.stratos.account.mgt/pom.xml index 99f973e..42dad8d 100644 --- a/components/org.apache.stratos.account.mgt/pom.xml +++ b/components/org.apache.stratos.account.mgt/pom.xml @@ -77,9 +77,9 @@ <version>${project.version}</version> </dependency> <dependency> - <groupId>org.apache.stratos</groupId> - <artifactId>org.apache.stratos.tenant.mgt</artifactId> - <version>${project.version}</version> + <groupId>org.wso2.carbon</groupId> + <artifactId>org.wso2.carbon.tenant.mgt</artifactId> + <version>2.2.2</version> </dependency> <dependency> <groupId>org.wso2.carbon</groupId> http://git-wip-us.apache.org/repos/asf/stratos/blob/8d473892/components/org.apache.stratos.account.mgt/src/main/java/org/apache/stratos/account/mgt/services/AccountMgtService.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.account.mgt/src/main/java/org/apache/stratos/account/mgt/services/AccountMgtService.java b/components/org.apache.stratos.account.mgt/src/main/java/org/apache/stratos/account/mgt/services/AccountMgtService.java index 729366f..93e3fd1 100644 --- a/components/org.apache.stratos.account.mgt/src/main/java/org/apache/stratos/account/mgt/services/AccountMgtService.java +++ b/components/org.apache.stratos.account.mgt/src/main/java/org/apache/stratos/account/mgt/services/AccountMgtService.java @@ -28,7 +28,7 @@ import org.apache.stratos.common.beans.TenantInfoBean; import org.apache.stratos.common.constants.StratosConstants; import org.apache.stratos.common.util.ClaimsMgtUtil; import org.apache.stratos.common.util.CommonUtil; -import org.apache.stratos.tenant.mgt.util.TenantMgtUtil; +import org.wso2.carbon.tenant.mgt.util.TenantMgtUtil; import org.wso2.carbon.user.core.UserCoreConstants; import org.wso2.carbon.user.core.UserStoreException; import org.wso2.carbon.user.core.UserStoreManager; http://git-wip-us.apache.org/repos/asf/stratos/blob/8d473892/components/org.apache.stratos.account.mgt/src/main/java/org/apache/stratos/account/mgt/util/Util.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.account.mgt/src/main/java/org/apache/stratos/account/mgt/util/Util.java b/components/org.apache.stratos.account.mgt/src/main/java/org/apache/stratos/account/mgt/util/Util.java index 2df4e16..1233711 100644 --- a/components/org.apache.stratos.account.mgt/src/main/java/org/apache/stratos/account/mgt/util/Util.java +++ b/components/org.apache.stratos.account.mgt/src/main/java/org/apache/stratos/account/mgt/util/Util.java @@ -26,7 +26,7 @@ import org.wso2.carbon.registry.core.service.RegistryService; import org.wso2.carbon.registry.core.session.UserRegistry; import org.apache.stratos.common.beans.TenantInfoBean; import org.apache.stratos.common.constants.StratosConstants; -import org.apache.stratos.common.exception.StratosException; +import org.apache.stratos.common.exception.ApacheStratosException; import org.apache.stratos.common.listeners.TenantMgtListener; import org.wso2.carbon.user.core.service.RealmService; import org.wso2.carbon.user.core.tenant.TenantManager; @@ -143,28 +143,28 @@ public class Util { } public static void alertTenantRenames(int tenantId, String oldName, - String newName) throws StratosException { + String newName) throws ApacheStratosException { for (TenantMgtListener tenantMgtLister : tenantMgtListeners) { tenantMgtLister.onTenantRename(tenantId, oldName, newName); } } - public static void alertTenantDeactivation(int tenantId) throws StratosException { + public static void alertTenantDeactivation(int tenantId) throws ApacheStratosException { for (TenantMgtListener tenantMgtLister : tenantMgtListeners) { tenantMgtLister.onTenantDeactivation(tenantId); } } - public static void alertTenantInitialActivation(int tenantId) throws StratosException { + public static void alertTenantInitialActivation(int tenantId) throws ApacheStratosException { for (TenantMgtListener tenantMgtLister : tenantMgtListeners) { tenantMgtLister.onTenantInitialActivation(tenantId); } } - public static void alertTenantUpdate(TenantInfoBean tenantInfoBean) throws StratosException { + public static void alertTenantUpdate(TenantInfoBean tenantInfoBean) throws ApacheStratosException { for (TenantMgtListener tenantMgtLister : tenantMgtListeners) { tenantMgtLister.onTenantUpdate(tenantInfoBean); http://git-wip-us.apache.org/repos/asf/stratos/blob/8d473892/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/TenantBillingService.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/TenantBillingService.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/TenantBillingService.java index 23cb7ae..d8eca30 100644 --- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/TenantBillingService.java +++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/TenantBillingService.java @@ -18,7 +18,7 @@ */ package org.apache.stratos.common; -import org.apache.stratos.common.exception.StratosException; +import org.apache.stratos.common.exception.ApacheStratosException; import org.wso2.carbon.user.api.Tenant; /** @@ -26,17 +26,17 @@ import org.wso2.carbon.user.api.Tenant; */ public interface TenantBillingService { - public void addUsagePlan(Tenant tenant, String usagePlan) throws StratosException; + public void addUsagePlan(Tenant tenant, String usagePlan) throws ApacheStratosException; - public String getActiveUsagePlan(String tenantDomain) throws StratosException; + public String getActiveUsagePlan(String tenantDomain) throws ApacheStratosException; - public void updateUsagePlan(String tenantDomain, String usagePlan) throws StratosException; + public void updateUsagePlan(String tenantDomain, String usagePlan) throws ApacheStratosException; - public void activateUsagePlan(String tenantDomain) throws StratosException; + public void activateUsagePlan(String tenantDomain) throws ApacheStratosException; - public void deactivateActiveUsagePlan(String tenantDomain) throws StratosException; + public void deactivateActiveUsagePlan(String tenantDomain) throws ApacheStratosException; - public void deleteBillingData(int tenantId) throws StratosException; + public void deleteBillingData(int tenantId) throws ApacheStratosException; } http://git-wip-us.apache.org/repos/asf/stratos/blob/8d473892/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/exception/ApacheStratosException.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/exception/ApacheStratosException.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/exception/ApacheStratosException.java new file mode 100644 index 0000000..8eaaa0f --- /dev/null +++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/exception/ApacheStratosException.java @@ -0,0 +1,42 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.stratos.common.exception; + +/** + * This class is defined as the general Exception implementation for Stratos. This can be used + * within Stratos components when handling exceptions. + */ +public class ApacheStratosException extends Exception{ + + public ApacheStratosException() { + } + + public ApacheStratosException(String message) { + super(message); + } + + public ApacheStratosException(String message, Throwable cause) { + super(message, cause); + } + + public ApacheStratosException(Throwable cause) { + super(cause); + } +} http://git-wip-us.apache.org/repos/asf/stratos/blob/8d473892/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/exception/StratosException.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/exception/StratosException.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/exception/StratosException.java deleted file mode 100644 index 8be9f89..0000000 --- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/exception/StratosException.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.stratos.common.exception; - -/** - * This class is defined as the general Exception implementation for Stratos. This can be used - * within Stratos components when handling exceptions. - */ -public class StratosException extends Exception{ - - public StratosException() { - } - - public StratosException(String message) { - super(message); - } - - public StratosException(String message, Throwable cause) { - super(message, cause); - } - - public StratosException(Throwable cause) { - super(cause); - } -} http://git-wip-us.apache.org/repos/asf/stratos/blob/8d473892/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/listeners/TenantMgtListener.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/listeners/TenantMgtListener.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/listeners/TenantMgtListener.java index 7e60ffc..4b747c8 100644 --- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/listeners/TenantMgtListener.java +++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/listeners/TenantMgtListener.java @@ -20,26 +20,26 @@ package org.apache.stratos.common.listeners; import org.apache.stratos.common.beans.TenantInfoBean; -import org.apache.stratos.common.exception.StratosException; +import org.apache.stratos.common.exception.ApacheStratosException; public interface TenantMgtListener { - public void onTenantCreate(TenantInfoBean tenantInfo) throws StratosException; + public void onTenantCreate(TenantInfoBean tenantInfo) throws ApacheStratosException; - public void onTenantUpdate(TenantInfoBean tenantInfo) throws StratosException; + public void onTenantUpdate(TenantInfoBean tenantInfo) throws ApacheStratosException; public void onTenantDelete(int tenantId); public void onTenantRename(int tenantId, String oldDomainName, - String newDomainName)throws StratosException; + String newDomainName)throws ApacheStratosException; - public void onTenantInitialActivation(int tenantId) throws StratosException; + public void onTenantInitialActivation(int tenantId) throws ApacheStratosException; - public void onTenantActivation(int tenantId) throws StratosException; + public void onTenantActivation(int tenantId) throws ApacheStratosException; - public void onTenantDeactivation(int tenantId) throws StratosException; + public void onTenantDeactivation(int tenantId) throws ApacheStratosException; public void onSubscriptionPlanChange(int tenentId, String oldPlan, - String newPlan) throws StratosException; + String newPlan) throws ApacheStratosException; public int getListenerOrder(); } http://git-wip-us.apache.org/repos/asf/stratos/blob/8d473892/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/packages/PackageInfoHolder.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/packages/PackageInfoHolder.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/packages/PackageInfoHolder.java index 68fc5da..ca1dc4b 100644 --- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/packages/PackageInfoHolder.java +++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/packages/PackageInfoHolder.java @@ -23,7 +23,7 @@ import org.apache.axiom.om.xpath.AXIOMXPath; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.stratos.common.constants.StratosConstants; -import org.apache.stratos.common.exception.StratosException; +import org.apache.stratos.common.exception.ApacheStratosException; import org.apache.stratos.common.util.CommonUtil; import org.jaxen.JaxenException; import org.wso2.carbon.utils.CarbonUtils; @@ -43,7 +43,7 @@ public class PackageInfoHolder { List<PackageInfo> multitenancyPackages = new ArrayList<PackageInfo>(); - public PackageInfoHolder() throws StratosException { + public PackageInfoHolder() throws ApacheStratosException { multitenancyPackages = deserializePackageDescriptionConfig(); } @@ -73,7 +73,7 @@ public class PackageInfoHolder { </package> </packages> */ - private List<PackageInfo> deserializePackageDescriptionConfig() throws StratosException { + private List<PackageInfo> deserializePackageDescriptionConfig() throws ApacheStratosException { String configFilePath = CarbonUtils.getCarbonConfigDirPath() + File.separator + StratosConstants.MULTITENANCY_CONFIG_FOLDER + File.separator + PACKAGE_DESCRIPTION_CONFIG; @@ -84,7 +84,7 @@ public class PackageInfoHolder { } catch (Exception e) { String msg = "Error in deserializing the packageConfigs file: " + configFilePath + "."; log.error(msg, e); - throw new StratosException(msg, e); + throw new ApacheStratosException(msg, e); } @SuppressWarnings("unchecked") @@ -138,7 +138,7 @@ public class PackageInfoHolder { return multitenancyPackages; } - private String getPackageConfigValue(String key, OMElement packageNode) throws StratosException { + private String getPackageConfigValue(String key, OMElement packageNode) throws ApacheStratosException { String qualifiedKey = "ns:" + key.replaceAll("\\.", "/ns:"); AXIOMXPath xpathExpression; try { @@ -158,7 +158,7 @@ public class PackageInfoHolder { } catch (JaxenException e) { String msg = "Error in retrieving the key: " + qualifiedKey + "."; log.error(msg, e); - throw new StratosException(msg, e); + throw new ApacheStratosException(msg, e); } } } http://git-wip-us.apache.org/repos/asf/stratos/blob/8d473892/components/org.apache.stratos.keystore.mgt/src/main/java/org/apache/stratos/keystore/mgt/KeystoreTenantMgtListener.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.keystore.mgt/src/main/java/org/apache/stratos/keystore/mgt/KeystoreTenantMgtListener.java b/components/org.apache.stratos.keystore.mgt/src/main/java/org/apache/stratos/keystore/mgt/KeystoreTenantMgtListener.java index d73215f..c7fb043 100644 --- a/components/org.apache.stratos.keystore.mgt/src/main/java/org/apache/stratos/keystore/mgt/KeystoreTenantMgtListener.java +++ b/components/org.apache.stratos.keystore.mgt/src/main/java/org/apache/stratos/keystore/mgt/KeystoreTenantMgtListener.java @@ -19,7 +19,7 @@ package org.apache.stratos.keystore.mgt; import org.apache.stratos.common.beans.TenantInfoBean; -import org.apache.stratos.common.exception.StratosException; +import org.apache.stratos.common.exception.ApacheStratosException; import org.apache.stratos.common.listeners.TenantMgtListener; import org.apache.commons.logging.Log; @@ -37,7 +37,7 @@ public class KeystoreTenantMgtListener implements TenantMgtListener { * Generate the keystore when a new tenant is registered. * @param tenantInfo Information about the newly created tenant */ - public void onTenantCreate(TenantInfoBean tenantInfo) throws StratosException { + public void onTenantCreate(TenantInfoBean tenantInfo) throws ApacheStratosException { try { KeyStoreGenerator ksGenerator = new KeyStoreGenerator(tenantInfo.getTenantId()); if (!ksGenerator.isKeyStoreExists()){ @@ -46,11 +46,11 @@ public class KeystoreTenantMgtListener implements TenantMgtListener { } catch (KeyStoreMgtException e) { String message = "Error when generating the keystore"; log.error(message, e); - throw new StratosException(message, e); + throw new ApacheStratosException(message, e); } } - public void onTenantUpdate(TenantInfoBean tenantInfo) throws StratosException { + public void onTenantUpdate(TenantInfoBean tenantInfo) throws ApacheStratosException { // It is not required to implement this method for keystore mgt. } @@ -59,7 +59,7 @@ public class KeystoreTenantMgtListener implements TenantMgtListener { } public void onTenantRename(int tenantId, String oldDomainName, - String newDomainName) throws StratosException { + String newDomainName) throws ApacheStratosException { // It is not required to implement this method for keystore mgt. } @@ -67,20 +67,20 @@ public class KeystoreTenantMgtListener implements TenantMgtListener { return EXEC_ORDER; } - public void onTenantInitialActivation(int tenantId) throws StratosException { + public void onTenantInitialActivation(int tenantId) throws ApacheStratosException { // It is not required to implement this method for keystore mgt. } - public void onTenantActivation(int tenantId) throws StratosException { + public void onTenantActivation(int tenantId) throws ApacheStratosException { // It is not required to implement this method for keystore mgt. } - public void onTenantDeactivation(int tenantId) throws StratosException { + public void onTenantDeactivation(int tenantId) throws ApacheStratosException { // It is not required to implement this method for keystore mgt. } public void onSubscriptionPlanChange(int tenentId, String oldPlan, - String newPlan) throws StratosException { + String newPlan) throws ApacheStratosException { // It is not required to implement this method for keystore mgt. } } http://git-wip-us.apache.org/repos/asf/stratos/blob/8d473892/components/org.apache.stratos.manager/pom.xml ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/pom.xml b/components/org.apache.stratos.manager/pom.xml index 9e1386f..d95fbd8 100644 --- a/components/org.apache.stratos.manager/pom.xml +++ b/components/org.apache.stratos.manager/pom.xml @@ -115,9 +115,9 @@ <version>${project.version}</version> </dependency> <dependency> - <groupId>org.apache.stratos</groupId> - <artifactId>org.apache.stratos.tenant.mgt</artifactId> - <version>${project.version}</version> + <groupId>org.wso2.carbon</groupId> + <artifactId>org.wso2.carbon.tenant.mgt</artifactId> + <version>2.2.2</version> <scope>provided</scope> </dependency> http://git-wip-us.apache.org/repos/asf/stratos/blob/8d473892/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/listener/TenantUserRoleCreator.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/listener/TenantUserRoleCreator.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/listener/TenantUserRoleCreator.java index 7bf2f8e..7a574bb 100644 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/listener/TenantUserRoleCreator.java +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/listener/TenantUserRoleCreator.java @@ -22,7 +22,7 @@ package org.apache.stratos.manager.listener; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.stratos.common.beans.TenantInfoBean; -import org.apache.stratos.common.exception.StratosException; +import org.apache.stratos.common.exception.ApacheStratosException; import org.apache.stratos.common.listeners.TenantMgtListener; import org.apache.stratos.manager.internal.DataHolder; import org.apache.stratos.manager.user.mgt.exception.UserManagerException; @@ -42,10 +42,10 @@ public class TenantUserRoleCreator implements TenantMgtListener { /** * Create an 'user' role at tenant creation time * @param tenantInfo TenantInfoBean - * @throws StratosException + * @throws org.apache.stratos.common.exception.ApacheStratosException */ @Override - public void onTenantCreate(TenantInfoBean tenantInfo) throws StratosException { + public void onTenantCreate(TenantInfoBean tenantInfo) throws ApacheStratosException { try { @@ -63,11 +63,11 @@ public class TenantUserRoleCreator implements TenantMgtListener { } catch (UserStoreException e) { String msg = "Error while retrieving the user store for tenant: "+ tenantInfo.getTenantDomain(); log.error(msg, e); - throw new StratosException(e.getMessage(), e); + throw new ApacheStratosException(e.getMessage(), e); } catch (UserManagerException e) { String msg = "Error while creating the user role in tenant: "+ tenantInfo.getTenantDomain(); log.error(msg, e); - throw new StratosException(e.getMessage(), e); + throw new ApacheStratosException(e.getMessage(), e); } finally { PrivilegedCarbonContext.endTenantFlow(); } @@ -76,7 +76,7 @@ public class TenantUserRoleCreator implements TenantMgtListener { @Override - public void onTenantUpdate(TenantInfoBean tenantInfo) throws StratosException { + public void onTenantUpdate(TenantInfoBean tenantInfo) throws ApacheStratosException { } @@ -87,28 +87,28 @@ public class TenantUserRoleCreator implements TenantMgtListener { @Override public void onTenantRename(int tenantId, String oldDomainName, String newDomainName) - throws StratosException { + throws ApacheStratosException { } @Override - public void onTenantInitialActivation(int tenantId) throws StratosException { + public void onTenantInitialActivation(int tenantId) throws ApacheStratosException { } @Override - public void onTenantActivation(int tenantId) throws StratosException { + public void onTenantActivation(int tenantId) throws ApacheStratosException { } @Override - public void onTenantDeactivation(int tenantId) throws StratosException { + public void onTenantDeactivation(int tenantId) throws ApacheStratosException { } @Override public void onSubscriptionPlanChange(int tenentId, String oldPlan, String newPlan) - throws StratosException { + throws ApacheStratosException { } http://git-wip-us.apache.org/repos/asf/stratos/blob/8d473892/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/publisher/TenantEventPublisher.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/publisher/TenantEventPublisher.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/publisher/TenantEventPublisher.java index 0f7816e..ebe5525 100644 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/publisher/TenantEventPublisher.java +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/publisher/TenantEventPublisher.java @@ -22,7 +22,7 @@ package org.apache.stratos.manager.publisher; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.stratos.common.beans.TenantInfoBean; -import org.apache.stratos.common.exception.StratosException; +import org.apache.stratos.common.exception.ApacheStratosException; import org.apache.stratos.common.listeners.TenantMgtListener; import org.apache.stratos.messaging.broker.publish.EventPublisher; import org.apache.stratos.messaging.broker.publish.EventPublisherPool; @@ -42,7 +42,7 @@ public class TenantEventPublisher implements TenantMgtListener { private static final int EXEC_ORDER = 1; @Override - public void onTenantCreate(TenantInfoBean tenantInfo) throws StratosException { + public void onTenantCreate(TenantInfoBean tenantInfo) throws ApacheStratosException { try { if (log.isDebugEnabled()) { log.debug(String.format("Publishing tenant created event: [tenant-id] %d [tenant-domain] %s", @@ -59,7 +59,7 @@ public class TenantEventPublisher implements TenantMgtListener { } @Override - public void onTenantUpdate(TenantInfoBean tenantInfo) throws StratosException { + public void onTenantUpdate(TenantInfoBean tenantInfo) throws ApacheStratosException { try { if (log.isInfoEnabled()) { log.info(String.format("Publishing tenant updated event: [tenant-id] %d [tenant-domain] %s", @@ -93,24 +93,24 @@ public class TenantEventPublisher implements TenantMgtListener { @Override public void onTenantRename(int tenantId, String oldDomainName, String newDomainName) - throws StratosException { + throws ApacheStratosException { } @Override - public void onTenantInitialActivation(int tenantId) throws StratosException { + public void onTenantInitialActivation(int tenantId) throws ApacheStratosException { } @Override - public void onTenantActivation(int tenantId) throws StratosException { + public void onTenantActivation(int tenantId) throws ApacheStratosException { } @Override - public void onTenantDeactivation(int tenantId) throws StratosException { + public void onTenantDeactivation(int tenantId) throws ApacheStratosException { } @Override public void onSubscriptionPlanChange(int tenantId, String oldPlan, String newPlan) - throws StratosException { + throws ApacheStratosException { } @Override http://git-wip-us.apache.org/repos/asf/stratos/blob/8d473892/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/publisher/TenantSynzhronizerTask.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/publisher/TenantSynzhronizerTask.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/publisher/TenantSynzhronizerTask.java index 78f587c..ff86d83 100644 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/publisher/TenantSynzhronizerTask.java +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/publisher/TenantSynzhronizerTask.java @@ -27,7 +27,7 @@ import java.util.Map; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.stratos.common.beans.TenantInfoBean; +import org.wso2.carbon.stratos.common.beans.TenantInfoBean; import org.apache.stratos.manager.internal.DataHolder; import org.apache.stratos.manager.retriever.DataInsertionAndRetrievalManager; import org.apache.stratos.manager.subscription.CartridgeSubscription; @@ -38,7 +38,7 @@ import org.apache.stratos.messaging.domain.tenant.Subscription; import org.apache.stratos.messaging.domain.tenant.Tenant; import org.apache.stratos.messaging.event.tenant.CompleteTenantEvent; import org.apache.stratos.messaging.util.Util; -import org.apache.stratos.tenant.mgt.util.TenantMgtUtil; +import org.wso2.carbon.tenant.mgt.util.TenantMgtUtil; import org.wso2.carbon.ntask.core.Task; import org.wso2.carbon.user.core.tenant.TenantManager; http://git-wip-us.apache.org/repos/asf/stratos/blob/8d473892/components/org.apache.stratos.metadataservice/pom.xml ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.metadataservice/pom.xml b/components/org.apache.stratos.metadataservice/pom.xml index 93b12e9..37eb828 100644 --- a/components/org.apache.stratos.metadataservice/pom.xml +++ b/components/org.apache.stratos.metadataservice/pom.xml @@ -109,9 +109,9 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>org.apache.stratos</groupId> - <artifactId>org.apache.stratos.tenant.mgt</artifactId> - <version>${project.version}</version> + <groupId>org.wso2.carbon</groupId> + <artifactId>org.wso2.carbon.tenant.mgt</artifactId> + <version>2.2.2</version> <scope>provided</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/stratos/blob/8d473892/components/org.apache.stratos.metadataservice/src/main/java/org/apache/stratos/metadataservice/ServiceHolder.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.metadataservice/src/main/java/org/apache/stratos/metadataservice/ServiceHolder.java b/components/org.apache.stratos.metadataservice/src/main/java/org/apache/stratos/metadataservice/ServiceHolder.java index 9b43ca4..f925924 100644 --- a/components/org.apache.stratos.metadataservice/src/main/java/org/apache/stratos/metadataservice/ServiceHolder.java +++ b/components/org.apache.stratos.metadataservice/src/main/java/org/apache/stratos/metadataservice/ServiceHolder.java @@ -21,7 +21,7 @@ package org.apache.stratos.metadataservice; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.stratos.common.TenantBillingService; -import org.apache.stratos.tenant.mgt.core.TenantPersistor; +import org.wso2.carbon.tenant.mgt.core.TenantPersistor; import org.wso2.carbon.context.PrivilegedCarbonContext; import org.wso2.carbon.registry.core.service.RegistryService; import org.wso2.carbon.user.core.service.RealmService; http://git-wip-us.apache.org/repos/asf/stratos/blob/8d473892/components/org.apache.stratos.rest.endpoint/pom.xml ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/pom.xml b/components/org.apache.stratos.rest.endpoint/pom.xml index dc62e2b..ca110ff 100644 --- a/components/org.apache.stratos.rest.endpoint/pom.xml +++ b/components/org.apache.stratos.rest.endpoint/pom.xml @@ -105,9 +105,9 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>org.apache.stratos</groupId> - <artifactId>org.apache.stratos.tenant.mgt</artifactId> - <version>${project.version}</version> + <groupId>org.wso2.carbon</groupId> + <artifactId>org.wso2.carbon.tenant.mgt</artifactId> + <version>2.2.2</version> <scope>provided</scope> </dependency> <dependency> @@ -117,6 +117,12 @@ <scope>provided</scope> </dependency> <dependency> + <groupId>org.wso2.carbon</groupId> + <artifactId>org.wso2.carbon.stratos.common</artifactId> + <version>2.2.0</version> + <scope>provided</scope> + </dependency> + <dependency> <groupId>org.apache.stratos</groupId> <artifactId>org.apache.stratos.manager</artifactId> <version>${project.version}</version> http://git-wip-us.apache.org/repos/asf/stratos/blob/8d473892/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/ServiceHolder.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/ServiceHolder.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/ServiceHolder.java index cc1b885..450ec4a 100644 --- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/ServiceHolder.java +++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/ServiceHolder.java @@ -26,7 +26,7 @@ import org.wso2.carbon.registry.core.service.RegistryService; import org.wso2.carbon.user.core.service.RealmService; import org.wso2.carbon.user.core.tenant.TenantManager; import org.wso2.carbon.utils.ConfigurationContextService; -import org.apache.stratos.tenant.mgt.core.TenantPersistor; +import org.wso2.carbon.tenant.mgt.core.TenantPersistor; /** * Some of the admin services needs objects with states inside the runtime. There are http://git-wip-us.apache.org/repos/asf/stratos/blob/8d473892/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV40.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV40.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV40.java index 674fa28..2f2aa9f 100644 --- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV40.java +++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV40.java @@ -21,8 +21,8 @@ package org.apache.stratos.rest.endpoint.api; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.stratos.common.beans.TenantInfoBean; -import org.apache.stratos.common.exception.StratosException; +import org.wso2.carbon.stratos.common.beans.TenantInfoBean; +import org.apache.stratos.common.exception.ApacheStratosException; import org.apache.stratos.common.util.ClaimsMgtUtil; import org.apache.stratos.common.util.CommonUtil; import org.apache.stratos.manager.dto.Cartridge; @@ -44,8 +44,8 @@ import org.apache.stratos.rest.endpoint.bean.repositoryNotificationInfoBean.Payl import org.apache.stratos.rest.endpoint.bean.subscription.domain.SubscriptionDomainBean; import org.apache.stratos.rest.endpoint.bean.topology.Cluster; import org.apache.stratos.rest.endpoint.exception.RestAPIException; -import org.apache.stratos.tenant.mgt.core.TenantPersistor; -import org.apache.stratos.tenant.mgt.util.TenantMgtUtil; +import org.wso2.carbon.tenant.mgt.core.TenantPersistor; +import org.wso2.carbon.tenant.mgt.util.TenantMgtUtil; import org.wso2.carbon.context.PrivilegedCarbonContext; import org.wso2.carbon.context.RegistryType; import org.wso2.carbon.registry.core.exceptions.RegistryException; @@ -56,6 +56,7 @@ import org.wso2.carbon.user.core.UserStoreException; import org.wso2.carbon.user.core.tenant.Tenant; import org.wso2.carbon.user.core.tenant.TenantManager; import org.wso2.carbon.utils.multitenancy.MultitenantConstants; +import org.wso2.carbon.stratos.common.exception.StratosException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; http://git-wip-us.apache.org/repos/asf/stratos/blob/8d473892/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java index 39244f6..e2dcbff 100644 --- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java +++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java @@ -21,8 +21,8 @@ package org.apache.stratos.rest.endpoint.api; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.stratos.common.beans.TenantInfoBean; -import org.apache.stratos.common.exception.StratosException; +import org.wso2.carbon.stratos.common.beans.TenantInfoBean; +import org.apache.stratos.common.exception.ApacheStratosException; import org.apache.stratos.common.util.ClaimsMgtUtil; import org.apache.stratos.common.util.CommonUtil; import org.apache.stratos.manager.composite.application.beans.ApplicationDefinition; @@ -53,8 +53,8 @@ import org.apache.stratos.rest.endpoint.bean.subscription.domain.SubscriptionDom import org.apache.stratos.rest.endpoint.bean.topology.Cluster; import org.apache.stratos.rest.endpoint.exception.RestAPIException; import org.apache.stratos.rest.endpoint.exception.TenantNotFoundException; -import org.apache.stratos.tenant.mgt.core.TenantPersistor; -import org.apache.stratos.tenant.mgt.util.TenantMgtUtil; +import org.wso2.carbon.tenant.mgt.core.TenantPersistor; +import org.wso2.carbon.tenant.mgt.util.TenantMgtUtil; import org.wso2.carbon.context.CarbonContext; import org.wso2.carbon.context.PrivilegedCarbonContext; import org.wso2.carbon.context.RegistryType; @@ -66,6 +66,7 @@ import org.wso2.carbon.user.api.UserStoreManager; import org.wso2.carbon.user.core.tenant.Tenant; import org.wso2.carbon.user.core.tenant.TenantManager; import org.wso2.carbon.utils.multitenancy.MultitenantConstants; +import org.wso2.carbon.stratos.common.exception.StratosException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; http://git-wip-us.apache.org/repos/asf/stratos/blob/8d473892/components/org.apache.stratos.tenant.mgt.email.sender/src/main/java/org/apache/stratos/tenant/mgt/email/sender/listener/EmailSenderListener.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.tenant.mgt.email.sender/src/main/java/org/apache/stratos/tenant/mgt/email/sender/listener/EmailSenderListener.java b/components/org.apache.stratos.tenant.mgt.email.sender/src/main/java/org/apache/stratos/tenant/mgt/email/sender/listener/EmailSenderListener.java index 6025202..9e40792 100644 --- a/components/org.apache.stratos.tenant.mgt.email.sender/src/main/java/org/apache/stratos/tenant/mgt/email/sender/listener/EmailSenderListener.java +++ b/components/org.apache.stratos.tenant.mgt.email.sender/src/main/java/org/apache/stratos/tenant/mgt/email/sender/listener/EmailSenderListener.java @@ -19,7 +19,7 @@ package org.apache.stratos.tenant.mgt.email.sender.listener; import org.apache.stratos.common.beans.TenantInfoBean; -import org.apache.stratos.common.exception.StratosException; +import org.apache.stratos.common.exception.ApacheStratosException; import org.apache.stratos.common.listeners.TenantMgtListener; import org.apache.stratos.tenant.mgt.email.sender.util.TenantMgtEmailSenderUtil; @@ -31,14 +31,14 @@ public class EmailSenderListener implements TenantMgtListener { private static final int EXEC_ORDER = 20; private static final Log log = LogFactory.getLog(EmailSenderListener.class); - public void onTenantCreate(TenantInfoBean tenantInfoBean) throws StratosException { + public void onTenantCreate(TenantInfoBean tenantInfoBean) throws ApacheStratosException { try { TenantMgtEmailSenderUtil.sendTenantCreationVerification(tenantInfoBean); } catch (Exception e) { String message = "Error sending tenant creation Mail to tenant domain " + tenantInfoBean.getTenantDomain(); log.error(message, e); - throw new StratosException(message, e); + throw new ApacheStratosException(message, e); } TenantMgtEmailSenderUtil.notifyTenantCreationToSuperAdmin(tenantInfoBean); } @@ -48,12 +48,12 @@ public class EmailSenderListener implements TenantMgtListener { } public void onTenantRename(int tenantId, String oldDomainName, - String newDomainName) throws StratosException { + String newDomainName) throws ApacheStratosException { // Do nothing. } - public void onTenantUpdate(TenantInfoBean tenantInfoBean) throws StratosException { + public void onTenantUpdate(TenantInfoBean tenantInfoBean) throws ApacheStratosException { if ((tenantInfoBean.getAdminPassword() != null) && (!tenantInfoBean.getAdminPassword().equals(""))) { try { @@ -62,7 +62,7 @@ public class EmailSenderListener implements TenantMgtListener { String message = "Error sending tenant update Mail to tenant domain " + tenantInfoBean.getTenantDomain(); log.error(message, e); - throw new StratosException(message, e); + throw new ApacheStratosException(message, e); } } } @@ -71,21 +71,21 @@ public class EmailSenderListener implements TenantMgtListener { // Do nothing } - public void onTenantInitialActivation(int tenantId) throws StratosException { + public void onTenantInitialActivation(int tenantId) throws ApacheStratosException { // send the notification message to the tenant admin TenantMgtEmailSenderUtil.notifyTenantInitialActivation(tenantId); } - public void onTenantActivation(int tenantId) throws StratosException { + public void onTenantActivation(int tenantId) throws ApacheStratosException { // Do nothing } - public void onTenantDeactivation(int tenantId) throws StratosException { + public void onTenantDeactivation(int tenantId) throws ApacheStratosException { // Do nothing } public void onSubscriptionPlanChange(int tenentId, String oldPlan, - String newPlan) throws StratosException { + String newPlan) throws ApacheStratosException { // Do nothing } http://git-wip-us.apache.org/repos/asf/stratos/blob/8d473892/components/org.apache.stratos.tenant.mgt/src/main/java/org/apache/stratos/tenant/mgt/services/GAppTenantRegistrationService.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.tenant.mgt/src/main/java/org/apache/stratos/tenant/mgt/services/GAppTenantRegistrationService.java b/components/org.apache.stratos.tenant.mgt/src/main/java/org/apache/stratos/tenant/mgt/services/GAppTenantRegistrationService.java index 7fd5f81..4555a89 100644 --- a/components/org.apache.stratos.tenant.mgt/src/main/java/org/apache/stratos/tenant/mgt/services/GAppTenantRegistrationService.java +++ b/components/org.apache.stratos.tenant.mgt/src/main/java/org/apache/stratos/tenant/mgt/services/GAppTenantRegistrationService.java @@ -25,7 +25,7 @@ import org.apache.stratos.tenant.mgt.exception.TenantManagementException; import org.apache.stratos.tenant.mgt.internal.TenantMgtServiceComponent; import org.apache.stratos.tenant.mgt.util.TenantMgtUtil; import org.apache.stratos.common.beans.TenantInfoBean; -import org.apache.stratos.common.exception.StratosException; +import org.apache.stratos.common.exception.ApacheStratosException; import org.wso2.carbon.user.api.RealmConfiguration; import org.wso2.carbon.user.api.TenantMgtConfiguration; import org.wso2.carbon.user.api.UserStoreException; @@ -108,7 +108,7 @@ public class GAppTenantRegistrationService { // Notify tenant addition try { TenantMgtUtil.triggerAddTenant(tenantInfoBean); - } catch (StratosException e) { + } catch (ApacheStratosException e) { String msg = "Error in notifying tenant addition."; log.error(msg, e); throw new Exception(msg, e); http://git-wip-us.apache.org/repos/asf/stratos/blob/8d473892/components/org.apache.stratos.tenant.mgt/src/main/java/org/apache/stratos/tenant/mgt/services/TenantMgtAdminService.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.tenant.mgt/src/main/java/org/apache/stratos/tenant/mgt/services/TenantMgtAdminService.java b/components/org.apache.stratos.tenant.mgt/src/main/java/org/apache/stratos/tenant/mgt/services/TenantMgtAdminService.java index 730796c..0b3290a 100644 --- a/components/org.apache.stratos.tenant.mgt/src/main/java/org/apache/stratos/tenant/mgt/services/TenantMgtAdminService.java +++ b/components/org.apache.stratos.tenant.mgt/src/main/java/org/apache/stratos/tenant/mgt/services/TenantMgtAdminService.java @@ -21,7 +21,7 @@ package org.apache.stratos.tenant.mgt.services; import org.wso2.carbon.core.AbstractAdmin; import org.wso2.carbon.registry.core.session.UserRegistry; import org.apache.stratos.common.beans.TenantInfoBean; -import org.apache.stratos.common.exception.StratosException; +import org.apache.stratos.common.exception.ApacheStratosException; import org.apache.stratos.common.util.ClaimsMgtUtil; import org.apache.stratos.common.util.CommonUtil; import org.apache.stratos.tenant.mgt.beans.PaginatedTenantInfoBean; @@ -41,9 +41,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import java.util.ArrayList; -import java.util.HashMap; import java.util.List; -import java.util.Map; /** * This is the admin Web service which is used for managing tenants @@ -106,7 +104,7 @@ public class TenantMgtAdminService extends AbstractAdmin { //Notify tenant addition try { TenantMgtUtil.triggerAddTenant(tenantInfoBean); - } catch (StratosException e) { + } catch (ApacheStratosException e) { String msg = "Error in notifying tenant addition."; log.error(msg, e); throw new Exception(msg, e); @@ -439,7 +437,7 @@ public class TenantMgtAdminService extends AbstractAdmin { //Notify tenant update to all listeners try { TenantMgtUtil.triggerUpdateTenant(tenantInfoBean); - } catch (StratosException e) { + } catch (ApacheStratosException e) { String msg = "Error in notifying tenant update."; log.error(msg, e); throw new Exception(msg, e); @@ -481,7 +479,7 @@ public class TenantMgtAdminService extends AbstractAdmin { //Notify tenant activation all listeners try { TenantMgtUtil.triggerTenantActivation(tenantId); - } catch (StratosException e) { + } catch (ApacheStratosException e) { String msg = "Error in notifying tenant activate."; log.error(msg, e); throw new Exception(msg, e); @@ -513,7 +511,7 @@ public class TenantMgtAdminService extends AbstractAdmin { //Notify tenant deactivation all listeners try { TenantMgtUtil.triggerTenantDeactivation(tenantId); - } catch (StratosException e) { + } catch (ApacheStratosException e) { String msg = "Error in notifying tenant deactivate."; log.error(msg, e); throw new Exception(msg, e); @@ -545,7 +543,7 @@ public class TenantMgtAdminService extends AbstractAdmin { //Notify tenant delete to all listeners try { TenantMgtUtil.triggerDeleteTenant(tenantId); - } catch (StratosException e) { + } catch (ApacheStratosException e) { String msg = "Error in notifying tenant delete"; log.error(msg, e); throw new Exception(msg, e); http://git-wip-us.apache.org/repos/asf/stratos/blob/8d473892/components/org.apache.stratos.tenant.mgt/src/main/java/org/apache/stratos/tenant/mgt/services/TenantSelfRegistrationService.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.tenant.mgt/src/main/java/org/apache/stratos/tenant/mgt/services/TenantSelfRegistrationService.java b/components/org.apache.stratos.tenant.mgt/src/main/java/org/apache/stratos/tenant/mgt/services/TenantSelfRegistrationService.java index 5b791db..46d1233 100644 --- a/components/org.apache.stratos.tenant.mgt/src/main/java/org/apache/stratos/tenant/mgt/services/TenantSelfRegistrationService.java +++ b/components/org.apache.stratos.tenant.mgt/src/main/java/org/apache/stratos/tenant/mgt/services/TenantSelfRegistrationService.java @@ -22,7 +22,7 @@ import org.wso2.carbon.captcha.mgt.beans.CaptchaInfoBean; import org.wso2.carbon.captcha.mgt.constants.CaptchaMgtConstants; import org.wso2.carbon.captcha.mgt.util.CaptchaUtil; import org.apache.stratos.common.beans.TenantInfoBean; -import org.apache.stratos.common.exception.StratosException; +import org.apache.stratos.common.exception.ApacheStratosException; import org.apache.stratos.common.util.CommonUtil; import org.apache.stratos.tenant.mgt.internal.TenantMgtServiceComponent; import org.apache.stratos.tenant.mgt.util.TenantMgtUtil; @@ -110,7 +110,7 @@ public class TenantSelfRegistrationService { //Notify tenant addition try { TenantMgtUtil.triggerAddTenant(tenantInfoBean); - } catch (StratosException e) { + } catch (ApacheStratosException e) { String msg = "Error in notifying tenant addition."; log.error(msg, e); throw new Exception(msg, e); http://git-wip-us.apache.org/repos/asf/stratos/blob/8d473892/components/org.apache.stratos.tenant.mgt/src/main/java/org/apache/stratos/tenant/mgt/util/TenantMgtUtil.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.tenant.mgt/src/main/java/org/apache/stratos/tenant/mgt/util/TenantMgtUtil.java b/components/org.apache.stratos.tenant.mgt/src/main/java/org/apache/stratos/tenant/mgt/util/TenantMgtUtil.java index ddca5a1..46d236a 100644 --- a/components/org.apache.stratos.tenant.mgt/src/main/java/org/apache/stratos/tenant/mgt/util/TenantMgtUtil.java +++ b/components/org.apache.stratos.tenant.mgt/src/main/java/org/apache/stratos/tenant/mgt/util/TenantMgtUtil.java @@ -30,7 +30,7 @@ import org.wso2.carbon.registry.core.session.UserRegistry; import org.wso2.carbon.registry.core.utils.UUIDGenerator; import org.apache.stratos.common.beans.TenantInfoBean; import org.apache.stratos.common.constants.StratosConstants; -import org.apache.stratos.common.exception.StratosException; +import org.apache.stratos.common.exception.ApacheStratosException; import org.apache.stratos.common.listeners.TenantMgtListener; import org.apache.stratos.common.util.ClaimsMgtUtil; import org.apache.stratos.common.util.CommonUtil; @@ -88,9 +88,9 @@ public class TenantMgtUtil { * Triggers adding the tenant for TenantMgtListener * * @param tenantInfo tenant - * @throws StratosException, trigger failed + * @throws org.apache.stratos.common.exception.ApacheStratosException, trigger failed */ - public static void triggerAddTenant(TenantInfoBean tenantInfo) throws StratosException { + public static void triggerAddTenant(TenantInfoBean tenantInfo) throws ApacheStratosException { // initializeRegistry(tenantInfoBean.getTenantId()); for (TenantMgtListener tenantMgtListener : TenantMgtServiceComponent.getTenantMgtListeners()) { @@ -102,17 +102,17 @@ public class TenantMgtUtil { * Triggers an update for the tenant for TenantMgtListener * * @param tenantInfoBean tenantInfoBean - * @throws org.apache.stratos.common.exception.StratosException, if update failed + * @throws org.apache.stratos.common.exception.ApacheStratosException, if update failed */ public static void triggerUpdateTenant( - TenantInfoBean tenantInfoBean) throws StratosException { + TenantInfoBean tenantInfoBean) throws ApacheStratosException { for (TenantMgtListener tenantMgtListener : TenantMgtServiceComponent.getTenantMgtListeners()) { tenantMgtListener.onTenantUpdate(tenantInfoBean); } } - public static void triggerDeleteTenant(int tenantId) throws StratosException { + public static void triggerDeleteTenant(int tenantId) throws ApacheStratosException { for (TenantMgtListener tenantMgtListener : TenantMgtServiceComponent.getTenantMgtListeners()) { tenantMgtListener.onTenantDelete(tenantId); @@ -120,21 +120,21 @@ public class TenantMgtUtil { } public static void triggerTenantInitialActivation( - TenantInfoBean tenantInfoBean) throws StratosException { + TenantInfoBean tenantInfoBean) throws ApacheStratosException { for (TenantMgtListener tenantMgtListener : TenantMgtServiceComponent.getTenantMgtListeners()) { tenantMgtListener.onTenantInitialActivation(tenantInfoBean.getTenantId()); } } - public static void triggerTenantActivation(int tenantId) throws StratosException { + public static void triggerTenantActivation(int tenantId) throws ApacheStratosException { for (TenantMgtListener tenantMgtListener : TenantMgtServiceComponent.getTenantMgtListeners()) { tenantMgtListener.onTenantActivation(tenantId); } } - public static void triggerTenantDeactivation(int tenantId) throws StratosException { + public static void triggerTenantDeactivation(int tenantId) throws ApacheStratosException { for (TenantMgtListener tenantMgtListener : TenantMgtServiceComponent.getTenantMgtListeners()) { tenantMgtListener.onTenantDeactivation(tenantId); @@ -360,7 +360,7 @@ public class TenantMgtUtil { //Notify tenant activation try { TenantMgtUtil.triggerTenantInitialActivation(tenantInfoBean); - } catch (StratosException e) { + } catch (ApacheStratosException e) { String msg = "Error in notifying tenant initial activation."; log.error(msg, e); throw new Exception(msg, e); http://git-wip-us.apache.org/repos/asf/stratos/blob/8d473892/components/org.apache.stratos.theme.mgt/src/main/java/org/apache/stratos/theme/mgt/util/ThemeLoadingListener.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.theme.mgt/src/main/java/org/apache/stratos/theme/mgt/util/ThemeLoadingListener.java b/components/org.apache.stratos.theme.mgt/src/main/java/org/apache/stratos/theme/mgt/util/ThemeLoadingListener.java index 6013a55..f6f6deb 100644 --- a/components/org.apache.stratos.theme.mgt/src/main/java/org/apache/stratos/theme/mgt/util/ThemeLoadingListener.java +++ b/components/org.apache.stratos.theme.mgt/src/main/java/org/apache/stratos/theme/mgt/util/ThemeLoadingListener.java @@ -21,7 +21,7 @@ package org.apache.stratos.theme.mgt.util; import org.wso2.carbon.registry.core.exceptions.RegistryException; import org.apache.stratos.common.beans.TenantInfoBean; -import org.apache.stratos.common.exception.StratosException; +import org.apache.stratos.common.exception.ApacheStratosException; import org.apache.stratos.common.listeners.TenantMgtListener; import org.apache.commons.logging.Log; @@ -30,18 +30,18 @@ import org.apache.commons.logging.LogFactory; public class ThemeLoadingListener implements TenantMgtListener { private static final Log log = LogFactory.getLog(ThemeLoadingListener.class); private static final int EXEC_ORDER = 10; - public void onTenantCreate(TenantInfoBean tenantInfo) throws StratosException { + public void onTenantCreate(TenantInfoBean tenantInfo) throws ApacheStratosException { try { ThemeUtil.loadTheme(tenantInfo.getTenantId()); } catch (RegistryException e) { String msg = "Error in loading the theme for the tenant: " + tenantInfo.getTenantDomain() + "."; log.error(msg, e); - throw new StratosException(msg, e); + throw new ApacheStratosException(msg, e); } } - public void onTenantUpdate(TenantInfoBean tenantInfo) throws StratosException { + public void onTenantUpdate(TenantInfoBean tenantInfo) throws ApacheStratosException { // do nothing } @@ -50,7 +50,7 @@ public class ThemeLoadingListener implements TenantMgtListener { } public void onTenantRename(int tenantId, String oldDomainName, - String newDomainName) throws StratosException { + String newDomainName) throws ApacheStratosException { // do nothing } @@ -58,22 +58,22 @@ public class ThemeLoadingListener implements TenantMgtListener { return EXEC_ORDER; } - public void onTenantInitialActivation(int tenantId) throws StratosException { + public void onTenantInitialActivation(int tenantId) throws ApacheStratosException { // do nothing } - public void onTenantActivation(int tenantId) throws StratosException { + public void onTenantActivation(int tenantId) throws ApacheStratosException { // do nothing } - public void onTenantDeactivation(int tenantId) throws StratosException { + public void onTenantDeactivation(int tenantId) throws ApacheStratosException { // do nothing } public void onSubscriptionPlanChange(int tenentId, String oldPlan, - String newPlan) throws StratosException { + String newPlan) throws ApacheStratosException { // do nothing } } http://git-wip-us.apache.org/repos/asf/stratos/blob/8d473892/components/pom.xml ---------------------------------------------------------------------- diff --git a/components/pom.xml b/components/pom.xml index 997588a..d2afb7f 100644 --- a/components/pom.xml +++ b/components/pom.xml @@ -59,10 +59,12 @@ <module>org.apache.stratos.load.balancer.extension.api</module> <!-- Tenant Mgt --> <module>org.apache.stratos.register.ui</module> +<!-- <module>org.apache.stratos.tenant.mgt.core</module> <module>org.apache.stratos.tenant.mgt</module> <module>org.apache.stratos.tenant.mgt.ui</module> <module>org.apache.stratos.tenant.mgt.email.sender</module> +--> <!-- Tenant Activity --> <module>org.apache.stratos.tenant.activity</module> <module>org.apache.stratos.tenant.activity.ui</module> http://git-wip-us.apache.org/repos/asf/stratos/blob/8d473892/features/manager/common/org.apache.stratos.common.server.feature/pom.xml ---------------------------------------------------------------------- diff --git a/features/manager/common/org.apache.stratos.common.server.feature/pom.xml b/features/manager/common/org.apache.stratos.common.server.feature/pom.xml index 032e8f3..de40653 100644 --- a/features/manager/common/org.apache.stratos.common.server.feature/pom.xml +++ b/features/manager/common/org.apache.stratos.common.server.feature/pom.xml @@ -109,11 +109,6 @@ </dependency> - <dependency> - <groupId>org.apache.stratos</groupId> - <artifactId>org.apache.stratos.tenant.mgt</artifactId> - <version>${project.version}</version> - </dependency> <dependency> <groupId>kaptcha.wso2</groupId> @@ -126,11 +121,6 @@ <version>${project.version}</version> </dependency> <dependency> - <groupId>org.apache.stratos</groupId> - <artifactId>org.apache.stratos.tenant.mgt.core</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> <groupId>org.wso2.carbon</groupId> <artifactId>org.wso2.carbon.captcha.mgt</artifactId> <version>${wso2carbon.version}</version> @@ -214,10 +204,8 @@ <!-- Tenant Mgmt --> <bundleDef>org.json.wso2:json</bundleDef> - <bundleDef>org.apache.stratos:org.apache.stratos.tenant.mgt:${project.version}</bundleDef> <bundleDef>kaptcha.wso2:kaptcha</bundleDef> <bundleDef>org.apache.stratos:org.apache.stratos.keystore.mgt</bundleDef> - <bundleDef>org.apache.stratos:org.apache.stratos.tenant.mgt.core:${project.version}</bundleDef> <bundleDef>org.wso2.carbon:org.wso2.carbon.captcha.mgt</bundleDef> <bundleDef>org.apache.stratos:org.apache.stratos.theme.mgt:${project.version}</bundleDef> <!-- End Tenant Mgmt --> http://git-wip-us.apache.org/repos/asf/stratos/blob/8d473892/features/manager/common/org.apache.stratos.common.ui.feature/pom.xml ---------------------------------------------------------------------- diff --git a/features/manager/common/org.apache.stratos.common.ui.feature/pom.xml b/features/manager/common/org.apache.stratos.common.ui.feature/pom.xml index 4d1b2f6..8a4793e 100644 --- a/features/manager/common/org.apache.stratos.common.ui.feature/pom.xml +++ b/features/manager/common/org.apache.stratos.common.ui.feature/pom.xml @@ -48,15 +48,15 @@ <artifactId>org.wso2.carbon.google.analytics.ui</artifactId> </dependency> <dependency> - <groupId>org.apache.stratos</groupId> - <artifactId>org.apache.stratos.tenant.mgt.stub</artifactId> - <version>${project.version}</version> + <groupId>org.wso2.carbon</groupId> + <artifactId>org.wso2.carbon.tenant.mgt.stub</artifactId> + <version>4.2.0</version> </dependency> <!-- Tenant Mgmt --> <dependency> - <groupId>org.apache.stratos</groupId> - <artifactId>org.apache.stratos.tenant.mgt.ui</artifactId> - <version>${project.version}</version> + <groupId>org.wso2.carbon</groupId> + <artifactId>org.wso2.carbon.tenant.mgt.ui</artifactId> + <version>2.2.0</version> </dependency> <dependency> <groupId>org.apache.stratos</groupId> @@ -104,9 +104,9 @@ <bundleDef>org.wso2.carbon:org.wso2.carbon.google.analytics.ui</bundleDef> <!-- Tenant Mgmt--> - <bundleDef>org.apache.stratos:org.apache.stratos.tenant.mgt.ui</bundleDef> + <bundleDef>org.wso2.carbon:org.wso2.carbon.tenant.mgt.ui</bundleDef> <bundleDef>org.apache.stratos:org.apache.stratos.common.stub</bundleDef> - <bundleDef>org.apache.stratos:org.apache.stratos.tenant.mgt.stub</bundleDef> + <bundleDef>org.wso2.carbon:org.wso2.carbon.tenant.mgt.stub</bundleDef> <!-- Tenant Mgmt End--> </bundles> http://git-wip-us.apache.org/repos/asf/stratos/blob/8d473892/features/manager/pom.xml ---------------------------------------------------------------------- diff --git a/features/manager/pom.xml b/features/manager/pom.xml index 67cbb8f..02825ed 100644 --- a/features/manager/pom.xml +++ b/features/manager/pom.xml @@ -37,7 +37,9 @@ <modules> <module>stratos-mgt</module> <module>common</module> +<!-- <module>tenant-mgt</module> +--> <module>gapp</module> <!--module>throttling</module--> <!--module>usage</module--> http://git-wip-us.apache.org/repos/asf/stratos/blob/8d473892/products/stratos/modules/integration/pom.xml ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/pom.xml b/products/stratos/modules/integration/pom.xml index 304cb5b..b683565 100755 --- a/products/stratos/modules/integration/pom.xml +++ b/products/stratos/modules/integration/pom.xml @@ -149,9 +149,9 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.apache.stratos</groupId> - <artifactId>org.apache.stratos.tenant.mgt.stub</artifactId> - <version>${project.version}</version> + <groupId>org.wso2.carbon</groupId> + <artifactId>org.wso2.carbon.tenant.mgt.stub</artifactId> + <version>4.2.0</version> </dependency> <dependency> <groupId>org.wso2.carbon</groupId> http://git-wip-us.apache.org/repos/asf/stratos/blob/8d473892/service-stubs/pom.xml ---------------------------------------------------------------------- diff --git a/service-stubs/pom.xml b/service-stubs/pom.xml index 84f698a..87fe43f 100644 --- a/service-stubs/pom.xml +++ b/service-stubs/pom.xml @@ -37,7 +37,6 @@ <module>org.apache.stratos.cloud.controller.service.stub</module> <module>org.apache.stratos.manager.stub</module> <module>org.apache.stratos.account.mgt.stub</module> - <module>org.apache.stratos.tenant.mgt.stub</module> <module>org.apache.stratos.common.stub</module> <module>org.apache.stratos.usage.stub</module> <module>org.apache.stratos.throttling.agent.stub</module>
