You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by re...@apache.org on 2015/05/21 11:37:34 UTC

[5/5] stratos git commit: removing account mgt, domain validation as it is not used

removing account mgt, domain validation as it is not used


Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/bfc6d758
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/bfc6d758
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/bfc6d758

Branch: refs/heads/master
Commit: bfc6d75863d57d8ae9eacf02515f9fa26bfb4b99
Parents: a03ff6d
Author: reka <rt...@gmail.com>
Authored: Thu May 21 15:05:11 2015 +0530
Committer: reka <rt...@gmail.com>
Committed: Thu May 21 15:07:19 2015 +0530

----------------------------------------------------------------------
 .../org.apache.stratos.account.mgt.ui/pom.xml   |  96 ---
 .../mgt/ui/clients/AccountMgtClient.java        | 178 -----
 .../mgt/ui/clients/EmailValidationClient.java   |  97 ---
 .../ui/clients/PackageInfoServiceClient.java    |  99 ---
 .../account/mgt/ui/clients/UsagePlanClient.java | 109 ----
 .../stratos/account/mgt/ui/utils/Util.java      | 119 ----
 .../src/main/resources/AccountMgtService.wsdl   | 646 -------------------
 .../main/resources/EmailValidationService.wsdl  | 113 ----
 .../src/main/resources/META-INF/component.xml   |  36 --
 .../account/mgt/ui/i18n/JSResources.properties  |  22 -
 .../account/mgt/ui/i18n/Resources.properties    |  41 --
 .../resources/web/account-mgt/account_mgt.jsp   | 530 ---------------
 .../web/account-mgt/css/account_mgt.css         |  34 -
 .../web/account-mgt/css/update_profile.css      |  48 --
 .../deactivate_account_ajaxprocessor.jsp        |  39 --
 .../web/account-mgt/docs/aboutUsagePlans.html   | 105 ---
 .../web/account-mgt/docs/images/account-mgt.png | Bin 39610 -> 0 bytes
 .../web/account-mgt/docs/userguide.html         |  45 --
 .../get_package_info_ajaxprocessor.jsp          |  40 --
 .../web/account-mgt/images/account-mgt-icon.gif | Bin 1041 -> 0 bytes
 .../web/account-mgt/images/ajax-loader.gif      | Bin 673 -> 0 bytes
 .../resources/web/account-mgt/images/right.gif  | Bin 924 -> 0 bytes
 .../resources/web/account-mgt/images/wrong.gif  | Bin 976 -> 0 bytes
 .../account-mgt/init_payment_ajaxprocessor.jsp  | 100 ---
 .../resources/web/account-mgt/js/account_mgt.js | 233 -------
 .../update_contact_ajaxprocessor.jsp            |  36 --
 .../account-mgt/update_profile_processor.jsp    |  63 --
 .../web/account-mgt/update_verifier.jsp         |  57 --
 ...update_verifier_redirector_ajaxprocessor.jsp |  31 -
 .../validate_domain_ajaxprocessor.jsp           |  30 -
 .../validation_success_ajaxprocessor.jsp        |  50 --
 .../org.apache.stratos.account.mgt/pom.xml      |  92 ---
 .../account/mgt/beans/AccountInfoBean.java      |  40 --
 .../internal/AccountMgtServiceComponent.java    | 140 ----
 .../account/mgt/services/AccountMgtService.java | 413 ------------
 .../mgt/services/EmailValidationService.java    | 156 -----
 .../apache/stratos/account/mgt/util/Util.java   | 174 -----
 .../src/main/resources/META-INF/component.xml   |  31 -
 .../src/main/resources/META-INF/services.xml    |  82 ---
 .../pom.xml                                     | 133 ----
 .../ui/clients/TenantActivityServiceClient.java | 156 -----
 .../TenantActivityUIServiceComponent.java       |  73 ---
 .../ui/utils/ManagerConfigurations.java         | 148 -----
 .../activity/ui/utils/TenantMonitorUtil.java    | 143 ----
 .../src/main/resources/META-INF/component.xml   |  36 --
 .../activity/ui/i18n/JSResources.properties     |  18 -
 .../activity/ui/i18n/Resources.properties       |  28 -
 .../web/tenant-activity/css/tenant-usage.css    |  47 --
 .../tenant-activity/docs/images/view-usage.png  | Bin 44786 -> 0 bytes
 .../web/tenant-activity/docs/userguide.html     |  77 ---
 .../find-tenant-ajaxprocessor.jsp               |  60 --
 .../web/tenant-activity/find-tenant.jsp         | 111 ----
 .../tenant-activity/get-data-ajaxprocessor.jsp  |  67 --
 .../images/instance-usage-report.gif            | Bin 849 -> 0 bytes
 .../web/tenant-activity/images/search.gif       | Bin 191 -> 0 bytes
 .../images/tenant-usage-report.gif              | Bin 1008 -> 0 bytes
 .../images/user-usage-report.gif                | Bin 1033 -> 0 bytes
 .../web/tenant-activity/show-active-tenants.jsp | 130 ----
 .../web/tenant-activity/tenant-activity.jsp     | 175 -----
 .../pom.xml                                     | 105 ---
 .../ui/clients/ValidateDomainAdminClient.java   | 118 ----
 .../domain/ui/clients/ValidateDomainClient.java |  30 -
 .../clients/ValidateDomainNonAdminClient.java   | 116 ----
 .../stratos/validate/domain/ui/utils/Util.java  |  43 --
 .../src/main/resources/META-INF/component.xml   |  22 -
 .../resources/ValidateDomainAdminService.wsdl   | 257 --------
 .../main/resources/ValidateDomainService.wsdl   | 257 --------
 .../domain/ui/i18n/JSResources.properties       |  28 -
 .../domain/ui/i18n/Resources.properties         |  24 -
 .../web/validate-domain/css/validate_domain.css |  52 --
 .../docs/images/domain-validation.png           | Bin 56415 -> 0 bytes
 .../web/validate-domain/docs/userguide.html     |  48 --
 .../web/validate-domain/images/ajax-loader.gif  | Bin 673 -> 0 bytes
 .../web/validate-domain/images/right.gif        | Bin 924 -> 0 bytes
 .../web/validate-domain/images/wrong.gif        | Bin 976 -> 0 bytes
 .../web/validate-domain/js/validate_domain.js   | 172 -----
 .../submit_validate_domain_ajaxprocessor.jsp    |  37 --
 .../validate_domain_logged_in.jsp               |  23 -
 .../validate_domain_not_logged_in.jsp           |  23 -
 .../validate_domain_template.jsp                | 203 ------
 .../validate_with_dns_ajaxprocessor.jsp         |  40 --
 .../validate_with_text_ajaxprocessor.jsp        |  40 --
 .../org.apache.stratos.validate.domain/pom.xml  |  83 ---
 .../ValidateDomainServiceComponent.java         |  88 ---
 .../services/ValidateDomainAdminService.java    |  40 --
 .../domain/services/ValidateDomainService.java  |  83 ---
 .../stratos/validate/domain/util/Util.java      | 320 ---------
 .../src/main/resources/META-INF/services.xml    |  41 --
 components/pom.xml                              |   5 -
 .../pom.xml                                     |  96 ---
 features/manager/tenant-activity/pom.xml        |   1 -
 91 files changed, 7922 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/stratos/blob/bfc6d758/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
deleted file mode 100644
index 5e56aba..0000000
--- a/components/org.apache.stratos.account.mgt.ui/pom.xml
+++ /dev/null
@@ -1,96 +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.
- -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <parent>
-        <groupId>org.apache.stratos</groupId>
-        <artifactId>stratos-components-parent</artifactId>
-        <version>4.1.0-SNAPSHOT</version>
-    </parent>
-
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>org.apache.stratos.account.mgt.ui</artifactId>
-    <packaging>bundle</packaging>
-    <name>Apache Stratos - Account Managment - User Interface</name>
-
-    <build>
-
-        <plugins>
-
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-
-                <extensions>true</extensions>
-                <configuration>
-                    <instructions>
-                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-                        <Bundle-Name>${project.artifactId}</Bundle-Name>
-                        <Export-Package>
-                            org.apache.stratos.account.mgt.ui.*,
-                        </Export-Package>
-                        <Import-Package>
-                            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}",
-                            *;resolution:=optional
-                        </Import-Package>
-                        <Carbon-Component>UIBundle</Carbon-Component>
-                    </instructions>
-                </configuration>
-            </plugin>
-
-        </plugins>
-    </build>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.wso2.carbon</groupId>
-            <artifactId>org.wso2.carbon.ui</artifactId>
-            <version>${wso2carbon.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.stratos</groupId>
-            <artifactId>org.apache.stratos.account.mgt.stub</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.wso2.carbon</groupId>
-            <artifactId>org.wso2.carbon.tenant.mgt.stub</artifactId>
-            <version>${wso2carbon.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.stratos</groupId>
-            <artifactId>org.apache.stratos.common</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.json.wso2</groupId>
-            <artifactId>json</artifactId>
-            <version>${json.wso2.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.stratos</groupId>
-            <artifactId>org.apache.stratos.common.stub</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-    </dependencies>
-</project>

http://git-wip-us.apache.org/repos/asf/stratos/blob/bfc6d758/components/org.apache.stratos.account.mgt.ui/src/main/java/org/apache/stratos/account/mgt/ui/clients/AccountMgtClient.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.account.mgt.ui/src/main/java/org/apache/stratos/account/mgt/ui/clients/AccountMgtClient.java b/components/org.apache.stratos.account.mgt.ui/src/main/java/org/apache/stratos/account/mgt/ui/clients/AccountMgtClient.java
deleted file mode 100644
index 15f608f..0000000
--- a/components/org.apache.stratos.account.mgt.ui/src/main/java/org/apache/stratos/account/mgt/ui/clients/AccountMgtClient.java
+++ /dev/null
@@ -1,178 +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.account.mgt.ui.clients;
-
-import org.apache.axis2.AxisFault;
-import org.apache.axis2.client.Options;
-import org.apache.axis2.client.ServiceClient;
-import org.apache.axis2.context.ConfigurationContext;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.wso2.carbon.CarbonConstants;
-import org.apache.stratos.account.mgt.stub.beans.xsd.AccountInfoBean;
-import org.apache.stratos.account.mgt.stub.services.AccountMgtServiceStub;
-import org.wso2.carbon.registry.core.exceptions.RegistryException;
-import org.wso2.carbon.ui.CarbonUIUtil;
-import org.wso2.carbon.utils.ServerConstants;
-
-import javax.servlet.ServletConfig;
-import javax.servlet.http.HttpSession;
-
-public class AccountMgtClient {
-    private static final Log log = LogFactory.getLog(AccountMgtClient.class);
-
-    private AccountMgtServiceStub stub;
-    private String epr;
-
-    public AccountMgtClient(String cookie, String backendServerURL,
-            ConfigurationContext configContext) throws RegistryException {
-
-        epr = backendServerURL + "AccountMgtService";
-
-        try {
-            stub = new AccountMgtServiceStub(configContext, epr);
-
-            ServiceClient client = stub._getServiceClient();
-            Options option = client.getOptions();
-            option.setManageSession(true);
-            option.setProperty(org.apache.axis2.transport.http.HTTPConstants.COOKIE_STRING, cookie);
-
-        } catch (AxisFault axisFault) {
-            String msg = "Failed to initiate AccountMgt service client.";
-            log.error(msg, axisFault);
-            throw new RegistryException(msg, axisFault);
-        }
-    }
-
-    public AccountMgtClient(ServletConfig config, HttpSession session) throws RegistryException {
-
-        String cookie = (String) session.getAttribute(ServerConstants.ADMIN_SERVICE_COOKIE);
-        String backendServerURL = CarbonUIUtil.getServerURL(config.getServletContext(), session);
-        ConfigurationContext configContext =
-                (ConfigurationContext) config.getServletContext().getAttribute(
-                        CarbonConstants.CONFIGURATION_CONTEXT);
-        epr = backendServerURL + "AccountMgtService";
-
-        try {
-            stub = new AccountMgtServiceStub(configContext, epr);
-
-            ServiceClient client = stub._getServiceClient();
-            Options option = client.getOptions();
-            option.setManageSession(true);
-            option.setProperty(org.apache.axis2.transport.http.HTTPConstants.COOKIE_STRING, cookie);
-
-        } catch (AxisFault axisFault) {
-            String msg = "Failed to initiate AccountMgt service client.";
-            log.error(msg, axisFault);
-            throw new RegistryException(msg, axisFault);
-        }
-    }
-
-    public void updateContact(String contactEmail) throws RegistryException {
-        try {
-            stub.updateContact(contactEmail);
-        } catch (Exception e) {
-            String msg = "Failed to update contact.";
-            log.error(msg, e);
-            throw new RegistryException(msg, e);
-        }
-    }
-
-    public String getContact() throws RegistryException {
-        try {
-            return stub.getContact();
-        } catch (Exception e) {
-            String msg = "Failed to get contact.";
-            log.error(msg, e);
-            throw new RegistryException(msg, e);
-        }
-    }
-
-   public boolean updateFullname(AccountInfoBean fullname) throws RegistryException {
-        try {
-            return stub.updateFullname(fullname);
-        } catch (Exception e) {
-            String msg = "Failed to update Fullname.";
-            log.error(msg, e);
-            throw new RegistryException(msg, e);
-        }
-    }
-
-    public AccountInfoBean getFullname() throws RegistryException {
-        try {
-            return stub.getFullname();
-        } catch (Exception e) {
-            String msg = "Failed to get administrator full name.";
-            log.error(msg, e);
-            throw new RegistryException(msg, e);
-        }
-    }
-
-    public void deactivate() throws RegistryException {
-        try {
-            stub.deactivate();
-        } catch (Exception e) {
-            String msg = "Failed to deactivate.";
-            log.error(msg, e);
-            throw new RegistryException(msg, e);
-        }
-    }
-
-    public boolean isDomainValidated() throws RegistryException {
-        try {
-            return stub.isDomainValidated();
-        } catch (Exception e) {
-            String msg = "Failed to check the domain validation.";
-            log.error(msg, e);
-            throw new RegistryException(msg, e);
-        }
-    }
-
-    public boolean finishedDomainValidation(String validatedDomain, String successKey)
-            throws RegistryException {
-        try {
-            return stub.finishedDomainValidation(validatedDomain, successKey);
-        } catch (Exception e) {
-            String msg = "Failed to finish the domain validation.";
-            log.error(msg, e);
-            throw new RegistryException(msg, e);
-        }
-    }
-
-    public boolean checkDomainAvailability(String domainName) throws RegistryException {
-        try {
-            return stub.checkDomainAvailability(domainName);
-        } catch (Exception e) {
-            String msg = "Failed to finish the domain availability.";
-            log.error(msg, e);
-            throw new RegistryException(msg, e);
-        }
-    }
-
-    public boolean isEmailValidated() throws RegistryException {
-        try {
-            return stub.isEmailValidated();
-        } catch (Exception e) {
-            String msg = "Failed to check the email validation.";
-            log.error(msg, e);
-            throw new RegistryException(msg, e);
-        }
-    }
-}

http://git-wip-us.apache.org/repos/asf/stratos/blob/bfc6d758/components/org.apache.stratos.account.mgt.ui/src/main/java/org/apache/stratos/account/mgt/ui/clients/EmailValidationClient.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.account.mgt.ui/src/main/java/org/apache/stratos/account/mgt/ui/clients/EmailValidationClient.java b/components/org.apache.stratos.account.mgt.ui/src/main/java/org/apache/stratos/account/mgt/ui/clients/EmailValidationClient.java
deleted file mode 100644
index 190b29d..0000000
--- a/components/org.apache.stratos.account.mgt.ui/src/main/java/org/apache/stratos/account/mgt/ui/clients/EmailValidationClient.java
+++ /dev/null
@@ -1,97 +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.account.mgt.ui.clients;
-
-import org.apache.axis2.AxisFault;
-import org.apache.axis2.client.Options;
-import org.apache.axis2.client.ServiceClient;
-import org.apache.axis2.context.ConfigurationContext;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.wso2.carbon.CarbonConstants;
-import org.apache.stratos.account.mgt.stub.services.EmailValidationServiceStub;
-import org.wso2.carbon.registry.core.exceptions.RegistryException;
-import org.wso2.carbon.ui.CarbonUIUtil;
-import org.wso2.carbon.utils.ServerConstants;
-
-import javax.servlet.ServletConfig;
-import javax.servlet.http.HttpSession;
-
-public class EmailValidationClient {
-     private static final Log log = LogFactory.getLog(EmailValidationClient.class);
-
-    private EmailValidationServiceStub stub;
-    private String epr;
-
-    public EmailValidationClient(
-            String cookie, String backendServerURL, ConfigurationContext configContext)
-            throws RegistryException {
-
-        epr = backendServerURL + "EmailValidationService";
-
-        try {
-            stub = new EmailValidationServiceStub(configContext, epr);
-
-            ServiceClient client = stub._getServiceClient();
-            Options option = client.getOptions();
-            option.setManageSession(true);
-            option.setProperty(org.apache.axis2.transport.http.HTTPConstants.COOKIE_STRING, cookie);
-
-        } catch (AxisFault axisFault) {
-            String msg = "Failed to initiate EmailValidationService service client.";
-            log.error(msg, axisFault);
-            throw new RegistryException(msg, axisFault);
-        }
-    }
-
-    public EmailValidationClient(ServletConfig config, HttpSession session)
-            throws RegistryException {
-
-        String cookie = (String)session.getAttribute(ServerConstants.ADMIN_SERVICE_COOKIE);
-        String backendServerURL = CarbonUIUtil.getServerURL(config.getServletContext(), session);
-        ConfigurationContext configContext = (ConfigurationContext) config.
-                getServletContext().getAttribute(CarbonConstants.CONFIGURATION_CONTEXT);
-        epr = backendServerURL + "EmailValidationService";
-
-        try {
-            stub = new EmailValidationServiceStub(configContext, epr);
-
-            ServiceClient client = stub._getServiceClient();
-            Options option = client.getOptions();
-            option.setManageSession(true);
-            option.setProperty(org.apache.axis2.transport.http.HTTPConstants.COOKIE_STRING, cookie);
-
-        } catch (AxisFault axisFault) {
-            String msg = "Failed to initiate EmailValidationService service client.";
-            log.error(msg, axisFault);
-            throw new RegistryException(msg, axisFault);
-        }
-    }
-
-    public void proceedUpdateContact(String domain, String email, String confirmationKey) throws RegistryException {
-        try {
-            stub.proceedUpdateContact(domain, email, confirmationKey);
-        } catch (Exception e) {
-            String msg = "Failed to proceed update contacts.";
-            log.error(msg, e);
-            throw new RegistryException(msg, e);
-        }
-    }
-}

http://git-wip-us.apache.org/repos/asf/stratos/blob/bfc6d758/components/org.apache.stratos.account.mgt.ui/src/main/java/org/apache/stratos/account/mgt/ui/clients/PackageInfoServiceClient.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.account.mgt.ui/src/main/java/org/apache/stratos/account/mgt/ui/clients/PackageInfoServiceClient.java b/components/org.apache.stratos.account.mgt.ui/src/main/java/org/apache/stratos/account/mgt/ui/clients/PackageInfoServiceClient.java
deleted file mode 100644
index 1425a58..0000000
--- a/components/org.apache.stratos.account.mgt.ui/src/main/java/org/apache/stratos/account/mgt/ui/clients/PackageInfoServiceClient.java
+++ /dev/null
@@ -1,99 +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.account.mgt.ui.clients;
-
-import org.apache.axis2.AxisFault;
-import org.apache.axis2.client.Options;
-import org.apache.axis2.client.ServiceClient;
-import org.apache.axis2.context.ConfigurationContext;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.json.JSONArray;
-import org.json.JSONObject;
-import org.wso2.carbon.registry.core.exceptions.RegistryException;
-import org.apache.stratos.common.packages.stub.PackageInfoServiceStub;
-import org.apache.stratos.common.packages.stub.PackageInfo;
-
-/**
- * PackageInfoService client
- */
-public class PackageInfoServiceClient {
-
-    private static Log log = LogFactory.getLog(PackageInfoServiceClient.class);
-
-    private PackageInfoServiceStub stub;
-    private String epr;
-
-    public PackageInfoServiceClient(
-            String cookie, String backendServerURL, ConfigurationContext configContext)
-            throws Exception {
-
-        epr = backendServerURL + "PackageInfoService";
-
-        try {
-            stub = new PackageInfoServiceStub(configContext, epr);
-
-            ServiceClient client = stub._getServiceClient();
-            Options option = client.getOptions();
-            option.setManageSession(true);
-            option.setProperty(org.apache.axis2.transport.http.HTTPConstants.COOKIE_STRING, cookie);
-
-        } catch (AxisFault axisFault) {
-            String msg = "Failed to initiate PackageInfoService client. " + axisFault.getMessage();
-            log.error(msg, axisFault);
-            throw new RegistryException(msg, axisFault);
-        }
-    }
-
-    public PackageInfo[] getBillingPackages() throws Exception {
-
-        try {
-            return stub.getPackageInfos();
-        } catch (Exception e) {
-            String msg = "Failed to get package information: " + e.getMessage();
-            log.error(msg, e);
-            throw new Exception(msg, e);
-        }
-    }
-
-    public JSONArray getBillingPackagesJsonArray() throws Exception {
-
-        try {
-            PackageInfo[] packageInfoArray = stub.getPackageInfos();
-            JSONArray jsonPackageInfoArray = new JSONArray();
-            for (PackageInfo packageInfo : packageInfoArray) {
-                JSONObject packageInfoObj = new JSONObject();
-                packageInfoObj.put("name", packageInfo.getName());
-                int subscriptionCharge = packageInfo.getSubscriptionCharge();
-                //TODO https://wso2.org/jira/browse/STRATOS-1819
-                StringBuffer charge = new StringBuffer("$" + subscriptionCharge);
-                packageInfoObj.put("subscriptionCharge", charge.toString());
-                jsonPackageInfoArray.put(packageInfoObj);
-            }
-            return jsonPackageInfoArray;
-        } catch (Exception e) {
-            String msg = "Failed to get package information: " + e.getMessage();
-            log.error(msg, e);
-            throw new Exception(msg, e);
-        }
-
-    }
-}
-

http://git-wip-us.apache.org/repos/asf/stratos/blob/bfc6d758/components/org.apache.stratos.account.mgt.ui/src/main/java/org/apache/stratos/account/mgt/ui/clients/UsagePlanClient.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.account.mgt.ui/src/main/java/org/apache/stratos/account/mgt/ui/clients/UsagePlanClient.java b/components/org.apache.stratos.account.mgt.ui/src/main/java/org/apache/stratos/account/mgt/ui/clients/UsagePlanClient.java
deleted file mode 100644
index 758da2f..0000000
--- a/components/org.apache.stratos.account.mgt.ui/src/main/java/org/apache/stratos/account/mgt/ui/clients/UsagePlanClient.java
+++ /dev/null
@@ -1,109 +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.account.mgt.ui.clients;
-
-import org.apache.axis2.AxisFault;
-import org.apache.axis2.client.Options;
-import org.apache.axis2.client.ServiceClient;
-import org.apache.axis2.context.ConfigurationContext;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.wso2.carbon.CarbonConstants;
-import org.apache.stratos.account.mgt.stub.services.BillingDataAccessServiceStub;
-import org.apache.stratos.account.mgt.stub.services.beans.xsd.Subscription;
-import org.wso2.carbon.registry.core.exceptions.RegistryException;
-import org.wso2.carbon.ui.CarbonUIUtil;
-import org.wso2.carbon.utils.ServerConstants;
-
-import javax.servlet.ServletConfig;
-import javax.servlet.http.HttpSession;
-
-public class UsagePlanClient {
-    private BillingDataAccessServiceStub stub;
-    private static final Log log = LogFactory.getLog(UsagePlanClient.class);
-
-    public UsagePlanClient(ServletConfig config, HttpSession session)
-            throws RegistryException {
-
-        String cookie = (String) session.getAttribute(ServerConstants.ADMIN_SERVICE_COOKIE);
-        String backendServerURL = CarbonUIUtil.getServerURL(config.getServletContext(), session);
-        ConfigurationContext configContext = (ConfigurationContext) config.
-                getServletContext().getAttribute(CarbonConstants.CONFIGURATION_CONTEXT);
-        String epr = backendServerURL + "BillingDataAccessService";
-
-        try {
-            stub = new BillingDataAccessServiceStub(configContext, epr);
-            ServiceClient client = stub._getServiceClient();
-            Options option = client.getOptions();
-            option.setManageSession(true);
-            option.setProperty(org.apache.axis2.transport.http.HTTPConstants.COOKIE_STRING, cookie);
-
-        } catch (AxisFault axisFault) {
-            String msg = "Failed to initiate Add Services service client. " + axisFault.getMessage();
-            log.error(msg, axisFault);
-            throw new RegistryException(msg, axisFault);
-        }
-    }
-
-
-    public boolean updateUsagePlan(String usagePlanName) {
-        try {
-            stub.changeSubscriptionByTenant(usagePlanName);
-        } catch (Exception e) {
-            return false;
-        }
-        return true;
-    }
-
-    public String getUsagePlanName(String tenantDomain) throws Exception{
-        //Subscription subscription;
-        try {
-        	// This section get commented because billing component is removed. In account_mgt jsp file get usage plan functionality removed.
-        	// If rewrite that functionality please uncomment below code lines.
-            
-        	//subscription=stub.getActiveSubscriptionOfCustomerByTenant();
-            //if(subscription!=null){
-            //    return subscription.getSubscriptionPlan();
-            //} else {
-                return "";
-            //}
-        } catch (Exception e) {
-            String msg = "Error occurred while getting the usage plan for tenant: " + tenantDomain;
-            log.error(msg, e);
-            throw new Exception(msg, e);
-        }
-    }
-
-    public boolean deactivateActiveUsagePlan(String tenantDomain){
-        log.info("Deactivating tenant domain: " + tenantDomain);
-        boolean deactivated = false;
-        try{
-            deactivated = stub.deactivateActiveSubscriptionByTenant();
-            if(deactivated){
-                log.info("Active subscription deactivated after deactivating the tenant: " + tenantDomain);
-            }
-        }catch (Exception e){
-            log.error("Error occurred while deactivating active subscription of: " +
-                        tenantDomain + " " + e.getMessage(), e);
-        }
-
-        return deactivated;
-    }
-}

http://git-wip-us.apache.org/repos/asf/stratos/blob/bfc6d758/components/org.apache.stratos.account.mgt.ui/src/main/java/org/apache/stratos/account/mgt/ui/utils/Util.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.account.mgt.ui/src/main/java/org/apache/stratos/account/mgt/ui/utils/Util.java b/components/org.apache.stratos.account.mgt.ui/src/main/java/org/apache/stratos/account/mgt/ui/utils/Util.java
deleted file mode 100644
index 547b74c..0000000
--- a/components/org.apache.stratos.account.mgt.ui/src/main/java/org/apache/stratos/account/mgt/ui/utils/Util.java
+++ /dev/null
@@ -1,119 +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.account.mgt.ui.utils;
-
-import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.impl.builder.StAXOMBuilder;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.stratos.account.mgt.stub.beans.xsd.AccountInfoBean;
-import org.apache.stratos.account.mgt.ui.clients.AccountMgtClient;
-import org.apache.stratos.account.mgt.ui.clients.UsagePlanClient;
-
-import javax.servlet.ServletConfig;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLStreamReader;
-import java.io.StringReader;
-import java.util.Iterator;
-
-public class Util {
-    private static final Log log = LogFactory.getLog(Util.class);
-    
-    public static HttpServletRequest readIntermediateData(HttpServletRequest request,String data){
-        try{
-            XMLStreamReader parser = XMLInputFactory.newInstance().createXMLStreamReader(new StringReader(data));
-            StAXOMBuilder builder = new StAXOMBuilder(parser);
-            OMElement documentElement =  builder.getDocumentElement();
-            Iterator it = documentElement.getChildElements();
-            while(it.hasNext()){
-                OMElement element = (OMElement)it.next();
-                if ("admin".equals(element.getLocalName())) {
-                    request.setAttribute("admin",element.getText());
-                } else if ("email".equals(element.getLocalName())) {
-                    request.setAttribute("email",element.getText());
-                } else if ("tenantDomain".equals(element.getLocalName())
-                           && request.getAttribute("tenantDomain") == null) {
-                    request.setAttribute("tenantDomain",element.getText());
-                } else if ("confirmationKey".equals(element.getLocalName())) {
-                    request.setAttribute("confirmationKey",element.getText());
-                }
-            }
-        }catch(Exception e){
-            log.error("Error parsing xml",e);
-        }
-        return request;
-    }
-
-    public static boolean updateFullname(
-            HttpServletRequest request,
-            ServletConfig config,
-            HttpSession session) throws Exception {
-
-        AccountInfoBean accountInfoBean = new AccountInfoBean();
-        String firstname = "", lastname = "";
-        try {
-            firstname = request.getParameter("firstname");
-            lastname = request.getParameter("lastname");
-            accountInfoBean.setFirstname(firstname);
-            accountInfoBean.setLastname(lastname);
-            AccountMgtClient client = new AccountMgtClient(config, session);
-            return client.updateFullname(accountInfoBean);
-        } catch (Exception e) {
-            String msg = "Failed to update tenant with firstname: " + firstname;
-            log.error(msg, e);
-            throw new Exception(msg, e);
-        }
-    }
-    public static String getUsagePlanName(ServletConfig config,
-                                           HttpSession session) throws Exception {
-        try{
-            String tenantDomain=(String)session.getAttribute("tenantDomain");
-            UsagePlanClient client=new UsagePlanClient(config, session);
-            return client.getUsagePlanName(tenantDomain);         
-        }
-        catch (Exception e){
-            String msg = "Failed to get usage plan for tenant";
-            log.error(msg, e);
-            throw new Exception(msg, e);
-        }
-    }
-
-    public static boolean updateUsagePlan( HttpServletRequest request, ServletConfig config,
-                                           HttpSession session) throws Exception {
-        boolean updated = false;
-        String tenantDomain="";
-        try{
-            tenantDomain=(String)session.getAttribute("tenantDomain");
-            String usagePlanName=(String)request.getParameter("selectedUsagePlan");
-            UsagePlanClient client=new UsagePlanClient(config, session);
-            updated = client.updateUsagePlan(usagePlanName);
-        }
-       catch (Exception e){
-            String msg = "Failed to update the usage plan for tenant: " + tenantDomain;
-            log.error(msg, e);
-            throw new Exception(msg, e);
-        }
-        return updated;
-    }
-    
-}

http://git-wip-us.apache.org/repos/asf/stratos/blob/bfc6d758/components/org.apache.stratos.account.mgt.ui/src/main/resources/AccountMgtService.wsdl
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.account.mgt.ui/src/main/resources/AccountMgtService.wsdl b/components/org.apache.stratos.account.mgt.ui/src/main/resources/AccountMgtService.wsdl
deleted file mode 100644
index ddc2fe2..0000000
--- a/components/org.apache.stratos.account.mgt.ui/src/main/resources/AccountMgtService.wsdl
+++ /dev/null
@@ -1,646 +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.
-  -->
-<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:ns1="http://org.apache.axis2/xsd" xmlns:ns="http://services.mgt.account.stratos.apache.org" xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" xmlns:ax21="http://beans.mgt.account.stratos.apache.org/xsd" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/" targetNamespace="http://services.mgt.account.stratos.apache.org">
-    <wsdl:documentation>AccountMgtService</wsdl:documentation>
-    <wsdl:types>
-        <xs:schema xmlns:ax22="http://beans.mgt.account.stratos.apache.org/xsd" attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://services.mgt.account.stratos.apache.org">
-            <xs:import namespace="http://beans.mgt.account.stratos.apache.org/xsd" />
-            <xs:element name="updateFullnameException">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element minOccurs="0" name="updateFullnameException" nillable="true" type="ns:Exception" />
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-            <xs:complexType name="Exception">
-                <xs:sequence>
-                    <xs:element minOccurs="0" name="Message" nillable="true" type="xs:string" />
-                </xs:sequence>
-            </xs:complexType>
-            <xs:element name="updateFullname">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element minOccurs="0" name="accountInfoBean" nillable="true" type="ax21:AccountInfoBean" />
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-            <xs:element name="updateFullnameResponse">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element minOccurs="0" name="return" type="xs:boolean" />
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-            <xs:element name="updateContactException">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element minOccurs="0" name="updateContactException" nillable="true" type="ns:Exception" />
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-            <xs:element name="updateContact">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element minOccurs="0" name="contactEmail" nillable="true" type="xs:string" />
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-            <xs:element name="isEmailValidatedException">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element minOccurs="0" name="isEmailValidatedException" nillable="true" type="ns:Exception" />
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-            <xs:element name="isEmailValidated">
-                <xs:complexType>
-                    <xs:sequence />
-                </xs:complexType>
-            </xs:element>
-            <xs:element name="isEmailValidatedResponse">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element minOccurs="0" name="return" type="xs:boolean" />
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-            <xs:element name="isDomainValidatedException">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element minOccurs="0" name="isDomainValidatedException" nillable="true" type="ns:Exception" />
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-            <xs:element name="isDomainValidated">
-                <xs:complexType>
-                    <xs:sequence />
-                </xs:complexType>
-            </xs:element>
-            <xs:element name="isDomainValidatedResponse">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element minOccurs="0" name="return" type="xs:boolean" />
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-            <xs:element name="getFullnameException">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element minOccurs="0" name="getFullnameException" nillable="true" type="ns:Exception" />
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-            <xs:element name="getFullname">
-                <xs:complexType>
-                    <xs:sequence />
-                </xs:complexType>
-            </xs:element>
-            <xs:element name="getFullnameResponse">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element minOccurs="0" name="return" nillable="true" type="ax21:AccountInfoBean" />
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-            <xs:element name="getContactException">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element minOccurs="0" name="getContactException" nillable="true" type="ns:Exception" />
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-            <xs:element name="getContact">
-                <xs:complexType>
-                    <xs:sequence />
-                </xs:complexType>
-            </xs:element>
-            <xs:element name="getContactResponse">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element minOccurs="0" name="return" nillable="true" type="xs:string" />
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-            <xs:element name="finishedDomainValidationException">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element minOccurs="0" name="finishedDomainValidationException" nillable="true" type="ns:Exception" />
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-            <xs:element name="finishedDomainValidation">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element minOccurs="0" name="validatedDomain" nillable="true" type="xs:string" />
-                        <xs:element minOccurs="0" name="successKey" nillable="true" type="xs:string" />
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-            <xs:element name="finishedDomainValidationResponse">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element minOccurs="0" name="return" type="xs:boolean" />
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-            <xs:element name="deactivateException">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element minOccurs="0" name="deactivateException" nillable="true" type="ns:Exception" />
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-            <xs:element name="deactivate">
-                <xs:complexType>
-                    <xs:sequence />
-                </xs:complexType>
-            </xs:element>
-            <xs:element name="checkDomainAvailabilityException">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element minOccurs="0" name="checkDomainAvailabilityException" nillable="true" type="ns:Exception" />
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-            <xs:element name="checkDomainAvailability">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element minOccurs="0" name="domainName" nillable="true" type="xs:string" />
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-            <xs:element name="checkDomainAvailabilityResponse">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element minOccurs="0" name="return" type="xs:boolean" />
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-        </xs:schema>
-        <xs:schema attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://beans.mgt.account.stratos.apache.org/xsd">
-            <xs:complexType name="AccountInfoBean">
-                <xs:sequence>
-                    <xs:element minOccurs="0" name="firstname" nillable="true" type="xs:string" />
-                    <xs:element minOccurs="0" name="lastname" nillable="true" type="xs:string" />
-                </xs:sequence>
-            </xs:complexType>
-        </xs:schema>
-    </wsdl:types>
-    <wsdl:message name="checkDomainAvailabilityRequest">
-        <wsdl:part name="parameters" element="ns:checkDomainAvailability" />
-    </wsdl:message>
-    <wsdl:message name="checkDomainAvailabilityResponse">
-        <wsdl:part name="parameters" element="ns:checkDomainAvailabilityResponse" />
-    </wsdl:message>
-    <wsdl:message name="checkDomainAvailabilityException">
-        <wsdl:part name="parameters" element="ns:checkDomainAvailabilityException" />
-    </wsdl:message>
-    <wsdl:message name="getContactRequest">
-        <wsdl:part name="parameters" element="ns:getContact" />
-    </wsdl:message>
-    <wsdl:message name="getContactResponse">
-        <wsdl:part name="parameters" element="ns:getContactResponse" />
-    </wsdl:message>
-    <wsdl:message name="getContactException">
-        <wsdl:part name="parameters" element="ns:getContactException" />
-    </wsdl:message>
-    <wsdl:message name="isEmailValidatedRequest">
-        <wsdl:part name="parameters" element="ns:isEmailValidated" />
-    </wsdl:message>
-    <wsdl:message name="isEmailValidatedResponse">
-        <wsdl:part name="parameters" element="ns:isEmailValidatedResponse" />
-    </wsdl:message>
-    <wsdl:message name="isEmailValidatedException">
-        <wsdl:part name="parameters" element="ns:isEmailValidatedException" />
-    </wsdl:message>
-    <wsdl:message name="updateFullnameRequest">
-        <wsdl:part name="parameters" element="ns:updateFullname" />
-    </wsdl:message>
-    <wsdl:message name="updateFullnameResponse">
-        <wsdl:part name="parameters" element="ns:updateFullnameResponse" />
-    </wsdl:message>
-    <wsdl:message name="updateFullnameException">
-        <wsdl:part name="parameters" element="ns:updateFullnameException" />
-    </wsdl:message>
-    <wsdl:message name="isDomainValidatedRequest">
-        <wsdl:part name="parameters" element="ns:isDomainValidated" />
-    </wsdl:message>
-    <wsdl:message name="isDomainValidatedResponse">
-        <wsdl:part name="parameters" element="ns:isDomainValidatedResponse" />
-    </wsdl:message>
-    <wsdl:message name="isDomainValidatedException">
-        <wsdl:part name="parameters" element="ns:isDomainValidatedException" />
-    </wsdl:message>
-    <wsdl:message name="deactivateRequest">
-        <wsdl:part name="parameters" element="ns:deactivate" />
-    </wsdl:message>
-    <wsdl:message name="deactivateResponse" />
-    <wsdl:message name="deactivateException">
-        <wsdl:part name="parameters" element="ns:deactivateException" />
-    </wsdl:message>
-    <wsdl:message name="getFullnameRequest">
-        <wsdl:part name="parameters" element="ns:getFullname" />
-    </wsdl:message>
-    <wsdl:message name="getFullnameResponse">
-        <wsdl:part name="parameters" element="ns:getFullnameResponse" />
-    </wsdl:message>
-    <wsdl:message name="getFullnameException">
-        <wsdl:part name="parameters" element="ns:getFullnameException" />
-    </wsdl:message>
-    <wsdl:message name="finishedDomainValidationRequest">
-        <wsdl:part name="parameters" element="ns:finishedDomainValidation" />
-    </wsdl:message>
-    <wsdl:message name="finishedDomainValidationResponse">
-        <wsdl:part name="parameters" element="ns:finishedDomainValidationResponse" />
-    </wsdl:message>
-    <wsdl:message name="finishedDomainValidationException">
-        <wsdl:part name="parameters" element="ns:finishedDomainValidationException" />
-    </wsdl:message>
-    <wsdl:message name="updateContactRequest">
-        <wsdl:part name="parameters" element="ns:updateContact" />
-    </wsdl:message>
-    <wsdl:message name="updateContactResponse" />
-    <wsdl:message name="updateContactException">
-        <wsdl:part name="parameters" element="ns:updateContactException" />
-    </wsdl:message>
-    <wsdl:portType name="AccountMgtServicePortType">
-        <wsdl:operation name="checkDomainAvailability">
-            <wsdl:input message="ns:checkDomainAvailabilityRequest" wsaw:Action="urn:checkDomainAvailability" />
-            <wsdl:output message="ns:checkDomainAvailabilityResponse" wsaw:Action="urn:checkDomainAvailabilityResponse" />
-            <wsdl:fault message="ns:checkDomainAvailabilityException" name="checkDomainAvailabilityException" wsaw:Action="urn:checkDomainAvailabilitycheckDomainAvailabilityException" />
-        </wsdl:operation>
-        <wsdl:operation name="getContact">
-            <wsdl:input message="ns:getContactRequest" wsaw:Action="urn:getContact" />
-            <wsdl:output message="ns:getContactResponse" wsaw:Action="urn:getContactResponse" />
-            <wsdl:fault message="ns:getContactException" name="getContactException" wsaw:Action="urn:getContactgetContactException" />
-        </wsdl:operation>
-        <wsdl:operation name="isEmailValidated">
-            <wsdl:input message="ns:isEmailValidatedRequest" wsaw:Action="urn:isEmailValidated" />
-            <wsdl:output message="ns:isEmailValidatedResponse" wsaw:Action="urn:isEmailValidatedResponse" />
-            <wsdl:fault message="ns:isEmailValidatedException" name="isEmailValidatedException" wsaw:Action="urn:isEmailValidatedisEmailValidatedException" />
-        </wsdl:operation>
-        <wsdl:operation name="updateFullname">
-            <wsdl:input message="ns:updateFullnameRequest" wsaw:Action="urn:updateFullname" />
-            <wsdl:output message="ns:updateFullnameResponse" wsaw:Action="urn:updateFullnameResponse" />
-            <wsdl:fault message="ns:updateFullnameException" name="updateFullnameException" wsaw:Action="urn:updateFullnameupdateFullnameException" />
-        </wsdl:operation>
-        <wsdl:operation name="isDomainValidated">
-            <wsdl:input message="ns:isDomainValidatedRequest" wsaw:Action="urn:isDomainValidated" />
-            <wsdl:output message="ns:isDomainValidatedResponse" wsaw:Action="urn:isDomainValidatedResponse" />
-            <wsdl:fault message="ns:isDomainValidatedException" name="isDomainValidatedException" wsaw:Action="urn:isDomainValidatedisDomainValidatedException" />
-        </wsdl:operation>
-        <wsdl:operation name="deactivate">
-            <wsdl:input message="ns:deactivateRequest" wsaw:Action="urn:deactivate" />
-            <wsdl:output message="ns:deactivateResponse" wsaw:Action="urn:deactivateResponse" />
-            <wsdl:fault message="ns:deactivateException" name="deactivateException" wsaw:Action="urn:deactivatedeactivateException" />
-        </wsdl:operation>
-        <wsdl:operation name="getFullname">
-            <wsdl:input message="ns:getFullnameRequest" wsaw:Action="urn:getFullname" />
-            <wsdl:output message="ns:getFullnameResponse" wsaw:Action="urn:getFullnameResponse" />
-            <wsdl:fault message="ns:getFullnameException" name="getFullnameException" wsaw:Action="urn:getFullnamegetFullnameException" />
-        </wsdl:operation>
-        <wsdl:operation name="finishedDomainValidation">
-            <wsdl:input message="ns:finishedDomainValidationRequest" wsaw:Action="urn:finishedDomainValidation" />
-            <wsdl:output message="ns:finishedDomainValidationResponse" wsaw:Action="urn:finishedDomainValidationResponse" />
-            <wsdl:fault message="ns:finishedDomainValidationException" name="finishedDomainValidationException" wsaw:Action="urn:finishedDomainValidationfinishedDomainValidationException" />
-        </wsdl:operation>
-        <wsdl:operation name="updateContact">
-            <wsdl:input message="ns:updateContactRequest" wsaw:Action="urn:updateContact" />
-            <wsdl:output message="ns:updateContactResponse" wsaw:Action="urn:updateContactResponse" />
-            <wsdl:fault message="ns:updateContactException" name="updateContactException" wsaw:Action="urn:updateContactupdateContactException" />
-        </wsdl:operation>
-    </wsdl:portType>
-    <wsdl:binding name="AccountMgtServiceSoap11Binding" type="ns:AccountMgtServicePortType">
-        <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document" />
-        <wsdl:operation name="checkDomainAvailability">
-            <soap:operation soapAction="urn:checkDomainAvailability" style="document" />
-            <wsdl:input>
-                <soap:body use="literal" />
-            </wsdl:input>
-            <wsdl:output>
-                <soap:body use="literal" />
-            </wsdl:output>
-            <wsdl:fault name="checkDomainAvailabilityException">
-                <soap:fault use="literal" name="checkDomainAvailabilityException" />
-            </wsdl:fault>
-        </wsdl:operation>
-        <wsdl:operation name="getContact">
-            <soap:operation soapAction="urn:getContact" style="document" />
-            <wsdl:input>
-                <soap:body use="literal" />
-            </wsdl:input>
-            <wsdl:output>
-                <soap:body use="literal" />
-            </wsdl:output>
-            <wsdl:fault name="getContactException">
-                <soap:fault use="literal" name="getContactException" />
-            </wsdl:fault>
-        </wsdl:operation>
-        <wsdl:operation name="isEmailValidated">
-            <soap:operation soapAction="urn:isEmailValidated" style="document" />
-            <wsdl:input>
-                <soap:body use="literal" />
-            </wsdl:input>
-            <wsdl:output>
-                <soap:body use="literal" />
-            </wsdl:output>
-            <wsdl:fault name="isEmailValidatedException">
-                <soap:fault use="literal" name="isEmailValidatedException" />
-            </wsdl:fault>
-        </wsdl:operation>
-        <wsdl:operation name="updateFullname">
-            <soap:operation soapAction="urn:updateFullname" style="document" />
-            <wsdl:input>
-                <soap:body use="literal" />
-            </wsdl:input>
-            <wsdl:output>
-                <soap:body use="literal" />
-            </wsdl:output>
-            <wsdl:fault name="updateFullnameException">
-                <soap:fault use="literal" name="updateFullnameException" />
-            </wsdl:fault>
-        </wsdl:operation>
-        <wsdl:operation name="isDomainValidated">
-            <soap:operation soapAction="urn:isDomainValidated" style="document" />
-            <wsdl:input>
-                <soap:body use="literal" />
-            </wsdl:input>
-            <wsdl:output>
-                <soap:body use="literal" />
-            </wsdl:output>
-            <wsdl:fault name="isDomainValidatedException">
-                <soap:fault use="literal" name="isDomainValidatedException" />
-            </wsdl:fault>
-        </wsdl:operation>
-        <wsdl:operation name="deactivate">
-            <soap:operation soapAction="urn:deactivate" style="document" />
-            <wsdl:input>
-                <soap:body use="literal" />
-            </wsdl:input>
-            <wsdl:output>
-                <soap:body use="literal" />
-            </wsdl:output>
-            <wsdl:fault name="deactivateException">
-                <soap:fault use="literal" name="deactivateException" />
-            </wsdl:fault>
-        </wsdl:operation>
-        <wsdl:operation name="getFullname">
-            <soap:operation soapAction="urn:getFullname" style="document" />
-            <wsdl:input>
-                <soap:body use="literal" />
-            </wsdl:input>
-            <wsdl:output>
-                <soap:body use="literal" />
-            </wsdl:output>
-            <wsdl:fault name="getFullnameException">
-                <soap:fault use="literal" name="getFullnameException" />
-            </wsdl:fault>
-        </wsdl:operation>
-        <wsdl:operation name="finishedDomainValidation">
-            <soap:operation soapAction="urn:finishedDomainValidation" style="document" />
-            <wsdl:input>
-                <soap:body use="literal" />
-            </wsdl:input>
-            <wsdl:output>
-                <soap:body use="literal" />
-            </wsdl:output>
-            <wsdl:fault name="finishedDomainValidationException">
-                <soap:fault use="literal" name="finishedDomainValidationException" />
-            </wsdl:fault>
-        </wsdl:operation>
-        <wsdl:operation name="updateContact">
-            <soap:operation soapAction="urn:updateContact" style="document" />
-            <wsdl:input>
-                <soap:body use="literal" />
-            </wsdl:input>
-            <wsdl:output>
-                <soap:body use="literal" />
-            </wsdl:output>
-            <wsdl:fault name="updateContactException">
-                <soap:fault use="literal" name="updateContactException" />
-            </wsdl:fault>
-        </wsdl:operation>
-    </wsdl:binding>
-    <wsdl:binding name="AccountMgtServiceSoap12Binding" type="ns:AccountMgtServicePortType">
-        <soap12:binding transport="http://schemas.xmlsoap.org/soap/http" style="document" />
-        <wsdl:operation name="checkDomainAvailability">
-            <soap12:operation soapAction="urn:checkDomainAvailability" style="document" />
-            <wsdl:input>
-                <soap12:body use="literal" />
-            </wsdl:input>
-            <wsdl:output>
-                <soap12:body use="literal" />
-            </wsdl:output>
-            <wsdl:fault name="checkDomainAvailabilityException">
-                <soap12:fault use="literal" name="checkDomainAvailabilityException" />
-            </wsdl:fault>
-        </wsdl:operation>
-        <wsdl:operation name="getContact">
-            <soap12:operation soapAction="urn:getContact" style="document" />
-            <wsdl:input>
-                <soap12:body use="literal" />
-            </wsdl:input>
-            <wsdl:output>
-                <soap12:body use="literal" />
-            </wsdl:output>
-            <wsdl:fault name="getContactException">
-                <soap12:fault use="literal" name="getContactException" />
-            </wsdl:fault>
-        </wsdl:operation>
-        <wsdl:operation name="isEmailValidated">
-            <soap12:operation soapAction="urn:isEmailValidated" style="document" />
-            <wsdl:input>
-                <soap12:body use="literal" />
-            </wsdl:input>
-            <wsdl:output>
-                <soap12:body use="literal" />
-            </wsdl:output>
-            <wsdl:fault name="isEmailValidatedException">
-                <soap12:fault use="literal" name="isEmailValidatedException" />
-            </wsdl:fault>
-        </wsdl:operation>
-        <wsdl:operation name="updateFullname">
-            <soap12:operation soapAction="urn:updateFullname" style="document" />
-            <wsdl:input>
-                <soap12:body use="literal" />
-            </wsdl:input>
-            <wsdl:output>
-                <soap12:body use="literal" />
-            </wsdl:output>
-            <wsdl:fault name="updateFullnameException">
-                <soap12:fault use="literal" name="updateFullnameException" />
-            </wsdl:fault>
-        </wsdl:operation>
-        <wsdl:operation name="isDomainValidated">
-            <soap12:operation soapAction="urn:isDomainValidated" style="document" />
-            <wsdl:input>
-                <soap12:body use="literal" />
-            </wsdl:input>
-            <wsdl:output>
-                <soap12:body use="literal" />
-            </wsdl:output>
-            <wsdl:fault name="isDomainValidatedException">
-                <soap12:fault use="literal" name="isDomainValidatedException" />
-            </wsdl:fault>
-        </wsdl:operation>
-        <wsdl:operation name="deactivate">
-            <soap12:operation soapAction="urn:deactivate" style="document" />
-            <wsdl:input>
-                <soap12:body use="literal" />
-            </wsdl:input>
-            <wsdl:output>
-                <soap12:body use="literal" />
-            </wsdl:output>
-            <wsdl:fault name="deactivateException">
-                <soap12:fault use="literal" name="deactivateException" />
-            </wsdl:fault>
-        </wsdl:operation>
-        <wsdl:operation name="getFullname">
-            <soap12:operation soapAction="urn:getFullname" style="document" />
-            <wsdl:input>
-                <soap12:body use="literal" />
-            </wsdl:input>
-            <wsdl:output>
-                <soap12:body use="literal" />
-            </wsdl:output>
-            <wsdl:fault name="getFullnameException">
-                <soap12:fault use="literal" name="getFullnameException" />
-            </wsdl:fault>
-        </wsdl:operation>
-        <wsdl:operation name="finishedDomainValidation">
-            <soap12:operation soapAction="urn:finishedDomainValidation" style="document" />
-            <wsdl:input>
-                <soap12:body use="literal" />
-            </wsdl:input>
-            <wsdl:output>
-                <soap12:body use="literal" />
-            </wsdl:output>
-            <wsdl:fault name="finishedDomainValidationException">
-                <soap12:fault use="literal" name="finishedDomainValidationException" />
-            </wsdl:fault>
-        </wsdl:operation>
-        <wsdl:operation name="updateContact">
-            <soap12:operation soapAction="urn:updateContact" style="document" />
-            <wsdl:input>
-                <soap12:body use="literal" />
-            </wsdl:input>
-            <wsdl:output>
-                <soap12:body use="literal" />
-            </wsdl:output>
-            <wsdl:fault name="updateContactException">
-                <soap12:fault use="literal" name="updateContactException" />
-            </wsdl:fault>
-        </wsdl:operation>
-    </wsdl:binding>
-    <wsdl:binding name="AccountMgtServiceHttpBinding" type="ns:AccountMgtServicePortType">
-        <http:binding verb="POST" />
-        <wsdl:operation name="checkDomainAvailability">
-            <http:operation location="checkDomainAvailability" />
-            <wsdl:input>
-                <mime:content type="text/xml" part="parameters" />
-            </wsdl:input>
-            <wsdl:output>
-                <mime:content type="text/xml" part="parameters" />
-            </wsdl:output>
-        </wsdl:operation>
-        <wsdl:operation name="getContact">
-            <http:operation location="getContact" />
-            <wsdl:input>
-                <mime:content type="text/xml" part="parameters" />
-            </wsdl:input>
-            <wsdl:output>
-                <mime:content type="text/xml" part="parameters" />
-            </wsdl:output>
-        </wsdl:operation>
-        <wsdl:operation name="isEmailValidated">
-            <http:operation location="isEmailValidated" />
-            <wsdl:input>
-                <mime:content type="text/xml" part="parameters" />
-            </wsdl:input>
-            <wsdl:output>
-                <mime:content type="text/xml" part="parameters" />
-            </wsdl:output>
-        </wsdl:operation>
-        <wsdl:operation name="updateFullname">
-            <http:operation location="updateFullname" />
-            <wsdl:input>
-                <mime:content type="text/xml" part="parameters" />
-            </wsdl:input>
-            <wsdl:output>
-                <mime:content type="text/xml" part="parameters" />
-            </wsdl:output>
-        </wsdl:operation>
-        <wsdl:operation name="isDomainValidated">
-            <http:operation location="isDomainValidated" />
-            <wsdl:input>
-                <mime:content type="text/xml" part="parameters" />
-            </wsdl:input>
-            <wsdl:output>
-                <mime:content type="text/xml" part="parameters" />
-            </wsdl:output>
-        </wsdl:operation>
-        <wsdl:operation name="deactivate">
-            <http:operation location="deactivate" />
-            <wsdl:input>
-                <mime:content type="text/xml" part="parameters" />
-            </wsdl:input>
-            <wsdl:output>
-                <mime:content type="text/xml" part="parameters" />
-            </wsdl:output>
-        </wsdl:operation>
-        <wsdl:operation name="getFullname">
-            <http:operation location="getFullname" />
-            <wsdl:input>
-                <mime:content type="text/xml" part="parameters" />
-            </wsdl:input>
-            <wsdl:output>
-                <mime:content type="text/xml" part="parameters" />
-            </wsdl:output>
-        </wsdl:operation>
-        <wsdl:operation name="finishedDomainValidation">
-            <http:operation location="finishedDomainValidation" />
-            <wsdl:input>
-                <mime:content type="text/xml" part="parameters" />
-            </wsdl:input>
-            <wsdl:output>
-                <mime:content type="text/xml" part="parameters" />
-            </wsdl:output>
-        </wsdl:operation>
-        <wsdl:operation name="updateContact">
-            <http:operation location="updateContact" />
-            <wsdl:input>
-                <mime:content type="text/xml" part="parameters" />
-            </wsdl:input>
-            <wsdl:output>
-                <mime:content type="text/xml" part="parameters" />
-            </wsdl:output>
-        </wsdl:operation>
-    </wsdl:binding>
-    <wsdl:service name="AccountMgtService">
-        <wsdl:port name="AccountMgtServiceHttpsSoap11Endpoint" binding="ns:AccountMgtServiceSoap11Binding">
-            <soap:address location="https://192.168.1.100:9443/services/AccountMgtService.AccountMgtServiceHttpsSoap11Endpoint/" />
-        </wsdl:port>
-        <wsdl:port name="AccountMgtServiceHttpsSoap12Endpoint" binding="ns:AccountMgtServiceSoap12Binding">
-            <soap12:address location="https://192.168.1.100:9443/services/AccountMgtService.AccountMgtServiceHttpsSoap12Endpoint/" />
-        </wsdl:port>
-        <wsdl:port name="AccountMgtServiceHttpsEndpoint" binding="ns:AccountMgtServiceHttpBinding">
-            <http:address location="https://192.168.1.100:9443/services/AccountMgtService.AccountMgtServiceHttpsEndpoint/" />
-        </wsdl:port>
-    </wsdl:service>
-</wsdl:definitions>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/bfc6d758/components/org.apache.stratos.account.mgt.ui/src/main/resources/EmailValidationService.wsdl
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.account.mgt.ui/src/main/resources/EmailValidationService.wsdl b/components/org.apache.stratos.account.mgt.ui/src/main/resources/EmailValidationService.wsdl
deleted file mode 100644
index 507ef31..0000000
--- a/components/org.apache.stratos.account.mgt.ui/src/main/resources/EmailValidationService.wsdl
+++ /dev/null
@@ -1,113 +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.
-  -->
-<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:ns1="http://org.apache.axis2/xsd" xmlns:ns="http://services.mgt.account.stratos.apache.org" xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/" targetNamespace="http://services.mgt.account.stratos.apache.org">
-    <wsdl:documentation>EmailValidationService</wsdl:documentation>
-    <wsdl:types>
-        <xs:schema attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://services.mgt.account.stratos.apache.org">
-            <xs:element name="proceedUpdateContactException">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element minOccurs="0" name="proceedUpdateContactException" nillable="true" type="ns:Exception" />
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-            <xs:complexType name="Exception">
-                <xs:sequence>
-                    <xs:element minOccurs="0" name="Message" nillable="true" type="xs:string" />
-                </xs:sequence>
-            </xs:complexType>
-            <xs:element name="proceedUpdateContact">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element minOccurs="0" name="domain" nillable="true" type="xs:string" />
-                        <xs:element minOccurs="0" name="email" nillable="true" type="xs:string" />
-                        <xs:element minOccurs="0" name="confirmationKey" nillable="true" type="xs:string" />
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-        </xs:schema>
-    </wsdl:types>
-    <wsdl:message name="proceedUpdateContactRequest">
-        <wsdl:part name="parameters" element="ns:proceedUpdateContact" />
-    </wsdl:message>
-    <wsdl:message name="proceedUpdateContactResponse" />
-    <wsdl:message name="proceedUpdateContactException">
-        <wsdl:part name="parameters" element="ns:proceedUpdateContactException" />
-    </wsdl:message>
-    <wsdl:portType name="EmailValidationServicePortType">
-        <wsdl:operation name="proceedUpdateContact">
-            <wsdl:input message="ns:proceedUpdateContactRequest" wsaw:Action="urn:proceedUpdateContact" />
-            <wsdl:output message="ns:proceedUpdateContactResponse" wsaw:Action="urn:proceedUpdateContactResponse" />
-            <wsdl:fault message="ns:proceedUpdateContactException" name="proceedUpdateContactException" wsaw:Action="urn:proceedUpdateContactproceedUpdateContactException" />
-        </wsdl:operation>
-    </wsdl:portType>
-    <wsdl:binding name="EmailValidationServiceSoap11Binding" type="ns:EmailValidationServicePortType">
-        <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document" />
-        <wsdl:operation name="proceedUpdateContact">
-            <soap:operation soapAction="urn:proceedUpdateContact" style="document" />
-            <wsdl:input>
-                <soap:body use="literal" />
-            </wsdl:input>
-            <wsdl:output>
-                <soap:body use="literal" />
-            </wsdl:output>
-            <wsdl:fault name="proceedUpdateContactException">
-                <soap:fault use="literal" name="proceedUpdateContactException" />
-            </wsdl:fault>
-        </wsdl:operation>
-    </wsdl:binding>
-    <wsdl:binding name="EmailValidationServiceSoap12Binding" type="ns:EmailValidationServicePortType">
-        <soap12:binding transport="http://schemas.xmlsoap.org/soap/http" style="document" />
-        <wsdl:operation name="proceedUpdateContact">
-            <soap12:operation soapAction="urn:proceedUpdateContact" style="document" />
-            <wsdl:input>
-                <soap12:body use="literal" />
-            </wsdl:input>
-            <wsdl:output>
-                <soap12:body use="literal" />
-            </wsdl:output>
-            <wsdl:fault name="proceedUpdateContactException">
-                <soap12:fault use="literal" name="proceedUpdateContactException" />
-            </wsdl:fault>
-        </wsdl:operation>
-    </wsdl:binding>
-    <wsdl:binding name="EmailValidationServiceHttpBinding" type="ns:EmailValidationServicePortType">
-        <http:binding verb="POST" />
-        <wsdl:operation name="proceedUpdateContact">
-            <http:operation location="proceedUpdateContact" />
-            <wsdl:input>
-                <mime:content type="text/xml" part="parameters" />
-            </wsdl:input>
-            <wsdl:output>
-                <mime:content type="text/xml" part="parameters" />
-            </wsdl:output>
-        </wsdl:operation>
-    </wsdl:binding>
-    <wsdl:service name="EmailValidationService">
-        <wsdl:port name="EmailValidationServiceHttpsSoap11Endpoint" binding="ns:EmailValidationServiceSoap11Binding">
-            <soap:address location="https://192.168.1.100:9443/services/EmailValidationService.EmailValidationServiceHttpsSoap11Endpoint/" />
-        </wsdl:port>
-        <wsdl:port name="EmailValidationServiceHttpsSoap12Endpoint" binding="ns:EmailValidationServiceSoap12Binding">
-            <soap12:address location="https://192.168.1.100:9443/services/EmailValidationService.EmailValidationServiceHttpsSoap12Endpoint/" />
-        </wsdl:port>
-        <wsdl:port name="EmailValidationServiceHttpsEndpoint" binding="ns:EmailValidationServiceHttpBinding">
-            <http:address location="https://192.168.1.100:9443/services/EmailValidationService.EmailValidationServiceHttpsEndpoint/" />
-        </wsdl:port>
-    </wsdl:service>
-</wsdl:definitions>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/bfc6d758/components/org.apache.stratos.account.mgt.ui/src/main/resources/META-INF/component.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.account.mgt.ui/src/main/resources/META-INF/component.xml b/components/org.apache.stratos.account.mgt.ui/src/main/resources/META-INF/component.xml
deleted file mode 100644
index 6eae8cd..0000000
--- a/components/org.apache.stratos.account.mgt.ui/src/main/resources/META-INF/component.xml
+++ /dev/null
@@ -1,36 +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.
- -->
-<component xmlns="http://products.wso2.org/carbon">
-    <!-- sample menu configuration -->
-    <menus>
-        <menu>
-            <id>gaas_account_mgt_menu</id>
-	    <i18n-bundle>org.apache.stratos.account.mgt.ui.i18n.Resources</i18n-bundle>
-            <i18n-key>account.mgt.menu</i18n-key>            
-            <parent-menu>configure_menu</parent-menu>
-            <link>../account-mgt/account_mgt.jsp</link>
-            <region>region1</region>
-            <order>1</order>
-            <style-class>manage</style-class>
-            <icon>../account-mgt/images/account-mgt-icon.gif</icon>
-            <require-permission>/permission/admin/configure/account</require-permission>
-            <require-not-super-tenant>true</require-not-super-tenant>
-        </menu>
-    </menus>
-</component>

http://git-wip-us.apache.org/repos/asf/stratos/blob/bfc6d758/components/org.apache.stratos.account.mgt.ui/src/main/resources/org/apache/stratos/account/mgt/ui/i18n/JSResources.properties
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.account.mgt.ui/src/main/resources/org/apache/stratos/account/mgt/ui/i18n/JSResources.properties b/components/org.apache.stratos.account.mgt.ui/src/main/resources/org/apache/stratos/account/mgt/ui/i18n/JSResources.properties
deleted file mode 100644
index 09dd768..0000000
--- a/components/org.apache.stratos.account.mgt.ui/src/main/resources/org/apache/stratos/account/mgt/ui/i18n/JSResources.properties
+++ /dev/null
@@ -1,22 +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.
-
-domain.available=Domain is available to register.
-domain.unavailable=Sorry!. The Domain is already registered. Please choose a different domain.
-domain.you.own=Currently you have registered an account with this domain. But you have not verified the ownership to it. 
-domain.validation.failed=Domain validation Failed.
-successfully.validated=The ownership of the domain is succesfully validated.

http://git-wip-us.apache.org/repos/asf/stratos/blob/bfc6d758/components/org.apache.stratos.account.mgt.ui/src/main/resources/org/apache/stratos/account/mgt/ui/i18n/Resources.properties
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.account.mgt.ui/src/main/resources/org/apache/stratos/account/mgt/ui/i18n/Resources.properties b/components/org.apache.stratos.account.mgt.ui/src/main/resources/org/apache/stratos/account/mgt/ui/i18n/Resources.properties
deleted file mode 100644
index b39ac96..0000000
--- a/components/org.apache.stratos.account.mgt.ui/src/main/resources/org/apache/stratos/account/mgt/ui/i18n/Resources.properties
+++ /dev/null
@@ -1,41 +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.
-
-account.mgt.menu=Account
-account.mgt.title=Account Management
-deactivate.account=Deactivate Account
-deactivate.account.title=Deactivate Account
-contact.information=Contact Information
-admin.information=Administrator Profile
-contact.email=Contact Email
-fullname=Full Name
-firstname=First Name
-lastname=Last Name
-update.contact=Update Contact
-update.profile=Update Profile
-validate.contact=Validate Contact
-deactive.account=Deactivate Account
-deactivate.account.msg=You can deactivate your account from here. <b>Caution: This is not undoable by the tenant.</b>
-deactivate.account.btn=Deactivate Account
-validate.domain.title=Validate Domain Ownership
-current.domain=Your Domain
-validate.domain=Validate Now!
-domain.to.validate=Domain to Validate
-successfully.validated=You have successfully validated your domain name.
-usage.plan.information= Usage Plan Information
-select.usage.plan.for.tenant=Select Usage Plan For Tenant
-select.package.message=According to the selected plan, resources will be allocated to you.\n You can update or downgrade your plan later \n according to your requirements. If you need further information on plans, click "Pricing Info".