You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by sa...@apache.org on 2013/07/02 11:23:16 UTC

[1/5] Refactoring org.wso2.carbon to org.apache.stratos

Updated Branches:
  refs/heads/master 72985a0f7 -> 335eb4188


http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/335eb418/components/stratos/account-mgt/org.wso2.carbon.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/js/account_mgt.js
----------------------------------------------------------------------
diff --git a/components/stratos/account-mgt/org.wso2.carbon.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/js/account_mgt.js b/components/stratos/account-mgt/org.wso2.carbon.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/js/account_mgt.js
deleted file mode 100644
index c957312..0000000
--- a/components/stratos/account-mgt/org.wso2.carbon.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/js/account_mgt.js
+++ /dev/null
@@ -1,214 +0,0 @@
-function deactivate(domain) {
-    sessionAwareFunction(function() {
-        CARBON.showConfirmationDialog("Are you sure you want to deactivate the domain: " +
-                                      domain + ".", function() {
-            var submitForm = document.getElementById("deactivate_form");
-            submitForm.submit();
-        });
-    }, "Session timed out. Please login again.");
-}
-
-function checkDomain(nname)
-{
-
-    var error = "";
-    error += validateEmpty(nname, "Domain");
-    if (error != "") {
-        return error;
-    }
-    //var arr = new Array(
-    //'.com','.net','.org','.biz','.coop','.info','.museum','.name',
-    //'.pro','.edu','.gov','.int','.mil','.ac','.ad','.ae','.af','.ag',
-    //'.ai','.al','.am','.an','.ao','.aq','.ar','.as','.at','.au','.aw',
-    //'.az','.ba','.bb','.bd','.be','.bf','.bg','.bh','.bi','.bj','.bm',
-    //'.bn','.bo','.br','.bs','.bt','.bv','.bw','.by','.bz','.ca','.cc',
-    //'.cd','.cf','.cg','.ch','.ci','.ck','.cl','.cm','.cn','.co','.cr',
-    //'.cu','.cv','.cx','.cy','.cz','.de','.dj','.dk','.dm','.do','.dz',
-    //'.ec','.ee','.eg','.eh','.er','.es','.et','.fi','.fj','.fk','.fm',
-    //'.fo','.fr','.ga','.gd','.ge','.gf','.gg','.gh','.gi','.gl','.gm',
-    //'.gn','.gp','.gq','.gr','.gs','.gt','.gu','.gv','.gy','.hk','.hm',
-    //'.hn','.hr','.ht','.hu','.id','.ie','.il','.im','.in','.io','.iq',
-    //'.ir','.is','.it','.je','.jm','.jo','.jp','.ke','.kg','.kh','.ki',
-    //'.km','.kn','.kp','.kr','.kw','.ky','.kz','.la','.lb','.lc','.li',
-    //'.lk','.lr','.ls','.lt','.lu','.lv','.ly','.ma','.mc','.md','.mg',
-    //'.mh','.mk','.ml','.mm','.mn','.mo','.mp','.mq','.mr','.ms','.mt',
-    //'.mu','.mv','.mw','.mx','.my','.mz','.na','.nc','.ne','.nf','.ng',
-    //'.ni','.nl','.no','.np','.nr','.nu','.nz','.om','.pa','.pe','.pf',
-    //'.pg','.ph','.pk','.pl','.pm','.pn','.pr','.ps','.pt','.pw','.py',
-    //'.qa','.re','.ro','.rw','.ru','.sa','.sb','.sc','.sd','.se','.sg',
-    //'.sh','.si','.sj','.sk','.sl','.sm','.sn','.so','.sr','.st','.sv',
-    //'.sy','.sz','.tc','.td','.tf','.tg','.th','.tj','.tk','.tm','.tn',
-    //'.to','.tp','.tr','.tt','.tv','.tw','.tz','.ua','.ug','.uk','.um',
-    //'.us','.uy','.uz','.va','.vc','.ve','.vg','.vi','.vn','.vu','.ws',
-    //'.wf','.ye','.yt','.yu','.za','.zm','.zw');
-
-    var mai = nname.value;
-
-    var val = true;
-    var dot = mai.lastIndexOf(".");
-    var dname = mai.substring(0, dot);
-    var ext = mai.substring(dot, mai.length);
-    //alert(ext);
-
-    if (ext.indexOf("-trial") >= 0 || ext.indexOf("-unverified") >= 0) {
-        // we are not allowing to create a domain with -trial or -unverified is in the extension
-        return "The domain name you entered is not valid. Please enter a valid domain name.";
-    }
-
-    if (ext.indexOf("/") >= 0 || ext.indexOf("\\") >= 0) {
-        return "The '/' and '\\' is not allowed in a domain name";
-    }
-
-    if (dot > 1 && dot < 57)
-    {
-        //	for(var i=0; i<arr.length; i++)
-        //	{
-        //	  if(ext == arr[i])
-        //	  {
-        //	 	val = true;
-        //		break;
-        //	  }
-        //	  else
-        //	  {
-        //	 	val = false;
-        //	  }
-        //	}
-        if (!val)
-        {
-            error = "Your domain extension " + ext + " is not correct";
-            return error;
-        }
-        else
-        {
-            for (var j = 0; j < dname.length; j++)
-            {
-                var dh = dname.charAt(j);
-                var hh = dh.charCodeAt(0);
-                if ((hh > 47 && hh < 59) || (hh > 64 && hh < 91) || (hh > 96 && hh < 123) || hh == 45 || hh == 46)
-                {
-                    if ((j == 0 || j == dname.length - 1) && hh == 45)
-                    {
-                        error = "Domain name should not begin and end with '-'";
-                        return error;
-                    }
-                }
-                else {
-                    error = "Your domain name should not have special characters";
-                    return error;
-                }
-            }
-        }
-    }
-    else
-    {
-        error = "Your Domain name is too short/long or you should have an extension to your domain.";
-        return error;
-    }
-
-    return error;
-}
-
-function clearDomainConfirmationMsg() {
-    var domain_confirmation_div = document.getElementById("domain-confirmation-msg");
-    domain_confirmation_div.innerHTML = "";
-}
-
-
-function domainSelected() {
-    var domain = document.getElementById('domainToValidate');
-
-    var reason = validateEmpty(domain, "Domain");
-    if (reason == "") {
-        reason += checkDomain(domain);
-    }
-
-    if (reason != "") {
-        CARBON.showWarningDialog(reason);
-        return false;
-    }
-    sessionAwareFunction(function() {
-        var validateDomainForm = document.getElementById('validateDomainForm');
-        validateDomainForm.submit();
-    }, "Session timed out. Please login again.");
-
-}
-
-function updateContact() {
-    var email = document.getElementById("email");
-    var oldEmail = document.getElementById("old-email");
-    var reason = "";
-    if (reason == "") {
-        reason += validateEmpty(email, "Email");
-    }
-    if (reason == "") {
-        reason += validateEmail(email);
-    }
-
-    if (reason == "" && email.value == oldEmail.innerHTML) {
-        reason += "You have not updated your email yet."
-    }
-
-    if (reason != "") {
-        CARBON.showWarningDialog(reason);
-        return;
-    }
-    // now call the updateContact.
-
-    sessionAwareFunction(function() {
-        debugger;
-        var busyContactPlaceHolder = document.getElementById("busyContact");
-        busyContactPlaceHolder.innerHTML = "<img src=\"images/ajax-loader.gif\"/>";
-
-        new Ajax.Request('../account-mgt/update_contact_ajaxprocessor.jsp',
-        {
-            method:'post',
-            parameters: {email: email.value},
-
-            onSuccess: function(transport) {
-                var returnValue = transport.responseText;
-                busyContactPlaceHolder.innerHTML = "";
-
-                if (returnValue.search(/----failed----/) == -1) {
-                    CARBON.showWarningDialog("We have sent an email to validate the contact details you just entered. Please follow " +
-                                             "the instructions in there to submit the updated contact details");
-                }
-                else {
-                    CARBON.showWarningDialog("Updating the contact information failed.");
-                }
-            },
-
-            onFailure: function(transport) {
-                busyContactPlaceHolder.innerHTML = "";
-                CARBON.showWarningDialog("Updating the contact information failed.");
-            }
-        });
-    }, "Session timed out. Please login again.");
-}
-
-
-function updateProfile() {
-    var update_profile_form = document.getElementById("update_profile_form");
-    var firstname = document.getElementById("firstname");
-    var oldFirstname = document.getElementById("old-firstname");
-    var lastname = document.getElementById("lastname");
-    var oldLastname = document.getElementById("old-lastname");
-
-    var reason = "";
-
-    if (reason == "") {
-        reason += validateEmpty(firstname, "First Name");
-    }
-    if (reason == "") {
-        reason += validateEmpty(lastname, "Last Name");
-
-        if ((reason == "" && firstname.value == oldFirstname.innerHTML) &&
-            (reason == "" && lastname.value == oldLastname.innerHTML)) {
-            reason += "You have not updated your firstname or last name yet.";
-        }
-    }
-    if (reason != "") {
-        CARBON.showWarningDialog(reason);
-        return;
-    }
-    update_profile_form.submit();
-}

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/335eb418/components/stratos/account-mgt/org.wso2.carbon.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/update_contact_ajaxprocessor.jsp
----------------------------------------------------------------------
diff --git a/components/stratos/account-mgt/org.wso2.carbon.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/update_contact_ajaxprocessor.jsp b/components/stratos/account-mgt/org.wso2.carbon.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/update_contact_ajaxprocessor.jsp
deleted file mode 100644
index 58a323b..0000000
--- a/components/stratos/account-mgt/org.wso2.carbon.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/update_contact_ajaxprocessor.jsp
+++ /dev/null
@@ -1,35 +0,0 @@
-<!--
- ~ Copyright (c) 2005-2010, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
- ~
- ~ WSO2 Inc. 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.
- -->
-<%@ page import="org.wso2.carbon.registry.core.exceptions.RegistryException" %>
-<%@ page import="org.wso2.carbon.account.mgt.ui.clients.AccountMgtClient" %>
-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%
-AccountMgtClient client;
-try {
-    String email = request.getParameter("email");
-    client = new AccountMgtClient(config, session);
-    client.updateContact(email);
-
-} catch (RegistryException e) {
-%>
-----failed----
-<%
-    return;
-}
-
-%>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/335eb418/components/stratos/account-mgt/org.wso2.carbon.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/update_profile_processor.jsp
----------------------------------------------------------------------
diff --git a/components/stratos/account-mgt/org.wso2.carbon.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/update_profile_processor.jsp b/components/stratos/account-mgt/org.wso2.carbon.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/update_profile_processor.jsp
deleted file mode 100644
index d0158c9..0000000
--- a/components/stratos/account-mgt/org.wso2.carbon.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/update_profile_processor.jsp
+++ /dev/null
@@ -1,62 +0,0 @@
-<!--
- ~ Copyright (c) 2005-2010, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
- ~
- ~ WSO2 Inc. 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.
- -->
-<%@ page import="org.wso2.carbon.registry.core.exceptions.RegistryException" %>
-<%@ page import="org.wso2.carbon.account.mgt.ui.clients.AccountMgtClient" %>
-<%@ page import="org.wso2.carbon.account.mgt.ui.utils.Util" %>
-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
-<%@ taglib uri="http://wso2.org/projects/carbon/taglibs/carbontags.jar" prefix="carbon" %>
-<carbon:jsi18n
-		resourceBundle="org.wso2.carbon.register.ui.i18n.JSResources"
-		request="<%=request%>" />
-<link href="css/update_profile.css" rel="stylesheet" type="text/css" media="all"/>
-
-
-<%
-    Boolean isUpdated;
-
-    try {
-    isUpdated = Util.updateFullname(request, config, session);
-    }
-    catch (Exception e) {
-    isUpdated  = false;
-    }
-
-%>
-<%        if (isUpdated) { %>
-
-    <div id="middle">
-
-       <h2>
-           Profile Successfully Updated.
-       </h2>
-
-
-   <%   }  else { %>
-
-    <div id="middle">
-
-       <h2>
-           Profile Update Failed
-       </h2>
-
-        <% } %>
-        <p>
-            Go to  <a href="../admin/index.jsp"> home page. </a>
-        </p>
-      </div>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/335eb418/components/stratos/account-mgt/org.wso2.carbon.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/update_verifier.jsp
----------------------------------------------------------------------
diff --git a/components/stratos/account-mgt/org.wso2.carbon.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/update_verifier.jsp b/components/stratos/account-mgt/org.wso2.carbon.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/update_verifier.jsp
deleted file mode 100644
index 2b35fc3..0000000
--- a/components/stratos/account-mgt/org.wso2.carbon.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/update_verifier.jsp
+++ /dev/null
@@ -1,56 +0,0 @@
-<!--
- ~ Copyright (c) 2005-2010, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
- ~
- ~ WSO2 Inc. 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.
- -->
-<%@ page import="org.wso2.carbon.CarbonConstants" %>
-<%@ page import="org.wso2.carbon.account.mgt.ui.clients.AccountMgtClient" %>
-<%@ page import="org.wso2.carbon.account.mgt.ui.utils.Util" %>
-<%@ page import="org.wso2.carbon.registry.core.exceptions.RegistryException" %>
-<%@ page import="org.wso2.carbon.account.mgt.ui.clients.EmailValidationClient" %>
-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
-<%@ taglib uri="http://wso2.org/projects/carbon/taglibs/carbontags.jar" prefix="carbon" %>
-<carbon:jsi18n
-        resourceBundle="org.wso2.carbon.register.ui.i18n.JSResources"
-        request="<%=request%>" />
-<%
-    String data = (String)session.getAttribute("intermediate-data");
-        
-    Util.readIntermediateData(request, data);
-
-    EmailValidationClient client;
-    String email;
-    String domain;
-    try {
-        email = (String)request.getAttribute("email");
-        domain = (String)request.getAttribute("tenantDomain");
-        String confirmationKey = (String)request.getAttribute("confirmationKey");
-
-        client = new EmailValidationClient(config, session);
-        client.proceedUpdateContact(domain, email, confirmationKey);
-    } catch (RegistryException e) {
-    %>
-      <div>Error in validating the contact.</div>
-    <%
-        return;
-    }
-
-%>
-
-<div style="margin:20px">You have successfully validated your email address and the contact information associated with your WSO2
-    Cloud Services account is updated. Click <a href="../admin/index.jsp">here</a> to access WSO2 Cloud Manager.    
-</div>
-

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/335eb418/components/stratos/account-mgt/org.wso2.carbon.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/update_verifier_redirector_ajaxprocessor.jsp
----------------------------------------------------------------------
diff --git a/components/stratos/account-mgt/org.wso2.carbon.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/update_verifier_redirector_ajaxprocessor.jsp b/components/stratos/account-mgt/org.wso2.carbon.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/update_verifier_redirector_ajaxprocessor.jsp
deleted file mode 100644
index cb5beae..0000000
--- a/components/stratos/account-mgt/org.wso2.carbon.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/update_verifier_redirector_ajaxprocessor.jsp
+++ /dev/null
@@ -1,30 +0,0 @@
-<!--
- ~ Copyright (c) 2005-2010, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
- ~
- ~ WSO2 Inc. 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.
- -->
-<%@ page import="org.wso2.carbon.account.mgt.ui.utils.Util" %>
-<%@ page import="org.wso2.carbon.utils.multitenancy.MultitenantConstants" %>
-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%
-//this jsp is used just to redirect to the correct update verifier.
-
-String data = (String)session.getAttribute("intermediate-data");
-
-Util.readIntermediateData(request, data);
-String domain = (String)request.getAttribute("tenantDomain");
-String contextPath = "/" + MultitenantConstants.TENANT_AWARE_URL_PREFIX + "/" + domain;
-response.sendRedirect("../account-mgt/update_verifier.jsp");
-%>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/335eb418/components/stratos/account-mgt/org.wso2.carbon.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/validate_domain_ajaxprocessor.jsp
----------------------------------------------------------------------
diff --git a/components/stratos/account-mgt/org.wso2.carbon.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/validate_domain_ajaxprocessor.jsp b/components/stratos/account-mgt/org.wso2.carbon.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/validate_domain_ajaxprocessor.jsp
deleted file mode 100644
index 71da4bd..0000000
--- a/components/stratos/account-mgt/org.wso2.carbon.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/validate_domain_ajaxprocessor.jsp
+++ /dev/null
@@ -1,29 +0,0 @@
-<!--
- ~ Copyright (c) 2005-2010, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
- ~
- ~ WSO2 Inc. 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.
- -->
-%@ page import="org.wso2.carbon.registry.core.RegistryConstants" %>
-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
-<%@ taglib uri="http://wso2.org/projects/carbon/taglibs/carbontags.jar" prefix="carbon" %>
-<%
-
-String domainToValidate = request.getParameter("domain");
-
-
-response.sendRedirect("../validate-domain/validate_domain_logged_in.jsp?domain=" + domainToValidate);
-
-%>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/335eb418/components/stratos/account-mgt/org.wso2.carbon.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/validation_success_ajaxprocessor.jsp
----------------------------------------------------------------------
diff --git a/components/stratos/account-mgt/org.wso2.carbon.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/validation_success_ajaxprocessor.jsp b/components/stratos/account-mgt/org.wso2.carbon.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/validation_success_ajaxprocessor.jsp
deleted file mode 100644
index 15aec9b..0000000
--- a/components/stratos/account-mgt/org.wso2.carbon.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/validation_success_ajaxprocessor.jsp
+++ /dev/null
@@ -1,49 +0,0 @@
-<!--
- ~ Copyright (c) 2005-2010, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
- ~
- ~ WSO2 Inc. 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.
- -->
-<%@ page import="org.wso2.carbon.account.mgt.ui.clients.AccountMgtClient" %>
-<%@ page import="org.wso2.carbon.registry.core.exceptions.RegistryException" %>
-<%@ page import="org.wso2.carbon.utils.multitenancy.MultitenantConstants" %>
-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%
-try {
-    String domainToRegister = (String)session.getAttribute("temp-domain-to-register");
-    String successKey = (String)session.getAttribute("validate-domain-success-key");
-    AccountMgtClient client = new AccountMgtClient(config, session);
-    if (client.finishedDomainValidation(domainToRegister, successKey)) {
-
-        //session.setAttribute(MultitenantConstants.TENANT_DOMAIN, domainToRegister);
-        session.setAttribute("domain-validation-success", "true");
-        // redirect to the login page with new domain name
-        response.sendRedirect("/t/" + domainToRegister + "/carbon/account-mgt/account_mgt.jsp");
-        return;
-    } else {
-        session.removeAttribute("temp-domain-to-register");
-        session.removeAttribute("validate-domain-success-key");
-
-        // now redirect to the account_mgt.js with the failure
-        session.setAttribute("domain-validation-failure", "true");
-        response.sendRedirect("../account-mgt/account_mgt.jsp");
-        return;
-    }
-} catch (RegistryException e) {
-%>
-  <div>Error in finishing the validation.</div>
-<%
-    return;
-}
-%>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/335eb418/components/stratos/account-mgt/org.wso2.carbon.account.mgt/2.1.0/pom.xml
----------------------------------------------------------------------
diff --git a/components/stratos/account-mgt/org.wso2.carbon.account.mgt/2.1.0/pom.xml b/components/stratos/account-mgt/org.wso2.carbon.account.mgt/2.1.0/pom.xml
deleted file mode 100644
index 599833d..0000000
--- a/components/stratos/account-mgt/org.wso2.carbon.account.mgt/2.1.0/pom.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<!--
-# Copyright (c) 2008, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
-#
-# Licensed 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.wso2.carbon</groupId>
-        <artifactId>account-mgt-parent</artifactId>
-        <version>2.1.0</version>
-<relativePath>../../pom.xml</relativePath>
-    </parent>
-
-    <modelVersion>4.0.0</modelVorg.apache.stratos.account.mgtg.wso2.carbon.account.mgt</artifactId>
-    <packaging>bundle</packaging>
-    <name>WSO2 Stratos - Account Management</name>
-
-    <build>
-
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-scr-plugin</artifactId>
-            </plugin>
-            <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>
-                        <Private-Package>
-                            org.apache.stratos.account.mgt.*,
-                        </Private-Package>
-                        <Import-Package>
-                            org.wso2.carbon.registry.core.*;version=1.0.1,
-                            javax.xml.namespace; version=0.0.0,
-                            javax.servlet;version="${imp.pkg.version.javax.servlet}",
-                            javax.servlet.http;version="${imp.pkg.version.javax.servlet}",
-                            *;resolution:=optional
-                        </Import-Package>
-                        <DynamicImport-Package>*</DynamicImport-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.wso2.carbon</groupId>
-            <artifactId>org.wso2.carbon.registry.core</artifactId>
-        </dependency>
-        <dependency>
-           <groupId>org.wso2.carbon</groupId>
-            <artifactId>org.wso2.carbon.email.verification</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.wso2.carbon</groupId>
-            <artifactId>org.wso2.carbon.stratos.common</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.wso2.carbon</groupId>
-            <artifactId>org.wso2.carbon.tenant.mgt</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.wso2.carbon</groupId>
-            <artifactId>atlassian-jira</artifactId>
-            <version>1.0.0.wso2v1</version>
-        </dependency>
-    </dependencies>
-
-</project>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/335eb418/components/stratos/account-mgt/org.wso2.carbon.account.mgt/2.1.0/src/main/resources/META-INF/component.xml
----------------------------------------------------------------------
diff --git a/components/stratos/account-mgt/org.wso2.carbon.account.mgt/2.1.0/src/main/resources/META-INF/component.xml b/components/stratos/account-mgt/org.wso2.carbon.account.mgt/2.1.0/src/main/resources/META-INF/component.xml
deleted file mode 100644
index e399648..0000000
--- a/components/stratos/account-mgt/org.wso2.carbon.account.mgt/2.1.0/src/main/resources/META-INF/component.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~  Copyright (c) 2009, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
-  ~
-  ~  Licensed 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">
-    <ManagementPermissions>
-        <ManagementPermission>
-            <DisplayName>Configure</DisplayName>
-            <ResourceId>/permission/admin/configure</ResourceId>
-        </ManagementPermission>
-        <ManagementPermission>
-            <DisplayName>Account</DisplayName>
-            <ResourceId>/permission/admin/configure/account</ResourceId>
-        </ManagementPermission>
-    </ManagementPermissions>
-</component>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/335eb418/components/stratos/account-mgt/org.wso2.carbon.account.mgt/2.1.0/src/main/resources/META-INF/services.xml
----------------------------------------------------------------------
diff --git a/components/stratos/account-mgt/org.wso2.carbon.account.mgt/2.1.0/src/main/resources/META-INF/services.xml b/components/stratos/account-mgt/org.wso2.carbon.account.mgt/2.1.0/src/main/resources/META-INF/services.xml
deleted file mode 100644
index a5deded..0000000
--- a/components/stratos/account-mgt/org.wso2.carbon.account.mgt/2.1.0/src/main/resources/META-INF/services.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- !
- ! Copyright 2006 The Apache Software Foundation.
- !
- ! Licensed under the Apache License, Version 2.0 (the "License");
- ! you may not use this file except in compliance with the License.
- ! You may obtain a copy of the License at
- !
- !      http://www.apache.org/licenses/LICENSE-2.0
- !
- ! Unless required by applicable law or agreed to in writing, software
- ! distributed under the License is distributed on an "AS IS" BASIS,
- ! WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ! See the License for the specific language governing permissions and
- ! limitations under the License.
- !-->
-<serviceGroup>
-
-    <service name="AccountMgtService" scope="transportsession">
-        <transports>
-            <transport>https</transport>
-        </transports>
-        <parameter name="ServiceClass" locked="false">
-            org.apache.stratos.account.mgt.services.AccountMgtService
-        </parameter>
-
-        <operation name="updateContact">
-            <parameter name="AuthorizationAction" locked="true">/permission/admin/configure/account</parameter>
-        </operation>
-
-        <operation name="getContact">
-            <parameter name="AuthorizationAction" locked="true">/permission/admin/configure/account</parameter>
-        </operation>
-
-        <operation name="updateFullname">
-            <parameter name="AuthorizationAction" locked="true">/permission/admin/configure/account</parameter>
-        </operation>
-
-        <operation name="getFullname">
-            <parameter name="AuthorizationAction" locked="true">/permission/admin/configure/account</parameter>
-        </operation>
-
-        <operation name="deactivate">
-            <parameter name="AuthorizationAction" locked="true">/permission/admin/configure/account</parameter>
-        </operation>
-
-        <operation name="isDomainValidated">
-            <parameter name="AuthorizationAction" locked="true">/permission/admin/configure/account</parameter>
-        </operation>
-
-        <operation name="finishedDomainValidation">
-            <parameter name="AuthorizationAction" locked="true">/permission/admin/configure/account</parameter>
-        </operation>
-
-        <operation name="checkDomainAvailability">
-            <parameter name="AuthorizationAction" locked="true">/permission/admin/configure/account</parameter>
-        </operation>
-
-        <operation name="isEmailValidated">
-            <parameter name="AuthorizationAction" locked="true">/permission/admin/configure/account</parameter>
-        </operation>
-        <parameter name="adminService" locked="true">true</parameter>
-    </service>
-
-    <service name="EmailValidationService" scope="transportsession">
-        <transports>
-            <transport>https</transport>
-        </transports>
-        <parameter name="ServiceClass" locked="false">
-            org.apache.stratos.account.mgt.services.EmailValidationService
-        </parameter>
-
-        <operation name="proceedUpdateContact">
-        </operation>
-    </service>
-
-    <parameter name="hiddenService" locked="true">true</parameter>
-
-</serviceGroup>


[2/5] Refactoring org.wso2.carbon to org.apache.stratos

Posted by sa...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/335eb418/components/stratos/account-mgt/org.wso2.carbon.account.mgt.ui/2.1.0/src/main/resources/AccountMgtService.wsdl
----------------------------------------------------------------------
diff --git a/components/stratos/account-mgt/org.wso2.carbon.account.mgt.ui/2.1.0/src/main/resources/AccountMgtService.wsdl b/components/stratos/account-mgt/org.wso2.carbon.account.mgt.ui/2.1.0/src/main/resources/AccountMgtService.wsdl
deleted file mode 100644
index f5aa207..0000000
--- a/components/stratos/account-mgt/org.wso2.carbon.account.mgt.ui/2.1.0/src/main/resources/AccountMgtService.wsdl
+++ /dev/null
@@ -1,628 +0,0 @@
-<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:ns1="http://org.apache.axis2/xsd" xmlns:ns="http://services.mgt.account.carbon.wso2.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.carbon.wso2.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.carbon.wso2.org">
-    <wsdl:documentation>AccountMgtService</wsdl:documentation>
-    <wsdl:types>
-        <xs:schema xmlns:ax22="http://beans.mgt.account.carbon.wso2.org/xsd" attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://services.mgt.account.carbon.wso2.org">
-            <xs:import namespace="http://beans.mgt.account.carbon.wso2.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.carbon.wso2.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/incubator-stratos/blob/335eb418/components/stratos/account-mgt/org.wso2.carbon.account.mgt.ui/2.1.0/src/main/resources/EmailValidationService.wsdl
----------------------------------------------------------------------
diff --git a/components/stratos/account-mgt/org.wso2.carbon.account.mgt.ui/2.1.0/src/main/resources/EmailValidationService.wsdl b/components/stratos/account-mgt/org.wso2.carbon.account.mgt.ui/2.1.0/src/main/resources/EmailValidationService.wsdl
deleted file mode 100644
index 7cb056f..0000000
--- a/components/stratos/account-mgt/org.wso2.carbon.account.mgt.ui/2.1.0/src/main/resources/EmailValidationService.wsdl
+++ /dev/null
@@ -1,95 +0,0 @@
-<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:ns1="http://org.apache.axis2/xsd" xmlns:ns="http://services.mgt.account.carbon.wso2.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.carbon.wso2.org">
-    <wsdl:documentation>EmailValidationService</wsdl:documentation>
-    <wsdl:types>
-        <xs:schema attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://services.mgt.account.carbon.wso2.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/incubator-stratos/blob/335eb418/components/stratos/account-mgt/org.wso2.carbon.account.mgt.ui/2.1.0/src/main/resources/META-INF/component.xml
----------------------------------------------------------------------
diff --git a/components/stratos/account-mgt/org.wso2.carbon.account.mgt.ui/2.1.0/src/main/resources/META-INF/component.xml b/components/stratos/account-mgt/org.wso2.carbon.account.mgt.ui/2.1.0/src/main/resources/META-INF/component.xml
deleted file mode 100644
index 6170c1f..0000000
--- a/components/stratos/account-mgt/org.wso2.carbon.account.mgt.ui/2.1.0/src/main/resources/META-INF/component.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<!--
- ~ Copyright (c) 2005-2010, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
- ~
- ~ WSO2 Inc. 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.wso2.carbon.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/incubator-stratos/blob/335eb418/components/stratos/account-mgt/org.wso2.carbon.account.mgt.ui/2.1.0/src/main/resources/org/wso2/carbon/account/mgt/ui/i18n/JSResources.properties
----------------------------------------------------------------------
diff --git a/components/stratos/account-mgt/org.wso2.carbon.account.mgt.ui/2.1.0/src/main/resources/org/wso2/carbon/account/mgt/ui/i18n/JSResources.properties b/components/stratos/account-mgt/org.wso2.carbon.account.mgt.ui/2.1.0/src/main/resources/org/wso2/carbon/account/mgt/ui/i18n/JSResources.properties
deleted file mode 100644
index 92f331d..0000000
--- a/components/stratos/account-mgt/org.wso2.carbon.account.mgt.ui/2.1.0/src/main/resources/org/wso2/carbon/account/mgt/ui/i18n/JSResources.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-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.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/335eb418/components/stratos/account-mgt/org.wso2.carbon.account.mgt.ui/2.1.0/src/main/resources/org/wso2/carbon/account/mgt/ui/i18n/Resources.properties
----------------------------------------------------------------------
diff --git a/components/stratos/account-mgt/org.wso2.carbon.account.mgt.ui/2.1.0/src/main/resources/org/wso2/carbon/account/mgt/ui/i18n/Resources.properties b/components/stratos/account-mgt/org.wso2.carbon.account.mgt.ui/2.1.0/src/main/resources/org/wso2/carbon/account/mgt/ui/i18n/Resources.properties
deleted file mode 100644
index ef72bbb..0000000
--- a/components/stratos/account-mgt/org.wso2.carbon.account.mgt.ui/2.1.0/src/main/resources/org/wso2/carbon/account/mgt/ui/i18n/Resources.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-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".

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/335eb418/components/stratos/account-mgt/org.wso2.carbon.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/account_mgt.jsp
----------------------------------------------------------------------
diff --git a/components/stratos/account-mgt/org.wso2.carbon.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/account_mgt.jsp b/components/stratos/account-mgt/org.wso2.carbon.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/account_mgt.jsp
deleted file mode 100644
index 3c693a6..0000000
--- a/components/stratos/account-mgt/org.wso2.carbon.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/account_mgt.jsp
+++ /dev/null
@@ -1,526 +0,0 @@
-<!--
-~ Copyright (c) 2005-2010, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
-~
-~ WSO2 Inc. 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.
--->
-<%@ page import="org.apache.stratos.account.mgt.AccountInfoBean" %>
-<%@ page import="org.wso2.carbon.account.mgt.ui.clients.AccountMgtClient" %>
-<%@ page import="org.wso2.carbon.account.mgt.ui.clients.UsagePlanClient" %>
-<%@ page import="org.wso2.carbon.stratos.common.constants.StratosConstants" %>
-<%@ page import="org.wso2.carbon.stratos.common.util.CommonUtil" %>
-<%@ page import="org.wso2.carbon.registry.core.exceptions.RegistryException" %>
-<%@ page import="org.wso2.carbon.utils.multitenancy.MultitenantConstants" %>
-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
-<%@ taglib uri="http://wso2.org/projects/carbon/taglibs/carbontags.jar" prefix="carbon" %>
-<link rel="stylesheet" type="text/css" href="../yui/assets/yui.css">
-<link rel="stylesheet" type="text/css" href="../yui/build/menu/assets/skins/sam/menu.css"/>
-<link rel="stylesheet" type="text/css" href="../yui/build/button/assets/skins/sam/button.css"/>
-<link rel="stylesheet" type="text/css"
-      href="../yui/build/container/assets/skins/sam/container.css"/>
-<link rel="stylesheet" type="text/css"
-      href="../yui/build/autocomplete/assets/skins/sam/autocomplete.css"/>
-<link rel="stylesheet" type="text/css" href="../yui/build/editor/assets/skins/sam/editor.css"/>
-<link rel="stylesheet" type="text/css" href="../account-mgt/css/account_mgt.css"/>
-<jsp:include page="../registry_common/registry_common-i18n-ajaxprocessor.jsp"/>
-<script type="text/javascript" src="../registry_common/js/registry_validation.js"></script>
-<script type="text/javascript" src="../registry_common/js/registry_common.js"></script>
-<script type="text/javascript" src="../ajax/js/prototype.js"></script>
-<script type="text/javascript" src="../account-mgt/js/account_mgt.js"></script>
-<carbon:jsi18n
-        resourceBundle="org.wso2.carbon.account.mgt.ui.i18n.JSResources"
-        request="<%=request%>"/>
-<fmt:bundle basename="org.wso2.carbon.account.mgt.ui.i18n.Resources">
-
-<%
-    if ("true".equals(session.getAttribute("domain-validation-failure"))) {
-        session.removeAttribute("domain-validation-failure");
-%>
-
-<script type="text/javascript">
-    jQuery(document).ready(function() {
-        CARBON.showWarningDialog(jsi18n["domain.validation.failed"]);
-    });
-</script>
-<%
-    }
-    if ("true".equals(session.getAttribute("domain-validation-success"))) {
-        session.removeAttribute("domain-validation-success");
-%>
-
-<script type="text/javascript">
-    jQuery(document).ready(function() {
-        CARBON.showWarningDialog(jsi18n["successfully.validated"]);
-    });
-</script>
-<%
-    }
-
-
-    if ("false".equals(session.getAttribute("temp-domain-available"))) {
-        session.removeAttribute("temp-domain-available");
-%>
-
-<script type="text/javascript">
-    jQuery(document).ready(function() {
-        CARBON.showWarningDialog(jsi18n["domain.unavailable"]);
-    });
-</script>
-<%
-    }
-%>
-<%
-
-    String contactEmail = "";
-    String firstname = "";
-    String lastname = "";
-    String tenantDomain = "";
-    String usagePlan = "";
-    boolean isDomainValidated;
-    boolean isEmailValidated = false;
-    AccountMgtClient client;
-    try {
-        client = new AccountMgtClient(config, session);
-        contactEmail = client.getContact();
-        AccountInfoBean accountInfoBean = client.getFullname();
-        firstname = accountInfoBean.getFirstname();
-        lastname = accountInfoBean.getLastname();
-        if (firstname == null) {
-            firstname = "";
-        }
-        if (lastname == null) {
-            lastname = "";
-        }
-        isDomainValidated = client.isDomainValidated();
-        isEmailValidated = client.isEmailValidated();
-
-
-        if ("true".equals(request.getParameter("isUpdate"))) {
-            usagePlan = request.getParameter("selectedUsagePlan");
-            if (org.wso2.carbon.account.mgt.ui.utils.Util.updateUsagePlan(request, config, session)) {
-%>
-<script type="text/javascript">
-    //        window.location.href="../admin/logout_action.jsp";
-    CARBON.showInfoDialog("Your usage plan has been updated.");
-</script>
-<%
-} else {
-%>
-<script type="text/javascript">
-    //        window.location.href="../admin/logout_action.jsp";
-    CARBON.showInfoDialog("Error occured while updating usage plan.");
-</script>
-<%
-        }
-    }
-    usagePlan = org.wso2.carbon.account.mgt.ui.utils.Util.getUsagePlanName(config, session);
-    if ("true".equals(request.getParameter("isDeactivated"))) {
-        client.deactivate();
-        tenantDomain = (String) session.getAttribute("tenantDomain");
-%>
-
-<script type="text/javascript">
-    //        window.location.href="../admin/logout_action.jsp";
-    CARBON.showInfoDialog("Your account has been deactivated.",
-                         function() {
-                             window.location.href = "../admin/logout_action.jsp"
-                         },
-                         function() {
-                             window.location.href = "../admin/logout_action.jsp"
-                         });
-</script>
-<%
-    }
-} catch (RegistryException e) {
-%>
-<div>Error in getting account management information.</div>
-<%
-        return;
-    }
-
-    String currentDomain = (String) session.getAttribute(MultitenantConstants.TENANT_DOMAIN);
-
-    if (session.getAttribute("submit-firstname") != null) {
-        firstname = (String) session.getAttribute("submit-firstname");
-        session.setAttribute("submit-firstname", null);
-    }
-    if (session.getAttribute("submit-lastname") != null) {
-        lastname = (String) session.getAttribute("submit-lastname");
-        session.setAttribute("submit-lastname", null);
-    }
-
-%>
-
-<carbon:breadcrumb label="resources"
-                   resourceBundle="org.wso2.carbon.account.mgt.ui.i18n.Resources"
-                   topPage="true" request="<%=request%>"/>
-<div id="middle">
-
-<div id="workArea">
-<h2><fmt:message key="account.mgt.title"/></h2>
-
-
-<table class="styledLeft">
-    <thead>
-    <tr>
-        <th><fmt:message key="contact.information"/></th>
-    </tr>
-    </thead>
-    <tbody>
-
-    <tr>
-        <td class="nopadding">
-            <form method="POST" action="update_contact_ajaxprocessor.jsp">
-                <table class="normal-nopadding" cellspacing="0">
-                    <tbody>
-                    <tr>
-                        <td width="200px"><fmt:message key="contact.email"/><span
-                                class="required">*</span></td>
-                        <td colspan="2">
-                            <input type="text" name="email" id="email" style="width:400px"
-                                   value="<%=contactEmail%>"/> <span id="busyContact">&nbsp;</span>
-                            <span style="visibility:hidden"
-                                  id="old-email"><%=isEmailValidated ? contactEmail : ""%></span>
-                        </td>
-                    </tr>
-                    <%
-                        if (isEmailValidated) {
-                    %>
-
-                    <tr>
-                        <td></td>
-                        <td colspan="2"><input onclick="updateContact()" type="button"
-                                               value="<fmt:message key="update.contact"/>"/></td>
-                    </tr>
-                    <%
-                    } else {
-                    %>
-                    <tr>
-                        <td colspan="3">
-                            <div class="not-validated"><img src="images/wrong.gif" alt="Validated"/>Your
-                                email is not validated.
-                                Please validate it from here.
-                            </div>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td></td>
-                        <td colspan="2"><input onclick="updateContact()" type="button"
-                                               value="<fmt:message key="validate.contact"/>"/></td>
-                    </tr>
-                    <%
-                        }
-                    %>
-
-                    <tr>
-                        <td colspan="3">
-                            <div class="table-spacer">&nbsp;</div>
-                        </td>
-                    </tr>
-                    </tbody>
-                </table>
-            </form>
-        </td>
-
-    </tr>
-
-    </tbody>
-</table>
-
-
-<table class="styledLeft">
-    <thead>
-    <tr>
-        <th><fmt:message key="admin.information"/></th>
-    </tr>
-    </thead>
-    <tbody>
-
-    <tr>
-        <td class="nopadding">
-            <form id="update_profile_form" action="update_profile_processor.jsp" method="POST">
-                <table class="normal-nopadding" cellspacing="0">
-                    <tbody>
-                    <tr>
-                        <td width="200px"><fmt:message key="firstname"/><span
-                                class="required">*</span></td>
-                        <td colspan="2">
-                            <input type="text" name="firstname" id="firstname" style="width:400px"
-                                   value="<%=firstname%>"/>
-                            <span style="visibility:hidden" id="old-firstname"><%=firstname%></span>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td width="200px"><fmt:message key="lastname"/><span
-                                class="required">*</span></td>
-                        <td colspan="2">
-                            <input type="text" name="lastname" id="lastname" style="width:400px"
-                                   value="<%=lastname%>"/>
-                            <span style="visibility:hidden" id="old-lastname"><%=lastname%></span>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td></td>
-                        <td colspan="2"><input onclick="updateProfile()" type="button"
-                                               value="<fmt:message key="update.profile"/>"/></td>
-                    </tr>
-                    <tr>
-                        <td colspan="3">
-                            <div class="table-spacer">&nbsp;</div>
-                        </td>
-                    </tr>
-                    </tbody>
-                </table>
-            </form>
-        </td>
-
-    </tr>
-
-    </tbody>
-</table>
-
-
-<table class="styledLeft">
-    <thead>
-    <tr>
-        <th><fmt:message key="validate.domain.title"/></th>
-    </tr>
-    </thead>
-    <tbody>
-
-    <tr>
-        <td class="nopadding">
-            <form onsubmit="return domainSelected();" id="validateDomainForm" method="POST"
-                  action="validate_domain_ajaxprocessor.jsp">
-                <table class="normal-nopadding" cellspacing="0">
-                    <tbody>
-                    <tr>
-                        <td width="200px"><fmt:message key="current.domain"/></td>
-                        <td colspan="2"><input readonly="true" type="text" name="domain" id="domain"
-                                               style="width:400px" value="<%=currentDomain%>"/>
-                        </td>
-                    </tr>
-
-                    <%
-                        if (isDomainValidated) {
-                    %>
-                    <tr>
-                        <td colspan="3">
-                            <div class="validated"><img src="images/right.gif" alt="Validated"/> The
-                                ownership of your domain is already validated.
-                            </div>
-                        </td>
-                    </tr>
-
-                    <%
-                    } else {
-                    %>
-                    <tr>
-                        <td colspan="3">
-                            <div class="not-validated"><img src="images/wrong.gif" alt="Validated"/>
-                                The ownership of your
-                                domain is not validated. You can validate it from here.
-                            </div>
-                        </td>
-                    </tr>
-
-                    <tr>
-                        <td></td>
-                        <td colspan="2"><input type="submit"
-                                               value="<fmt:message key="validate.domain"/>"/></td>
-                    </tr>
-                    <tr>
-                        <td colspan="3">
-                            <div class="table-spacer">&nbsp;</div>
-                        </td>
-                    </tr>
-
-                    <%
-                        }
-                    %>
-                    </tbody>
-                </table>
-            </form>
-        </td>
-    </tr>
-
-    </tbody>
-</table>
-
-
-<table class="styledLeft">
-    <thead>
-    <tr>
-        <th><fmt:message key="deactivate.account.title"/></th>
-    </tr>
-    </thead>
-    <tbody>
-
-
-    <tr>
-        <td class="nopadding">
-            <form method="POST" id="deactivate_form" action="account_mgt.jsp">
-                <input type="hidden" name="isDeactivated" value="true"/>
-                <table class="normal-nopadding" cellspacing="0">
-                    <tbody>
-                    <tr>
-                        <td colspan="3"><fmt:message key="deactivate.account.msg"/></td>
-                    </tr>
-                    <tr>
-                        <td width="200px"></td>
-                        <td colspan="2"><input onclick="return deactivate('<%=currentDomain%>');"
-                                               type="button"
-                                               value="<fmt:message key="deactivate.account.btn"/>"/>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td colspan="3">
-                            <div class="table-spacer">&nbsp;</div>
-                        </td>
-                    </tr>
-                    </tbody>
-                </table>
-            </form>
-        </td>
-    </tr>
-
-    </tbody>
-</table>
-
-
-<table class="styledLeft">
-    <thead>
-    <tr>
-        <th><fmt:message key="usage.plan.information"/>
-            <% if (usagePlan.length() > 10) {
-                String planName = usagePlan;
-            %>
-            - Your Current Usage Plan is : <%=planName%>
-            <%}%>
-        </th>
-    </tr>
-    </thead>
-    <tbody>
-
-<script type="text/javascript">
-<%
-    boolean chargeOnRegistration = CommonUtil.isChargedOnRegistration();
-%>
-
-function updatePlan(plan, existingPlan, regTenantDomain) {
-    var newPlan = plan.options[plan.selectedIndex].value;
-    if(newPlan==existingPlan){
-        CARBON.showInfoDialog("Please select the new plan before updating");
-    }else{
-        sessionAwareFunction(function() {
-        CARBON.showConfirmationDialog("Are you sure you want to update your UsagePlan ? "
-                                      , function() {
-
-
-
-
-
-            var submitForm = document.getElementById("usagePlanUpdate_form");
-            submitForm.submit();
-        });
-    }, "Session timed out. Please login again.");
-    }
-}
-</script>
-
-    <tr>
-        <td class="nopadding">
-            <form method="POST" id="usagePlanUpdate_form"
-            <% if (chargeOnRegistration){ %>
-            action="init_payment_ajaxprocessor.jsp"
-            <% } else { %>
-            action="account_mgt.jsp"
-            <% } %>
-            >
-                <input type="hidden" name="isUpdate" value="true"/>
-                <table class="normal-nopadding" cellspacing="0">
-                    <tbody>
-                    <td><fmt:message key="select.usage.plan.for.tenant"/></td>
-                    <td>
-                        <select name="selectedUsagePlan" id="selectedUsagePlan">
-                        </select>
-                        <a href="<%=CommonUtil.getStratosConfig().getUsagePlanURL()%>"
-                           target="_blank">
-                            <b>Pricing Info</b></a>
-                    </td>
-
-
-                    </tr>
-                    <tr>
-                        <td colspan="2"><fmt:message key="select.package.message"/>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td width="200px"></td>
-                        <td colspan="2"><input
-                                onclick="return updatePlan(document.getElementById('selectedUsagePlan'), '<%=usagePlan%>', '<%=currentDomain%>');"
-                                type="button"
-                                value="Update Plan"/>
-                        </td>
-                    </tr>
-                    </tbody>
-                </table>
-            </form>
-    </tbody>
-</table>
-</div>
-</div>
-</fmt:bundle>
-<script type="text/javascript">
-
-    jQuery(document).ready(
-                          function() {
-                              jQuery.ajax({
-                                  type: 'POST',
-                                  url: 'get_package_info_ajaxprocessor.jsp',
-                                  dataType: 'json',
-                                  data: 'plan=0',
-                                  async: false,
-                                  success: function(data) {
-                                      packageInfo = data;
-                                  },
-                                  error:function (xhr, ajaxOptions, thrownError) {
-                                      CARBON.showErrorDialog('Could not get package information.');
-                                  }
-                              });
-
-                              var charge;
-                              var name;
-                              for (var i = 0; i < packageInfo.length; i++) {
-                                  charge = packageInfo[i].subscriptionCharge;
-                                  name = packageInfo[i].name;
-                                  if (name == '<%=org.wso2.carbon.account.mgt.ui.utils.Util.getUsagePlanName(config, session)%>') {
-                                      option = document.createElement("option");
-                                      option.value = name;
-                                      option.selected = name;
-                                      option.innerHTML = name;
-                                      document.getElementById('selectedUsagePlan').appendChild(option);
-
-                                  }
-                                  else {
-                                      option = document.createElement("option");
-                                      option.value = name;
-                                      option.innerHTML = name
-                                      document.getElementById('selectedUsagePlan').appendChild(option);
-                                  }
-                              }
-                          }
-            );
-</script>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/335eb418/components/stratos/account-mgt/org.wso2.carbon.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/css/account_mgt.css
----------------------------------------------------------------------
diff --git a/components/stratos/account-mgt/org.wso2.carbon.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/css/account_mgt.css b/components/stratos/account-mgt/org.wso2.carbon.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/css/account_mgt.css
deleted file mode 100644
index 9dd4170..0000000
--- a/components/stratos/account-mgt/org.wso2.carbon.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/css/account_mgt.css
+++ /dev/null
@@ -1,15 +0,0 @@
-div.not-validated {
-    color: #f00;
-    padding: 15px 0px 10px 0px;
-}
-
-div.validated {
-    font-color: #058000;
-    padding: 15px 0px 10px 0px;
-}
-
-
-div.table-spacer {
-    margin: 5px;
-    clear:both;
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/335eb418/components/stratos/account-mgt/org.wso2.carbon.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/css/update_profile.css
----------------------------------------------------------------------
diff --git a/components/stratos/account-mgt/org.wso2.carbon.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/css/update_profile.css b/components/stratos/account-mgt/org.wso2.carbon.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/css/update_profile.css
deleted file mode 100644
index c3878ae..0000000
--- a/components/stratos/account-mgt/org.wso2.carbon.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/css/update_profile.css
+++ /dev/null
@@ -1,29 +0,0 @@
-body {
-	color:#111111;
-	font-family:"Calibri","Lucida Grande","Lucida Sans","Microsoft Sans Serif","Lucida Sans Unicode","Verdana","Sans-serif","trebuchet ms" !important;
-	font-size:0.75em;
-	font-size-adjust:none;
-	font-style:normal;
-	font-variant:normal;
-	font-weight:normal;
-	line-height:1.25em;
-	background-position: left top;
-	background-repeat: repeat-x;
-	margin: 0px;
-	padding: 0px;
-}
-
-div.clear {
-	clear:both;
-}
-p { }
-
-td { }
-
-a:link { }
-
-a:visited { }
-
-a:hover { }
-
-a:active { }

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/335eb418/components/stratos/account-mgt/org.wso2.carbon.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/deactivate_account_ajaxprocessor.jsp
----------------------------------------------------------------------
diff --git a/components/stratos/account-mgt/org.wso2.carbon.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/deactivate_account_ajaxprocessor.jsp b/components/stratos/account-mgt/org.wso2.carbon.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/deactivate_account_ajaxprocessor.jsp
deleted file mode 100644
index fabc967..0000000
--- a/components/stratos/account-mgt/org.wso2.carbon.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/deactivate_account_ajaxprocessor.jsp
+++ /dev/null
@@ -1,38 +0,0 @@
-<!--
- ~ Copyright (c) 2005-2010, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
- ~
- ~ WSO2 Inc. 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.
- -->
-<%@ page import="org.wso2.carbon.registry.core.exceptions.RegistryException" %>
-<%@ page import="org.wso2.carbon.account.mgt.ui.clients.AccountMgtClient" %>
-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%
-AccountMgtClient client;
-try {
-    client = new AccountMgtClient(config, session);
-    client.deactivate();
-
-    // redirect to the carbon login page
-    %><script type="text/javascript">
-        CARBON.showInfoDialog("Your account has been deactivated.",
-                function() {window.location.href="../admin/logout_action.jsp"},
-                function() {window.location.href="../admin/logout_action.jsp"});
-    </script><%
-} catch (RegistryException e) {
-%>
-  <div>Error in deactivating the account.</div>
-<%
-}
-%>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/335eb418/components/stratos/account-mgt/org.wso2.carbon.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/docs/aboutUsagePlans.html
----------------------------------------------------------------------
diff --git a/components/stratos/account-mgt/org.wso2.carbon.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/docs/aboutUsagePlans.html b/components/stratos/account-mgt/org.wso2.carbon.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/docs/aboutUsagePlans.html
deleted file mode 100644
index 791b867..0000000
--- a/components/stratos/account-mgt/org.wso2.carbon.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/docs/aboutUsagePlans.html
+++ /dev/null
@@ -1,104 +0,0 @@
-<!--
- ~ Copyright (c) 2005-2010, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
- ~
- ~ WSO2 Inc. 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.
- -->
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-  <title>Select Usage Plan For Tenant - User Guide</title>
-  <link href="../../admin/css/documentation.css" rel="stylesheet" type="text/css" media="all" />
-</head>
-
-<body>
-
-
- <h1>Select Usage Plan For Tenant</h1>
-
-
- <h2> <b> Usage Plans(Subscriptions)</b></h2>
-
-<p>
-    According to the usage plan that you selected you will get different volume of service and registry
-    bandwidths other services that available for tenants.By selecting right usage plan that suits
-    your requirements you can get maximum profit
-</p>
-
-
-<h2><b>Multitenancy Free</b></h2>
-<p>
-  This is the free usage plan.You will get limited amount of resources.This package is
-  best suite for evaluation and tests.
-</p>
- <h2><b>Multitenancy Small</b></h2>
-<p>
-   This package is best suite for small business.
-</p>
-<h2><b>Multitenancy Medium</b></h2>
-<p>
-   This usage plan suites for medium scale business.You will get average amount of resources
-    with this package.
-</p>
-<h2><b>Multitenancy Large</b></h2>
-<p>
-   This is the premium usage plan.You will get maximum resources form this plan.
-   This is best suite to large scale business.
-</p>
-
-<p>
-
-   Usage Plan summery
-<table border="1">
-<tr>
-<td>Usage Plan Name</td>
-<td>Number Of Users</td>
-<td>Registry Bandwidth (Mb) </td>
-<td>Service BandWidth (Mb) </td>
-<td>Cost Per Month ($)</td>
-</tr>
-<tr>
-<td>Multitenancy Free</td>
-<td>5</td>
-<td>10</td>
-<td>10</td>
-<td>10</td>
-</tr>
-<tr>
-<td>Multitenancy Small</td>
-<td>10</td>
-<td>25</td>
-<td>25</td>
-<td>25</td>
-</tr>
-<tr>
-<td>Multitenancy Medium</td>
-<td>20</td>
-<td>100</td>
-<td>100</td>
-<td>100</td>
-</tr>
-<tr>
-<td>Multitenancy Large</td>
-<td>50</td>
-<td>200</td>
-<td>200</td>
-<td>200</td>
-</tr>
-</table> 
-<div><strong>Figure1: Usage Plan Summery Table</strong></div>
-</p>
-</body>
-
-</html>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/335eb418/components/stratos/account-mgt/org.wso2.carbon.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/docs/images/account-mgt.png
----------------------------------------------------------------------
diff --git a/components/stratos/account-mgt/org.wso2.carbon.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/docs/images/account-mgt.png b/components/stratos/account-mgt/org.wso2.carbon.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/docs/images/account-mgt.png
deleted file mode 100644
index f67777f..0000000
Binary files a/components/stratos/account-mgt/org.wso2.carbon.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/docs/images/account-mgt.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/335eb418/components/stratos/account-mgt/org.wso2.carbon.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/docs/userguide.html
----------------------------------------------------------------------
diff --git a/components/stratos/account-mgt/org.wso2.carbon.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/docs/userguide.html b/components/stratos/account-mgt/org.wso2.carbon.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/docs/userguide.html
deleted file mode 100644
index fd04465..0000000
--- a/components/stratos/account-mgt/org.wso2.carbon.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/docs/userguide.html
+++ /dev/null
@@ -1,44 +0,0 @@
-<!--
- ~ Copyright (c) 2005-2010, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
- ~
- ~ WSO2 Inc. 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.
- -->
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-  <title>Stratos Account Managment- User Guide</title>
-  <link href="../../admin/css/documentation.css" rel="stylesheet" type="text/css" media="all" />
-</head>
-
-<body>
-<h1>Stratos Account Management</h1>
-
-<p>
-You can use this form to
-<ul>
-    <li>Update or validate the contact information</li>
-    <li>Deactivate the account</li>
-    <li>Validate the domain name ownership (If you have not already done it)</li>
-</ul>
-</p>
-
-<p>
-<img src="images/account-mgt.png" alt="Account Management Page"/>
-<div><strong>Figure1: Account Management Page</strong></div>
-</p>
-
-</body>
-
-</html>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/335eb418/components/stratos/account-mgt/org.wso2.carbon.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/get_package_info_ajaxprocessor.jsp
----------------------------------------------------------------------
diff --git a/components/stratos/account-mgt/org.wso2.carbon.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/get_package_info_ajaxprocessor.jsp b/components/stratos/account-mgt/org.wso2.carbon.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/get_package_info_ajaxprocessor.jsp
deleted file mode 100644
index 8a52783..0000000
--- a/components/stratos/account-mgt/org.wso2.carbon.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/get_package_info_ajaxprocessor.jsp
+++ /dev/null
@@ -1,39 +0,0 @@
-<%--
-~ Copyright (c) 2005-2010, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
-~
-~ WSO2 Inc. 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.
---%>
-<%@ page import="org.wso2.carbon.ui.CarbonUIUtil" %>
-<%@ page import="org.json.JSONArray" %>
-<%@ page import="org.wso2.carbon.account.mgt.ui.clients.PackageInfoServiceClient" %>
-<%@ page import="org.wso2.carbon.utils.ServerConstants" %>
-<%@ page import="org.apache.axis2.context.ConfigurationContext" %>
-<%@ page import="org.wso2.carbon.CarbonConstants" %>
-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
-<%@ taglib uri="http://wso2.org/projects/carbon/taglibs/carbontags.jar" prefix="carbon" %>
-
-<%
-
-    String backendServerUrl = CarbonUIUtil.getServerURL(config.getServletContext(), session);
-    String cookie = (String) session.getAttribute(ServerConstants.ADMIN_SERVICE_COOKIE);
-    ConfigurationContext configContext =
-            (ConfigurationContext) config.getServletContext().getAttribute(CarbonConstants.CONFIGURATION_CONTEXT);
-
-    PackageInfoServiceClient client = new PackageInfoServiceClient(cookie, backendServerUrl, configContext);
-    JSONArray packageInfoArray = client.getBillingPackagesJsonArray();
-
-    out.write(packageInfoArray.toString());
-%>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/335eb418/components/stratos/account-mgt/org.wso2.carbon.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/images/account-mgt-icon.gif
----------------------------------------------------------------------
diff --git a/components/stratos/account-mgt/org.wso2.carbon.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/images/account-mgt-icon.gif b/components/stratos/account-mgt/org.wso2.carbon.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/images/account-mgt-icon.gif
deleted file mode 100644
index 7cd3939..0000000
Binary files a/components/stratos/account-mgt/org.wso2.carbon.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/images/account-mgt-icon.gif and /dev/null differ

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/335eb418/components/stratos/account-mgt/org.wso2.carbon.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/images/ajax-loader.gif
----------------------------------------------------------------------
diff --git a/components/stratos/account-mgt/org.wso2.carbon.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/images/ajax-loader.gif b/components/stratos/account-mgt/org.wso2.carbon.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/images/ajax-loader.gif
deleted file mode 100644
index f2a1bc0..0000000
Binary files a/components/stratos/account-mgt/org.wso2.carbon.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/images/ajax-loader.gif and /dev/null differ

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/335eb418/components/stratos/account-mgt/org.wso2.carbon.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/images/right.gif
----------------------------------------------------------------------
diff --git a/components/stratos/account-mgt/org.wso2.carbon.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/images/right.gif b/components/stratos/account-mgt/org.wso2.carbon.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/images/right.gif
deleted file mode 100644
index 72a64c9..0000000
Binary files a/components/stratos/account-mgt/org.wso2.carbon.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/images/right.gif and /dev/null differ

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/335eb418/components/stratos/account-mgt/org.wso2.carbon.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/images/wrong.gif
----------------------------------------------------------------------
diff --git a/components/stratos/account-mgt/org.wso2.carbon.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/images/wrong.gif b/components/stratos/account-mgt/org.wso2.carbon.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/images/wrong.gif
deleted file mode 100644
index 77e1f2c..0000000
Binary files a/components/stratos/account-mgt/org.wso2.carbon.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/images/wrong.gif and /dev/null differ

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/335eb418/components/stratos/account-mgt/org.wso2.carbon.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/init_payment_ajaxprocessor.jsp
----------------------------------------------------------------------
diff --git a/components/stratos/account-mgt/org.wso2.carbon.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/init_payment_ajaxprocessor.jsp b/components/stratos/account-mgt/org.wso2.carbon.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/init_payment_ajaxprocessor.jsp
deleted file mode 100644
index 088fb32..0000000
--- a/components/stratos/account-mgt/org.wso2.carbon.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/init_payment_ajaxprocessor.jsp
+++ /dev/null
@@ -1,99 +0,0 @@
-<!--
- ~ Copyright (c) 2005-2010, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
- ~
- ~ WSO2 Inc. 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.
- -->
-<%@ page import="org.apache.axis2.context.ConfigurationContext" %>
-<%@ page import="org.json.JSONArray"%>
-<%@ page import="org.wso2.carbon.CarbonConstants" %>
-<%@ page import="org.wso2.carbon.register.ui.clients.PackageInfoServiceClient" %>
-<%@ page import="org.wso2.carbon.stratos.common.util.CommonUtil" %>
-<%@ page import="org.wso2.carbon.ui.CarbonUIUtil" %>
-<%@ page import="org.wso2.carbon.utils.ServerConstants" %>
-<%@ page import="java.util.Collections" %>
-<%@ page import="java.util.Enumeration" %>
-<%@ page import="java.util.Iterator" %>
-<%@ page import="java.util.List" %>
-<%@ page import="java.util.Map" %>
-<%@ page import="org.json.JSONException" %>
-<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
-<%@ taglib uri="http://wso2.org/projects/carbon/taglibs/carbontags.jar" prefix="carbon" %>
-<carbon:jsi18n
-		resourceBundle="org.wso2.carbon.register.ui.i18n.JSResources"
-		request="<%=request%>" />
-<script type="text/javascript" src="../registry_common/js/registry_validation.js"></script>
-<script type="text/javascript" src="../registry_common/js/registry_common.js"></script>
-<script type="text/javascript" src="../ajax/js/prototype.js"></script>
-<script type="text/javascript" src="../admin/js/jquery.js"></script>
-<script type="text/javascript" src="../admin/js/jquery.form.js"></script>
-<script type="text/javascript" src="../dialog/js/jqueryui/jquery-ui.min.js"></script>
-<%
-    String tenantDomain = (String) session.getAttribute("tenantDomain");
-    // The actual usage plan the tenant selects in select_usage_plan.jsp
-    String selectedUsagePlan = request.getParameter("selectedUsagePlan");
-    session.setAttribute("selectedUsagePlan", selectedUsagePlan);
-
-    String backendServerUrl = CarbonUIUtil.getServerURL(config.getServletContext(), session);
-    String cookie = (String) session.getAttribute(ServerConstants.ADMIN_SERVICE_COOKIE);
-    ConfigurationContext configContext =
-            (ConfigurationContext)config.getServletContext().getAttribute(CarbonConstants.CONFIGURATION_CONTEXT);
-
-    PackageInfoServiceClient client = new PackageInfoServiceClient(cookie, backendServerUrl,configContext);
-    JSONArray packageInfoArray = client.getBillingPackagesJsonArray();
-    String amount = "0";
-
-    for (int i = 0; i < packageInfoArray.length(); i++) {
-        try {
-            if (packageInfoArray.getJSONObject(i).getString("name").equals(selectedUsagePlan)) {
-                amount = packageInfoArray.getJSONObject(i).getString("subscriptionCharge");
-            }
-        } catch (JSONException e) {
-            //
-        }
-    }
-
-    String paypalUrl = CommonUtil.getStratosConfig().getPaypalUrl();
-    String adminConsoleURL = CarbonUIUtil.getAdminConsoleURL(request);
-    adminConsoleURL = adminConsoleURL.substring(0, adminConsoleURL.indexOf("carbon"));
-    String successUrl = adminConsoleURL + "carbon/payment/registration_payment.jsp";
-    String cancelUrl = adminConsoleURL + "carbon/account-mgt/account_mgt.jsp";
-%>
-
-<script type="text/javascript">
-
-
-        var successUrl = '<%=successUrl%>';
-        var cancelUrl = '<%=cancelUrl%>';
-        var amount = '<%=amount%>';
-        var tenantDomain = '<%=tenantDomain%>';
-        jQuery.ajax({
-            type: 'GET',
-            url: '../payment/setEC-ajaxprocessor.jsp',
-            data: 'successUrl=' + successUrl + '&cancelUrl=' + cancelUrl + '&amount=' + amount + '&tenantDomain=' + tenantDomain,
-            dataType: 'json',
-            async: false,
-            success: function(msg) {
-                var resp = msg;
-                if(resp.ack=='Success'){
-                    location.href = '<%=paypalUrl%>' + resp.token;
-                }else{
-                    location.href = cancelUrl;
-                }
-            },
-            error:function () {
-                location.href = cancelUrl;
-            }
-        });
-</script>
\ No newline at end of file


[5/5] git commit: Refactoring org.wso2.carbon to org.apache.stratos

Posted by sa...@apache.org.
Refactoring org.wso2.carbon to org.apache.stratos


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

Branch: refs/heads/master
Commit: 335eb4188d63a65f3b869794a71601533b6e6847
Parents: 72985a0
Author: Sajith Kariyawasam <sa...@wso2.com>
Authored: Tue Jul 2 14:52:52 2013 +0530
Committer: Sajith Kariyawasam <sa...@wso2.com>
Committed: Tue Jul 2 14:52:52 2013 +0530

----------------------------------------------------------------------
 .../2.1.0/pom.xml                               |  89 +++
 .../mgt/ui/clients/AccountMgtClient.java        | 176 ++++++
 .../mgt/ui/clients/EmailValidationClient.java   |  95 +++
 .../ui/clients/PackageInfoServiceClient.java    |  97 +++
 .../account/mgt/ui/clients/UsagePlanClient.java | 104 +++
 .../wso2/carbon/account/mgt/ui/utils/Util.java  | 117 ++++
 .../src/main/resources/AccountMgtService.wsdl   | 628 +++++++++++++++++++
 .../main/resources/EmailValidationService.wsdl  |  95 +++
 .../src/main/resources/META-INF/component.xml   |  35 ++
 .../account/mgt/ui/i18n/JSResources.properties  |   5 +
 .../account/mgt/ui/i18n/Resources.properties    |  24 +
 .../resources/web/account-mgt/account_mgt.jsp   | 526 ++++++++++++++++
 .../web/account-mgt/css/account_mgt.css         |  15 +
 .../web/account-mgt/css/update_profile.css      |  29 +
 .../deactivate_account_ajaxprocessor.jsp        |  38 ++
 .../web/account-mgt/docs/aboutUsagePlans.html   | 104 +++
 .../web/account-mgt/docs/images/account-mgt.png | Bin 0 -> 39610 bytes
 .../web/account-mgt/docs/userguide.html         |  44 ++
 .../get_package_info_ajaxprocessor.jsp          |  39 ++
 .../web/account-mgt/images/account-mgt-icon.gif | Bin 0 -> 1041 bytes
 .../web/account-mgt/images/ajax-loader.gif      | Bin 0 -> 673 bytes
 .../resources/web/account-mgt/images/right.gif  | Bin 0 -> 924 bytes
 .../resources/web/account-mgt/images/wrong.gif  | Bin 0 -> 976 bytes
 .../account-mgt/init_payment_ajaxprocessor.jsp  |  99 +++
 .../resources/web/account-mgt/js/account_mgt.js | 214 +++++++
 .../update_contact_ajaxprocessor.jsp            |  35 ++
 .../account-mgt/update_profile_processor.jsp    |  62 ++
 .../web/account-mgt/update_verifier.jsp         |  56 ++
 ...update_verifier_redirector_ajaxprocessor.jsp |  30 +
 .../validate_domain_ajaxprocessor.jsp           |  29 +
 .../validation_success_ajaxprocessor.jsp        |  49 ++
 .../2.1.0/pom.xml                               |  87 +++
 .../account/mgt/beans/AccountInfoBean.java      |  40 ++
 .../internal/AccountMgtServiceComponent.java    | 139 ++++
 .../account/mgt/services/AccountMgtService.java | 416 ++++++++++++
 .../mgt/services/EmailValidationService.java    | 153 +++++
 .../apache/stratos/account/mgt/util/Util.java   | 173 +++++
 .../src/main/resources/META-INF/component.xml   |  29 +
 .../src/main/resources/META-INF/services.xml    |  80 +++
 .../2.1.0/pom.xml                               |  89 ---
 .../mgt/ui/clients/AccountMgtClient.java        | 176 ------
 .../mgt/ui/clients/EmailValidationClient.java   |  95 ---
 .../ui/clients/PackageInfoServiceClient.java    |  97 ---
 .../account/mgt/ui/clients/UsagePlanClient.java | 104 ---
 .../wso2/carbon/account/mgt/ui/utils/Util.java  | 117 ----
 .../src/main/resources/AccountMgtService.wsdl   | 628 -------------------
 .../main/resources/EmailValidationService.wsdl  |  95 ---
 .../src/main/resources/META-INF/component.xml   |  35 --
 .../account/mgt/ui/i18n/JSResources.properties  |   5 -
 .../account/mgt/ui/i18n/Resources.properties    |  24 -
 .../resources/web/account-mgt/account_mgt.jsp   | 526 ----------------
 .../web/account-mgt/css/account_mgt.css         |  15 -
 .../web/account-mgt/css/update_profile.css      |  29 -
 .../deactivate_account_ajaxprocessor.jsp        |  38 --
 .../web/account-mgt/docs/aboutUsagePlans.html   | 104 ---
 .../web/account-mgt/docs/images/account-mgt.png | Bin 39610 -> 0 bytes
 .../web/account-mgt/docs/userguide.html         |  44 --
 .../get_package_info_ajaxprocessor.jsp          |  39 --
 .../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  |  99 ---
 .../resources/web/account-mgt/js/account_mgt.js | 214 -------
 .../update_contact_ajaxprocessor.jsp            |  35 --
 .../account-mgt/update_profile_processor.jsp    |  62 --
 .../web/account-mgt/update_verifier.jsp         |  56 --
 ...update_verifier_redirector_ajaxprocessor.jsp |  30 -
 .../validate_domain_ajaxprocessor.jsp           |  29 -
 .../validation_success_ajaxprocessor.jsp        |  49 --
 .../org.wso2.carbon.account.mgt/2.1.0/pom.xml   |  87 ---
 .../src/main/resources/META-INF/component.xml   |  29 -
 .../src/main/resources/META-INF/services.xml    |  80 ---
 73 files changed, 3951 insertions(+), 3030 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/335eb418/components/stratos/account-mgt/org.apache.stratos.account.mgt.ui/2.1.0/pom.xml
----------------------------------------------------------------------
diff --git a/components/stratos/account-mgt/org.apache.stratos.account.mgt.ui/2.1.0/pom.xml b/components/stratos/account-mgt/org.apache.stratos.account.mgt.ui/2.1.0/pom.xml
new file mode 100644
index 0000000..15619fc
--- /dev/null
+++ b/components/stratos/account-mgt/org.apache.stratos.account.mgt.ui/2.1.0/pom.xml
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+# Copyright (c) 2008, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+#
+# Licensed 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.wso2.carbon</groupId>
+        <artifactId>account-mgt-parent</artifactId>
+        <version>2.1.0</version>
+<relativePath>../../pom.xml</relativePath>
+    </parent>
+
+    <modelVersion>4.0.0</modelorg.apache.stratos.account.mgt.uiwso2.carbon.account.mgt.ui</artifactId>
+    <version>2.1.0</version>
+    <packaging>bundle</packaging>
+    <name>WSO2 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.wso2.carbon.account.mgt.ui.*,
+                        </Export-Package>
+                        <Import-Package>
+                            org.wso2.carbon.tenant.mgt.stub.*; version="${carbon.platform.package.import.version.range}",
+                            javax.servlet;version="${imp.pkg.version.javax.servlet}",
+                            javax.servlet.http;version="${imp.pkg.version.javax.servlet}",
+                            org.wso2.carbon.account.mgt.stub.*; version="${carbon.platform.package.import.version.range}",
+                            *;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>
+        </dependency>
+        <dependency>
+            <groupId>org.wso2.carbon</groupId>
+            <artifactId>org.wso2.carbon.account.mgt.stub</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.wso2.carbon</groupId>
+            <artifactId>org.wso2.carbon.tenant.mgt.stub</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.wso2.carbon</groupId>
+            <artifactId>org.wso2.carbon.stratos.common</artifactId>
+        </dependency>
+        <dependency>
+          <groupId>org.json.wso2</groupId>
+          <artifactId>json</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.wso2.carbon</groupId>
+            <artifactId>org.wso2.carbon.stratos.common.stub</artifactId>
+        </dependency>
+    </dependencies>
+</project>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/335eb418/components/stratos/account-mgt/org.apache.stratos.account.mgt.ui/2.1.0/src/main/java/org/wso2/carbon/account/mgt/ui/clients/AccountMgtClient.java
----------------------------------------------------------------------
diff --git a/components/stratos/account-mgt/org.apache.stratos.account.mgt.ui/2.1.0/src/main/java/org/wso2/carbon/account/mgt/ui/clients/AccountMgtClient.java b/components/stratos/account-mgt/org.apache.stratos.account.mgt.ui/2.1.0/src/main/java/org/wso2/carbon/account/mgt/ui/clients/AccountMgtClient.java
new file mode 100644
index 0000000..7f944df
--- /dev/null
+++ b/components/stratos/account-mgt/org.apache.stratos.account.mgt.ui/2.1.0/src/main/java/org/wso2/carbon/account/mgt/ui/clients/AccountMgtClient.java
@@ -0,0 +1,176 @@
+/*
+*  Copyright (c) 2005-2010, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+*
+*  WSO2 Inc. 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.wso2.carbon.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.wso2.carbon.account.mgt.stub.beans.xsd.AccountInfoBean;
+import org.wso2.carbon.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/incubator-stratos/blob/335eb418/components/stratos/account-mgt/org.apache.stratos.account.mgt.ui/2.1.0/src/main/java/org/wso2/carbon/account/mgt/ui/clients/EmailValidationClient.java
----------------------------------------------------------------------
diff --git a/components/stratos/account-mgt/org.apache.stratos.account.mgt.ui/2.1.0/src/main/java/org/wso2/carbon/account/mgt/ui/clients/EmailValidationClient.java b/components/stratos/account-mgt/org.apache.stratos.account.mgt.ui/2.1.0/src/main/java/org/wso2/carbon/account/mgt/ui/clients/EmailValidationClient.java
new file mode 100644
index 0000000..20aeb8d
--- /dev/null
+++ b/components/stratos/account-mgt/org.apache.stratos.account.mgt.ui/2.1.0/src/main/java/org/wso2/carbon/account/mgt/ui/clients/EmailValidationClient.java
@@ -0,0 +1,95 @@
+/*
+*  Copyright (c) 2005-2010, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+*
+*  WSO2 Inc. 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.wso2.carbon.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.wso2.carbon.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);
+        }
+    }
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/335eb418/components/stratos/account-mgt/org.apache.stratos.account.mgt.ui/2.1.0/src/main/java/org/wso2/carbon/account/mgt/ui/clients/PackageInfoServiceClient.java
----------------------------------------------------------------------
diff --git a/components/stratos/account-mgt/org.apache.stratos.account.mgt.ui/2.1.0/src/main/java/org/wso2/carbon/account/mgt/ui/clients/PackageInfoServiceClient.java b/components/stratos/account-mgt/org.apache.stratos.account.mgt.ui/2.1.0/src/main/java/org/wso2/carbon/account/mgt/ui/clients/PackageInfoServiceClient.java
new file mode 100644
index 0000000..adc1576
--- /dev/null
+++ b/components/stratos/account-mgt/org.apache.stratos.account.mgt.ui/2.1.0/src/main/java/org/wso2/carbon/account/mgt/ui/clients/PackageInfoServiceClient.java
@@ -0,0 +1,97 @@
+/*<!--
+~ Copyright (c) 2005-2010, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+~
+~ WSO2 Inc. 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.wso2.carbon.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.wso2.carbon.stratos.common.packages.stub.PackageInfoServiceStub;
+import org.wso2.carbon.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/incubator-stratos/blob/335eb418/components/stratos/account-mgt/org.apache.stratos.account.mgt.ui/2.1.0/src/main/java/org/wso2/carbon/account/mgt/ui/clients/UsagePlanClient.java
----------------------------------------------------------------------
diff --git a/components/stratos/account-mgt/org.apache.stratos.account.mgt.ui/2.1.0/src/main/java/org/wso2/carbon/account/mgt/ui/clients/UsagePlanClient.java b/components/stratos/account-mgt/org.apache.stratos.account.mgt.ui/2.1.0/src/main/java/org/wso2/carbon/account/mgt/ui/clients/UsagePlanClient.java
new file mode 100644
index 0000000..f5970ca
--- /dev/null
+++ b/components/stratos/account-mgt/org.apache.stratos.account.mgt.ui/2.1.0/src/main/java/org/wso2/carbon/account/mgt/ui/clients/UsagePlanClient.java
@@ -0,0 +1,104 @@
+/*
+*  Copyright (c) 2005-2010, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+*
+*  WSO2 Inc. 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.wso2.carbon.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.wso2.carbon.account.mgt.stub.services.BillingDataAccessServiceStub;
+import org.wso2.carbon.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 {
+            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/incubator-stratos/blob/335eb418/components/stratos/account-mgt/org.apache.stratos.account.mgt.ui/2.1.0/src/main/java/org/wso2/carbon/account/mgt/ui/utils/Util.java
----------------------------------------------------------------------
diff --git a/components/stratos/account-mgt/org.apache.stratos.account.mgt.ui/2.1.0/src/main/java/org/wso2/carbon/account/mgt/ui/utils/Util.java b/components/stratos/account-mgt/org.apache.stratos.account.mgt.ui/2.1.0/src/main/java/org/wso2/carbon/account/mgt/ui/utils/Util.java
new file mode 100644
index 0000000..6c263ae
--- /dev/null
+++ b/components/stratos/account-mgt/org.apache.stratos.account.mgt.ui/2.1.0/src/main/java/org/wso2/carbon/account/mgt/ui/utils/Util.java
@@ -0,0 +1,117 @@
+/*
+ *  Copyright (c) 2005-2008, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *
+ *  WSO2 Inc. 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.wso2.carbon.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.wso2.carbon.account.mgt.stub.beans.xsd.AccountInfoBean;
+import org.wso2.carbon.account.mgt.ui.clients.AccountMgtClient;
+import org.wso2.carbon.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/incubator-stratos/blob/335eb418/components/stratos/account-mgt/org.apache.stratos.account.mgt.ui/2.1.0/src/main/resources/AccountMgtService.wsdl
----------------------------------------------------------------------
diff --git a/components/stratos/account-mgt/org.apache.stratos.account.mgt.ui/2.1.0/src/main/resources/AccountMgtService.wsdl b/components/stratos/account-mgt/org.apache.stratos.account.mgt.ui/2.1.0/src/main/resources/AccountMgtService.wsdl
new file mode 100644
index 0000000..f5aa207
--- /dev/null
+++ b/components/stratos/account-mgt/org.apache.stratos.account.mgt.ui/2.1.0/src/main/resources/AccountMgtService.wsdl
@@ -0,0 +1,628 @@
+<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:ns1="http://org.apache.axis2/xsd" xmlns:ns="http://services.mgt.account.carbon.wso2.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.carbon.wso2.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.carbon.wso2.org">
+    <wsdl:documentation>AccountMgtService</wsdl:documentation>
+    <wsdl:types>
+        <xs:schema xmlns:ax22="http://beans.mgt.account.carbon.wso2.org/xsd" attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://services.mgt.account.carbon.wso2.org">
+            <xs:import namespace="http://beans.mgt.account.carbon.wso2.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.carbon.wso2.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/incubator-stratos/blob/335eb418/components/stratos/account-mgt/org.apache.stratos.account.mgt.ui/2.1.0/src/main/resources/EmailValidationService.wsdl
----------------------------------------------------------------------
diff --git a/components/stratos/account-mgt/org.apache.stratos.account.mgt.ui/2.1.0/src/main/resources/EmailValidationService.wsdl b/components/stratos/account-mgt/org.apache.stratos.account.mgt.ui/2.1.0/src/main/resources/EmailValidationService.wsdl
new file mode 100644
index 0000000..7cb056f
--- /dev/null
+++ b/components/stratos/account-mgt/org.apache.stratos.account.mgt.ui/2.1.0/src/main/resources/EmailValidationService.wsdl
@@ -0,0 +1,95 @@
+<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:ns1="http://org.apache.axis2/xsd" xmlns:ns="http://services.mgt.account.carbon.wso2.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.carbon.wso2.org">
+    <wsdl:documentation>EmailValidationService</wsdl:documentation>
+    <wsdl:types>
+        <xs:schema attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://services.mgt.account.carbon.wso2.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/incubator-stratos/blob/335eb418/components/stratos/account-mgt/org.apache.stratos.account.mgt.ui/2.1.0/src/main/resources/META-INF/component.xml
----------------------------------------------------------------------
diff --git a/components/stratos/account-mgt/org.apache.stratos.account.mgt.ui/2.1.0/src/main/resources/META-INF/component.xml b/components/stratos/account-mgt/org.apache.stratos.account.mgt.ui/2.1.0/src/main/resources/META-INF/component.xml
new file mode 100644
index 0000000..6170c1f
--- /dev/null
+++ b/components/stratos/account-mgt/org.apache.stratos.account.mgt.ui/2.1.0/src/main/resources/META-INF/component.xml
@@ -0,0 +1,35 @@
+<!--
+ ~ Copyright (c) 2005-2010, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ ~
+ ~ WSO2 Inc. 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.wso2.carbon.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/incubator-stratos/blob/335eb418/components/stratos/account-mgt/org.apache.stratos.account.mgt.ui/2.1.0/src/main/resources/org/wso2/carbon/account/mgt/ui/i18n/JSResources.properties
----------------------------------------------------------------------
diff --git a/components/stratos/account-mgt/org.apache.stratos.account.mgt.ui/2.1.0/src/main/resources/org/wso2/carbon/account/mgt/ui/i18n/JSResources.properties b/components/stratos/account-mgt/org.apache.stratos.account.mgt.ui/2.1.0/src/main/resources/org/wso2/carbon/account/mgt/ui/i18n/JSResources.properties
new file mode 100644
index 0000000..92f331d
--- /dev/null
+++ b/components/stratos/account-mgt/org.apache.stratos.account.mgt.ui/2.1.0/src/main/resources/org/wso2/carbon/account/mgt/ui/i18n/JSResources.properties
@@ -0,0 +1,5 @@
+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.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/335eb418/components/stratos/account-mgt/org.apache.stratos.account.mgt.ui/2.1.0/src/main/resources/org/wso2/carbon/account/mgt/ui/i18n/Resources.properties
----------------------------------------------------------------------
diff --git a/components/stratos/account-mgt/org.apache.stratos.account.mgt.ui/2.1.0/src/main/resources/org/wso2/carbon/account/mgt/ui/i18n/Resources.properties b/components/stratos/account-mgt/org.apache.stratos.account.mgt.ui/2.1.0/src/main/resources/org/wso2/carbon/account/mgt/ui/i18n/Resources.properties
new file mode 100644
index 0000000..ef72bbb
--- /dev/null
+++ b/components/stratos/account-mgt/org.apache.stratos.account.mgt.ui/2.1.0/src/main/resources/org/wso2/carbon/account/mgt/ui/i18n/Resources.properties
@@ -0,0 +1,24 @@
+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".


[4/5] Refactoring org.wso2.carbon to org.apache.stratos

Posted by sa...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/335eb418/components/stratos/account-mgt/org.apache.stratos.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/account_mgt.jsp
----------------------------------------------------------------------
diff --git a/components/stratos/account-mgt/org.apache.stratos.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/account_mgt.jsp b/components/stratos/account-mgt/org.apache.stratos.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/account_mgt.jsp
new file mode 100644
index 0000000..3c693a6
--- /dev/null
+++ b/components/stratos/account-mgt/org.apache.stratos.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/account_mgt.jsp
@@ -0,0 +1,526 @@
+<!--
+~ Copyright (c) 2005-2010, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+~
+~ WSO2 Inc. 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.
+-->
+<%@ page import="org.apache.stratos.account.mgt.AccountInfoBean" %>
+<%@ page import="org.wso2.carbon.account.mgt.ui.clients.AccountMgtClient" %>
+<%@ page import="org.wso2.carbon.account.mgt.ui.clients.UsagePlanClient" %>
+<%@ page import="org.wso2.carbon.stratos.common.constants.StratosConstants" %>
+<%@ page import="org.wso2.carbon.stratos.common.util.CommonUtil" %>
+<%@ page import="org.wso2.carbon.registry.core.exceptions.RegistryException" %>
+<%@ page import="org.wso2.carbon.utils.multitenancy.MultitenantConstants" %>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
+<%@ taglib uri="http://wso2.org/projects/carbon/taglibs/carbontags.jar" prefix="carbon" %>
+<link rel="stylesheet" type="text/css" href="../yui/assets/yui.css">
+<link rel="stylesheet" type="text/css" href="../yui/build/menu/assets/skins/sam/menu.css"/>
+<link rel="stylesheet" type="text/css" href="../yui/build/button/assets/skins/sam/button.css"/>
+<link rel="stylesheet" type="text/css"
+      href="../yui/build/container/assets/skins/sam/container.css"/>
+<link rel="stylesheet" type="text/css"
+      href="../yui/build/autocomplete/assets/skins/sam/autocomplete.css"/>
+<link rel="stylesheet" type="text/css" href="../yui/build/editor/assets/skins/sam/editor.css"/>
+<link rel="stylesheet" type="text/css" href="../account-mgt/css/account_mgt.css"/>
+<jsp:include page="../registry_common/registry_common-i18n-ajaxprocessor.jsp"/>
+<script type="text/javascript" src="../registry_common/js/registry_validation.js"></script>
+<script type="text/javascript" src="../registry_common/js/registry_common.js"></script>
+<script type="text/javascript" src="../ajax/js/prototype.js"></script>
+<script type="text/javascript" src="../account-mgt/js/account_mgt.js"></script>
+<carbon:jsi18n
+        resourceBundle="org.wso2.carbon.account.mgt.ui.i18n.JSResources"
+        request="<%=request%>"/>
+<fmt:bundle basename="org.wso2.carbon.account.mgt.ui.i18n.Resources">
+
+<%
+    if ("true".equals(session.getAttribute("domain-validation-failure"))) {
+        session.removeAttribute("domain-validation-failure");
+%>
+
+<script type="text/javascript">
+    jQuery(document).ready(function() {
+        CARBON.showWarningDialog(jsi18n["domain.validation.failed"]);
+    });
+</script>
+<%
+    }
+    if ("true".equals(session.getAttribute("domain-validation-success"))) {
+        session.removeAttribute("domain-validation-success");
+%>
+
+<script type="text/javascript">
+    jQuery(document).ready(function() {
+        CARBON.showWarningDialog(jsi18n["successfully.validated"]);
+    });
+</script>
+<%
+    }
+
+
+    if ("false".equals(session.getAttribute("temp-domain-available"))) {
+        session.removeAttribute("temp-domain-available");
+%>
+
+<script type="text/javascript">
+    jQuery(document).ready(function() {
+        CARBON.showWarningDialog(jsi18n["domain.unavailable"]);
+    });
+</script>
+<%
+    }
+%>
+<%
+
+    String contactEmail = "";
+    String firstname = "";
+    String lastname = "";
+    String tenantDomain = "";
+    String usagePlan = "";
+    boolean isDomainValidated;
+    boolean isEmailValidated = false;
+    AccountMgtClient client;
+    try {
+        client = new AccountMgtClient(config, session);
+        contactEmail = client.getContact();
+        AccountInfoBean accountInfoBean = client.getFullname();
+        firstname = accountInfoBean.getFirstname();
+        lastname = accountInfoBean.getLastname();
+        if (firstname == null) {
+            firstname = "";
+        }
+        if (lastname == null) {
+            lastname = "";
+        }
+        isDomainValidated = client.isDomainValidated();
+        isEmailValidated = client.isEmailValidated();
+
+
+        if ("true".equals(request.getParameter("isUpdate"))) {
+            usagePlan = request.getParameter("selectedUsagePlan");
+            if (org.wso2.carbon.account.mgt.ui.utils.Util.updateUsagePlan(request, config, session)) {
+%>
+<script type="text/javascript">
+    //        window.location.href="../admin/logout_action.jsp";
+    CARBON.showInfoDialog("Your usage plan has been updated.");
+</script>
+<%
+} else {
+%>
+<script type="text/javascript">
+    //        window.location.href="../admin/logout_action.jsp";
+    CARBON.showInfoDialog("Error occured while updating usage plan.");
+</script>
+<%
+        }
+    }
+    usagePlan = org.wso2.carbon.account.mgt.ui.utils.Util.getUsagePlanName(config, session);
+    if ("true".equals(request.getParameter("isDeactivated"))) {
+        client.deactivate();
+        tenantDomain = (String) session.getAttribute("tenantDomain");
+%>
+
+<script type="text/javascript">
+    //        window.location.href="../admin/logout_action.jsp";
+    CARBON.showInfoDialog("Your account has been deactivated.",
+                         function() {
+                             window.location.href = "../admin/logout_action.jsp"
+                         },
+                         function() {
+                             window.location.href = "../admin/logout_action.jsp"
+                         });
+</script>
+<%
+    }
+} catch (RegistryException e) {
+%>
+<div>Error in getting account management information.</div>
+<%
+        return;
+    }
+
+    String currentDomain = (String) session.getAttribute(MultitenantConstants.TENANT_DOMAIN);
+
+    if (session.getAttribute("submit-firstname") != null) {
+        firstname = (String) session.getAttribute("submit-firstname");
+        session.setAttribute("submit-firstname", null);
+    }
+    if (session.getAttribute("submit-lastname") != null) {
+        lastname = (String) session.getAttribute("submit-lastname");
+        session.setAttribute("submit-lastname", null);
+    }
+
+%>
+
+<carbon:breadcrumb label="resources"
+                   resourceBundle="org.wso2.carbon.account.mgt.ui.i18n.Resources"
+                   topPage="true" request="<%=request%>"/>
+<div id="middle">
+
+<div id="workArea">
+<h2><fmt:message key="account.mgt.title"/></h2>
+
+
+<table class="styledLeft">
+    <thead>
+    <tr>
+        <th><fmt:message key="contact.information"/></th>
+    </tr>
+    </thead>
+    <tbody>
+
+    <tr>
+        <td class="nopadding">
+            <form method="POST" action="update_contact_ajaxprocessor.jsp">
+                <table class="normal-nopadding" cellspacing="0">
+                    <tbody>
+                    <tr>
+                        <td width="200px"><fmt:message key="contact.email"/><span
+                                class="required">*</span></td>
+                        <td colspan="2">
+                            <input type="text" name="email" id="email" style="width:400px"
+                                   value="<%=contactEmail%>"/> <span id="busyContact">&nbsp;</span>
+                            <span style="visibility:hidden"
+                                  id="old-email"><%=isEmailValidated ? contactEmail : ""%></span>
+                        </td>
+                    </tr>
+                    <%
+                        if (isEmailValidated) {
+                    %>
+
+                    <tr>
+                        <td></td>
+                        <td colspan="2"><input onclick="updateContact()" type="button"
+                                               value="<fmt:message key="update.contact"/>"/></td>
+                    </tr>
+                    <%
+                    } else {
+                    %>
+                    <tr>
+                        <td colspan="3">
+                            <div class="not-validated"><img src="images/wrong.gif" alt="Validated"/>Your
+                                email is not validated.
+                                Please validate it from here.
+                            </div>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td></td>
+                        <td colspan="2"><input onclick="updateContact()" type="button"
+                                               value="<fmt:message key="validate.contact"/>"/></td>
+                    </tr>
+                    <%
+                        }
+                    %>
+
+                    <tr>
+                        <td colspan="3">
+                            <div class="table-spacer">&nbsp;</div>
+                        </td>
+                    </tr>
+                    </tbody>
+                </table>
+            </form>
+        </td>
+
+    </tr>
+
+    </tbody>
+</table>
+
+
+<table class="styledLeft">
+    <thead>
+    <tr>
+        <th><fmt:message key="admin.information"/></th>
+    </tr>
+    </thead>
+    <tbody>
+
+    <tr>
+        <td class="nopadding">
+            <form id="update_profile_form" action="update_profile_processor.jsp" method="POST">
+                <table class="normal-nopadding" cellspacing="0">
+                    <tbody>
+                    <tr>
+                        <td width="200px"><fmt:message key="firstname"/><span
+                                class="required">*</span></td>
+                        <td colspan="2">
+                            <input type="text" name="firstname" id="firstname" style="width:400px"
+                                   value="<%=firstname%>"/>
+                            <span style="visibility:hidden" id="old-firstname"><%=firstname%></span>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td width="200px"><fmt:message key="lastname"/><span
+                                class="required">*</span></td>
+                        <td colspan="2">
+                            <input type="text" name="lastname" id="lastname" style="width:400px"
+                                   value="<%=lastname%>"/>
+                            <span style="visibility:hidden" id="old-lastname"><%=lastname%></span>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td></td>
+                        <td colspan="2"><input onclick="updateProfile()" type="button"
+                                               value="<fmt:message key="update.profile"/>"/></td>
+                    </tr>
+                    <tr>
+                        <td colspan="3">
+                            <div class="table-spacer">&nbsp;</div>
+                        </td>
+                    </tr>
+                    </tbody>
+                </table>
+            </form>
+        </td>
+
+    </tr>
+
+    </tbody>
+</table>
+
+
+<table class="styledLeft">
+    <thead>
+    <tr>
+        <th><fmt:message key="validate.domain.title"/></th>
+    </tr>
+    </thead>
+    <tbody>
+
+    <tr>
+        <td class="nopadding">
+            <form onsubmit="return domainSelected();" id="validateDomainForm" method="POST"
+                  action="validate_domain_ajaxprocessor.jsp">
+                <table class="normal-nopadding" cellspacing="0">
+                    <tbody>
+                    <tr>
+                        <td width="200px"><fmt:message key="current.domain"/></td>
+                        <td colspan="2"><input readonly="true" type="text" name="domain" id="domain"
+                                               style="width:400px" value="<%=currentDomain%>"/>
+                        </td>
+                    </tr>
+
+                    <%
+                        if (isDomainValidated) {
+                    %>
+                    <tr>
+                        <td colspan="3">
+                            <div class="validated"><img src="images/right.gif" alt="Validated"/> The
+                                ownership of your domain is already validated.
+                            </div>
+                        </td>
+                    </tr>
+
+                    <%
+                    } else {
+                    %>
+                    <tr>
+                        <td colspan="3">
+                            <div class="not-validated"><img src="images/wrong.gif" alt="Validated"/>
+                                The ownership of your
+                                domain is not validated. You can validate it from here.
+                            </div>
+                        </td>
+                    </tr>
+
+                    <tr>
+                        <td></td>
+                        <td colspan="2"><input type="submit"
+                                               value="<fmt:message key="validate.domain"/>"/></td>
+                    </tr>
+                    <tr>
+                        <td colspan="3">
+                            <div class="table-spacer">&nbsp;</div>
+                        </td>
+                    </tr>
+
+                    <%
+                        }
+                    %>
+                    </tbody>
+                </table>
+            </form>
+        </td>
+    </tr>
+
+    </tbody>
+</table>
+
+
+<table class="styledLeft">
+    <thead>
+    <tr>
+        <th><fmt:message key="deactivate.account.title"/></th>
+    </tr>
+    </thead>
+    <tbody>
+
+
+    <tr>
+        <td class="nopadding">
+            <form method="POST" id="deactivate_form" action="account_mgt.jsp">
+                <input type="hidden" name="isDeactivated" value="true"/>
+                <table class="normal-nopadding" cellspacing="0">
+                    <tbody>
+                    <tr>
+                        <td colspan="3"><fmt:message key="deactivate.account.msg"/></td>
+                    </tr>
+                    <tr>
+                        <td width="200px"></td>
+                        <td colspan="2"><input onclick="return deactivate('<%=currentDomain%>');"
+                                               type="button"
+                                               value="<fmt:message key="deactivate.account.btn"/>"/>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td colspan="3">
+                            <div class="table-spacer">&nbsp;</div>
+                        </td>
+                    </tr>
+                    </tbody>
+                </table>
+            </form>
+        </td>
+    </tr>
+
+    </tbody>
+</table>
+
+
+<table class="styledLeft">
+    <thead>
+    <tr>
+        <th><fmt:message key="usage.plan.information"/>
+            <% if (usagePlan.length() > 10) {
+                String planName = usagePlan;
+            %>
+            - Your Current Usage Plan is : <%=planName%>
+            <%}%>
+        </th>
+    </tr>
+    </thead>
+    <tbody>
+
+<script type="text/javascript">
+<%
+    boolean chargeOnRegistration = CommonUtil.isChargedOnRegistration();
+%>
+
+function updatePlan(plan, existingPlan, regTenantDomain) {
+    var newPlan = plan.options[plan.selectedIndex].value;
+    if(newPlan==existingPlan){
+        CARBON.showInfoDialog("Please select the new plan before updating");
+    }else{
+        sessionAwareFunction(function() {
+        CARBON.showConfirmationDialog("Are you sure you want to update your UsagePlan ? "
+                                      , function() {
+
+
+
+
+
+            var submitForm = document.getElementById("usagePlanUpdate_form");
+            submitForm.submit();
+        });
+    }, "Session timed out. Please login again.");
+    }
+}
+</script>
+
+    <tr>
+        <td class="nopadding">
+            <form method="POST" id="usagePlanUpdate_form"
+            <% if (chargeOnRegistration){ %>
+            action="init_payment_ajaxprocessor.jsp"
+            <% } else { %>
+            action="account_mgt.jsp"
+            <% } %>
+            >
+                <input type="hidden" name="isUpdate" value="true"/>
+                <table class="normal-nopadding" cellspacing="0">
+                    <tbody>
+                    <td><fmt:message key="select.usage.plan.for.tenant"/></td>
+                    <td>
+                        <select name="selectedUsagePlan" id="selectedUsagePlan">
+                        </select>
+                        <a href="<%=CommonUtil.getStratosConfig().getUsagePlanURL()%>"
+                           target="_blank">
+                            <b>Pricing Info</b></a>
+                    </td>
+
+
+                    </tr>
+                    <tr>
+                        <td colspan="2"><fmt:message key="select.package.message"/>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td width="200px"></td>
+                        <td colspan="2"><input
+                                onclick="return updatePlan(document.getElementById('selectedUsagePlan'), '<%=usagePlan%>', '<%=currentDomain%>');"
+                                type="button"
+                                value="Update Plan"/>
+                        </td>
+                    </tr>
+                    </tbody>
+                </table>
+            </form>
+    </tbody>
+</table>
+</div>
+</div>
+</fmt:bundle>
+<script type="text/javascript">
+
+    jQuery(document).ready(
+                          function() {
+                              jQuery.ajax({
+                                  type: 'POST',
+                                  url: 'get_package_info_ajaxprocessor.jsp',
+                                  dataType: 'json',
+                                  data: 'plan=0',
+                                  async: false,
+                                  success: function(data) {
+                                      packageInfo = data;
+                                  },
+                                  error:function (xhr, ajaxOptions, thrownError) {
+                                      CARBON.showErrorDialog('Could not get package information.');
+                                  }
+                              });
+
+                              var charge;
+                              var name;
+                              for (var i = 0; i < packageInfo.length; i++) {
+                                  charge = packageInfo[i].subscriptionCharge;
+                                  name = packageInfo[i].name;
+                                  if (name == '<%=org.wso2.carbon.account.mgt.ui.utils.Util.getUsagePlanName(config, session)%>') {
+                                      option = document.createElement("option");
+                                      option.value = name;
+                                      option.selected = name;
+                                      option.innerHTML = name;
+                                      document.getElementById('selectedUsagePlan').appendChild(option);
+
+                                  }
+                                  else {
+                                      option = document.createElement("option");
+                                      option.value = name;
+                                      option.innerHTML = name
+                                      document.getElementById('selectedUsagePlan').appendChild(option);
+                                  }
+                              }
+                          }
+            );
+</script>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/335eb418/components/stratos/account-mgt/org.apache.stratos.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/css/account_mgt.css
----------------------------------------------------------------------
diff --git a/components/stratos/account-mgt/org.apache.stratos.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/css/account_mgt.css b/components/stratos/account-mgt/org.apache.stratos.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/css/account_mgt.css
new file mode 100644
index 0000000..9dd4170
--- /dev/null
+++ b/components/stratos/account-mgt/org.apache.stratos.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/css/account_mgt.css
@@ -0,0 +1,15 @@
+div.not-validated {
+    color: #f00;
+    padding: 15px 0px 10px 0px;
+}
+
+div.validated {
+    font-color: #058000;
+    padding: 15px 0px 10px 0px;
+}
+
+
+div.table-spacer {
+    margin: 5px;
+    clear:both;
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/335eb418/components/stratos/account-mgt/org.apache.stratos.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/css/update_profile.css
----------------------------------------------------------------------
diff --git a/components/stratos/account-mgt/org.apache.stratos.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/css/update_profile.css b/components/stratos/account-mgt/org.apache.stratos.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/css/update_profile.css
new file mode 100644
index 0000000..c3878ae
--- /dev/null
+++ b/components/stratos/account-mgt/org.apache.stratos.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/css/update_profile.css
@@ -0,0 +1,29 @@
+body {
+	color:#111111;
+	font-family:"Calibri","Lucida Grande","Lucida Sans","Microsoft Sans Serif","Lucida Sans Unicode","Verdana","Sans-serif","trebuchet ms" !important;
+	font-size:0.75em;
+	font-size-adjust:none;
+	font-style:normal;
+	font-variant:normal;
+	font-weight:normal;
+	line-height:1.25em;
+	background-position: left top;
+	background-repeat: repeat-x;
+	margin: 0px;
+	padding: 0px;
+}
+
+div.clear {
+	clear:both;
+}
+p { }
+
+td { }
+
+a:link { }
+
+a:visited { }
+
+a:hover { }
+
+a:active { }

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/335eb418/components/stratos/account-mgt/org.apache.stratos.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/deactivate_account_ajaxprocessor.jsp
----------------------------------------------------------------------
diff --git a/components/stratos/account-mgt/org.apache.stratos.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/deactivate_account_ajaxprocessor.jsp b/components/stratos/account-mgt/org.apache.stratos.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/deactivate_account_ajaxprocessor.jsp
new file mode 100644
index 0000000..fabc967
--- /dev/null
+++ b/components/stratos/account-mgt/org.apache.stratos.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/deactivate_account_ajaxprocessor.jsp
@@ -0,0 +1,38 @@
+<!--
+ ~ Copyright (c) 2005-2010, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ ~
+ ~ WSO2 Inc. 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.
+ -->
+<%@ page import="org.wso2.carbon.registry.core.exceptions.RegistryException" %>
+<%@ page import="org.wso2.carbon.account.mgt.ui.clients.AccountMgtClient" %>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%
+AccountMgtClient client;
+try {
+    client = new AccountMgtClient(config, session);
+    client.deactivate();
+
+    // redirect to the carbon login page
+    %><script type="text/javascript">
+        CARBON.showInfoDialog("Your account has been deactivated.",
+                function() {window.location.href="../admin/logout_action.jsp"},
+                function() {window.location.href="../admin/logout_action.jsp"});
+    </script><%
+} catch (RegistryException e) {
+%>
+  <div>Error in deactivating the account.</div>
+<%
+}
+%>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/335eb418/components/stratos/account-mgt/org.apache.stratos.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/docs/aboutUsagePlans.html
----------------------------------------------------------------------
diff --git a/components/stratos/account-mgt/org.apache.stratos.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/docs/aboutUsagePlans.html b/components/stratos/account-mgt/org.apache.stratos.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/docs/aboutUsagePlans.html
new file mode 100644
index 0000000..791b867
--- /dev/null
+++ b/components/stratos/account-mgt/org.apache.stratos.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/docs/aboutUsagePlans.html
@@ -0,0 +1,104 @@
+<!--
+ ~ Copyright (c) 2005-2010, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ ~
+ ~ WSO2 Inc. 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.
+ -->
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+  <title>Select Usage Plan For Tenant - User Guide</title>
+  <link href="../../admin/css/documentation.css" rel="stylesheet" type="text/css" media="all" />
+</head>
+
+<body>
+
+
+ <h1>Select Usage Plan For Tenant</h1>
+
+
+ <h2> <b> Usage Plans(Subscriptions)</b></h2>
+
+<p>
+    According to the usage plan that you selected you will get different volume of service and registry
+    bandwidths other services that available for tenants.By selecting right usage plan that suits
+    your requirements you can get maximum profit
+</p>
+
+
+<h2><b>Multitenancy Free</b></h2>
+<p>
+  This is the free usage plan.You will get limited amount of resources.This package is
+  best suite for evaluation and tests.
+</p>
+ <h2><b>Multitenancy Small</b></h2>
+<p>
+   This package is best suite for small business.
+</p>
+<h2><b>Multitenancy Medium</b></h2>
+<p>
+   This usage plan suites for medium scale business.You will get average amount of resources
+    with this package.
+</p>
+<h2><b>Multitenancy Large</b></h2>
+<p>
+   This is the premium usage plan.You will get maximum resources form this plan.
+   This is best suite to large scale business.
+</p>
+
+<p>
+
+   Usage Plan summery
+<table border="1">
+<tr>
+<td>Usage Plan Name</td>
+<td>Number Of Users</td>
+<td>Registry Bandwidth (Mb) </td>
+<td>Service BandWidth (Mb) </td>
+<td>Cost Per Month ($)</td>
+</tr>
+<tr>
+<td>Multitenancy Free</td>
+<td>5</td>
+<td>10</td>
+<td>10</td>
+<td>10</td>
+</tr>
+<tr>
+<td>Multitenancy Small</td>
+<td>10</td>
+<td>25</td>
+<td>25</td>
+<td>25</td>
+</tr>
+<tr>
+<td>Multitenancy Medium</td>
+<td>20</td>
+<td>100</td>
+<td>100</td>
+<td>100</td>
+</tr>
+<tr>
+<td>Multitenancy Large</td>
+<td>50</td>
+<td>200</td>
+<td>200</td>
+<td>200</td>
+</tr>
+</table> 
+<div><strong>Figure1: Usage Plan Summery Table</strong></div>
+</p>
+</body>
+
+</html>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/335eb418/components/stratos/account-mgt/org.apache.stratos.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/docs/images/account-mgt.png
----------------------------------------------------------------------
diff --git a/components/stratos/account-mgt/org.apache.stratos.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/docs/images/account-mgt.png b/components/stratos/account-mgt/org.apache.stratos.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/docs/images/account-mgt.png
new file mode 100644
index 0000000..f67777f
Binary files /dev/null and b/components/stratos/account-mgt/org.apache.stratos.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/docs/images/account-mgt.png differ

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/335eb418/components/stratos/account-mgt/org.apache.stratos.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/docs/userguide.html
----------------------------------------------------------------------
diff --git a/components/stratos/account-mgt/org.apache.stratos.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/docs/userguide.html b/components/stratos/account-mgt/org.apache.stratos.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/docs/userguide.html
new file mode 100644
index 0000000..fd04465
--- /dev/null
+++ b/components/stratos/account-mgt/org.apache.stratos.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/docs/userguide.html
@@ -0,0 +1,44 @@
+<!--
+ ~ Copyright (c) 2005-2010, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ ~
+ ~ WSO2 Inc. 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.
+ -->
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+  <title>Stratos Account Managment- User Guide</title>
+  <link href="../../admin/css/documentation.css" rel="stylesheet" type="text/css" media="all" />
+</head>
+
+<body>
+<h1>Stratos Account Management</h1>
+
+<p>
+You can use this form to
+<ul>
+    <li>Update or validate the contact information</li>
+    <li>Deactivate the account</li>
+    <li>Validate the domain name ownership (If you have not already done it)</li>
+</ul>
+</p>
+
+<p>
+<img src="images/account-mgt.png" alt="Account Management Page"/>
+<div><strong>Figure1: Account Management Page</strong></div>
+</p>
+
+</body>
+
+</html>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/335eb418/components/stratos/account-mgt/org.apache.stratos.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/get_package_info_ajaxprocessor.jsp
----------------------------------------------------------------------
diff --git a/components/stratos/account-mgt/org.apache.stratos.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/get_package_info_ajaxprocessor.jsp b/components/stratos/account-mgt/org.apache.stratos.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/get_package_info_ajaxprocessor.jsp
new file mode 100644
index 0000000..8a52783
--- /dev/null
+++ b/components/stratos/account-mgt/org.apache.stratos.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/get_package_info_ajaxprocessor.jsp
@@ -0,0 +1,39 @@
+<%--
+~ Copyright (c) 2005-2010, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+~
+~ WSO2 Inc. 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.
+--%>
+<%@ page import="org.wso2.carbon.ui.CarbonUIUtil" %>
+<%@ page import="org.json.JSONArray" %>
+<%@ page import="org.wso2.carbon.account.mgt.ui.clients.PackageInfoServiceClient" %>
+<%@ page import="org.wso2.carbon.utils.ServerConstants" %>
+<%@ page import="org.apache.axis2.context.ConfigurationContext" %>
+<%@ page import="org.wso2.carbon.CarbonConstants" %>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
+<%@ taglib uri="http://wso2.org/projects/carbon/taglibs/carbontags.jar" prefix="carbon" %>
+
+<%
+
+    String backendServerUrl = CarbonUIUtil.getServerURL(config.getServletContext(), session);
+    String cookie = (String) session.getAttribute(ServerConstants.ADMIN_SERVICE_COOKIE);
+    ConfigurationContext configContext =
+            (ConfigurationContext) config.getServletContext().getAttribute(CarbonConstants.CONFIGURATION_CONTEXT);
+
+    PackageInfoServiceClient client = new PackageInfoServiceClient(cookie, backendServerUrl, configContext);
+    JSONArray packageInfoArray = client.getBillingPackagesJsonArray();
+
+    out.write(packageInfoArray.toString());
+%>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/335eb418/components/stratos/account-mgt/org.apache.stratos.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/images/account-mgt-icon.gif
----------------------------------------------------------------------
diff --git a/components/stratos/account-mgt/org.apache.stratos.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/images/account-mgt-icon.gif b/components/stratos/account-mgt/org.apache.stratos.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/images/account-mgt-icon.gif
new file mode 100644
index 0000000..7cd3939
Binary files /dev/null and b/components/stratos/account-mgt/org.apache.stratos.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/images/account-mgt-icon.gif differ

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/335eb418/components/stratos/account-mgt/org.apache.stratos.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/images/ajax-loader.gif
----------------------------------------------------------------------
diff --git a/components/stratos/account-mgt/org.apache.stratos.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/images/ajax-loader.gif b/components/stratos/account-mgt/org.apache.stratos.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/images/ajax-loader.gif
new file mode 100644
index 0000000..f2a1bc0
Binary files /dev/null and b/components/stratos/account-mgt/org.apache.stratos.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/images/ajax-loader.gif differ

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/335eb418/components/stratos/account-mgt/org.apache.stratos.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/images/right.gif
----------------------------------------------------------------------
diff --git a/components/stratos/account-mgt/org.apache.stratos.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/images/right.gif b/components/stratos/account-mgt/org.apache.stratos.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/images/right.gif
new file mode 100644
index 0000000..72a64c9
Binary files /dev/null and b/components/stratos/account-mgt/org.apache.stratos.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/images/right.gif differ

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/335eb418/components/stratos/account-mgt/org.apache.stratos.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/images/wrong.gif
----------------------------------------------------------------------
diff --git a/components/stratos/account-mgt/org.apache.stratos.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/images/wrong.gif b/components/stratos/account-mgt/org.apache.stratos.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/images/wrong.gif
new file mode 100644
index 0000000..77e1f2c
Binary files /dev/null and b/components/stratos/account-mgt/org.apache.stratos.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/images/wrong.gif differ

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/335eb418/components/stratos/account-mgt/org.apache.stratos.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/init_payment_ajaxprocessor.jsp
----------------------------------------------------------------------
diff --git a/components/stratos/account-mgt/org.apache.stratos.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/init_payment_ajaxprocessor.jsp b/components/stratos/account-mgt/org.apache.stratos.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/init_payment_ajaxprocessor.jsp
new file mode 100644
index 0000000..088fb32
--- /dev/null
+++ b/components/stratos/account-mgt/org.apache.stratos.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/init_payment_ajaxprocessor.jsp
@@ -0,0 +1,99 @@
+<!--
+ ~ Copyright (c) 2005-2010, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ ~
+ ~ WSO2 Inc. 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.
+ -->
+<%@ page import="org.apache.axis2.context.ConfigurationContext" %>
+<%@ page import="org.json.JSONArray"%>
+<%@ page import="org.wso2.carbon.CarbonConstants" %>
+<%@ page import="org.wso2.carbon.register.ui.clients.PackageInfoServiceClient" %>
+<%@ page import="org.wso2.carbon.stratos.common.util.CommonUtil" %>
+<%@ page import="org.wso2.carbon.ui.CarbonUIUtil" %>
+<%@ page import="org.wso2.carbon.utils.ServerConstants" %>
+<%@ page import="java.util.Collections" %>
+<%@ page import="java.util.Enumeration" %>
+<%@ page import="java.util.Iterator" %>
+<%@ page import="java.util.List" %>
+<%@ page import="java.util.Map" %>
+<%@ page import="org.json.JSONException" %>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
+<%@ taglib uri="http://wso2.org/projects/carbon/taglibs/carbontags.jar" prefix="carbon" %>
+<carbon:jsi18n
+		resourceBundle="org.wso2.carbon.register.ui.i18n.JSResources"
+		request="<%=request%>" />
+<script type="text/javascript" src="../registry_common/js/registry_validation.js"></script>
+<script type="text/javascript" src="../registry_common/js/registry_common.js"></script>
+<script type="text/javascript" src="../ajax/js/prototype.js"></script>
+<script type="text/javascript" src="../admin/js/jquery.js"></script>
+<script type="text/javascript" src="../admin/js/jquery.form.js"></script>
+<script type="text/javascript" src="../dialog/js/jqueryui/jquery-ui.min.js"></script>
+<%
+    String tenantDomain = (String) session.getAttribute("tenantDomain");
+    // The actual usage plan the tenant selects in select_usage_plan.jsp
+    String selectedUsagePlan = request.getParameter("selectedUsagePlan");
+    session.setAttribute("selectedUsagePlan", selectedUsagePlan);
+
+    String backendServerUrl = CarbonUIUtil.getServerURL(config.getServletContext(), session);
+    String cookie = (String) session.getAttribute(ServerConstants.ADMIN_SERVICE_COOKIE);
+    ConfigurationContext configContext =
+            (ConfigurationContext)config.getServletContext().getAttribute(CarbonConstants.CONFIGURATION_CONTEXT);
+
+    PackageInfoServiceClient client = new PackageInfoServiceClient(cookie, backendServerUrl,configContext);
+    JSONArray packageInfoArray = client.getBillingPackagesJsonArray();
+    String amount = "0";
+
+    for (int i = 0; i < packageInfoArray.length(); i++) {
+        try {
+            if (packageInfoArray.getJSONObject(i).getString("name").equals(selectedUsagePlan)) {
+                amount = packageInfoArray.getJSONObject(i).getString("subscriptionCharge");
+            }
+        } catch (JSONException e) {
+            //
+        }
+    }
+
+    String paypalUrl = CommonUtil.getStratosConfig().getPaypalUrl();
+    String adminConsoleURL = CarbonUIUtil.getAdminConsoleURL(request);
+    adminConsoleURL = adminConsoleURL.substring(0, adminConsoleURL.indexOf("carbon"));
+    String successUrl = adminConsoleURL + "carbon/payment/registration_payment.jsp";
+    String cancelUrl = adminConsoleURL + "carbon/account-mgt/account_mgt.jsp";
+%>
+
+<script type="text/javascript">
+
+
+        var successUrl = '<%=successUrl%>';
+        var cancelUrl = '<%=cancelUrl%>';
+        var amount = '<%=amount%>';
+        var tenantDomain = '<%=tenantDomain%>';
+        jQuery.ajax({
+            type: 'GET',
+            url: '../payment/setEC-ajaxprocessor.jsp',
+            data: 'successUrl=' + successUrl + '&cancelUrl=' + cancelUrl + '&amount=' + amount + '&tenantDomain=' + tenantDomain,
+            dataType: 'json',
+            async: false,
+            success: function(msg) {
+                var resp = msg;
+                if(resp.ack=='Success'){
+                    location.href = '<%=paypalUrl%>' + resp.token;
+                }else{
+                    location.href = cancelUrl;
+                }
+            },
+            error:function () {
+                location.href = cancelUrl;
+            }
+        });
+</script>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/335eb418/components/stratos/account-mgt/org.apache.stratos.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/js/account_mgt.js
----------------------------------------------------------------------
diff --git a/components/stratos/account-mgt/org.apache.stratos.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/js/account_mgt.js b/components/stratos/account-mgt/org.apache.stratos.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/js/account_mgt.js
new file mode 100644
index 0000000..c957312
--- /dev/null
+++ b/components/stratos/account-mgt/org.apache.stratos.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/js/account_mgt.js
@@ -0,0 +1,214 @@
+function deactivate(domain) {
+    sessionAwareFunction(function() {
+        CARBON.showConfirmationDialog("Are you sure you want to deactivate the domain: " +
+                                      domain + ".", function() {
+            var submitForm = document.getElementById("deactivate_form");
+            submitForm.submit();
+        });
+    }, "Session timed out. Please login again.");
+}
+
+function checkDomain(nname)
+{
+
+    var error = "";
+    error += validateEmpty(nname, "Domain");
+    if (error != "") {
+        return error;
+    }
+    //var arr = new Array(
+    //'.com','.net','.org','.biz','.coop','.info','.museum','.name',
+    //'.pro','.edu','.gov','.int','.mil','.ac','.ad','.ae','.af','.ag',
+    //'.ai','.al','.am','.an','.ao','.aq','.ar','.as','.at','.au','.aw',
+    //'.az','.ba','.bb','.bd','.be','.bf','.bg','.bh','.bi','.bj','.bm',
+    //'.bn','.bo','.br','.bs','.bt','.bv','.bw','.by','.bz','.ca','.cc',
+    //'.cd','.cf','.cg','.ch','.ci','.ck','.cl','.cm','.cn','.co','.cr',
+    //'.cu','.cv','.cx','.cy','.cz','.de','.dj','.dk','.dm','.do','.dz',
+    //'.ec','.ee','.eg','.eh','.er','.es','.et','.fi','.fj','.fk','.fm',
+    //'.fo','.fr','.ga','.gd','.ge','.gf','.gg','.gh','.gi','.gl','.gm',
+    //'.gn','.gp','.gq','.gr','.gs','.gt','.gu','.gv','.gy','.hk','.hm',
+    //'.hn','.hr','.ht','.hu','.id','.ie','.il','.im','.in','.io','.iq',
+    //'.ir','.is','.it','.je','.jm','.jo','.jp','.ke','.kg','.kh','.ki',
+    //'.km','.kn','.kp','.kr','.kw','.ky','.kz','.la','.lb','.lc','.li',
+    //'.lk','.lr','.ls','.lt','.lu','.lv','.ly','.ma','.mc','.md','.mg',
+    //'.mh','.mk','.ml','.mm','.mn','.mo','.mp','.mq','.mr','.ms','.mt',
+    //'.mu','.mv','.mw','.mx','.my','.mz','.na','.nc','.ne','.nf','.ng',
+    //'.ni','.nl','.no','.np','.nr','.nu','.nz','.om','.pa','.pe','.pf',
+    //'.pg','.ph','.pk','.pl','.pm','.pn','.pr','.ps','.pt','.pw','.py',
+    //'.qa','.re','.ro','.rw','.ru','.sa','.sb','.sc','.sd','.se','.sg',
+    //'.sh','.si','.sj','.sk','.sl','.sm','.sn','.so','.sr','.st','.sv',
+    //'.sy','.sz','.tc','.td','.tf','.tg','.th','.tj','.tk','.tm','.tn',
+    //'.to','.tp','.tr','.tt','.tv','.tw','.tz','.ua','.ug','.uk','.um',
+    //'.us','.uy','.uz','.va','.vc','.ve','.vg','.vi','.vn','.vu','.ws',
+    //'.wf','.ye','.yt','.yu','.za','.zm','.zw');
+
+    var mai = nname.value;
+
+    var val = true;
+    var dot = mai.lastIndexOf(".");
+    var dname = mai.substring(0, dot);
+    var ext = mai.substring(dot, mai.length);
+    //alert(ext);
+
+    if (ext.indexOf("-trial") >= 0 || ext.indexOf("-unverified") >= 0) {
+        // we are not allowing to create a domain with -trial or -unverified is in the extension
+        return "The domain name you entered is not valid. Please enter a valid domain name.";
+    }
+
+    if (ext.indexOf("/") >= 0 || ext.indexOf("\\") >= 0) {
+        return "The '/' and '\\' is not allowed in a domain name";
+    }
+
+    if (dot > 1 && dot < 57)
+    {
+        //	for(var i=0; i<arr.length; i++)
+        //	{
+        //	  if(ext == arr[i])
+        //	  {
+        //	 	val = true;
+        //		break;
+        //	  }
+        //	  else
+        //	  {
+        //	 	val = false;
+        //	  }
+        //	}
+        if (!val)
+        {
+            error = "Your domain extension " + ext + " is not correct";
+            return error;
+        }
+        else
+        {
+            for (var j = 0; j < dname.length; j++)
+            {
+                var dh = dname.charAt(j);
+                var hh = dh.charCodeAt(0);
+                if ((hh > 47 && hh < 59) || (hh > 64 && hh < 91) || (hh > 96 && hh < 123) || hh == 45 || hh == 46)
+                {
+                    if ((j == 0 || j == dname.length - 1) && hh == 45)
+                    {
+                        error = "Domain name should not begin and end with '-'";
+                        return error;
+                    }
+                }
+                else {
+                    error = "Your domain name should not have special characters";
+                    return error;
+                }
+            }
+        }
+    }
+    else
+    {
+        error = "Your Domain name is too short/long or you should have an extension to your domain.";
+        return error;
+    }
+
+    return error;
+}
+
+function clearDomainConfirmationMsg() {
+    var domain_confirmation_div = document.getElementById("domain-confirmation-msg");
+    domain_confirmation_div.innerHTML = "";
+}
+
+
+function domainSelected() {
+    var domain = document.getElementById('domainToValidate');
+
+    var reason = validateEmpty(domain, "Domain");
+    if (reason == "") {
+        reason += checkDomain(domain);
+    }
+
+    if (reason != "") {
+        CARBON.showWarningDialog(reason);
+        return false;
+    }
+    sessionAwareFunction(function() {
+        var validateDomainForm = document.getElementById('validateDomainForm');
+        validateDomainForm.submit();
+    }, "Session timed out. Please login again.");
+
+}
+
+function updateContact() {
+    var email = document.getElementById("email");
+    var oldEmail = document.getElementById("old-email");
+    var reason = "";
+    if (reason == "") {
+        reason += validateEmpty(email, "Email");
+    }
+    if (reason == "") {
+        reason += validateEmail(email);
+    }
+
+    if (reason == "" && email.value == oldEmail.innerHTML) {
+        reason += "You have not updated your email yet."
+    }
+
+    if (reason != "") {
+        CARBON.showWarningDialog(reason);
+        return;
+    }
+    // now call the updateContact.
+
+    sessionAwareFunction(function() {
+        debugger;
+        var busyContactPlaceHolder = document.getElementById("busyContact");
+        busyContactPlaceHolder.innerHTML = "<img src=\"images/ajax-loader.gif\"/>";
+
+        new Ajax.Request('../account-mgt/update_contact_ajaxprocessor.jsp',
+        {
+            method:'post',
+            parameters: {email: email.value},
+
+            onSuccess: function(transport) {
+                var returnValue = transport.responseText;
+                busyContactPlaceHolder.innerHTML = "";
+
+                if (returnValue.search(/----failed----/) == -1) {
+                    CARBON.showWarningDialog("We have sent an email to validate the contact details you just entered. Please follow " +
+                                             "the instructions in there to submit the updated contact details");
+                }
+                else {
+                    CARBON.showWarningDialog("Updating the contact information failed.");
+                }
+            },
+
+            onFailure: function(transport) {
+                busyContactPlaceHolder.innerHTML = "";
+                CARBON.showWarningDialog("Updating the contact information failed.");
+            }
+        });
+    }, "Session timed out. Please login again.");
+}
+
+
+function updateProfile() {
+    var update_profile_form = document.getElementById("update_profile_form");
+    var firstname = document.getElementById("firstname");
+    var oldFirstname = document.getElementById("old-firstname");
+    var lastname = document.getElementById("lastname");
+    var oldLastname = document.getElementById("old-lastname");
+
+    var reason = "";
+
+    if (reason == "") {
+        reason += validateEmpty(firstname, "First Name");
+    }
+    if (reason == "") {
+        reason += validateEmpty(lastname, "Last Name");
+
+        if ((reason == "" && firstname.value == oldFirstname.innerHTML) &&
+            (reason == "" && lastname.value == oldLastname.innerHTML)) {
+            reason += "You have not updated your firstname or last name yet.";
+        }
+    }
+    if (reason != "") {
+        CARBON.showWarningDialog(reason);
+        return;
+    }
+    update_profile_form.submit();
+}

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/335eb418/components/stratos/account-mgt/org.apache.stratos.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/update_contact_ajaxprocessor.jsp
----------------------------------------------------------------------
diff --git a/components/stratos/account-mgt/org.apache.stratos.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/update_contact_ajaxprocessor.jsp b/components/stratos/account-mgt/org.apache.stratos.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/update_contact_ajaxprocessor.jsp
new file mode 100644
index 0000000..58a323b
--- /dev/null
+++ b/components/stratos/account-mgt/org.apache.stratos.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/update_contact_ajaxprocessor.jsp
@@ -0,0 +1,35 @@
+<!--
+ ~ Copyright (c) 2005-2010, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ ~
+ ~ WSO2 Inc. 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.
+ -->
+<%@ page import="org.wso2.carbon.registry.core.exceptions.RegistryException" %>
+<%@ page import="org.wso2.carbon.account.mgt.ui.clients.AccountMgtClient" %>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%
+AccountMgtClient client;
+try {
+    String email = request.getParameter("email");
+    client = new AccountMgtClient(config, session);
+    client.updateContact(email);
+
+} catch (RegistryException e) {
+%>
+----failed----
+<%
+    return;
+}
+
+%>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/335eb418/components/stratos/account-mgt/org.apache.stratos.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/update_profile_processor.jsp
----------------------------------------------------------------------
diff --git a/components/stratos/account-mgt/org.apache.stratos.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/update_profile_processor.jsp b/components/stratos/account-mgt/org.apache.stratos.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/update_profile_processor.jsp
new file mode 100644
index 0000000..d0158c9
--- /dev/null
+++ b/components/stratos/account-mgt/org.apache.stratos.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/update_profile_processor.jsp
@@ -0,0 +1,62 @@
+<!--
+ ~ Copyright (c) 2005-2010, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ ~
+ ~ WSO2 Inc. 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.
+ -->
+<%@ page import="org.wso2.carbon.registry.core.exceptions.RegistryException" %>
+<%@ page import="org.wso2.carbon.account.mgt.ui.clients.AccountMgtClient" %>
+<%@ page import="org.wso2.carbon.account.mgt.ui.utils.Util" %>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
+<%@ taglib uri="http://wso2.org/projects/carbon/taglibs/carbontags.jar" prefix="carbon" %>
+<carbon:jsi18n
+		resourceBundle="org.wso2.carbon.register.ui.i18n.JSResources"
+		request="<%=request%>" />
+<link href="css/update_profile.css" rel="stylesheet" type="text/css" media="all"/>
+
+
+<%
+    Boolean isUpdated;
+
+    try {
+    isUpdated = Util.updateFullname(request, config, session);
+    }
+    catch (Exception e) {
+    isUpdated  = false;
+    }
+
+%>
+<%        if (isUpdated) { %>
+
+    <div id="middle">
+
+       <h2>
+           Profile Successfully Updated.
+       </h2>
+
+
+   <%   }  else { %>
+
+    <div id="middle">
+
+       <h2>
+           Profile Update Failed
+       </h2>
+
+        <% } %>
+        <p>
+            Go to  <a href="../admin/index.jsp"> home page. </a>
+        </p>
+      </div>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/335eb418/components/stratos/account-mgt/org.apache.stratos.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/update_verifier.jsp
----------------------------------------------------------------------
diff --git a/components/stratos/account-mgt/org.apache.stratos.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/update_verifier.jsp b/components/stratos/account-mgt/org.apache.stratos.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/update_verifier.jsp
new file mode 100644
index 0000000..2b35fc3
--- /dev/null
+++ b/components/stratos/account-mgt/org.apache.stratos.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/update_verifier.jsp
@@ -0,0 +1,56 @@
+<!--
+ ~ Copyright (c) 2005-2010, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ ~
+ ~ WSO2 Inc. 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.
+ -->
+<%@ page import="org.wso2.carbon.CarbonConstants" %>
+<%@ page import="org.wso2.carbon.account.mgt.ui.clients.AccountMgtClient" %>
+<%@ page import="org.wso2.carbon.account.mgt.ui.utils.Util" %>
+<%@ page import="org.wso2.carbon.registry.core.exceptions.RegistryException" %>
+<%@ page import="org.wso2.carbon.account.mgt.ui.clients.EmailValidationClient" %>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
+<%@ taglib uri="http://wso2.org/projects/carbon/taglibs/carbontags.jar" prefix="carbon" %>
+<carbon:jsi18n
+        resourceBundle="org.wso2.carbon.register.ui.i18n.JSResources"
+        request="<%=request%>" />
+<%
+    String data = (String)session.getAttribute("intermediate-data");
+        
+    Util.readIntermediateData(request, data);
+
+    EmailValidationClient client;
+    String email;
+    String domain;
+    try {
+        email = (String)request.getAttribute("email");
+        domain = (String)request.getAttribute("tenantDomain");
+        String confirmationKey = (String)request.getAttribute("confirmationKey");
+
+        client = new EmailValidationClient(config, session);
+        client.proceedUpdateContact(domain, email, confirmationKey);
+    } catch (RegistryException e) {
+    %>
+      <div>Error in validating the contact.</div>
+    <%
+        return;
+    }
+
+%>
+
+<div style="margin:20px">You have successfully validated your email address and the contact information associated with your WSO2
+    Cloud Services account is updated. Click <a href="../admin/index.jsp">here</a> to access WSO2 Cloud Manager.    
+</div>
+

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/335eb418/components/stratos/account-mgt/org.apache.stratos.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/update_verifier_redirector_ajaxprocessor.jsp
----------------------------------------------------------------------
diff --git a/components/stratos/account-mgt/org.apache.stratos.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/update_verifier_redirector_ajaxprocessor.jsp b/components/stratos/account-mgt/org.apache.stratos.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/update_verifier_redirector_ajaxprocessor.jsp
new file mode 100644
index 0000000..cb5beae
--- /dev/null
+++ b/components/stratos/account-mgt/org.apache.stratos.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/update_verifier_redirector_ajaxprocessor.jsp
@@ -0,0 +1,30 @@
+<!--
+ ~ Copyright (c) 2005-2010, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ ~
+ ~ WSO2 Inc. 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.
+ -->
+<%@ page import="org.wso2.carbon.account.mgt.ui.utils.Util" %>
+<%@ page import="org.wso2.carbon.utils.multitenancy.MultitenantConstants" %>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%
+//this jsp is used just to redirect to the correct update verifier.
+
+String data = (String)session.getAttribute("intermediate-data");
+
+Util.readIntermediateData(request, data);
+String domain = (String)request.getAttribute("tenantDomain");
+String contextPath = "/" + MultitenantConstants.TENANT_AWARE_URL_PREFIX + "/" + domain;
+response.sendRedirect("../account-mgt/update_verifier.jsp");
+%>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/335eb418/components/stratos/account-mgt/org.apache.stratos.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/validate_domain_ajaxprocessor.jsp
----------------------------------------------------------------------
diff --git a/components/stratos/account-mgt/org.apache.stratos.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/validate_domain_ajaxprocessor.jsp b/components/stratos/account-mgt/org.apache.stratos.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/validate_domain_ajaxprocessor.jsp
new file mode 100644
index 0000000..71da4bd
--- /dev/null
+++ b/components/stratos/account-mgt/org.apache.stratos.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/validate_domain_ajaxprocessor.jsp
@@ -0,0 +1,29 @@
+<!--
+ ~ Copyright (c) 2005-2010, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ ~
+ ~ WSO2 Inc. 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.
+ -->
+%@ page import="org.wso2.carbon.registry.core.RegistryConstants" %>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
+<%@ taglib uri="http://wso2.org/projects/carbon/taglibs/carbontags.jar" prefix="carbon" %>
+<%
+
+String domainToValidate = request.getParameter("domain");
+
+
+response.sendRedirect("../validate-domain/validate_domain_logged_in.jsp?domain=" + domainToValidate);
+
+%>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/335eb418/components/stratos/account-mgt/org.apache.stratos.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/validation_success_ajaxprocessor.jsp
----------------------------------------------------------------------
diff --git a/components/stratos/account-mgt/org.apache.stratos.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/validation_success_ajaxprocessor.jsp b/components/stratos/account-mgt/org.apache.stratos.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/validation_success_ajaxprocessor.jsp
new file mode 100644
index 0000000..15aec9b
--- /dev/null
+++ b/components/stratos/account-mgt/org.apache.stratos.account.mgt.ui/2.1.0/src/main/resources/web/account-mgt/validation_success_ajaxprocessor.jsp
@@ -0,0 +1,49 @@
+<!--
+ ~ Copyright (c) 2005-2010, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ ~
+ ~ WSO2 Inc. 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.
+ -->
+<%@ page import="org.wso2.carbon.account.mgt.ui.clients.AccountMgtClient" %>
+<%@ page import="org.wso2.carbon.registry.core.exceptions.RegistryException" %>
+<%@ page import="org.wso2.carbon.utils.multitenancy.MultitenantConstants" %>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%
+try {
+    String domainToRegister = (String)session.getAttribute("temp-domain-to-register");
+    String successKey = (String)session.getAttribute("validate-domain-success-key");
+    AccountMgtClient client = new AccountMgtClient(config, session);
+    if (client.finishedDomainValidation(domainToRegister, successKey)) {
+
+        //session.setAttribute(MultitenantConstants.TENANT_DOMAIN, domainToRegister);
+        session.setAttribute("domain-validation-success", "true");
+        // redirect to the login page with new domain name
+        response.sendRedirect("/t/" + domainToRegister + "/carbon/account-mgt/account_mgt.jsp");
+        return;
+    } else {
+        session.removeAttribute("temp-domain-to-register");
+        session.removeAttribute("validate-domain-success-key");
+
+        // now redirect to the account_mgt.js with the failure
+        session.setAttribute("domain-validation-failure", "true");
+        response.sendRedirect("../account-mgt/account_mgt.jsp");
+        return;
+    }
+} catch (RegistryException e) {
+%>
+  <div>Error in finishing the validation.</div>
+<%
+    return;
+}
+%>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/335eb418/components/stratos/account-mgt/org.apache.stratos.account.mgt/2.1.0/pom.xml
----------------------------------------------------------------------
diff --git a/components/stratos/account-mgt/org.apache.stratos.account.mgt/2.1.0/pom.xml b/components/stratos/account-mgt/org.apache.stratos.account.mgt/2.1.0/pom.xml
new file mode 100644
index 0000000..7c9020f
--- /dev/null
+++ b/components/stratos/account-mgt/org.apache.stratos.account.mgt/2.1.0/pom.xml
@@ -0,0 +1,87 @@
+<!--
+# Copyright (c) 2008, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+#
+# Licensed 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.wso2.carbon</groupId>
+        <artifactId>account-mgt-parent</artifactId>
+        <version>2.1.0</version>
+<relativePath>../../pom.xml</relativePath>
+    </parent>
+
+<modelVersion>4.0.0</modelVersion>
+<artifactId>org.apache.stratos.account.mgt</artifactId>
+    <packaging>bundle</packaging>
+    <name>WSO2 Stratos - Account Management</name>
+    <build>
+
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-scr-plugin</artifactId>
+            </plugin>
+            <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>
+                        <Private-Package>
+                            org.apache.stratos.account.mgt.*,
+                        </Private-Package>
+                        <Import-Package>
+                            org.wso2.carbon.registry.core.*;version=1.0.1,
+                            javax.xml.namespace; version=0.0.0,
+                            javax.servlet;version="${imp.pkg.version.javax.servlet}",
+                            javax.servlet.http;version="${imp.pkg.version.javax.servlet}",
+                            *;resolution:=optional
+                        </Import-Package>
+                        <DynamicImport-Package>*</DynamicImport-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.wso2.carbon</groupId>
+            <artifactId>org.wso2.carbon.registry.core</artifactId>
+        </dependency>
+        <dependency>
+           <groupId>org.wso2.carbon</groupId>
+            <artifactId>org.wso2.carbon.email.verification</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.wso2.carbon</groupId>
+            <artifactId>org.wso2.carbon.stratos.common</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.wso2.carbon</groupId>
+            <artifactId>org.wso2.carbon.tenant.mgt</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.wso2.carbon</groupId>
+            <artifactId>atlassian-jira</artifactId>
+            <version>1.0.0.wso2v1</version>
+        </dependency>
+    </dependencies>
+
+</project>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/335eb418/components/stratos/account-mgt/org.apache.stratos.account.mgt/2.1.0/src/main/java/org/apache/stratos/account/mgt/beans/AccountInfoBean.java
----------------------------------------------------------------------
diff --git a/components/stratos/account-mgt/org.apache.stratos.account.mgt/2.1.0/src/main/java/org/apache/stratos/account/mgt/beans/AccountInfoBean.java b/components/stratos/account-mgt/org.apache.stratos.account.mgt/2.1.0/src/main/java/org/apache/stratos/account/mgt/beans/AccountInfoBean.java
new file mode 100644
index 0000000..6492bea
--- /dev/null
+++ b/components/stratos/account-mgt/org.apache.stratos.account.mgt/2.1.0/src/main/java/org/apache/stratos/account/mgt/beans/AccountInfoBean.java
@@ -0,0 +1,40 @@
+/*
+ *  Copyright (c) 2005-2010, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *
+ *  WSO2 Inc. 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.beans;
+
+public class AccountInfoBean {
+    private String firstname;
+    private String lastname;
+
+    public String getFirstname() {
+        return firstname;
+    }
+
+    public void setFirstname(String firstname) {
+        this.firstname = firstname;
+    }
+
+    public String getLastname() {
+        return lastname;
+    }
+
+    public void setLastname(String lastname) {
+        this.lastname = lastname;
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/335eb418/components/stratos/account-mgt/org.apache.stratos.account.mgt/2.1.0/src/main/java/org/apache/stratos/account/mgt/internal/AccountMgtServiceComponent.java
----------------------------------------------------------------------
diff --git a/components/stratos/account-mgt/org.apache.stratos.account.mgt/2.1.0/src/main/java/org/apache/stratos/account/mgt/internal/AccountMgtServiceComponent.java b/components/stratos/account-mgt/org.apache.stratos.account.mgt/2.1.0/src/main/java/org/apache/stratos/account/mgt/internal/AccountMgtServiceComponent.java
new file mode 100644
index 0000000..49c1c22
--- /dev/null
+++ b/components/stratos/account-mgt/org.apache.stratos.account.mgt/2.1.0/src/main/java/org/apache/stratos/account/mgt/internal/AccountMgtServiceComponent.java
@@ -0,0 +1,139 @@
+/*
+*  Copyright (c) 2005-2010, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+*
+*  WSO2 Inc. 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.internal;
+
+import org.wso2.carbon.email.verification.util.EmailVerifcationSubscriber;
+import org.wso2.carbon.registry.core.service.RegistryService;
+import org.wso2.carbon.stratos.common.TenantBillingService;
+import org.wso2.carbon.stratos.common.listeners.TenantMgtListener;
+import org.wso2.carbon.user.core.service.RealmService;
+import org.wso2.carbon.utils.ConfigurationContextService;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.stratos.account.mgt.util.Util;
+
+import org.osgi.service.component.ComponentContext;
+
+/**
+ * @scr.component name="org.apache.stratos.account.mgt" immediate="true"
+ * @scr.reference name="registry.service"
+ *                interface="org.wso2.carbon.registry.core.service.RegistryService"
+ *                cardinality="1..1" policy="dynamic" bind="setRegistryService"
+ *                unbind="unsetRegistryService"
+ * @scr.reference name="user.realmservice.default"
+ *                interface="org.wso2.carbon.user.core.service.RealmService"
+ *                cardinality="1..1" policy="dynamic" bind="setRealmService"
+ *                unbind="unsetRealmService"
+ * @scr.reference name="config.context.service"
+ *                interface="org.wso2.carbon.utils.ConfigurationContextService"
+ *                cardinality="1..1" policy="dynamic"
+ *                bind="setConfigurationContextService"
+ *                unbind="unsetConfigurationContextService"
+ * @scr.reference name="emailverification.service" interface=
+ *                "org.wso2.carbon.email.verification.util.EmailVerifcationSubscriber"
+ *                cardinality="1..1" policy="dynamic"
+ *                bind="setEmailVerificationService"
+ *                unbind="unsetEmailVerificationService"
+ * @scr.reference name="org.wso2.carbon.tenant.mgt.listener.service"
+ *                interface="org.wso2.carbon.stratos.common.listeners.TenantMgtListener"
+ *                cardinality="0..n" policy="dynamic"
+ *                bind="setTenantMgtListenerService"
+ *                unbind="unsetTenantMgtListenerService"
+ * @scr.reference name="default.tenant.billing.service"
+ *                interface="org.wso2.carbon.stratos.common.TenantBillingService"
+ *                cardinality="1..1" policy="dynamic"
+ *                bind="setTenantBillingService"
+ *                unbind="unsetTenantBillingService"
+ */
+public class AccountMgtServiceComponent {
+    private static Log log = LogFactory.getLog(AccountMgtServiceComponent.class);
+    private static ConfigurationContextService configContextService = null;
+    private static TenantBillingService billingService = null;
+    
+    protected void activate(ComponentContext context) {
+        try {
+            Util.loadEmailVerificationConfig();
+            log.debug("******* Stratos account management bundle is activated ******* ");
+        } catch (Exception e) {
+            log.error("******* Stratos account management bundle failed activating ****", e);
+        }
+    }
+
+    protected void deactivate(ComponentContext context) {
+        log.debug("******* Stratos account managment bundle is deactivated ******* ");
+    }
+
+    protected void setRegistryService(RegistryService registryService) {
+        Util.setRegistryService(registryService);
+    }
+
+    protected void unsetRegistryService(RegistryService registryService) {
+        Util.setRegistryService(null);
+    }
+
+    protected void setRealmService(RealmService realmService) {
+        Util.setRealmService(realmService);
+    }
+
+    protected void unsetRealmService(RealmService realmService) {
+        Util.setRealmService(null);
+    }
+
+    protected void setConfigurationContextService(ConfigurationContextService contextService) {
+        if (log.isDebugEnabled()) {
+            log.debug("Setting the ConfigurationContext");
+        }
+        configContextService = contextService;
+    }
+
+    protected void unsetConfigurationContextService(ConfigurationContextService contextService) {
+        if (log.isDebugEnabled()) {
+            log.debug("Unsetting the ConfigurationContext");
+        }
+    }
+
+    protected void setEmailVerificationService(EmailVerifcationSubscriber emailService) {
+        Util.setEmailVerificationService(emailService);
+    }
+
+    protected void unsetEmailVerificationService(EmailVerifcationSubscriber emailService) {
+        Util.setEmailVerificationService(null);
+    }
+
+    protected void setTenantMgtListenerService(TenantMgtListener tenantMgtListener) {
+        Util.addTenantMgtListenerService(tenantMgtListener);
+    }
+
+    protected void unsetTenantMgtListenerService(TenantMgtListener tenantMgtListener) {
+        Util.removeTenantMgtListenerService(tenantMgtListener);
+    }
+    
+    protected void setTenantBillingService(TenantBillingService tenantBillingService) {
+        billingService = tenantBillingService;
+    }
+    
+    protected void unsetTenantBillingService(TenantBillingService tenantBilling) {
+        setTenantBillingService(null);
+    }
+    
+    public static TenantBillingService getBillingService() {
+        return billingService;
+    }
+
+}


[3/5] Refactoring org.wso2.carbon to org.apache.stratos

Posted by sa...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/335eb418/components/stratos/account-mgt/org.apache.stratos.account.mgt/2.1.0/src/main/java/org/apache/stratos/account/mgt/services/AccountMgtService.java
----------------------------------------------------------------------
diff --git a/components/stratos/account-mgt/org.apache.stratos.account.mgt/2.1.0/src/main/java/org/apache/stratos/account/mgt/services/AccountMgtService.java b/components/stratos/account-mgt/org.apache.stratos.account.mgt/2.1.0/src/main/java/org/apache/stratos/account/mgt/services/AccountMgtService.java
new file mode 100644
index 0000000..14058d2
--- /dev/null
+++ b/components/stratos/account-mgt/org.apache.stratos.account.mgt/2.1.0/src/main/java/org/apache/stratos/account/mgt/services/AccountMgtService.java
@@ -0,0 +1,416 @@
+/*
+ * Copyright (c) 2005-2010, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ * 
+ * WSO2 Inc. 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.services;
+
+import org.wso2.carbon.core.AbstractAdmin;
+import org.wso2.carbon.email.verification.util.EmailVerifcationSubscriber;
+import org.wso2.carbon.registry.core.RegistryConstants;
+import org.wso2.carbon.registry.core.Resource;
+import org.wso2.carbon.registry.core.session.UserRegistry;
+import org.wso2.carbon.registry.core.utils.UUIDGenerator;
+import org.wso2.carbon.stratos.common.beans.TenantInfoBean;
+import org.wso2.carbon.stratos.common.constants.StratosConstants;
+import org.wso2.carbon.stratos.common.util.ClaimsMgtUtil;
+import org.wso2.carbon.stratos.common.util.CommonUtil;
+import org.wso2.carbon.tenant.mgt.util.TenantMgtUtil;
+import org.wso2.carbon.user.core.UserCoreConstants;
+import org.wso2.carbon.user.core.UserStoreException;
+import org.wso2.carbon.user.core.UserStoreManager;
+import org.wso2.carbon.user.core.service.RealmService;
+import org.wso2.carbon.user.core.tenant.Tenant;
+import org.wso2.carbon.user.core.tenant.TenantManager;
+import org.wso2.carbon.utils.multitenancy.MultitenantConstants;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.stratos.account.mgt.beans.AccountInfoBean;
+import org.apache.stratos.account.mgt.util.Util;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Account Management Service Class
+ */
+public class AccountMgtService extends AbstractAdmin {
+    private static final Log log = LogFactory.getLog(AccountMgtService.class);
+
+    /**
+     * Updates the contact email.
+     *
+     * @param contactEmail email
+     * @throws Exception, if update contact failed.
+     */
+    public void updateContact(String contactEmail) throws Exception {
+        EmailVerifcationSubscriber emailverifier = Util.getEmailVerificationService();
+
+        TenantManager tenantManager = Util.getTenantManager();
+        UserRegistry registry = (UserRegistry) getGovernanceRegistry();
+        if (registry == null) {
+            // we can't continue without having a valid registry in the session
+            String msg = "Error in retrieving the registry for the login tenant.";
+            log.error(msg);
+            throw new Exception(msg);
+        }
+        int tenantId = registry.getTenantId();
+
+        Tenant tenant;
+        try {
+            tenant = (Tenant) tenantManager.getTenant(tenantId);
+        } catch (UserStoreException e) {
+            String msg = "Error in retrieving the tenant information for the tenant id: " +
+                    tenantId + ".";
+            log.error(msg, e);
+            throw new Exception(msg, e);
+        }
+
+        // generating the confirmation key
+        String confirmationKey = UUIDGenerator.generateUUID();
+        UserRegistry superTenantSystemRegistry =
+                Util.getGovernanceSystemRegistry(MultitenantConstants.SUPER_TENANT_ID);
+        Resource resource;
+        String emailVerificationPath = StratosConstants.ADMIN_EMAIL_VERIFICATION_FLAG_PATH +
+                RegistryConstants.PATH_SEPARATOR + tenantId;
+        if (superTenantSystemRegistry.resourceExists(emailVerificationPath)) {
+            resource = superTenantSystemRegistry.get(emailVerificationPath);
+        } else {
+            resource = superTenantSystemRegistry.newResource();
+        }
+        resource.setContent(confirmationKey);
+        superTenantSystemRegistry.put(emailVerificationPath, resource);
+
+        try {
+            Map<String, String> datatostore = new HashMap<String, String>();
+            datatostore.put("first-name",
+                    ClaimsMgtUtil.getFirstName(Util.getRealmService(), tenantId));
+            datatostore.put("email", contactEmail);
+            datatostore.put("userName", tenant.getAdminName());
+            datatostore.put("tenantDomain", tenant.getDomain());
+            datatostore.put("confirmationKey", confirmationKey);
+            emailverifier.requestUserVerification(datatostore, Util.getEmailVerifierConfig());
+        } catch (Exception e) {
+            String msg = "Error in adding tenant, tenant domain: " + tenant.getDomain() + ".";
+            log.error(msg);
+            throw new Exception(msg, e);
+        }
+    }
+
+    /**
+     * gets the contact of the tenant admin
+     *
+     * @throws Exception, if getting the contact email address failed.
+     * @return, the contact email address
+     */
+    public String getContact() throws Exception {
+        TenantManager tenantManager = Util.getTenantManager();
+        UserRegistry registry = (UserRegistry) getGovernanceRegistry();
+        if (registry == null) {
+            // we can't continue without having a valid registry in the session
+            String msg = "Error in retrieving the registry for the login tenant.";
+            log.error(msg);
+            throw new Exception(msg);
+        }
+        int tenantId = registry.getTenantId();
+        // get the tenant information from the tenant manager
+        Tenant tenant;
+        try {
+            tenant = (Tenant) tenantManager.getTenant(tenantId);
+        } catch (UserStoreException e) {
+            String msg = "Error in retrieving the tenant information for the tenant id: " +
+                    tenantId + ".";
+            log.error(msg, e);
+            throw new Exception(msg, e);
+        }
+        return tenant.getEmail();
+    }
+
+    /**
+     * Updates the fullname information
+     *
+     * @param accountInfoBean profile information stored in AccountInfoBean
+     * @return true, if updated successfully.
+     * @throws Exception UserStoreException.
+     */
+    public boolean updateFullname(AccountInfoBean accountInfoBean) throws Exception {
+        TenantManager tenantManager = Util.getTenantManager();
+        UserRegistry registry = (UserRegistry) getGovernanceRegistry();
+        if (registry == null) {
+            // we can't continue without having a valid registry in the session
+            String msg = "Error in retrieving the registry for the login tenant.";
+            log.error(msg);
+            throw new Exception(msg);
+        }
+        int tenantId = registry.getTenantId();
+        // get the tenant information from the tenant manager
+        Tenant tenant;
+        try {
+            tenant = (Tenant) tenantManager.getTenant(tenantId);
+        } catch (UserStoreException e) {
+            String msg = "Error in retrieving the tenant information for the tenant id: " +
+                    tenantId + ".";
+            log.info(msg, e);
+            throw new Exception(msg, e);
+        }
+        RealmService realmService = Util.getRealmService();
+        try {
+            Map<String, String> claimsMap = new HashMap<String, String>();
+            claimsMap.put(UserCoreConstants.ClaimTypeURIs.GIVEN_NAME,
+                    accountInfoBean.getFirstname());
+            claimsMap.put(UserCoreConstants.ClaimTypeURIs.SURNAME, accountInfoBean.getLastname());
+            UserStoreManager userStoreManager =
+                    (UserStoreManager) realmService.getTenantUserRealm(tenantId)
+                            .getUserStoreManager();
+            userStoreManager.setUserClaimValues(
+                    ClaimsMgtUtil.getAdminUserNameFromTenantId(realmService, tenantId),
+                    claimsMap, UserCoreConstants.DEFAULT_PROFILE);
+            log.info("FirstName: " + accountInfoBean.getFirstname() +
+                    " has been updated to the tenant admin " +
+                    ClaimsMgtUtil.getAdminUserNameFromTenantId(realmService, tenantId) + " of " +
+                    tenant.getDomain());
+            
+            //Notify tenant update to all listeners
+            TenantInfoBean tenantInfoBean = new TenantInfoBean();
+            tenantInfoBean.setTenantId(tenantId);
+            tenantInfoBean.setFirstname(accountInfoBean.getFirstname());
+            tenantInfoBean.setLastname(accountInfoBean.getLastname());
+            Util.alertTenantUpdate(tenantInfoBean);
+            
+            return true;
+        } catch (Exception e) {
+            // this is expected, as many users haven't given their fullnames
+            // during their registration.
+            String msg =
+                    "Error in updating the firstname: " + accountInfoBean.getFirstname() +
+                            " for the tenant admin: " +
+                            ClaimsMgtUtil.getAdminUserNameFromTenantId(realmService, tenantId);
+            log.info(msg);
+            throw new Exception(msg, e);
+        }
+    }
+
+    /**
+     * gets the profile information - saved as claims -
+     * currently saved claims are first name and last name - hence the profile so far is a fullname.
+     *
+     * @return AccountInfoBean - Currently depicts the fullname as an object.
+     * @throws Exception, UserStoreException
+     */
+    public AccountInfoBean getFullname() throws Exception {
+
+        String firstname = "", lastname = "";
+        TenantManager tenantManager = Util.getTenantManager();
+        UserRegistry registry = (UserRegistry) getGovernanceRegistry();
+        if (registry == null) {
+            // we can't continue without having a valid registry in the session
+            String msg = "Error in retrieving the registry for the login tenant.";
+            log.error(msg);
+            throw new Exception(msg);
+        }
+        int tenantId = registry.getTenantId();
+        // get the tenant information from the tenant manager
+        Tenant tenant;
+        try {
+            tenant = (Tenant) tenantManager.getTenant(tenantId);
+        } catch (UserStoreException e) {
+            String msg = "Error in retrieving the tenant information for the tenant id: " +
+                    tenantId + ".";
+            log.info(msg, e);
+            throw new Exception(msg, e);
+        }
+
+        // getting the other parameters from the claims.
+        try {
+            firstname = ClaimsMgtUtil.getFirstName(Util.getRealmService(), tenantId);
+
+        } catch (Exception e) {
+            String msg = "Error in retrieving the firstname for the admin of the domain " +
+                    tenant.getDomain();
+            log.info(msg);
+        }
+        try {
+            lastname = ClaimsMgtUtil.getLastName(Util.getRealmService(), tenantId);
+        } catch (Exception e) {
+            // this is expected, as many users haven't given their lastnames
+            // during their registration.
+            String msg = "Error in retrieving the Lastname for the admin of the domain " +
+                    tenant.getDomain();
+            log.info(msg);
+        }
+
+        AccountInfoBean accountInfoBean = new AccountInfoBean();
+        accountInfoBean.setFirstname(firstname);
+        accountInfoBean.setLastname(lastname);
+        return accountInfoBean;
+    }
+
+
+    /**
+     * deactivates the tenant
+     *
+     * @throws Exception, if deactivating the tenant failed.
+     */
+    public void deactivate() throws Exception {
+        // The one who have a proper permission will be able to deactivate the tenant.
+        TenantManager tenantManager = Util.getTenantManager();
+        UserRegistry registry = (UserRegistry) getGovernanceRegistry();
+        if (registry == null) {
+            // we can't continue without having a valid registry in the session
+            String msg = "Error in retrieving the registry for the login tenant.";
+            log.error(msg);
+            throw new Exception(msg);
+        }
+        int tenantId = registry.getTenantId();
+        try {
+            tenantManager.deactivateTenant(tenantId);
+        } catch (UserStoreException e) {
+            String msg = "Error in deactivating the tenant id: " + tenantId + ".";
+            log.error(msg, e);
+            throw new Exception(msg, e);
+        }
+
+        //Notify tenant deactivation to Listeners
+        Util.alertTenantDeactivation(tenantId);
+    }
+
+    /**
+     * checks whether the domain is validated.
+     *
+     * @return true, if the domain has been validated.
+     * @throws Exception, if the domain validation failed.
+     */
+    public boolean isDomainValidated() throws Exception {
+        // first we will get the current domain name
+        TenantManager tenantManager = Util.getTenantManager();
+        UserRegistry registry = (UserRegistry) getGovernanceRegistry();
+        if (registry == null) {
+            // we can't continue without having a valid registry in the session
+            String msg = "Error in retrieving the registry for the login tenant.";
+            log.error(msg);
+            throw new Exception(msg);
+        }
+        int tenantId = registry.getTenantId();
+        // get the tenant information from the tenant manager
+        Tenant tenant;
+        try {
+            tenant = (Tenant) tenantManager.getTenant(tenantId);
+        } catch (UserStoreException e) {
+            String msg = "Error in retrieving the tenant information for the tenant id: " +
+                    tenantId + ".";
+            log.error(msg, e);
+            throw new Exception(msg, e);
+        }
+        String domainName = tenant.getDomain();
+        TenantMgtUtil.validateDomain(domainName);
+
+        String domainValidationPath = StratosConstants.TENANT_DOMAIN_VERIFICATION_FLAG_PATH +
+                RegistryConstants.PATH_SEPARATOR + tenantId;
+        UserRegistry superTenantRegistry = Util.getGovernanceSystemRegistry(
+                MultitenantConstants.SUPER_TENANT_ID);
+        if (superTenantRegistry.resourceExists(domainValidationPath)) {
+            Resource validationFlagR = superTenantRegistry.get(domainValidationPath);
+            return "true".equals(validationFlagR.getProperty(domainName));
+        }
+        return false;
+    }
+
+    /**
+     * If the domain validation has been completed.
+     *
+     * @param validatedDomain the domain being validated.
+     * @param successKey      success key
+     * @return true, if the domain has been validated successfully.
+     * @throws Exception, if the domain validation failed.
+     */
+    public boolean finishedDomainValidation(
+            String validatedDomain, String successKey) throws Exception {
+        // create a flag on domain validation, so that we can move the content
+        // of the current domain name to the new validated domain name
+        if (!CommonUtil.validateDomainFromSuccessKey(Util.getGovernanceSystemRegistry(
+                MultitenantConstants.SUPER_TENANT_ID), validatedDomain, successKey)) {
+            String msg = "Domain: " + validatedDomain + " is not validated against successKey: " +
+                    successKey + ".";
+            log.error(msg);
+            throw new Exception(msg);
+        }
+
+        // we keep an entry about domain validation here.
+
+        // first we will get the current domain name
+        UserRegistry registry = (UserRegistry) getGovernanceRegistry();
+        if (registry == null) {
+            // we can't continue without having a valid registry in the session
+            String msg = "Error in retrieving the registry for the login tenant.";
+            log.error(msg);
+            throw new Exception(msg);
+        }
+        int tenantId = registry.getTenantId();
+
+        // keep the domain validation path.
+
+        String domainValidationPath = StratosConstants.TENANT_DOMAIN_VERIFICATION_FLAG_PATH +
+                RegistryConstants.PATH_SEPARATOR + tenantId;
+        UserRegistry superTenantRegistry =
+                Util.getGovernanceSystemRegistry(MultitenantConstants.SUPER_TENANT_ID);
+        Resource validationFlagR = superTenantRegistry.newResource();
+        validationFlagR.setProperty(validatedDomain, "true");
+        superTenantRegistry.put(domainValidationPath, validationFlagR);
+
+        return true;
+    }
+
+    /**
+     * Check whether the domain is available.
+     *
+     * @param domainName domain name
+     * @return true, if the domain is available to register.
+     * @throws Exception, if the domain validation failed.
+     */
+    public boolean checkDomainAvailability(String domainName) throws Exception {
+        TenantManager tenantManager = Util.getTenantManager();
+        int tenantId = tenantManager.getTenantId(domainName);
+        return tenantId < 0;
+    }
+
+    /**
+     * check whether the email has been validated.
+     *
+     * @throws Exception, if the validation failed.
+     * @return, true if already validated.
+     */
+    public boolean isEmailValidated() throws Exception {
+        UserRegistry userRegistry = (UserRegistry) getGovernanceRegistry();
+        if (userRegistry.getTenantId() == MultitenantConstants.SUPER_TENANT_ID) {
+            // no email validation step required for super tenant
+            return true;
+        }
+
+        String email = getContact();
+        UserRegistry superTenantSystemRegistry =
+                Util.getGovernanceSystemRegistry(MultitenantConstants.SUPER_TENANT_ID);
+        String emailVerificationPath = StratosConstants.ADMIN_EMAIL_VERIFICATION_FLAG_PATH +
+                RegistryConstants.PATH_SEPARATOR +
+                userRegistry.getTenantId();
+        if (!superTenantSystemRegistry.resourceExists(emailVerificationPath)) {
+            // the confirmation key should exist,otherwise fail registration
+            return false;
+        }
+        Resource resource = superTenantSystemRegistry.get(emailVerificationPath);
+
+        return "true".equals(resource.getProperty(email));
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/335eb418/components/stratos/account-mgt/org.apache.stratos.account.mgt/2.1.0/src/main/java/org/apache/stratos/account/mgt/services/EmailValidationService.java
----------------------------------------------------------------------
diff --git a/components/stratos/account-mgt/org.apache.stratos.account.mgt/2.1.0/src/main/java/org/apache/stratos/account/mgt/services/EmailValidationService.java b/components/stratos/account-mgt/org.apache.stratos.account.mgt/2.1.0/src/main/java/org/apache/stratos/account/mgt/services/EmailValidationService.java
new file mode 100644
index 0000000..b8fb75e
--- /dev/null
+++ b/components/stratos/account-mgt/org.apache.stratos.account.mgt/2.1.0/src/main/java/org/apache/stratos/account/mgt/services/EmailValidationService.java
@@ -0,0 +1,153 @@
+/*
+ * Copyright (c) 2008, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *
+ * Licensed 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.services;
+
+import org.wso2.carbon.registry.core.RegistryConstants;
+import org.wso2.carbon.registry.core.Resource;
+import org.wso2.carbon.registry.core.exceptions.RegistryException;
+import org.wso2.carbon.registry.core.session.UserRegistry;
+import org.wso2.carbon.stratos.common.beans.TenantInfoBean;
+import org.wso2.carbon.stratos.common.constants.StratosConstants;
+import org.wso2.carbon.stratos.common.util.CommonUtil;
+import org.wso2.carbon.user.api.Tenant;
+import org.wso2.carbon.user.core.UserStoreException;
+import org.wso2.carbon.user.core.tenant.TenantManager;
+import org.wso2.carbon.utils.multitenancy.MultitenantConstants;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.stratos.account.mgt.internal.AccountMgtServiceComponent;
+import org.apache.stratos.account.mgt.util.Util;
+
+/**
+ * Email Validation Service
+ */
+public class EmailValidationService {
+    private static final Log log = LogFactory.getLog(EmailValidationService.class);
+
+    /**
+     * Proceed updating the contact email address
+     *
+     * @param domain          tenant domain
+     * @param email           email address
+     * @param confirmationKey confirmation key.
+     * @throws Exception, RegistryException.
+     */
+    public void proceedUpdateContact(String domain, String email, String confirmationKey)
+            throws Exception {
+
+        TenantManager tenantManager = Util.getTenantManager();
+        int tenantId;
+
+        try {
+            tenantId = tenantManager.getTenantId(domain);
+        } catch (UserStoreException e) {
+            String msg = "Error in adding tenant, tenant domain: " + domain + ".";
+            log.error(msg);
+            throw new RegistryException(msg, e);
+        }
+
+        UserRegistry superTenantSystemRegistry = Util.getGovernanceSystemRegistry(
+                MultitenantConstants.SUPER_TENANT_ID);
+        String emailVerificationPath =
+                StratosConstants.ADMIN_EMAIL_VERIFICATION_FLAG_PATH +
+                RegistryConstants.PATH_SEPARATOR + tenantId;
+        if (!superTenantSystemRegistry.resourceExists(emailVerificationPath)) {
+            // the confirmation key should exist,otherwise fail registraion
+            String msg = "The confirmationKey doesn't exist in service.";
+            log.error(msg);
+            throw new RegistryException(msg);
+        }
+        Resource resource = superTenantSystemRegistry.get(emailVerificationPath);
+        String actualConfirmationKey = null;
+        Object content = resource.getContent();
+        if (content instanceof String) {
+            actualConfirmationKey = (String) content;
+        } else if (content instanceof byte[]) {
+            actualConfirmationKey = new String((byte[]) content);
+        }
+
+        if (actualConfirmationKey == null || !actualConfirmationKey.equals(confirmationKey)) {
+            // validation will fail.
+            String msg = "The email confirmation key is not matching";
+            log.error(msg);
+            throw new RegistryException(msg);
+        }
+
+        resource.setProperty(email, "true");
+
+        // now we will really update the tenant email
+        Tenant tenant;
+        try {
+            tenant = tenantManager.getTenant(tenantId);
+        } catch (UserStoreException e) {
+            String msg =
+                    "Error in retrieving the tenant information for the tenant id: " + tenantId +
+                    ".";
+            log.error(msg, e);
+            throw new RegistryException(msg, e);
+        }
+
+        // If TenantActivation is moderated, the mail address associated with the validation link
+        // would not be the tenant email. Otherwise, the validation mail would be the tenant email.
+        if (!CommonUtil.isTenantActivationModerated()) {
+            tenant.setEmail(email);
+        }
+
+        try {
+            tenantManager.updateTenant(tenant);
+        } catch (UserStoreException e) {
+            String msg =
+                    "Error in updating the tenant information for the tenant id: " + tenantId + ".";
+            log.error(msg, e);
+            throw new RegistryException(msg, e);
+        }
+
+        // activate the tenant on successful validation of the email, if it is not already activated.
+        if ("false".equals(resource.getProperty(StratosConstants.IS_EMAIL_VALIDATED))) {
+            tenantManager.activateTenant(tenantId);
+            // set the registry flag
+            resource.editPropertyValue(StratosConstants.IS_EMAIL_VALIDATED, "false", "true");
+
+            if (log.isDebugEnabled()) {
+                log.debug("Tenant : " + tenantId + " is activated after validating the " +
+                          "email of the tenant admin.");
+            }
+            
+            //Notify all the listeners that tenant has been activated for the first time
+            Util.alertTenantInitialActivation(tenantId);
+
+            //Activating the usage plan
+            try{
+                AccountMgtServiceComponent.getBillingService().activateUsagePlan(domain);
+            }catch(Exception e){
+                log.error("Error occurred while activating the usage plan for tenant: " + domain
+                        + " tenant Id: " + tenantId, e);
+            }
+
+        }
+        
+        //This is considered an update. Hence notify the update to all listeners
+        TenantInfoBean tenantInfoBean = new TenantInfoBean();
+        tenantInfoBean.setTenantId(tenantId);
+        tenantInfoBean.setTenantDomain(domain);
+        tenantInfoBean.setEmail(email);
+        Util.alertTenantUpdate(tenantInfoBean);
+
+        // update the registry
+        superTenantSystemRegistry.put(emailVerificationPath, resource);
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/335eb418/components/stratos/account-mgt/org.apache.stratos.account.mgt/2.1.0/src/main/java/org/apache/stratos/account/mgt/util/Util.java
----------------------------------------------------------------------
diff --git a/components/stratos/account-mgt/org.apache.stratos.account.mgt/2.1.0/src/main/java/org/apache/stratos/account/mgt/util/Util.java b/components/stratos/account-mgt/org.apache.stratos.account.mgt/2.1.0/src/main/java/org/apache/stratos/account/mgt/util/Util.java
new file mode 100644
index 0000000..1d03a3c
--- /dev/null
+++ b/components/stratos/account-mgt/org.apache.stratos.account.mgt/2.1.0/src/main/java/org/apache/stratos/account/mgt/util/Util.java
@@ -0,0 +1,173 @@
+/*
+ *  Copyright (c) 2005-2008, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *
+ *  WSO2 Inc. 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.util;
+
+import org.wso2.carbon.email.verification.util.EmailVerifcationSubscriber;
+import org.wso2.carbon.email.verification.util.EmailVerifierConfig;
+import org.wso2.carbon.registry.core.exceptions.RegistryException;
+import org.wso2.carbon.registry.core.service.RegistryService;
+import org.wso2.carbon.registry.core.session.UserRegistry;
+import org.wso2.carbon.stratos.common.beans.TenantInfoBean;
+import org.wso2.carbon.stratos.common.constants.StratosConstants;
+import org.wso2.carbon.stratos.common.exception.StratosException;
+import org.wso2.carbon.stratos.common.listeners.TenantMgtListener;
+import org.wso2.carbon.user.core.service.RealmService;
+import org.wso2.carbon.user.core.tenant.TenantManager;
+import org.wso2.carbon.utils.CarbonUtils;
+
+import org.apache.axis2.context.MessageContext;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
+
+/**
+ * Util methods for AccountMgt
+ */
+public class Util {
+
+    private static final Log log = LogFactory.getLog(Util.class);
+
+    private static RegistryService registryService;
+    private static RealmService realmService;
+    private static EmailVerifcationSubscriber emailVerificationService = null;
+    private static EmailVerifierConfig emailVerfierConfig = null;
+    private static List<TenantMgtListener> tenantMgtListeners = new ArrayList<TenantMgtListener>();
+
+    public static synchronized void setRegistryService(RegistryService service) {
+        if (registryService == null) {
+            registryService = service;
+        }
+    }
+
+    
+    public static RealmService getRealmService() {
+        return realmService;
+    }
+
+
+    public static RegistryService getRegistryService() {
+        return registryService;
+    }
+
+    public static synchronized void setEmailVerificationService(EmailVerifcationSubscriber service) {
+        if (emailVerificationService == null) {
+            emailVerificationService = service;
+        }
+    }
+
+    public static EmailVerifcationSubscriber getEmailVerificationService() {
+        return emailVerificationService;
+    }
+
+
+    public static synchronized void setRealmService(RealmService service) {
+        if (realmService == null) {
+            realmService = service;
+        }
+    }
+
+
+    public static TenantManager getTenantManager() {
+        return realmService.getTenantManager();
+    }
+
+    public static UserRegistry getGovernanceSystemRegistry(int tenantId) throws RegistryException {
+        return registryService.getGovernanceSystemRegistry(tenantId);
+    }
+
+    public static HttpSession getRequestSession() throws RegistryException {
+        MessageContext messageContext = MessageContext.getCurrentMessageContext();
+        if (messageContext == null) {
+            String msg = "Could not get the user's session. Message context not found.";
+            log.error(msg);
+            throw new RegistryException(msg);
+        }
+
+        HttpServletRequest request =
+                (HttpServletRequest) messageContext.getProperty("transport.http.servletRequest");
+
+        return request.getSession();
+    }
+
+    public static void loadEmailVerificationConfig() {
+        String configXml = CarbonUtils.getCarbonConfigDirPath()+ File.separator
+                           + StratosConstants.EMAIL_CONFIG +File.separator +"email-update.xml";
+        emailVerfierConfig = org.wso2.carbon.email.verification.util.Util.loadeMailVerificationConfig(configXml);
+    }
+
+    public static EmailVerifierConfig getEmailVerifierConfig() {
+        return emailVerfierConfig;
+    }
+
+    public static void addTenantMgtListenerService(TenantMgtListener tenantMgtListener) {
+        tenantMgtListeners.add(tenantMgtListener);
+        sortTenantMgtListeners();
+    }
+
+    public static void removeTenantMgtListenerService(TenantMgtListener tenantMgtListener) {
+        tenantMgtListeners.remove(tenantMgtListener);
+        sortTenantMgtListeners();
+    }
+    
+    private static void sortTenantMgtListeners() {
+        Collections.sort(tenantMgtListeners, new Comparator<TenantMgtListener>() {
+            public int compare(TenantMgtListener o1, TenantMgtListener o2) {
+                return o1.getListenerOrder() - o2.getListenerOrder();
+            }
+        });
+    }
+    
+    public static void alertTenantRenames(int tenantId, String oldName, 
+                                          String newName) throws StratosException {
+
+        for (TenantMgtListener tenantMgtLister : tenantMgtListeners) {
+            tenantMgtLister.onTenantRename(tenantId, oldName, newName);
+        }
+    }
+    
+    public static void alertTenantDeactivation(int tenantId) throws StratosException {
+
+        for (TenantMgtListener tenantMgtLister : tenantMgtListeners) {
+            tenantMgtLister.onTenantDeactivation(tenantId);
+        }
+    }
+    
+    public static void alertTenantInitialActivation(int tenantId) throws StratosException {
+
+        for (TenantMgtListener tenantMgtLister : tenantMgtListeners) {
+            tenantMgtLister.onTenantInitialActivation(tenantId);
+        }
+    }
+    
+    public static void alertTenantUpdate(TenantInfoBean tenantInfoBean) throws StratosException {
+
+        for (TenantMgtListener tenantMgtLister : tenantMgtListeners) {
+            tenantMgtLister.onTenantUpdate(tenantInfoBean);
+        }
+    }
+    
+}

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/335eb418/components/stratos/account-mgt/org.apache.stratos.account.mgt/2.1.0/src/main/resources/META-INF/component.xml
----------------------------------------------------------------------
diff --git a/components/stratos/account-mgt/org.apache.stratos.account.mgt/2.1.0/src/main/resources/META-INF/component.xml b/components/stratos/account-mgt/org.apache.stratos.account.mgt/2.1.0/src/main/resources/META-INF/component.xml
new file mode 100644
index 0000000..e399648
--- /dev/null
+++ b/components/stratos/account-mgt/org.apache.stratos.account.mgt/2.1.0/src/main/resources/META-INF/component.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~  Copyright (c) 2009, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+  ~
+  ~  Licensed 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">
+    <ManagementPermissions>
+        <ManagementPermission>
+            <DisplayName>Configure</DisplayName>
+            <ResourceId>/permission/admin/configure</ResourceId>
+        </ManagementPermission>
+        <ManagementPermission>
+            <DisplayName>Account</DisplayName>
+            <ResourceId>/permission/admin/configure/account</ResourceId>
+        </ManagementPermission>
+    </ManagementPermissions>
+</component>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/335eb418/components/stratos/account-mgt/org.apache.stratos.account.mgt/2.1.0/src/main/resources/META-INF/services.xml
----------------------------------------------------------------------
diff --git a/components/stratos/account-mgt/org.apache.stratos.account.mgt/2.1.0/src/main/resources/META-INF/services.xml b/components/stratos/account-mgt/org.apache.stratos.account.mgt/2.1.0/src/main/resources/META-INF/services.xml
new file mode 100644
index 0000000..a5deded
--- /dev/null
+++ b/components/stratos/account-mgt/org.apache.stratos.account.mgt/2.1.0/src/main/resources/META-INF/services.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ !
+ ! Copyright 2006 The Apache Software Foundation.
+ !
+ ! Licensed under the Apache License, Version 2.0 (the "License");
+ ! you may not use this file except in compliance with the License.
+ ! You may obtain a copy of the License at
+ !
+ !      http://www.apache.org/licenses/LICENSE-2.0
+ !
+ ! Unless required by applicable law or agreed to in writing, software
+ ! distributed under the License is distributed on an "AS IS" BASIS,
+ ! WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ! See the License for the specific language governing permissions and
+ ! limitations under the License.
+ !-->
+<serviceGroup>
+
+    <service name="AccountMgtService" scope="transportsession">
+        <transports>
+            <transport>https</transport>
+        </transports>
+        <parameter name="ServiceClass" locked="false">
+            org.apache.stratos.account.mgt.services.AccountMgtService
+        </parameter>
+
+        <operation name="updateContact">
+            <parameter name="AuthorizationAction" locked="true">/permission/admin/configure/account</parameter>
+        </operation>
+
+        <operation name="getContact">
+            <parameter name="AuthorizationAction" locked="true">/permission/admin/configure/account</parameter>
+        </operation>
+
+        <operation name="updateFullname">
+            <parameter name="AuthorizationAction" locked="true">/permission/admin/configure/account</parameter>
+        </operation>
+
+        <operation name="getFullname">
+            <parameter name="AuthorizationAction" locked="true">/permission/admin/configure/account</parameter>
+        </operation>
+
+        <operation name="deactivate">
+            <parameter name="AuthorizationAction" locked="true">/permission/admin/configure/account</parameter>
+        </operation>
+
+        <operation name="isDomainValidated">
+            <parameter name="AuthorizationAction" locked="true">/permission/admin/configure/account</parameter>
+        </operation>
+
+        <operation name="finishedDomainValidation">
+            <parameter name="AuthorizationAction" locked="true">/permission/admin/configure/account</parameter>
+        </operation>
+
+        <operation name="checkDomainAvailability">
+            <parameter name="AuthorizationAction" locked="true">/permission/admin/configure/account</parameter>
+        </operation>
+
+        <operation name="isEmailValidated">
+            <parameter name="AuthorizationAction" locked="true">/permission/admin/configure/account</parameter>
+        </operation>
+        <parameter name="adminService" locked="true">true</parameter>
+    </service>
+
+    <service name="EmailValidationService" scope="transportsession">
+        <transports>
+            <transport>https</transport>
+        </transports>
+        <parameter name="ServiceClass" locked="false">
+            org.apache.stratos.account.mgt.services.EmailValidationService
+        </parameter>
+
+        <operation name="proceedUpdateContact">
+        </operation>
+    </service>
+
+    <parameter name="hiddenService" locked="true">true</parameter>
+
+</serviceGroup>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/335eb418/components/stratos/account-mgt/org.wso2.carbon.account.mgt.ui/2.1.0/pom.xml
----------------------------------------------------------------------
diff --git a/components/stratos/account-mgt/org.wso2.carbon.account.mgt.ui/2.1.0/pom.xml b/components/stratos/account-mgt/org.wso2.carbon.account.mgt.ui/2.1.0/pom.xml
deleted file mode 100644
index 15619fc..0000000
--- a/components/stratos/account-mgt/org.wso2.carbon.account.mgt.ui/2.1.0/pom.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-# Copyright (c) 2008, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
-#
-# Licensed 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.wso2.carbon</groupId>
-        <artifactId>account-mgt-parent</artifactId>
-        <version>2.1.0</version>
-<relativePath>../../pom.xml</relativePath>
-    </parent>
-
-    <modelVersion>4.0.0</modelorg.apache.stratos.account.mgt.uiwso2.carbon.account.mgt.ui</artifactId>
-    <version>2.1.0</version>
-    <packaging>bundle</packaging>
-    <name>WSO2 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.wso2.carbon.account.mgt.ui.*,
-                        </Export-Package>
-                        <Import-Package>
-                            org.wso2.carbon.tenant.mgt.stub.*; version="${carbon.platform.package.import.version.range}",
-                            javax.servlet;version="${imp.pkg.version.javax.servlet}",
-                            javax.servlet.http;version="${imp.pkg.version.javax.servlet}",
-                            org.wso2.carbon.account.mgt.stub.*; version="${carbon.platform.package.import.version.range}",
-                            *;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>
-        </dependency>
-        <dependency>
-            <groupId>org.wso2.carbon</groupId>
-            <artifactId>org.wso2.carbon.account.mgt.stub</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.wso2.carbon</groupId>
-            <artifactId>org.wso2.carbon.tenant.mgt.stub</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.wso2.carbon</groupId>
-            <artifactId>org.wso2.carbon.stratos.common</artifactId>
-        </dependency>
-        <dependency>
-          <groupId>org.json.wso2</groupId>
-          <artifactId>json</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.wso2.carbon</groupId>
-            <artifactId>org.wso2.carbon.stratos.common.stub</artifactId>
-        </dependency>
-    </dependencies>
-</project>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/335eb418/components/stratos/account-mgt/org.wso2.carbon.account.mgt.ui/2.1.0/src/main/java/org/wso2/carbon/account/mgt/ui/clients/AccountMgtClient.java
----------------------------------------------------------------------
diff --git a/components/stratos/account-mgt/org.wso2.carbon.account.mgt.ui/2.1.0/src/main/java/org/wso2/carbon/account/mgt/ui/clients/AccountMgtClient.java b/components/stratos/account-mgt/org.wso2.carbon.account.mgt.ui/2.1.0/src/main/java/org/wso2/carbon/account/mgt/ui/clients/AccountMgtClient.java
deleted file mode 100644
index 7f944df..0000000
--- a/components/stratos/account-mgt/org.wso2.carbon.account.mgt.ui/2.1.0/src/main/java/org/wso2/carbon/account/mgt/ui/clients/AccountMgtClient.java
+++ /dev/null
@@ -1,176 +0,0 @@
-/*
-*  Copyright (c) 2005-2010, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
-*
-*  WSO2 Inc. 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.wso2.carbon.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.wso2.carbon.account.mgt.stub.beans.xsd.AccountInfoBean;
-import org.wso2.carbon.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/incubator-stratos/blob/335eb418/components/stratos/account-mgt/org.wso2.carbon.account.mgt.ui/2.1.0/src/main/java/org/wso2/carbon/account/mgt/ui/clients/EmailValidationClient.java
----------------------------------------------------------------------
diff --git a/components/stratos/account-mgt/org.wso2.carbon.account.mgt.ui/2.1.0/src/main/java/org/wso2/carbon/account/mgt/ui/clients/EmailValidationClient.java b/components/stratos/account-mgt/org.wso2.carbon.account.mgt.ui/2.1.0/src/main/java/org/wso2/carbon/account/mgt/ui/clients/EmailValidationClient.java
deleted file mode 100644
index 20aeb8d..0000000
--- a/components/stratos/account-mgt/org.wso2.carbon.account.mgt.ui/2.1.0/src/main/java/org/wso2/carbon/account/mgt/ui/clients/EmailValidationClient.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
-*  Copyright (c) 2005-2010, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
-*
-*  WSO2 Inc. 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.wso2.carbon.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.wso2.carbon.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);
-        }
-    }
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/335eb418/components/stratos/account-mgt/org.wso2.carbon.account.mgt.ui/2.1.0/src/main/java/org/wso2/carbon/account/mgt/ui/clients/PackageInfoServiceClient.java
----------------------------------------------------------------------
diff --git a/components/stratos/account-mgt/org.wso2.carbon.account.mgt.ui/2.1.0/src/main/java/org/wso2/carbon/account/mgt/ui/clients/PackageInfoServiceClient.java b/components/stratos/account-mgt/org.wso2.carbon.account.mgt.ui/2.1.0/src/main/java/org/wso2/carbon/account/mgt/ui/clients/PackageInfoServiceClient.java
deleted file mode 100644
index adc1576..0000000
--- a/components/stratos/account-mgt/org.wso2.carbon.account.mgt.ui/2.1.0/src/main/java/org/wso2/carbon/account/mgt/ui/clients/PackageInfoServiceClient.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*<!--
-~ Copyright (c) 2005-2010, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
-~
-~ WSO2 Inc. 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.wso2.carbon.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.wso2.carbon.stratos.common.packages.stub.PackageInfoServiceStub;
-import org.wso2.carbon.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/incubator-stratos/blob/335eb418/components/stratos/account-mgt/org.wso2.carbon.account.mgt.ui/2.1.0/src/main/java/org/wso2/carbon/account/mgt/ui/clients/UsagePlanClient.java
----------------------------------------------------------------------
diff --git a/components/stratos/account-mgt/org.wso2.carbon.account.mgt.ui/2.1.0/src/main/java/org/wso2/carbon/account/mgt/ui/clients/UsagePlanClient.java b/components/stratos/account-mgt/org.wso2.carbon.account.mgt.ui/2.1.0/src/main/java/org/wso2/carbon/account/mgt/ui/clients/UsagePlanClient.java
deleted file mode 100644
index f5970ca..0000000
--- a/components/stratos/account-mgt/org.wso2.carbon.account.mgt.ui/2.1.0/src/main/java/org/wso2/carbon/account/mgt/ui/clients/UsagePlanClient.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
-*  Copyright (c) 2005-2010, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
-*
-*  WSO2 Inc. 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.wso2.carbon.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.wso2.carbon.account.mgt.stub.services.BillingDataAccessServiceStub;
-import org.wso2.carbon.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 {
-            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/incubator-stratos/blob/335eb418/components/stratos/account-mgt/org.wso2.carbon.account.mgt.ui/2.1.0/src/main/java/org/wso2/carbon/account/mgt/ui/utils/Util.java
----------------------------------------------------------------------
diff --git a/components/stratos/account-mgt/org.wso2.carbon.account.mgt.ui/2.1.0/src/main/java/org/wso2/carbon/account/mgt/ui/utils/Util.java b/components/stratos/account-mgt/org.wso2.carbon.account.mgt.ui/2.1.0/src/main/java/org/wso2/carbon/account/mgt/ui/utils/Util.java
deleted file mode 100644
index 6c263ae..0000000
--- a/components/stratos/account-mgt/org.wso2.carbon.account.mgt.ui/2.1.0/src/main/java/org/wso2/carbon/account/mgt/ui/utils/Util.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- *  Copyright (c) 2005-2008, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
- *
- *  WSO2 Inc. 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.wso2.carbon.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.wso2.carbon.account.mgt.stub.beans.xsd.AccountInfoBean;
-import org.wso2.carbon.account.mgt.ui.clients.AccountMgtClient;
-import org.wso2.carbon.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;
-    }
-    
-}