You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ud...@apache.org on 2014/12/11 16:35:00 UTC
[1/9] stratos git commit: Revert "Revert "upgrading sso and adding
oauth and application management feature""
Repository: stratos
Updated Branches:
refs/heads/apache-4.1.0-test 215565f25 -> ae6d41f1e
Revert "Revert "upgrading sso and adding oauth and application management feature""
This reverts commit e7c168ff7c09ddea01f378801640d915c147bf5e.
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/8fab9b23
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/8fab9b23
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/8fab9b23
Branch: refs/heads/apache-4.1.0-test
Commit: 8fab9b23c6194c27cd8451724f4f2f10e09c74d0
Parents: 283d21d
Author: Udara Liyanage <ud...@wso2.com>
Authored: Sun Dec 7 11:22:32 2014 +0530
Committer: Udara Liyanage <ud...@wso2.com>
Committed: Sun Dec 7 11:22:32 2014 +0530
----------------------------------------------------------------------
products/stratos/modules/p2-profile-gen/pom.xml | 99 +++++++++++++++++---
1 file changed, 86 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/8fab9b23/products/stratos/modules/p2-profile-gen/pom.xml
----------------------------------------------------------------------
diff --git a/products/stratos/modules/p2-profile-gen/pom.xml b/products/stratos/modules/p2-profile-gen/pom.xml
index 0aa8593..c5b3e92 100644
--- a/products/stratos/modules/p2-profile-gen/pom.xml
+++ b/products/stratos/modules/p2-profile-gen/pom.xml
@@ -272,9 +272,9 @@
<featureArtifactDef>org.wso2.carbon:org.wso2.carbon.transport.mgt.server.feature:${carbon.version}</featureArtifactDef>
<featureArtifactDef>org.wso2.carbon:org.wso2.carbon.event.common.feature:${carbon.version}</featureArtifactDef>
<featureArtifactDef>org.wso2.carbon:org.wso2.carbon.event.server.feature:${carbon.platform.patch.version.4.2.1}</featureArtifactDef>
- <featureArtifactDef>org.wso2.carbon:org.wso2.carbon.identity.relying.party.feature:${carbon.platform.patch.version.4.2.1}</featureArtifactDef>
+ <!--<featureArtifactDef>org.wso2.carbon:org.wso2.carbon.identity.relying.party.feature:${carbon.platform.patch.version.4.2.1}</featureArtifactDef>-->
<featureArtifactDef>org.wso2.carbon:org.wso2.carbon.identity.core.feature:${carbon.platform.patch.version.4.2.2}</featureArtifactDef>
- <featureArtifactDef>org.wso2.carbon:org.wso2.carbon.identity.sso.saml.feature:${carbon.platform.patch.version.4.2.2}</featureArtifactDef>
+ <featureArtifactDef>org.wso2.carbon:org.wso2.carbon.identity.sso.saml.feature:${carbon.platform.patch.version.4.2.3}</featureArtifactDef>
<featureArtifactDef>org.wso2.carbon:org.wso2.carbon.registry.ui.menu.feature:${carbon.version}</featureArtifactDef>
<featureArtifactDef>org.wso2.carbon:org.wso2.carbon.module.mgt.server.feature:${carbon.version}</featureArtifactDef>
<featureArtifactDef>org.wso2.carbon:org.wso2.carbon.caching.feature:${carbon.version}</featureArtifactDef>
@@ -284,12 +284,20 @@
<featureArtifactDef>org.apache.stratos:org.apache.stratos.metadataservice.feature:${project.version}</featureArtifactDef>
<featureArtifactDef>org.wso2.carbon:org.wso2.carbon.identity.authenticator.saml2.sso.server.feature:${carbon.platform.patch.version.4.2.1}</featureArtifactDef>
<featureArtifactDef>org.wso2.carbon:org.wso2.carbon.identity.authenticator.saml2.sso.ui.feature:${carbon.platform.patch.version.4.2.2}</featureArtifactDef>
- <featureArtifactDef>org.wso2.carbon:org.wso2.carbon.identity.application.authentication.framework.server.feature:${carbon.platform.patch.version.4.2.1}</featureArtifactDef>
+ <featureArtifactDef>org.wso2.carbon:org.wso2.carbon.identity.application.authentication.framework.server.feature:${carbon.platform.patch.version.4.2.2}</featureArtifactDef>
+ <featureArtifactDef>org.wso2.carbon:org.wso2.carbon.identity.oauth.feature:${carbon.platform.patch.version.4.2.3}</featureArtifactDef>
+ <featureArtifactDef>org.wso2.carbon:org.wso2.carbon.identity.provider.server.feature:${carbon.platform.patch.version.4.2.3}</featureArtifactDef>
+ <featureArtifactDef>org.wso2.carbon:org.wso2.carbon.idp.mgt.feature:${carbon.platform.patch.version.4.2.3}</featureArtifactDef>
+ <featureArtifactDef>org.wso2.carbon:org.wso2.carbon.stratos.common.server.feature:2.2.0</featureArtifactDef>
+ <featureArtifactDef>org.wso2.carbon:org.wso2.carbon.as.runtimes.cxf.feature:4.2.2</featureArtifactDef>
+ <featureArtifactDef>org.wso2.carbon:org.wso2.carbon.identity.relying.party.server.feature:4.2.2</featureArtifactDef>
+ <featureArtifactDef>org.wso2.carbon:org.wso2.carbon.identity.application.mgt.feature:4.2.0</featureArtifactDef>
+ <featureArtifactDef>org.wso2.carbon:org.wso2.carbon.identity.core.feature:4.2.3</featureArtifactDef>
+ <featureArtifactDef>org.wso2.carbon:org.wso2.carbon.identity.user.profile.server.feature:${carbon.platform.patch.version.4.2.2}</featureArtifactDef>
<featureArtifactDef>org.jaggeryjs:org.jaggeryjs.feature:0.9.0.ALPHA4.wso2v3</featureArtifactDef>
<featureArtifactDef>caramel:caramel.feature:1.0.1</featureArtifactDef>
<featureArtifactDef>org.wso2.store:org.wso2.store.feature:${store.version}</featureArtifactDef>
<featureArtifactDef>org.wso2.carbon:org.wso2.carbon.identity.application.authenticator.basicauth.server.feature:4.2.1</featureArtifactDef>
- <featureArtifactDef>org.wso2.carbon:org.wso2.carbon.identity.application.authentication.framework.server.feature:4.2.1</featureArtifactDef>
<featureArtifactDef>org.apache.stratos:org.apache.stratos.messaging.feature:${project.version}</featureArtifactDef>
<featureArtifactDef>org.apache.stratos:org.apache.stratos.autoscaler.feature:${project.version}</featureArtifactDef>
<featureArtifactDef>org.wso2.carbon:org.wso2.carbon.registry.ui.menu.feature:${carbon.version}</featureArtifactDef>
@@ -419,7 +427,7 @@
</feature>
<feature>
<id>org.wso2.carbon.identity.sso.saml.feature.group</id>
- <version>${carbon.platform.patch.version.4.2.2}</version>
+ <version>${carbon.platform.patch.version.4.2.3}</version>
</feature>
<feature>
<id>org.apache.stratos.logging.mgt.feature.group</id>
@@ -510,12 +518,44 @@
<version>${store.version}</version>
</feature>
<feature>
- <id>org.wso2.carbon.identity.application.authenticator.basicauth.server.feature.group</id>
- <version>4.2.1</version>
+ <id>org.wso2.carbon.identity.application.authentication.framework.server.feature.group</id>
+ <version>4.2.2</version>
</feature>
<feature>
- <id>org.wso2.carbon.identity.application.authentication.framework.server.feature.group</id>
- <version>4.2.1</version>
+ <id>org.wso2.carbon.identity.oauth.feature.group</id>
+ <version>4.2.3</version>
+ </feature>
+ <feature>
+ <id>org.wso2.carbon.identity.provider.server.feature.group</id>
+ <version>4.2.3</version>
+ </feature>
+ <feature>
+ <id>org.wso2.carbon.idp.mgt.feature.group</id>
+ <version>4.2.3</version>
+ </feature>
+ <feature>
+ <id>org.wso2.carbon.stratos.common.server.feature.group</id>
+ <version>2.2.0</version>
+ </feature>
+ <feature>
+ <id>org.wso2.carbon.as.runtimes.cxf.feature.group</id>
+ <version>4.2.2</version>
+ </feature>
+ <feature>
+ <id>org.wso2.carbon.identity.relying.party.server.feature.group</id>
+ <version>4.2.2</version>
+ </feature>
+ <feature>
+ <id>org.wso2.carbon.identity.application.mgt.feature.group</id>
+ <version>4.2.0</version>
+ </feature>
+ <feature>
+ <id>org.wso2.carbon.identity.core.feature.group</id>
+ <version>4.2.3</version>
+ </feature>
+ <feature>
+ <id>org.wso2.carbon.identity.user.profile.server.feature.group</id>
+ <version>4.2.2</version>
</feature>
<!-- User Management features -->
<feature>
@@ -715,7 +755,7 @@
</feature>
<feature>
<id>org.wso2.carbon.identity.sso.saml.feature.group</id>
- <version>${carbon.platform.patch.version.4.2.2}</version>
+ <version>${carbon.platform.patch.version.4.2.3}</version>
</feature>
<feature>
<id>org.wso2.carbon.databridge.datapublisher.feature.group</id>
@@ -775,12 +815,14 @@
<!-- GApp SSO features -->
<feature>
<id>org.wso2.carbon.identity.core.feature.group</id>
- <version>${carbon.platform.patch.version.4.2.2}</version>
+ <version>${carbon.platform.patch.version.4.2.3}</version>
</feature>
+ <!--
<feature>
<id>org.wso2.carbon.identity.relying.party.feature.group</id>
<version>${carbon.platform.patch.version.4.2.1}</version>
</feature>
+ -->
<!--End GApp SSO features -->
<feature>
@@ -825,9 +867,40 @@
</feature>
<feature>
<id>org.wso2.carbon.identity.application.authentication.framework.server.feature.group</id>
- <version>4.2.1</version>
+ <version>4.2.2</version>
+ </feature>
+ <feature>
+ <id>org.wso2.carbon.identity.oauth.feature.group</id>
+ <version>4.2.3</version>
+ </feature>
+ <feature>
+ <id>org.wso2.carbon.identity.provider.server.feature.group</id>
+ <version>4.2.3</version>
+ </feature>
+ <feature>
+ <id>org.wso2.carbon.idp.mgt.feature.group</id>
+ <version>4.2.3</version>
+ </feature>
+ <feature>
+ <id>org.wso2.carbon.stratos.common.server.feature.group</id>
+ <version>2.2.0</version>
+ </feature>
+ <feature>
+ <id>org.wso2.carbon.as.runtimes.cxf.feature.group</id>
+ <version>4.2.2</version>
+ </feature>
+ <feature>
+ <id>org.wso2.carbon.identity.relying.party.server.feature.group</id>
+ <version>4.2.2</version>
+ </feature>
+ <feature>
+ <id>org.wso2.carbon.identity.application.mgt.feature.group</id>
+ <version>4.2.0</version>
+ </feature>
+ <feature>
+ <id>org.wso2.carbon.identity.core.feature.group</id>
+ <version>4.2.3</version>
</feature>
-
<!--autoscalar-->
<feature>
<id>org.apache.stratos.autoscaler.feature.group</id>
[6/9] stratos git commit: remove stratos tenant dispatcher component
from server
Posted by ud...@apache.org.
remove stratos tenant dispatcher component from server
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/3f452f21
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/3f452f21
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/3f452f21
Branch: refs/heads/apache-4.1.0-test
Commit: 3f452f2177b51d8b155f0e04b4dffa010c384cf8
Parents: 8d7e292
Author: Udara Liyanage <ud...@wso2.com>
Authored: Wed Dec 10 18:56:38 2014 +0530
Committer: Udara Liyanage <ud...@wso2.com>
Committed: Wed Dec 10 18:56:38 2014 +0530
----------------------------------------------------------------------
.../common/org.apache.stratos.common.server.feature/pom.xml | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/3f452f21/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 de40653..bff7eb4 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
@@ -57,11 +57,13 @@
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.tenant.activity</artifactId>
</dependency>-->
+<!--
<dependency>
<groupId>org.apache.stratos</groupId>
<artifactId>org.apache.stratos.tenant.dispatcher</artifactId>
<version>${project.version}</version>
</dependency>
+-->
<dependency>
<groupId>org.apache.stratos</groupId>
<artifactId>org.apache.stratos.redirector.servlet</artifactId>
@@ -191,7 +193,9 @@
<bundleDef>org.apache.stratos:org.apache.stratos.redirector.servlet</bundleDef>
<bundleDef>org.apache.stratos:org.apache.stratos.activation:${project.version}</bundleDef>
<!--<bundleDef>org.wso2.carbon:org.wso2.carbon.sample.installer:${stratos.version}</bundleDef>-->
+<!--
<bundleDef>org.apache.stratos:org.apache.stratos.tenant.dispatcher</bundleDef>
+-->
<!--<bundleDef>org.wso2.carbon:org.wso2.carbon.throttling.agent</bundleDef>-->
<!--<bundleDef>org.wso2.carbon:org.wso2.carbon.throttling.agent.stub</bundleDef>-->
<!--<bundleDef>org.wso2.carbon:org.wso2.carbon.usage.agent</bundleDef>-->
[3/9] stratos git commit: Revert "commenting token generation due to
bundle issue"
Posted by ud...@apache.org.
Revert "commenting token generation due to bundle issue"
This reverts commit 283d21d95c122c25e84706c16f1279cd6b2e0366.
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/c41e16fa
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/c41e16fa
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/c41e16fa
Branch: refs/heads/apache-4.1.0-test
Commit: c41e16fa19e45cb70324e1c054ef5f3f119d42a9
Parents: df02814
Author: Udara Liyanage <ud...@wso2.com>
Authored: Sun Dec 7 11:22:56 2014 +0530
Committer: Udara Liyanage <ud...@wso2.com>
Committed: Sun Dec 7 11:22:56 2014 +0530
----------------------------------------------------------------------
.../applications/parser/DefaultApplicationParser.java | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/c41e16fa/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/DefaultApplicationParser.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/DefaultApplicationParser.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/DefaultApplicationParser.java
index 3cb50a6..de9110f 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/DefaultApplicationParser.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/DefaultApplicationParser.java
@@ -19,6 +19,8 @@
package org.apache.stratos.autoscaler.applications.parser;
+import org.apache.amber.oauth2.common.exception.OAuthProblemException;
+import org.apache.amber.oauth2.common.exception.OAuthSystemException;
import org.apache.commons.codec.binary.Base64;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
@@ -30,6 +32,9 @@ import org.apache.stratos.autoscaler.applications.STClusterInformation;
import org.apache.stratos.autoscaler.applications.payload.PayloadData;
import org.apache.stratos.autoscaler.applications.pojo.*;
import org.apache.stratos.autoscaler.client.CloudControllerClient;
+import org.apache.stratos.autoscaler.client.IdentityApplicationManagementServiceClient;
+import org.apache.stratos.autoscaler.client.oAuthAdminServiceClient;
+import org.apache.stratos.autoscaler.exception.AutoScalerException;
import org.apache.stratos.autoscaler.exception.application.ApplicationDefinitionException;
import org.apache.stratos.autoscaler.exception.cartridge.CartridgeInformationException;
import org.apache.stratos.autoscaler.pojo.ServiceGroup;
@@ -41,10 +46,12 @@ import org.apache.stratos.messaging.domain.applications.Application;
import org.apache.stratos.messaging.domain.applications.ClusterDataHolder;
import org.apache.stratos.messaging.domain.applications.DependencyOrder;
import org.apache.stratos.messaging.domain.applications.Group;
+import org.wso2.carbon.identity.oauth.stub.OAuthAdminServiceException;
import javax.crypto.Cipher;
import javax.crypto.SecretKey;
import javax.crypto.spec.SecretKeySpec;
+import java.rmi.RemoteException;
import java.util.*;
/**
@@ -793,7 +800,6 @@ public class DefaultApplicationParser implements ApplicationParser {
return new ApplicationClusterContext(cartridgeInfo.getType(), clusterId, hostname, textPayload, deploymentPolicy, isLB);
}
- /*
public String createToken(String appid) throws AutoScalerException {
String token = null;
String ouathAppName = appid + Math.random();
@@ -820,7 +826,6 @@ public class DefaultApplicationParser implements ApplicationParser {
return token;
}
- */
private CartridgeInfo getCartridge (String cartridgeType) throws ApplicationDefinitionException {
try {
[9/9] stratos git commit: Merge branch 'bundle' into apache-4.1.0-test
Posted by ud...@apache.org.
Merge branch 'bundle' into apache-4.1.0-test
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/ae6d41f1
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/ae6d41f1
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/ae6d41f1
Branch: refs/heads/apache-4.1.0-test
Commit: ae6d41f1e15c3dc7410aeca0b35da19d1e680b3f
Parents: 215565f f5a07b1
Author: Udara Liyanage <ud...@wso2.com>
Authored: Thu Dec 11 17:24:11 2014 +0530
Committer: Udara Liyanage <ud...@wso2.com>
Committed: Thu Dec 11 17:24:11 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 +-
.../parser/DefaultApplicationParser.java | 11 +-
.../stratos/common/TenantBillingService.java | 14 +--
.../exception/ApacheStratosException.java | 42 +++++++
.../common/exception/StratosException.java | 42 -------
.../common/listeners/TenantMgtListener.java | 16 +--
.../common/packages/PackageInfoHolder.java | 12 +-
.../src/main/resources/META-INF/services.xml | 34 ------
.../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 | 13 +--
.../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 | 8 +-
.../pom.xml | 32 ++----
.../pom.xml | 47 ++++----
features/manager/pom.xml | 10 +-
.../pom.xml | 8 +-
features/manager/tenant-mgt/pom.xml | 6 +-
.../modules/distribution/src/assembly/bin.xml | 11 ++
products/stratos/modules/integration/pom.xml | 6 +-
products/stratos/modules/p2-profile-gen/pom.xml | 114 +++++++++++++++----
service-stubs/pom.xml | 5 +-
38 files changed, 346 insertions(+), 293 deletions(-)
----------------------------------------------------------------------
[4/9] stratos git commit: remove org.apache.stratos.mgt
Posted by ud...@apache.org.
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 <ud...@wso2.com>
Authored: Tue Dec 9 10:47:27 2014 +0530
Committer: Udara Liyanage <ud...@wso2.com>
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>
[2/9] stratos git commit: Revert "Revert "add oAuth war s to product""
Posted by ud...@apache.org.
Revert "Revert "add oAuth war s to product""
This reverts commit b460062bff36a37c3ae3a58ac684da5d57aa44ad.
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/df028143
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/df028143
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/df028143
Branch: refs/heads/apache-4.1.0-test
Commit: df0281433052fac8d1df035353b53330774beea4
Parents: 8fab9b2
Author: Udara Liyanage <ud...@wso2.com>
Authored: Sun Dec 7 11:22:46 2014 +0530
Committer: Udara Liyanage <ud...@wso2.com>
Committed: Sun Dec 7 11:22:46 2014 +0530
----------------------------------------------------------------------
.../stratos/modules/distribution/src/assembly/bin.xml | 11 +++++++++++
1 file changed, 11 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/df028143/products/stratos/modules/distribution/src/assembly/bin.xml
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/src/assembly/bin.xml b/products/stratos/modules/distribution/src/assembly/bin.xml
index 374236b..07b7de4 100755
--- a/products/stratos/modules/distribution/src/assembly/bin.xml
+++ b/products/stratos/modules/distribution/src/assembly/bin.xml
@@ -941,6 +941,17 @@
<outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/webapps/</outputDirectory>
<fileMode>644</fileMode>
</file>
+ <!--oauth2.war and authenticationendpoint.war is related to oAuth feature -->
+ <file>
+ <source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/webapps/oauth2.war</source>
+ <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/webapps/</outputDirectory>
+ <fileMode>644</fileMode>
+ </file>
+ <file>
+ <source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/webapps/authenticationendpoint.war</source>
+ <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/webapps/</outputDirectory>
+ <fileMode>644</fileMode>
+ </file>
<!-- End of REST endpoint webapp -->
<!-- Meta data service webapp -->
[8/9] stratos git commit: tenant redirect, dispatcher ,
theme mgt refers to wso2 versions
Posted by ud...@apache.org.
tenant redirect, dispatcher , theme mgt refers to wso2 versions
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/f5a07b13
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/f5a07b13
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/f5a07b13
Branch: refs/heads/apache-4.1.0-test
Commit: f5a07b132458db27c14cc65c29d870dd3fb4aea7
Parents: 5155b45
Author: Udara Liyanage <ud...@wso2.com>
Authored: Thu Dec 11 17:22:11 2014 +0530
Committer: Udara Liyanage <ud...@wso2.com>
Committed: Thu Dec 11 17:22:11 2014 +0530
----------------------------------------------------------------------
.../parser/DefaultApplicationParser.java | 2 +-
.../src/main/resources/META-INF/services.xml | 34 --------------------
components/pom.xml | 6 +++-
.../pom.xml | 16 ++++-----
.../pom.xml | 31 +++++++++---------
features/manager/pom.xml | 8 ++---
.../pom.xml | 8 ++---
features/manager/tenant-mgt/pom.xml | 6 ++--
products/stratos/modules/p2-profile-gen/pom.xml | 15 ++++-----
service-stubs/pom.xml | 4 +--
10 files changed, 49 insertions(+), 81 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/f5a07b13/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/DefaultApplicationParser.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/DefaultApplicationParser.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/DefaultApplicationParser.java
index de9110f..5472163 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/DefaultApplicationParser.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/DefaultApplicationParser.java
@@ -794,7 +794,7 @@ public class DefaultApplicationParser implements ApplicationParser {
// Create text payload
PayloadData payloadData = ApplicationUtils.createPayload(appId, groupName, cartridgeInfo, subscriptionKey, tenantId, clusterId,
hostname, repoUrl, alias, null, dependencyAliases, properties);
- //TOD payloadData.add("TOKEN", createToken(appId));
+ payloadData.add("TOKEN", createToken(appId));
String textPayload = payloadData.toString();
return new ApplicationClusterContext(cartridgeInfo.getType(), clusterId, hostname, textPayload, deploymentPolicy, isLB);
http://git-wip-us.apache.org/repos/asf/stratos/blob/f5a07b13/components/org.apache.stratos.common/src/main/resources/META-INF/services.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/resources/META-INF/services.xml b/components/org.apache.stratos.common/src/main/resources/META-INF/services.xml
deleted file mode 100644
index 7f0bcf3..0000000
--- a/components/org.apache.stratos.common/src/main/resources/META-INF/services.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ 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.
- -->
-<serviceGroup>
-
- <service name="PackageInfoService" scope="transportsession">
- <transports>
- <transport>https</transport>
- </transports>
- <parameter name="ServiceClass" locked="false">
- org.apache.stratos.common.services.PackageInfoService
- </parameter>
- <parameter name="adminService" locked="ture">false</parameter>
- </service>
-
- <parameter name="hiddenService" locked="ture">true</parameter>
-
-</serviceGroup>
http://git-wip-us.apache.org/repos/asf/stratos/blob/f5a07b13/components/pom.xml
----------------------------------------------------------------------
diff --git a/components/pom.xml b/components/pom.xml
index d2afb7f..d9657f3 100644
--- a/components/pom.xml
+++ b/components/pom.xml
@@ -81,8 +81,10 @@
<module>org.apache.stratos.throttling.ui</module-->
<!-- Redirector -->
<module>org.apache.stratos.sso.redirector.ui</module>
+<!--
<module>org.apache.stratos.redirector.servlet</module>
<module>org.apache.stratos.redirector.servlet.ui</module>
+-->
<!-- Status Monitor -->
<module>org.apache.stratos.status.monitor.core</module>
<module>org.apache.stratos.status.monitor</module>
@@ -94,12 +96,14 @@
<module>org.apache.stratos.usage.summary.helper</module>
<module>org.apache.stratos.usage.ui</module-->
- <module>org.apache.stratos.tenant.dispatcher</module>
+ <!--<module>org.apache.stratos.tenant.dispatcher</module>-->
<module>org.apache.stratos.keystore.mgt</module>
<module>org.apache.stratos.activation</module>
<!-- Theme mgt -->
+<!--
<module>org.apache.stratos.theme.mgt.ui</module>
<module>org.apache.stratos.theme.mgt</module>
+-->
<!--Logging mgt-->
<module>org.apache.stratos.logging.view.ui</module>
<!-- RESTful admin services -->
http://git-wip-us.apache.org/repos/asf/stratos/blob/f5a07b13/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 bff7eb4..f368ea4 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
@@ -65,9 +65,9 @@
</dependency>
-->
<dependency>
- <groupId>org.apache.stratos</groupId>
- <artifactId>org.apache.stratos.redirector.servlet</artifactId>
- <version>${project.version}</version>
+ <groupId>org.wso2.carbon</groupId>
+ <artifactId>org.wso2.carbon.redirector.servlet</artifactId>
+ <version>2.2.1</version>
</dependency>
<!--<dependency>
<groupId>org.wso2.carbon</groupId>
@@ -128,9 +128,9 @@
<version>${wso2carbon.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.stratos</groupId>
- <artifactId>org.apache.stratos.theme.mgt</artifactId>
- <version>${project.version}</version>
+ <groupId>org.wso2.carbon</groupId>
+ <artifactId>org.wso2.carbon.theme.mgt</artifactId>
+ <version>2.2.0</version>
</dependency>
</dependencies>
@@ -190,7 +190,7 @@
</adviceFile>
<bundles>
<bundleDef>org.apache.stratos:org.apache.stratos.common:${project.version}</bundleDef>
- <bundleDef>org.apache.stratos:org.apache.stratos.redirector.servlet</bundleDef>
+ <bundleDef>org.wso2.carbon:org.wso2.carbon.redirector.servlet:2.2.1</bundleDef>
<bundleDef>org.apache.stratos:org.apache.stratos.activation:${project.version}</bundleDef>
<!--<bundleDef>org.wso2.carbon:org.wso2.carbon.sample.installer:${stratos.version}</bundleDef>-->
<!--
@@ -211,7 +211,7 @@
<bundleDef>kaptcha.wso2:kaptcha</bundleDef>
<bundleDef>org.apache.stratos:org.apache.stratos.keystore.mgt</bundleDef>
<bundleDef>org.wso2.carbon:org.wso2.carbon.captcha.mgt</bundleDef>
- <bundleDef>org.apache.stratos:org.apache.stratos.theme.mgt:${project.version}</bundleDef>
+ <bundleDef>org.wso2.carbon:org.wso2.carbon.theme.mgt:2.2.0</bundleDef>
<!-- End Tenant Mgmt -->
</bundles>
http://git-wip-us.apache.org/repos/asf/stratos/blob/f5a07b13/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 8a4793e..480c0c0 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
@@ -34,14 +34,14 @@
<dependencies>
<dependency>
- <groupId>org.apache.stratos</groupId>
- <artifactId>org.apache.stratos.redirector.servlet.ui</artifactId>
- <version>${project.version}</version>
+ <groupId>org.wso2.carbon</groupId>
+ <artifactId>org.wso2.carbon.redirector.servlet.ui</artifactId>
+ <version>2.2.0</version>
</dependency>
<dependency>
- <groupId>org.apache.stratos</groupId>
- <artifactId>org.apache.stratos.sso.redirector.ui</artifactId>
- <version>${project.version}</version>
+ <groupId>org.wso2.carbon</groupId>
+ <artifactId>org.wso2.carbon.sso.redirector.ui</artifactId>
+ <version>2.2.0</version>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
@@ -64,16 +64,15 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.stratos</groupId>
- <artifactId>org.apache.stratos.theme.mgt.ui</artifactId>
- <version>${project.version}</version>
+ <groupId>org.wso2.carbon</groupId>
+ <artifactId>org.wso2.carbon.theme.mgt.ui</artifactId>
+ <version>2.2.0</version>
</dependency>
<dependency>
- <groupId>org.apache.stratos</groupId>
- <artifactId>org.apache.stratos.theme.mgt.stub</artifactId>
- <version>${project.version}</version>
+ <groupId>org.wso2.carbon</groupId>
+ <artifactId>org.wso2.carbon.theme.mgt.stub</artifactId>
+ <version>4.2.0</version>
</dependency>
-
</dependencies>
<build>
<plugins>
@@ -98,9 +97,9 @@
</properties>
</adviceFile>
<bundles>
- <bundleDef>org.apache.stratos:org.apache.stratos.redirector.servlet.ui</bundleDef>
- <bundleDef>org.apache.stratos:org.apache.stratos.redirector.servlet.stub:${project.version}</bundleDef>
- <bundleDef>org.apache.stratos:org.apache.stratos.sso.redirector.ui</bundleDef>
+ <bundleDef>org.wso2.carbon:org.wso2.carbon.redirector.servlet.ui</bundleDef>
+ <bundleDef>org.wso2.carbon:org.wso2.carbon.redirector.servlet.stub:4.2.0</bundleDef>
+ <bundleDef>org.wso2.carbon:org.wso2.carbon.sso.redirector.ui</bundleDef>
<bundleDef>org.wso2.carbon:org.wso2.carbon.google.analytics.ui</bundleDef>
<!-- Tenant Mgmt-->
http://git-wip-us.apache.org/repos/asf/stratos/blob/f5a07b13/features/manager/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/pom.xml b/features/manager/pom.xml
index 02825ed..c7a3557 100644
--- a/features/manager/pom.xml
+++ b/features/manager/pom.xml
@@ -73,14 +73,14 @@
<version>${stratos.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.stratos</groupId>
- <artifactId>org.apache.stratos.redirector.servlet</artifactId>
- <version>${project.version}</version>
+ <groupId>org.wso2.carbon</groupId>
+ <artifactId>org.wso2.carbon.redirector.servlet</artifactId>
+ <version>2.2.1</version>
</dependency>
<dependency>
<groupId>org.apache.stratos</groupId>
<artifactId>org.apache.stratos.redirector.servlet.ui</artifactId>
- <version>${project.version}</version>
+ <version>2.2.0</version>
</dependency>
<dependency>
<groupId>org.apache.stratos</groupId>
http://git-wip-us.apache.org/repos/asf/stratos/blob/f5a07b13/features/manager/tenant-mgt/org.apache.stratos.tenant.mgt.core.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/tenant-mgt/org.apache.stratos.tenant.mgt.core.feature/pom.xml b/features/manager/tenant-mgt/org.apache.stratos.tenant.mgt.core.feature/pom.xml
index 416ac96..3c4ee55 100644
--- a/features/manager/tenant-mgt/org.apache.stratos.tenant.mgt.core.feature/pom.xml
+++ b/features/manager/tenant-mgt/org.apache.stratos.tenant.mgt.core.feature/pom.xml
@@ -44,9 +44,9 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.stratos</groupId>
- <artifactId>org.apache.stratos.theme.mgt</artifactId>
- <version>${project.version}</version>
+ <groupId>org.wso2.carbon</groupId>
+ <artifactId>org.wso2.carbon.theme.mgt</artifactId>
+ <version>2.2.0</version>
</dependency>
<dependency>
<groupId>org.apache.stratos</groupId>
@@ -106,7 +106,7 @@
<importBundles>
<importBundleDef>org.apache.stratos:org.apache.stratos.common</importBundleDef>
<importBundleDef>org.apache.stratos:org.apache.stratos.tenant.mgt.core</importBundleDef>
- <importBundleDef>org.apache.stratos:org.apache.stratos.theme.mgt</importBundleDef>
+ <importBundleDef>org.wso2.carbon:org.wso2.carbon.theme.mgt</importBundleDef>
<importBundleDef>org.apache.stratos:org.apache.stratos.keystore.mgt</importBundleDef>
</importBundles>
<importFeatures>
http://git-wip-us.apache.org/repos/asf/stratos/blob/f5a07b13/features/manager/tenant-mgt/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/tenant-mgt/pom.xml b/features/manager/tenant-mgt/pom.xml
index 463348d..112882d 100644
--- a/features/manager/tenant-mgt/pom.xml
+++ b/features/manager/tenant-mgt/pom.xml
@@ -54,9 +54,9 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.stratos</groupId>
- <artifactId>org.apache.stratos.theme.mgt</artifactId>
- <version>${project.version}</version>
+ <groupId>org.wso2.carbon</groupId>
+ <artifactId>org.wso2.carbon.theme.mgt</artifactId>
+ <version>2.2.0</version>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
http://git-wip-us.apache.org/repos/asf/stratos/blob/f5a07b13/products/stratos/modules/p2-profile-gen/pom.xml
----------------------------------------------------------------------
diff --git a/products/stratos/modules/p2-profile-gen/pom.xml b/products/stratos/modules/p2-profile-gen/pom.xml
index 6be2f03..60fa2e4 100644
--- a/products/stratos/modules/p2-profile-gen/pom.xml
+++ b/products/stratos/modules/p2-profile-gen/pom.xml
@@ -307,7 +307,6 @@
<featureArtifactDef>org.wso2.carbon:org.apache.synapse.transport.nhttp.feature:${synapse.version}</featureArtifactDef>
<featureArtifactDef>org.wso2.carbon:org.wso2.carbon.datasource.server.feature:${carbon.version}</featureArtifactDef>
<featureArtifactDef>org.wso2.carbon:org.wso2.carbon.mediation.initializer.feature:${carbon.version}</featureArtifactDef>
- <featureArtifactDef>org.wso2.carbon:org.wso2.carbon.service.mgt.server.feature:${carbon.version}</featureArtifactDef>
<featureArtifactDef>org.wso2.carbon:org.wso2.carbon.endpoint.server.feature:${carbon.version}</featureArtifactDef>
<featureArtifactDef>org.wso2.carbon:org.wso2.carbon.sequences.server.feature:${carbon.version}</featureArtifactDef>
<featureArtifactDef>org.wso2.carbon:org.wso2.carbon.mediators.server.feature:${carbon.version}</featureArtifactDef>
@@ -333,7 +332,7 @@
<featureArtifactDef>org.wso2.carbon:org.wso2.carbon.cassandra.common.feature:${carbon.platform.version}</featureArtifactDef>
<!-- Common features -->
<featureArtifactDef>org.apache.stratos:org.apache.stratos.metadata.client.feature:${project.version}</featureArtifactDef>
- <!--featureArtifactDef>org.apache.stratos:org.apache.stratos.custom.handlers.feature:${project.version}</featureArtifactDef-->
+ <featureArtifactDef>org.apache.stratos:org.apache.stratos.custom.handlers.feature:${project.version}</featureArtifactDef>
</featureArtifacts>
</configuration>
</execution>
@@ -562,10 +561,10 @@
<id>org.wso2.carbon.user.mgt.feature.group</id>
<version>${carbon.platform.patch.version.4.2.1}</version>
</feature>
- <!--feature>
+ <feature>
<id>org.apache.stratos.custom.handlers.feature.group</id>
<version>${project.version}</version>
- </feature-->
+ </feature>
</features>
</configuration>
</execution>
@@ -679,7 +678,7 @@
</feature>
<feature>
<id>org.wso2.carbon.service.mgt.server.feature.group</id>
- <version>${carbon.version}</version>
+ <version>${carbon.platform.patch.version.4.2.1}</version>
</feature>
<feature>
<id>org.wso2.carbon.transport.mgt.server.feature.group</id>
@@ -922,7 +921,7 @@
</feature>
<feature>
<id>org.wso2.carbon.service.mgt.server.feature.group</id>
- <version>${carbon.version}</version>
+ <version>${carbon.platform.patch.version.4.2.1}</version>
</feature>
<feature>
@@ -1002,10 +1001,10 @@
<id>org.apache.stratos.metadata.client.feature.group</id>
<version>${project.version}</version>
</feature>
- <!--feature>
+ <feature>
<id>org.apache.stratos.custom.handlers.feature.group</id>
<version>${project.version}</version>
- </feature-->
+ </feature>
</features>
</configuration>
http://git-wip-us.apache.org/repos/asf/stratos/blob/f5a07b13/service-stubs/pom.xml
----------------------------------------------------------------------
diff --git a/service-stubs/pom.xml b/service-stubs/pom.xml
index 87fe43f..e42dbef 100644
--- a/service-stubs/pom.xml
+++ b/service-stubs/pom.xml
@@ -44,11 +44,11 @@
<module>org.apache.stratos.tenant.register.stub</module>
<module>org.apache.stratos.cartridge.agent.stub</module>
<module>org.apache.stratos.tenant.activity.stub</module>
- <module>org.apache.stratos.theme.mgt.stub</module>
+ <!--<module>org.apache.stratos.theme.mgt.stub</module>-->
<module>org.apache.stratos.validate.domain.stub</module>
<module>org.apache.stratos.adc.instanceinfo.mgt.stub</module>
<module>org.apache.stratos.tenant.register.gapp.stub</module>
- <module>org.apache.stratos.redirector.servlet.stub</module>
+ <!--<module>org.apache.stratos.redirector.servlet.stub</module>-->
<module>org.apache.stratos.adc.reponotification.service.stub</module>
<module>org.apache.stratos.billing.mgt.stub</module>
<module>org.apache.stratos.throttle.stub</module>
[7/9] stratos git commit: comment tenant add trigger from task
Posted by ud...@apache.org.
comment tenant add trigger from task
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/5155b457
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/5155b457
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/5155b457
Branch: refs/heads/apache-4.1.0-test
Commit: 5155b457b711fb5528e6e9eadd24b57c08b78d3c
Parents: 3f452f2
Author: Udara Liyanage <ud...@wso2.com>
Authored: Wed Dec 10 18:57:05 2014 +0530
Committer: Udara Liyanage <ud...@wso2.com>
Committed: Wed Dec 10 18:57:05 2014 +0530
----------------------------------------------------------------------
.../manager/publisher/TenantSynzhronizerTask.java | 13 ++++---------
1 file changed, 4 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/5155b457/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 ff86d83..564e675 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
@@ -19,15 +19,8 @@
package org.apache.stratos.manager.publisher;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-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,10 +31,12 @@ 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.wso2.carbon.tenant.mgt.util.TenantMgtUtil;
import org.wso2.carbon.ntask.core.Task;
+import org.wso2.carbon.stratos.common.beans.TenantInfoBean;
import org.wso2.carbon.user.core.tenant.TenantManager;
+import java.util.*;
+
/**
* Tenant synchronizer task for publishing complete tenant event periodically
* to message broker.
@@ -79,7 +74,7 @@ public class TenantSynzhronizerTask implements Task {
TenantInfoBean tenantBean = new TenantInfoBean();
tenantBean.setTenantId(carbonTenant.getId());
tenantBean.setTenantDomain(carbonTenant.getDomain());
- TenantMgtUtil.triggerAddTenant(tenantBean);
+ //TenantMgtUtil.triggerAddTenant(tenantBean);
// add tenant to Tenant Manager
org.apache.stratos.messaging.message.receiver.tenant.TenantManager.getInstance()
.addTenant(tenant);
[5/9] stratos git commit: upgrade wso2.stratos.common to 2.2.2
Posted by ud...@apache.org.
upgrade wso2.stratos.common to 2.2.2
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/8d7e292c
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/8d7e292c
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/8d7e292c
Branch: refs/heads/apache-4.1.0-test
Commit: 8d7e292ca26cb90eca0c2a0426e4cde0d07c8db5
Parents: 8d47389
Author: Udara Liyanage <ud...@wso2.com>
Authored: Wed Dec 10 18:56:08 2014 +0530
Committer: Udara Liyanage <ud...@wso2.com>
Committed: Wed Dec 10 18:56:08 2014 +0530
----------------------------------------------------------------------
products/stratos/modules/p2-profile-gen/pom.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d7e292c/products/stratos/modules/p2-profile-gen/pom.xml
----------------------------------------------------------------------
diff --git a/products/stratos/modules/p2-profile-gen/pom.xml b/products/stratos/modules/p2-profile-gen/pom.xml
index c5b3e92..6be2f03 100644
--- a/products/stratos/modules/p2-profile-gen/pom.xml
+++ b/products/stratos/modules/p2-profile-gen/pom.xml
@@ -288,7 +288,7 @@
<featureArtifactDef>org.wso2.carbon:org.wso2.carbon.identity.oauth.feature:${carbon.platform.patch.version.4.2.3}</featureArtifactDef>
<featureArtifactDef>org.wso2.carbon:org.wso2.carbon.identity.provider.server.feature:${carbon.platform.patch.version.4.2.3}</featureArtifactDef>
<featureArtifactDef>org.wso2.carbon:org.wso2.carbon.idp.mgt.feature:${carbon.platform.patch.version.4.2.3}</featureArtifactDef>
- <featureArtifactDef>org.wso2.carbon:org.wso2.carbon.stratos.common.server.feature:2.2.0</featureArtifactDef>
+ <featureArtifactDef>org.wso2.carbon:org.wso2.carbon.stratos.common.server.feature:2.2.2</featureArtifactDef>
<featureArtifactDef>org.wso2.carbon:org.wso2.carbon.as.runtimes.cxf.feature:4.2.2</featureArtifactDef>
<featureArtifactDef>org.wso2.carbon:org.wso2.carbon.identity.relying.party.server.feature:4.2.2</featureArtifactDef>
<featureArtifactDef>org.wso2.carbon:org.wso2.carbon.identity.application.mgt.feature:4.2.0</featureArtifactDef>
@@ -535,7 +535,7 @@
</feature>
<feature>
<id>org.wso2.carbon.stratos.common.server.feature.group</id>
- <version>2.2.0</version>
+ <version>2.2.2</version>
</feature>
<feature>
<id>org.wso2.carbon.as.runtimes.cxf.feature.group</id>
@@ -883,7 +883,7 @@
</feature>
<feature>
<id>org.wso2.carbon.stratos.common.server.feature.group</id>
- <version>2.2.0</version>
+ <version>2.2.2</version>
</feature>
<feature>
<id>org.wso2.carbon.as.runtimes.cxf.feature.group</id>