You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by is...@apache.org on 2013/07/29 09:55:04 UTC
git commit: Fixing Stratos Controller Tenant Management issue.
Updated pages to use org.apache.stratos components
Updated Branches:
refs/heads/master c88fe38c8 -> 8a7eaee3d
Fixing Stratos Controller Tenant Management issue. Updated pages to use org.apache.stratos components
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/8a7eaee3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/8a7eaee3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/8a7eaee3
Branch: refs/heads/master
Commit: 8a7eaee3dbd096e763fe8cbbe3e0521cb0b98a1f
Parents: c88fe38
Author: Isuru Perera <is...@apache.org>
Authored: Mon Jul 29 13:24:28 2013 +0530
Committer: Isuru Perera <is...@apache.org>
Committed: Mon Jul 29 13:24:28 2013 +0530
----------------------------------------------------------------------
.../tenant-register/domain_availability_ajaxprocessor.jsp | 2 +-
.../src/main/resources/web/tenant-register/select_domain.jsp | 2 +-
.../main/resources/web/tenant-register/select_usage_plan.jsp | 2 +-
.../web/tenant-register/submit_tenant_ajaxprocessor.jsp | 2 +-
.../mgt/core/internal/TenantMgtCoreServiceComponent.java | 2 +-
components/org.apache.stratos.tenant.mgt.ui/pom.xml | 6 +++---
.../stratos/tenant/mgt/ui/clients/TenantServiceClient.java | 6 +++---
.../apache/stratos/tenant/mgt/ui/utils/TenantMgtUtil.java | 2 +-
.../web/tenant-mgt/activate_tenant_ajaxprocessor.jsp | 2 +-
.../src/main/resources/web/tenant-mgt/add_tenant.jsp | 6 +++---
.../tenant-mgt/check_domain_availability_ajaxprocessor.jsp | 2 +-
.../web/tenant-mgt/get_package_info_ajaxprocessor.jsp | 2 +-
.../resources/web/tenant-mgt/submit_tenant_ajaxprocessor.jsp | 4 ++--
.../src/main/resources/web/tenant-mgt/view_tenants.jsp | 8 ++++----
.../tenant/mgt/internal/util/TenantMgtRampartUtil.java | 2 +-
.../resources/p2.inf | 2 +-
.../src/main/resources/p2.inf | 2 +-
.../org.apache.stratos.tenant.mgt.server.feature/pom.xml | 2 +-
.../service/org.apache.stratos.server.feature/pom.xml | 4 ++--
.../features/service/org.apache.stratos.ui.feature/pom.xml | 6 +++---
products/stratos_controller/modules/integration/pom.xml | 6 +++---
.../stratos/manager/integration/tests/TenantMgtTestCase.java | 4 ++--
service-stubs/org.apache.stratos.tenant.mgt.stub/pom.xml | 8 ++++----
23 files changed, 42 insertions(+), 42 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/8a7eaee3/components/org.apache.stratos.register.ui/src/main/resources/web/tenant-register/domain_availability_ajaxprocessor.jsp
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.register.ui/src/main/resources/web/tenant-register/domain_availability_ajaxprocessor.jsp b/components/org.apache.stratos.register.ui/src/main/resources/web/tenant-register/domain_availability_ajaxprocessor.jsp
index f442459..8d2fefd 100644
--- a/components/org.apache.stratos.register.ui/src/main/resources/web/tenant-register/domain_availability_ajaxprocessor.jsp
+++ b/components/org.apache.stratos.register.ui/src/main/resources/web/tenant-register/domain_availability_ajaxprocessor.jsp
@@ -19,7 +19,7 @@
<%@ page import="org.wso2.carbon.registry.core.RegistryConstants" %>
<%@ page import="org.wso2.carbon.ui.CarbonUIMessage" %>
<%@ page import="org.wso2.carbon.registry.common.ui.UIException" %>
-<%@ page import="org.wso2.carbon.register.ui.utils.TenantConfigUtil" %>
+<%@ page import="org.apache.stratos.register.ui.utils.TenantConfigUtil" %>
<%@ page import="java.util.Enumeration" %>
<%@ page import="org.wso2.carbon.CarbonConstants" %>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/8a7eaee3/components/org.apache.stratos.register.ui/src/main/resources/web/tenant-register/select_domain.jsp
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.register.ui/src/main/resources/web/tenant-register/select_domain.jsp b/components/org.apache.stratos.register.ui/src/main/resources/web/tenant-register/select_domain.jsp
index 5acd953..d59e607 100644
--- a/components/org.apache.stratos.register.ui/src/main/resources/web/tenant-register/select_domain.jsp
+++ b/components/org.apache.stratos.register.ui/src/main/resources/web/tenant-register/select_domain.jsp
@@ -18,7 +18,7 @@
-->
<%@ page import="org.apache.stratos.common.constants.StratosConstants" %>
<%@ page import="org.apache.stratos.common.util.CommonUtil" %>
-<%@ page import="org.wso2.carbon.register.ui.utils.TenantConfigUtil" %>
+<%@ page import="org.apache.stratos.register.ui.utils.TenantConfigUtil" %>
<%@ page import="org.apache.stratos.tenant.register.stub.beans.xsd.CaptchaInfoBean" %>
<%@ page import="org.wso2.carbon.ui.CarbonUIUtil" %>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/8a7eaee3/components/org.apache.stratos.register.ui/src/main/resources/web/tenant-register/select_usage_plan.jsp
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.register.ui/src/main/resources/web/tenant-register/select_usage_plan.jsp b/components/org.apache.stratos.register.ui/src/main/resources/web/tenant-register/select_usage_plan.jsp
index de521e9..07d5af3 100644
--- a/components/org.apache.stratos.register.ui/src/main/resources/web/tenant-register/select_usage_plan.jsp
+++ b/components/org.apache.stratos.register.ui/src/main/resources/web/tenant-register/select_usage_plan.jsp
@@ -18,7 +18,7 @@
-->
<%@ page import="org.apache.stratos.common.constants.StratosConstants" %>
<%@ page import="org.apache.stratos.common.util.CommonUtil" %>
-<%@ page import="org.wso2.carbon.register.ui.utils.TenantConfigUtil" %>
+<%@ page import="org.apache.stratos.register.ui.utils.TenantConfigUtil" %>
<%@ page import="org.apache.stratos.tenant.register.stub.beans.xsd.CaptchaInfoBean" %>
<%@ page import="org.wso2.carbon.ui.CarbonUIUtil" %>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/8a7eaee3/components/org.apache.stratos.register.ui/src/main/resources/web/tenant-register/submit_tenant_ajaxprocessor.jsp
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.register.ui/src/main/resources/web/tenant-register/submit_tenant_ajaxprocessor.jsp b/components/org.apache.stratos.register.ui/src/main/resources/web/tenant-register/submit_tenant_ajaxprocessor.jsp
index 1647921..026b1b1 100644
--- a/components/org.apache.stratos.register.ui/src/main/resources/web/tenant-register/submit_tenant_ajaxprocessor.jsp
+++ b/components/org.apache.stratos.register.ui/src/main/resources/web/tenant-register/submit_tenant_ajaxprocessor.jsp
@@ -16,7 +16,7 @@
~ specific language governing permissions and limitations
~ under the License.
-->
-<%@ page import="org.wso2.carbon.register.ui.utils.TenantConfigUtil" %>
+<%@ page import="org.apache.stratos.register.ui.utils.TenantConfigUtil" %>
<%@ page import="org.apache.stratos.common.constants.StratosConstants"%>
<%@ page import="org.wso2.carbon.captcha.mgt.constants.CaptchaMgtConstants"%>
<%@ page import="org.wso2.carbon.utils.multitenancy.MultitenantConstants" %>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/8a7eaee3/components/org.apache.stratos.tenant.mgt.core/src/main/java/org/apache/stratos/tenant/mgt/core/internal/TenantMgtCoreServiceComponent.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.tenant.mgt.core/src/main/java/org/apache/stratos/tenant/mgt/core/internal/TenantMgtCoreServiceComponent.java b/components/org.apache.stratos.tenant.mgt.core/src/main/java/org/apache/stratos/tenant/mgt/core/internal/TenantMgtCoreServiceComponent.java
index 56b8582..22a8a50 100644
--- a/components/org.apache.stratos.tenant.mgt.core/src/main/java/org/apache/stratos/tenant/mgt/core/internal/TenantMgtCoreServiceComponent.java
+++ b/components/org.apache.stratos.tenant.mgt.core/src/main/java/org/apache/stratos/tenant/mgt/core/internal/TenantMgtCoreServiceComponent.java
@@ -33,7 +33,7 @@ import org.wso2.carbon.user.core.tenant.TenantManager;
import org.apache.stratos.tenant.mgt.core.DefaultTenantPersistor;
/**
- * @scr.component name="org.wso2.carbon.tenant.mgt.core" immediate="true"
+ * @scr.component name="org.apache.stratos.tenant.mgt.core" immediate="true"
* @scr.reference name="registry.service"
* interface="org.wso2.carbon.registry.core.service.RegistryService"
* cardinality="1..1" policy="dynamic" bind="setRegistryService"
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/8a7eaee3/components/org.apache.stratos.tenant.mgt.ui/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.tenant.mgt.ui/pom.xml b/components/org.apache.stratos.tenant.mgt.ui/pom.xml
index d55b2a3..6a71d63 100644
--- a/components/org.apache.stratos.tenant.mgt.ui/pom.xml
+++ b/components/org.apache.stratos.tenant.mgt.ui/pom.xml
@@ -100,9 +100,9 @@
<version>${wso2carbon.version}</version>
</dependency>
<dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.tenant.mgt.stub</artifactId>
- <version>${wso2carbon.version}</version>
+ <groupId>org.apache.stratos</groupId>
+ <artifactId>org.apache.stratos.tenant.mgt.stub</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.stratos</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/8a7eaee3/components/org.apache.stratos.tenant.mgt.ui/src/main/java/org/apache/stratos/tenant/mgt/ui/clients/TenantServiceClient.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.tenant.mgt.ui/src/main/java/org/apache/stratos/tenant/mgt/ui/clients/TenantServiceClient.java b/components/org.apache.stratos.tenant.mgt.ui/src/main/java/org/apache/stratos/tenant/mgt/ui/clients/TenantServiceClient.java
index d7a4b76..15fafcc 100644
--- a/components/org.apache.stratos.tenant.mgt.ui/src/main/java/org/apache/stratos/tenant/mgt/ui/clients/TenantServiceClient.java
+++ b/components/org.apache.stratos.tenant.mgt.ui/src/main/java/org/apache/stratos/tenant/mgt/ui/clients/TenantServiceClient.java
@@ -26,9 +26,9 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.wso2.carbon.CarbonConstants;
import org.wso2.carbon.registry.core.exceptions.RegistryException;
-import org.wso2.carbon.tenant.mgt.stub.TenantMgtAdminServiceStub;
-import org.wso2.carbon.tenant.mgt.stub.beans.xsd.PaginatedTenantInfoBean;
-import org.wso2.carbon.tenant.mgt.stub.beans.xsd.TenantInfoBean;
+import org.apache.stratos.tenant.mgt.stub.TenantMgtAdminServiceStub;
+import org.apache.stratos.tenant.mgt.stub.beans.xsd.PaginatedTenantInfoBean;
+import org.apache.stratos.tenant.mgt.stub.beans.xsd.TenantInfoBean;
import org.wso2.carbon.ui.CarbonUIUtil;
import org.wso2.carbon.utils.ServerConstants;
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/8a7eaee3/components/org.apache.stratos.tenant.mgt.ui/src/main/java/org/apache/stratos/tenant/mgt/ui/utils/TenantMgtUtil.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.tenant.mgt.ui/src/main/java/org/apache/stratos/tenant/mgt/ui/utils/TenantMgtUtil.java b/components/org.apache.stratos.tenant.mgt.ui/src/main/java/org/apache/stratos/tenant/mgt/ui/utils/TenantMgtUtil.java
index 5de4a38..e1c9b69 100644
--- a/components/org.apache.stratos.tenant.mgt.ui/src/main/java/org/apache/stratos/tenant/mgt/ui/utils/TenantMgtUtil.java
+++ b/components/org.apache.stratos.tenant.mgt.ui/src/main/java/org/apache/stratos/tenant/mgt/ui/utils/TenantMgtUtil.java
@@ -20,7 +20,7 @@ package org.apache.stratos.tenant.mgt.ui.utils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.wso2.carbon.tenant.mgt.stub.beans.xsd.TenantInfoBean;
+import org.apache.stratos.tenant.mgt.stub.beans.xsd.TenantInfoBean;
import org.apache.stratos.tenant.mgt.ui.clients.TenantServiceClient;
import javax.servlet.ServletConfig;
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/8a7eaee3/components/org.apache.stratos.tenant.mgt.ui/src/main/resources/web/tenant-mgt/activate_tenant_ajaxprocessor.jsp
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.tenant.mgt.ui/src/main/resources/web/tenant-mgt/activate_tenant_ajaxprocessor.jsp b/components/org.apache.stratos.tenant.mgt.ui/src/main/resources/web/tenant-mgt/activate_tenant_ajaxprocessor.jsp
index c520c37..26ef239 100644
--- a/components/org.apache.stratos.tenant.mgt.ui/src/main/resources/web/tenant-mgt/activate_tenant_ajaxprocessor.jsp
+++ b/components/org.apache.stratos.tenant.mgt.ui/src/main/resources/web/tenant-mgt/activate_tenant_ajaxprocessor.jsp
@@ -17,7 +17,7 @@
~ under the License.
-->
-<%@ page import="org.wso2.carbon.tenant.mgt.ui.clients.TenantServiceClient" %>
+<%@ page import="org.apache.stratos.tenant.mgt.ui.clients.TenantServiceClient" %>
<%@ page import="org.wso2.carbon.ui.CarbonUIMessage" %>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<script type="text/javascript" src="../admin/js/jquery.js"></script>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/8a7eaee3/components/org.apache.stratos.tenant.mgt.ui/src/main/resources/web/tenant-mgt/add_tenant.jsp
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.tenant.mgt.ui/src/main/resources/web/tenant-mgt/add_tenant.jsp b/components/org.apache.stratos.tenant.mgt.ui/src/main/resources/web/tenant-mgt/add_tenant.jsp
index c75ee99..f2d85a6 100644
--- a/components/org.apache.stratos.tenant.mgt.ui/src/main/resources/web/tenant-mgt/add_tenant.jsp
+++ b/components/org.apache.stratos.tenant.mgt.ui/src/main/resources/web/tenant-mgt/add_tenant.jsp
@@ -16,9 +16,9 @@
~ specific language governing permissions and limitations
~ under the License.
-->
-<%@ page import="org.wso2.carbon.stratos.common.util.CommonUtil" %>
-<%@ page import="org.wso2.carbon.tenant.mgt.stub.beans.xsd.TenantInfoBean" %>
-<%@ page import="org.wso2.carbon.tenant.mgt.ui.utils.TenantMgtUtil" %>
+<%@ page import="org.apache.stratos.common.util.CommonUtil" %>
+<%@ page import="org.apache.stratos.tenant.mgt.stub.beans.xsd.TenantInfoBean" %>
+<%@ page import="org.apache.stratos.tenant.mgt.ui.utils.TenantMgtUtil" %>
<%@ page import="org.wso2.carbon.ui.CarbonUIMessage" %>
<%@ page import="org.wso2.carbon.base.ServerConfiguration" %>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/8a7eaee3/components/org.apache.stratos.tenant.mgt.ui/src/main/resources/web/tenant-mgt/check_domain_availability_ajaxprocessor.jsp
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.tenant.mgt.ui/src/main/resources/web/tenant-mgt/check_domain_availability_ajaxprocessor.jsp b/components/org.apache.stratos.tenant.mgt.ui/src/main/resources/web/tenant-mgt/check_domain_availability_ajaxprocessor.jsp
index 5b9083f..6d21e89 100644
--- a/components/org.apache.stratos.tenant.mgt.ui/src/main/resources/web/tenant-mgt/check_domain_availability_ajaxprocessor.jsp
+++ b/components/org.apache.stratos.tenant.mgt.ui/src/main/resources/web/tenant-mgt/check_domain_availability_ajaxprocessor.jsp
@@ -18,7 +18,7 @@
-->
<%@ page import="org.apache.axis2.AxisFault" %>
-<%@ page import="org.wso2.carbon.stratos.common.util.CommonUtil" %>
+<%@ page import="org.apache.stratos.common.util.CommonUtil" %>
<%@ page import="org.json.JSONException" %>
<%@ page import="org.json.JSONObject" %>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/8a7eaee3/components/org.apache.stratos.tenant.mgt.ui/src/main/resources/web/tenant-mgt/get_package_info_ajaxprocessor.jsp
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.tenant.mgt.ui/src/main/resources/web/tenant-mgt/get_package_info_ajaxprocessor.jsp b/components/org.apache.stratos.tenant.mgt.ui/src/main/resources/web/tenant-mgt/get_package_info_ajaxprocessor.jsp
index 7b405dd..be3d3df 100644
--- a/components/org.apache.stratos.tenant.mgt.ui/src/main/resources/web/tenant-mgt/get_package_info_ajaxprocessor.jsp
+++ b/components/org.apache.stratos.tenant.mgt.ui/src/main/resources/web/tenant-mgt/get_package_info_ajaxprocessor.jsp
@@ -18,7 +18,7 @@
-->
<%@ page import="org.wso2.carbon.ui.CarbonUIUtil" %>
<%@ page import="org.json.JSONArray" %>
-<%@ page import="org.wso2.carbon.tenant.mgt.ui.clients.PackageInfoServiceClient" %>
+<%@ page import="org.apache.stratos.tenant.mgt.ui.clients.PackageInfoServiceClient" %>
<%@ page import="org.wso2.carbon.utils.ServerConstants" %>
<%@ page import="org.apache.axis2.context.ConfigurationContext" %>
<%@ page import="org.wso2.carbon.CarbonConstants" %>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/8a7eaee3/components/org.apache.stratos.tenant.mgt.ui/src/main/resources/web/tenant-mgt/submit_tenant_ajaxprocessor.jsp
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.tenant.mgt.ui/src/main/resources/web/tenant-mgt/submit_tenant_ajaxprocessor.jsp b/components/org.apache.stratos.tenant.mgt.ui/src/main/resources/web/tenant-mgt/submit_tenant_ajaxprocessor.jsp
index a2ba3a1..8d02668 100644
--- a/components/org.apache.stratos.tenant.mgt.ui/src/main/resources/web/tenant-mgt/submit_tenant_ajaxprocessor.jsp
+++ b/components/org.apache.stratos.tenant.mgt.ui/src/main/resources/web/tenant-mgt/submit_tenant_ajaxprocessor.jsp
@@ -16,8 +16,8 @@
~ specific language governing permissions and limitations
~ under the License.
-->
-<%@ page import="org.wso2.carbon.stratos.common.util.CommonUtil" %>
-<%@ page import="org.wso2.carbon.tenant.mgt.ui.utils.TenantMgtUtil" %>
+<%@ page import="org.apache.stratos.common.util.CommonUtil" %>
+<%@ page import="org.apache.stratos.tenant.mgt.ui.utils.TenantMgtUtil" %>
<%@ page import="org.wso2.carbon.ui.CarbonUIMessage" %>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<script type="text/javascript" src="../admin/js/jquery.js"></script>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/8a7eaee3/components/org.apache.stratos.tenant.mgt.ui/src/main/resources/web/tenant-mgt/view_tenants.jsp
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.tenant.mgt.ui/src/main/resources/web/tenant-mgt/view_tenants.jsp b/components/org.apache.stratos.tenant.mgt.ui/src/main/resources/web/tenant-mgt/view_tenants.jsp
index 626b3b1..bd79380 100644
--- a/components/org.apache.stratos.tenant.mgt.ui/src/main/resources/web/tenant-mgt/view_tenants.jsp
+++ b/components/org.apache.stratos.tenant.mgt.ui/src/main/resources/web/tenant-mgt/view_tenants.jsp
@@ -18,10 +18,10 @@
-->
<%@ page import="org.apache.axis2.context.ConfigurationContext" %>
<%@ page import="org.wso2.carbon.CarbonConstants" %>
-<%@ page import="org.wso2.carbon.tenant.mgt.stub.beans.xsd.PaginatedTenantInfoBean" %>
-<%@ page import="org.wso2.carbon.tenant.mgt.stub.beans.xsd.TenantInfoBean" %>
-<%@ page import="org.wso2.carbon.tenant.mgt.ui.clients.TenantServiceClient" %>
-<%@ page import="org.wso2.carbon.tenant.mgt.ui.utils.TenantMgtUtil" %>
+<%@ page import="org.apache.stratos.tenant.mgt.stub.beans.xsd.PaginatedTenantInfoBean" %>
+<%@ page import="org.apache.stratos.tenant.mgt.stub.beans.xsd.TenantInfoBean" %>
+<%@ page import="org.apache.stratos.tenant.mgt.ui.clients.TenantServiceClient" %>
+<%@ page import="org.apache.stratos.tenant.mgt.ui.utils.TenantMgtUtil" %>
<%@ page import="org.wso2.carbon.ui.CarbonUIMessage" %>
<%@ page import="org.wso2.carbon.ui.CarbonUIUtil" %>
<%@ page import="org.wso2.carbon.utils.ServerConstants" %>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/8a7eaee3/components/org.apache.stratos.tenant.mgt/src/main/java/org/apache/stratos/tenant/mgt/internal/util/TenantMgtRampartUtil.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.tenant.mgt/src/main/java/org/apache/stratos/tenant/mgt/internal/util/TenantMgtRampartUtil.java b/components/org.apache.stratos.tenant.mgt/src/main/java/org/apache/stratos/tenant/mgt/internal/util/TenantMgtRampartUtil.java
index 7cc40c7..69e703a 100644
--- a/components/org.apache.stratos.tenant.mgt/src/main/java/org/apache/stratos/tenant/mgt/internal/util/TenantMgtRampartUtil.java
+++ b/components/org.apache.stratos.tenant.mgt/src/main/java/org/apache/stratos/tenant/mgt/internal/util/TenantMgtRampartUtil.java
@@ -22,7 +22,7 @@ public class TenantMgtRampartUtil {
//Populate Rampart Configuration
RampartConfig rampartConfig = new RampartConfig();
rampartConfig.setUser(privateKeyAlias);
- rampartConfig.setPwCbClass("org.wso2.carbon.tenant.mgt.services.InMemoryPasswordcallbackHandler");
+ rampartConfig.setPwCbClass("org.apache.stratos.tenant.mgt.services.InMemoryPasswordcallbackHandler");
//Set the private key alias and private key password in the password callback handler
InMemoryPasswordcallbackHandler.addUser(privateKeyAlias, privateKeyPassword);
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/8a7eaee3/features/manager/tenant-mgt/org.apache.stratos.tenant.mgt.core.feature/resources/p2.inf
----------------------------------------------------------------------
diff --git a/features/manager/tenant-mgt/org.apache.stratos.tenant.mgt.core.feature/resources/p2.inf b/features/manager/tenant-mgt/org.apache.stratos.tenant.mgt.core.feature/resources/p2.inf
index 644de8e..5ea2354 100644
--- a/features/manager/tenant-mgt/org.apache.stratos.tenant.mgt.core.feature/resources/p2.inf
+++ b/features/manager/tenant-mgt/org.apache.stratos.tenant.mgt.core.feature/resources/p2.inf
@@ -1,2 +1,2 @@
instructions.configure = \
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/features/org.wso2.carbon.tenant.mgt.core_${feature.version}/conf/cloud-services-desc.xml,target:${installFolder}/../conf/cloud-services-desc.xml,overwrite:true);
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/features/org.apache.stratos.tenant.mgt.core_${feature.version}/conf/cloud-services-desc.xml,target:${installFolder}/../conf/cloud-services-desc.xml,overwrite:true);
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/8a7eaee3/features/manager/tenant-mgt/org.apache.stratos.tenant.mgt.core.feature/src/main/resources/p2.inf
----------------------------------------------------------------------
diff --git a/features/manager/tenant-mgt/org.apache.stratos.tenant.mgt.core.feature/src/main/resources/p2.inf b/features/manager/tenant-mgt/org.apache.stratos.tenant.mgt.core.feature/src/main/resources/p2.inf
index 644de8e..5ea2354 100644
--- a/features/manager/tenant-mgt/org.apache.stratos.tenant.mgt.core.feature/src/main/resources/p2.inf
+++ b/features/manager/tenant-mgt/org.apache.stratos.tenant.mgt.core.feature/src/main/resources/p2.inf
@@ -1,2 +1,2 @@
instructions.configure = \
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/features/org.wso2.carbon.tenant.mgt.core_${feature.version}/conf/cloud-services-desc.xml,target:${installFolder}/../conf/cloud-services-desc.xml,overwrite:true);
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/features/org.apache.stratos.tenant.mgt.core_${feature.version}/conf/cloud-services-desc.xml,target:${installFolder}/../conf/cloud-services-desc.xml,overwrite:true);
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/8a7eaee3/features/manager/tenant-mgt/org.apache.stratos.tenant.mgt.server.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/tenant-mgt/org.apache.stratos.tenant.mgt.server.feature/pom.xml b/features/manager/tenant-mgt/org.apache.stratos.tenant.mgt.server.feature/pom.xml
index f00dff9..5c4dc32 100644
--- a/features/manager/tenant-mgt/org.apache.stratos.tenant.mgt.server.feature/pom.xml
+++ b/features/manager/tenant-mgt/org.apache.stratos.tenant.mgt.server.feature/pom.xml
@@ -65,7 +65,7 @@
<goal>p2-feature-gen</goal>
</goals>
<configuration>
- <id>org.wso2.carbon.tenant.mgt.server</id>
+ <id>org.apache.stratos.tenant.mgt.server</id>
<propertiesFile>../../../../etc/feature.properties</propertiesFile>
<adviceFile>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/8a7eaee3/products/stratos_controller/modules/features/service/org.apache.stratos.server.feature/pom.xml
----------------------------------------------------------------------
diff --git a/products/stratos_controller/modules/features/service/org.apache.stratos.server.feature/pom.xml b/products/stratos_controller/modules/features/service/org.apache.stratos.server.feature/pom.xml
index 4ff39cc..dc339b0 100755
--- a/products/stratos_controller/modules/features/service/org.apache.stratos.server.feature/pom.xml
+++ b/products/stratos_controller/modules/features/service/org.apache.stratos.server.feature/pom.xml
@@ -212,8 +212,8 @@
<bundleDef>org.apache.stratos:org.apache.stratos.email.sender:${project.version}</bundleDef>
<bundleDef>org.apache.stratos:org.apache.stratos.tenant.mgt.email.sender:${project.version}</bundleDef>
<bundleDef>org.apache.stratos:org.apache.stratos.account.mgt:${project.version}</bundleDef>
- <!--<bundleDef>org.wso2.carbon:org.wso2.carbon.tenant.mgt</bundleDef>-->
- <!--<bundleDef>org.wso2.carbon:org.wso2.carbon.tenant.mgt.core</bundleDef>-->
+ <!--<bundleDef>org.wso2.carbon:org.apache.stratos.tenant.mgt</bundleDef>-->
+ <!--<bundleDef>org.wso2.carbon:org.apache.stratos.tenant.mgt.core</bundleDef>-->
<!--<bundleDef>org.wso2.carbon:org.wso2.carbon.theme.mgt</bundleDef>-->
<bundleDef>org.apache.stratos:org.apache.stratos.validate.domain:${project.version}</bundleDef>
<bundleDef>org.wso2.carbon:org.wso2.carbon.email.verification:${carbon.version}</bundleDef>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/8a7eaee3/products/stratos_controller/modules/features/service/org.apache.stratos.ui.feature/pom.xml
----------------------------------------------------------------------
diff --git a/products/stratos_controller/modules/features/service/org.apache.stratos.ui.feature/pom.xml b/products/stratos_controller/modules/features/service/org.apache.stratos.ui.feature/pom.xml
index 450c14d..bdec5c9 100755
--- a/products/stratos_controller/modules/features/service/org.apache.stratos.ui.feature/pom.xml
+++ b/products/stratos_controller/modules/features/service/org.apache.stratos.ui.feature/pom.xml
@@ -53,7 +53,7 @@
</dependency>
<!--<dependency>
<groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.tenant.mgt.ui</artifactId>
+ <artifactId>org.apache.stratos.tenant.mgt.ui</artifactId>
<version>${stratos.version}</version>
</dependency>-->
<dependency>
@@ -166,7 +166,7 @@
</adviceFile>
<bundles>
<bundleDef>org.apache.stratos:org.apache.stratos.account.mgt.ui:${project.version}</bundleDef>
- <!--<bundleDef>org.wso2.carbon:org.wso2.carbon.tenant.mgt.ui</bundleDef>-->
+ <!--<bundleDef>org.wso2.carbon:org.apache.stratos.tenant.mgt.ui</bundleDef>-->
<bundleDef>org.apache.stratos:org.apache.stratos.theme.mgt.ui:${project.version}</bundleDef>
<bundleDef>org.apache.stratos:org.apache.stratos.theme.mgt.stub:${project.version}</bundleDef>
<bundleDef>org.apache.batik.wso2:batik</bundleDef>
@@ -186,7 +186,7 @@
<bundleDef>org.apache.stratos:org.apache.stratos.account.mgt.stub:${project.version}</bundleDef>
<bundleDef>org.apache.stratos:org.apache.stratos.validate.domain.stub:${project.version}</bundleDef>
- <!--<bundleDef>org.wso2.carbon:org.wso2.carbon.tenant.mgt.stub:${wso2carbon.version}</bundleDef>-->
+ <!--<bundleDef>org.wso2.carbon:org.apache.stratos.tenant.mgt.stub:${wso2carbon.version}</bundleDef>-->
<bundleDef>org.apache.stratos:org.apache.stratos.tenant.register.stub:${project.version}</bundleDef>
<bundleDef>org.wso2.carbon:org.wso2.carbon.payment.stub:${wso2carbon.version}</bundleDef>
</bundles>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/8a7eaee3/products/stratos_controller/modules/integration/pom.xml
----------------------------------------------------------------------
diff --git a/products/stratos_controller/modules/integration/pom.xml b/products/stratos_controller/modules/integration/pom.xml
index 7f53d1d..ee863e8 100755
--- a/products/stratos_controller/modules/integration/pom.xml
+++ b/products/stratos_controller/modules/integration/pom.xml
@@ -150,9 +150,9 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.tenant.mgt.stub</artifactId>
- <version>${carbon.version}</version>
+ <groupId>org.apache.stratos</groupId>
+ <artifactId>org.apache.stratos.tenant.mgt.stub</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/8a7eaee3/products/stratos_controller/modules/integration/src/test/java/org/apache/stratos/manager/integration/tests/TenantMgtTestCase.java
----------------------------------------------------------------------
diff --git a/products/stratos_controller/modules/integration/src/test/java/org/apache/stratos/manager/integration/tests/TenantMgtTestCase.java b/products/stratos_controller/modules/integration/src/test/java/org/apache/stratos/manager/integration/tests/TenantMgtTestCase.java
index f33946c..963e0a1 100755
--- a/products/stratos_controller/modules/integration/src/test/java/org/apache/stratos/manager/integration/tests/TenantMgtTestCase.java
+++ b/products/stratos_controller/modules/integration/src/test/java/org/apache/stratos/manager/integration/tests/TenantMgtTestCase.java
@@ -27,8 +27,8 @@ import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
import org.wso2.carbon.integration.framework.utils.FrameworkSettings;
-import org.wso2.carbon.tenant.mgt.stub.TenantMgtAdminServiceStub;
-import org.wso2.carbon.tenant.mgt.stub.beans.xsd.TenantInfoBean;
+import org.apache.stratos.tenant.mgt.stub.TenantMgtAdminServiceStub;
+import org.apache.stratos.tenant.mgt.stub.beans.xsd.TenantInfoBean;
import org.wso2.carbon.utils.CarbonUtils;
import java.util.Calendar;
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/8a7eaee3/service-stubs/org.apache.stratos.tenant.mgt.stub/pom.xml
----------------------------------------------------------------------
diff --git a/service-stubs/org.apache.stratos.tenant.mgt.stub/pom.xml b/service-stubs/org.apache.stratos.tenant.mgt.stub/pom.xml
index f8f25d9..9d6efaa 100644
--- a/service-stubs/org.apache.stratos.tenant.mgt.stub/pom.xml
+++ b/service-stubs/org.apache.stratos.tenant.mgt.stub/pom.xml
@@ -49,8 +49,8 @@
<tasks>
<java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
<arg line="-uri src/main/resources/TenantMgtAdminService.wsdl -u -uw -o target/generated-code
- -p org.wso2.carbon.tenant.mgt.stub
- -ns2p http://services.mgt.tenant.carbon.wso2.org=org.wso2.carbon.tenant.mgt.stub.services,http://beans.mgt.tenant.carbon.wso2.org/xsd=org.wso2.carbon.tenant.mgt.stub.beans.xsd,http://beans.common.stratos.carbon.wso2.org/xsd=org.wso2.carbon.tenant.mgt.stub.beans.xsd"/>
+ -p org.apache.stratos.tenant.mgt.stub
+ -ns2p http://services.mgt.tenant.stratos.apache.org=org.apache.stratos.tenant.mgt.stub.services,http://beans.mgt.tenant.stratos.apache.org/xsd=org.apache.stratos.tenant.mgt.stub.beans.xsd,http://beans.common.stratos.apache.org/xsd=org.apache.stratos.tenant.mgt.stub.beans.xsd"/>
<classpath refid="maven.dependency.classpath"/>
<classpath refid="maven.compile.classpath"/>
<classpath refid="maven.runtime.classpath"/>
@@ -71,10 +71,10 @@
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Bundle-Name>${project.artifactId}</Bundle-Name>
<Export-Package>
- org.wso2.carbon.tenant.mgt.stub.*; version="${carbon.platform.package.export.version}"
+ org.apache.stratos.tenant.mgt.stub.*; version="${carbon.platform.package.export.version}"
</Export-Package>
<Import-Package>
- !org.wso2.carbon.tenant.mgt.stub.*,
+ !org.apache.stratos.tenant.mgt.stub.*,
*;resolution:=optional
</Import-Package>
</instructions>