You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by re...@apache.org on 2015/05/21 11:37:30 UTC
[1/5] stratos git commit: removing account mgt,
domain validation as it is not used
Repository: stratos
Updated Branches:
refs/heads/master a03ff6dbe -> bfc6d7586
http://git-wip-us.apache.org/repos/asf/stratos/blob/bfc6d758/components/org.apache.stratos.validate.domain.ui/src/main/resources/web/validate-domain/js/validate_domain.js
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.validate.domain.ui/src/main/resources/web/validate-domain/js/validate_domain.js b/components/org.apache.stratos.validate.domain.ui/src/main/resources/web/validate-domain/js/validate_domain.js
deleted file mode 100644
index 6d95e54..0000000
--- a/components/org.apache.stratos.validate.domain.ui/src/main/resources/web/validate-domain/js/validate_domain.js
+++ /dev/null
@@ -1,172 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
-*/
-
-function validateWithText(domain, status) {
- sessionAwareStatusAwareFunction(function() {
- if(domain == "") {
- CARBON.showWarningDialog(org_wso2_carbon_validate_domain_ui_jsi18n["domain.empty"]);
- return false;
- }
-
- var reason = checkDomain(domain);
- if (reason != "") {
- CARBON.showWarningDialog(reason);
- return false;
- }
-
- var continueDiv = document.getElementById("with-text-continue");
- var msgDiv = document.getElementById("with-text-msg");
- var keyInput = document.getElementById("with-text-success-key");
-
- var busyTextPlaceHolder = document.getElementById("busyText");
- busyTextPlaceHolder.innerHTML = "<img src=\"images/ajax-loader.gif\"/>";
-
- new Ajax.Request('../validate-domain/validate_with_text_ajaxprocessor.jsp',
- {
- method:'post',
- parameters: {domain: domain, status: status},
-
- onSuccess: function(transport) {
- busyTextPlaceHolder.innerHTML = "";
- var returnValue = transport.responseText;
- if (returnValue.search(/----false----/) >= 0) {
- msgDiv.style.color = "#f00";
- msgDiv.innerHTML = "<img src='images/wrong.gif'/> " + org_wso2_carbon_validate_domain_ui_jsi18n["validation.fail.with.text"];
- continueDiv.style.visibility = "hidden";
- } else if (returnValue.search(/----unavailable----/) >= 0) {
- msgDiv.style.color = "#f00";
- msgDiv.innerHTML = "<img src='images/wrong.gif'/> " + org_wso2_carbon_validate_domain_ui_jsi18n["domain.unavailable"];
- continueDiv.style.visibility = "hidden";
- } else if (returnValue != "") {
- msgDiv.style.color = "#058000";
- msgDiv.innerHTML = "<img src='images/right.gif'/> " + org_wso2_carbon_validate_domain_ui_jsi18n["validation.success.with.text"];
- continueDiv.style.visibility = "visible";
- keyInput.value = returnValue;
- }
- },
-
- onFailure: function(transport){
- busyTextPlaceHolder.innerHTML = "";
- }
- });
- }, status, org_wso2_carbon_validate_domain_ui_jsi18n["session.timed.out"]);
-}
-
-function validateWithDNS(domain, status) {
- sessionAwareStatusAwareFunction(function() {
- if(domain == "") {
- CARBON.showWarningDialog(org_wso2_carbon_validate_domain_ui_jsi18n["domain.empty"]);
- return false;
- }
-
- var reason = checkDomain(domain);
- if (reason != "") {
- CARBON.showWarningDialog(reason);
- return false;
- }
-
- var continueDiv = document.getElementById("with-dns-continue");
- var msgDiv = document.getElementById("with-dns-msg");
- var keyInput = document.getElementById("with-dns-success-key");
-
- var busyDNSPlaceHolder = document.getElementById("busyDNS");
- busyDNSPlaceHolder.innerHTML = "<img src=\"images/ajax-loader.gif\"/>";
-
- new Ajax.Request('../validate-domain/validate_with_dns_ajaxprocessor.jsp',
- {
- method:'post',
- parameters: {domain: domain, status: status},
-
- onSuccess: function(transport) {
- busyDNSPlaceHolder.innerHTML = "";
- var returnValue = transport.responseText;
- if (returnValue.search(/----false----/) >= 0) {
- msgDiv.style.color = "#f00";
- msgDiv.innerHTML = "<img src='images/wrong.gif'/> " + org_wso2_carbon_validate_domain_ui_jsi18n["validation.fail.with.dns"];
- continueDiv.style.visibility = "hidden";
- } else if (returnValue.search(/----unavailable----/) >= 0) {
- msgDiv.style.color = "#f00";
- msgDiv.innerHTML = "<img src='images/wrong.gif'/> " + org_wso2_carbon_validate_domain_ui_jsi18n["domain.unavailable"];
- continueDiv.style.visibility = "hidden";
- } else if (returnValue != "") {
- msgDiv.style.color = "#058000";
- msgDiv.innerHTML = "<img src='images/right.gif'/> " + org_wso2_carbon_validate_domain_ui_jsi18n["validation.success.with.dns"];
- continueDiv.style.visibility = "visible";
- keyInput.value = returnValue;
- }
- },
-
- onFailure: function(transport){
- busyDNSPlaceHolder.innerHTML = "";
- }
- });
- }, status, org_wso2_carbon_validate_domain_ui_jsi18n["session.timed.out"]);
-}
-
-
-function gotoRegister() {
- window.location.href = '../tenant-register/success_register.jsp';
-}
-
-function checkDomain(domain)
-{
- var error = "";
- var lastIndexOfDot = domain.lastIndexOf(".");
- var indexOfDot = domain.indexOf(".");
- var extension = domain.substring(lastIndexOfDot, domain.length);
-
- var illegalChars = /([^a-zA-Z0-9\._\-])/; // allow only letters and numbers . - _and period
- if (extension.indexOf("-trial") >= 0 || extension.indexOf("-unverified") >= 0) {
- // we are not allowing to create a domain with -trial or -unverified is in the extension
- error = "The domain name you entered is not valid. Please enter a valid domain name.";
- }
- else if (lastIndexOfDot <= 0) {
- // since this is domain validation, this expects a valid domain with an extension.
- error = "Invalid domain: " + domain + ". You should have an extension to your domain.";
- }
- else if (indexOfDot == 0) {
- error = "Invalid domain, starting with '.'";
- }
- else if (illegalChars.test(domain)) {
- error = "The domain only allows letters, numbers, '.', '-' and '_'. <br />";
- }
- return error;
-}
-
-function sessionAwareStatusAwareFunction(func, status, msg) {
- if (status == "logged_in") {
- sessionAwareFunction(func, msg);
- } else {
- func();
- }
-}
-
-function submitValidateWithDNSForm(status) {
- sessionAwareStatusAwareFunction(function() {
- $('validateWithDNSForm').submit();
- }, status, org_wso2_carbon_validate_domain_ui_jsi18n["session.timed.out"]);
-}
-
-function submitValidateWithTextForm(status) {
- sessionAwareStatusAwareFunction(function() {
- $('validateWithTextForm').submit();
- }, status, org_wso2_carbon_validate_domain_ui_jsi18n["session.timed.out"]);
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/bfc6d758/components/org.apache.stratos.validate.domain.ui/src/main/resources/web/validate-domain/submit_validate_domain_ajaxprocessor.jsp
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.validate.domain.ui/src/main/resources/web/validate-domain/submit_validate_domain_ajaxprocessor.jsp b/components/org.apache.stratos.validate.domain.ui/src/main/resources/web/validate-domain/submit_validate_domain_ajaxprocessor.jsp
deleted file mode 100644
index 85d5b83..0000000
--- a/components/org.apache.stratos.validate.domain.ui/src/main/resources/web/validate-domain/submit_validate_domain_ajaxprocessor.jsp
+++ /dev/null
@@ -1,37 +0,0 @@
-<%--
- ~ Licensed to the Apache Software Foundation (ASF) under one
- ~ or more contributor license agreements. See the NOTICE file
- ~ distributed with this work for additional information
- ~ regarding copyright ownership. The ASF licenses this file
- ~ to you under the Apache License, Version 2.0 (the
- ~ "License"); you may not use this file except in compliance
- ~ with the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing,
- ~ software distributed under the License is distributed on an
- ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- ~ KIND, either express or implied. See the License for the
- ~ specific language governing permissions and limitations
- ~ under the License.
- --%>
-<%@ page import="org.wso2.carbon.utils.multitenancy.MultitenantConstants" %>
-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%
-String successKey = request.getParameter("successKey");
-String domain = request.getParameter("domain");
-String status = request.getParameter("status");
-session.setAttribute("validate-domain-success-key", successKey);
-session.setAttribute("temp-domain-to-register", domain);
-
-// redirect to the add registry domain page
-if ("logged_in".equals(status)) {
- // we have already logged in so redirect to the account management page
- response.sendRedirect("../account-mgt/validation_success_ajaxprocessor.jsp");
-}
-else {
- // if not logged in we will redirect to the register org page
- response.sendRedirect("../tenant-register/success_register.jsp");
-}
-%>
http://git-wip-us.apache.org/repos/asf/stratos/blob/bfc6d758/components/org.apache.stratos.validate.domain.ui/src/main/resources/web/validate-domain/validate_domain_logged_in.jsp
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.validate.domain.ui/src/main/resources/web/validate-domain/validate_domain_logged_in.jsp b/components/org.apache.stratos.validate.domain.ui/src/main/resources/web/validate-domain/validate_domain_logged_in.jsp
deleted file mode 100644
index a9f2d41..0000000
--- a/components/org.apache.stratos.validate.domain.ui/src/main/resources/web/validate-domain/validate_domain_logged_in.jsp
+++ /dev/null
@@ -1,23 +0,0 @@
-<%--
- ~ Licensed to the Apache Software Foundation (ASF) under one
- ~ or more contributor license agreements. See the NOTICE file
- ~ distributed with this work for additional information
- ~ regarding copyright ownership. The ASF licenses this file
- ~ to you under the Apache License, Version 2.0 (the
- ~ "License"); you may not use this file except in compliance
- ~ with the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing,
- ~ software distributed under the License is distributed on an
- ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- ~ KIND, either express or implied. See the License for the
- ~ specific language governing permissions and limitations
- ~ under the License.
- --%>
-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<jsp:include page="validate_domain_template.jsp">
- <jsp:param name="status"
- value="logged_in" />
-</jsp:include>
http://git-wip-us.apache.org/repos/asf/stratos/blob/bfc6d758/components/org.apache.stratos.validate.domain.ui/src/main/resources/web/validate-domain/validate_domain_not_logged_in.jsp
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.validate.domain.ui/src/main/resources/web/validate-domain/validate_domain_not_logged_in.jsp b/components/org.apache.stratos.validate.domain.ui/src/main/resources/web/validate-domain/validate_domain_not_logged_in.jsp
deleted file mode 100644
index 55ef267..0000000
--- a/components/org.apache.stratos.validate.domain.ui/src/main/resources/web/validate-domain/validate_domain_not_logged_in.jsp
+++ /dev/null
@@ -1,23 +0,0 @@
-<%--
- ~ Licensed to the Apache Software Foundation (ASF) under one
- ~ or more contributor license agreements. See the NOTICE file
- ~ distributed with this work for additional information
- ~ regarding copyright ownership. The ASF licenses this file
- ~ to you under the Apache License, Version 2.0 (the
- ~ "License"); you may not use this file except in compliance
- ~ with the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing,
- ~ software distributed under the License is distributed on an
- ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- ~ KIND, either express or implied. See the License for the
- ~ specific language governing permissions and limitations
- ~ under the License.
- --%>
-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<jsp:include page="validate_domain_template.jsp">
- <jsp:param name="status"
- value="not_logged_in" />
-</jsp:include>
http://git-wip-us.apache.org/repos/asf/stratos/blob/bfc6d758/components/org.apache.stratos.validate.domain.ui/src/main/resources/web/validate-domain/validate_domain_template.jsp
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.validate.domain.ui/src/main/resources/web/validate-domain/validate_domain_template.jsp b/components/org.apache.stratos.validate.domain.ui/src/main/resources/web/validate-domain/validate_domain_template.jsp
deleted file mode 100644
index e6d6c03..0000000
--- a/components/org.apache.stratos.validate.domain.ui/src/main/resources/web/validate-domain/validate_domain_template.jsp
+++ /dev/null
@@ -1,203 +0,0 @@
-<%--
- ~ Licensed to the Apache Software Foundation (ASF) under one
- ~ or more contributor license agreements. See the NOTICE file
- ~ distributed with this work for additional information
- ~ regarding copyright ownership. The ASF licenses this file
- ~ to you under the Apache License, Version 2.0 (the
- ~ "License"); you may not use this file except in compliance
- ~ with the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing,
- ~ software distributed under the License is distributed on an
- ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- ~ KIND, either express or implied. See the License for the
- ~ specific language governing permissions and limitations
- ~ under the License.
- --%>
-<%@ page import="org.wso2.carbon.validate.domain.ui.clients.ValidateDomainClient"%>
-<%@ page import="org.wso2.carbon.validate.domain.ui.utils.Util"%>
-<%@ page import="org.wso2.carbon.ui.CarbonUIUtil"%>
-<%@ page import="org.wso2.carbon.utils.multitenancy.MultitenantConstants"%>
-<%@ 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="../validate-domain/css/validate_domain.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>
-<carbon:jsi18n
- resourceBundle="org.apache.stratos.validate.domain.ui.i18n.JSResources"
- request="<%=request%>" namespace="org.wso2.carbon.validate.domain.ui"/>
-
-<script type="text/javascript" src="../validate-domain/js/validate_domain.js"></script>
-
-<fmt:bundle
- basename="org.apache.stratos.validate.domain.ui.i18n.Resources">
- <%
- String domain = request.getParameter("domain");
- String status = request.getParameter("status");
- // get the validation key
- ValidateDomainClient client =
- Util.getValidateDomainClient(request, config, session);
- String domainValidationKey = client.getDomainValidationKey(domain);
- if ("unavailable".equals(domainValidationKey)) {
- %>
- <script type="text/javascript">
- jQuery(document).ready(function() {
- CARBON.showErrorDialog('The domain you are trying to validate ' +
- 'is already taken. Please retry with another domain.');
- });
- </script>
-
- <%
- }
- //String serverUrl = CarbonUIUtil.getServerURL(config.getServletContext(), session);
- String adminConsoleURL = CarbonUIUtil.getAdminConsoleURL("/");
- String serverUrl = adminConsoleURL.replace("carbon","services");
- // remove the services directory.
- String serverRoot =
- serverUrl.substring(0, serverUrl.length() - "/services/".length());
- // we have to remove the port as well.
- if (serverRoot == null) {
- serverRoot = "stratoslive.wso2.com";
- }
- // server root without https
- serverRoot = serverRoot.substring(8);
- int semiCol = serverRoot.indexOf(':');
- if (semiCol >= 0) {
- // need to remove the port
- serverRoot = serverRoot.substring(0, semiCol);
- }
-
- // we have additional statement
- String statementToIgnoreValidate = "";
- if (session.getAttribute(MultitenantConstants.TENANT_DOMAIN) == null) {
- statementToIgnoreValidate =
- "or <input type='button' onclick='gotoRegister()' value='Skip the validation step'/>";
- }
- %>
- <div id="middle">
-
- <carbon:breadcrumb label="validate"
- resourceBundle="org.apache.stratos.validate.domain.ui.i18n.Resources"
- topPage="false" request="<%=request%>" />
-
- <div id="workArea">
- <h2><fmt:message key="domain.ownership.validation" /></h2>
-
- <div id="validation-introduction">
- <p>You can validate your domain using the following method <%=statementToIgnoreValidate%></p>
- <ul>
- <li class="catagory">Creating a text file in the domain web
- ROOT</li>
-<!-- <li class="catagory">2. Setting up a CNAME entry in your DNS</li> -->
- </ul>
- </div>
-
- <div id="with-text">
-
- <table class="styledLeft">
- <thead>
- <tr>
- <th>Validate domain using a text file</th>
- </tr>
- </thead>
- <tbody>
- <tr>
- <td>
- <p>Add a text file inside the web root of your domain with the following configuration:</p>
- <div class="conf-info">
- <%
- // the filename is hard coded now, a change in this need to be reflected at validateDomainService.jsp
- %>
- <p>Filename: <strong>wso2multitenancy.txt</strong></p>
- <p>Text content: <strong><%=domainValidationKey%></strong></p>
- </div>
- <p class="validate-button"><em> Click the 'Validate'
- button, after you complete the above step </em> <input type="button"
- value="Validate" onclick="validateWithText('<%=domain%>', '<%=status%>')" /> <span
- id="busyText"></span></p>
- <p>
- <div id="with-text-msg"></div>
- </p>
- <p>
- <div id="with-text-continue" style="visibility: hidden">
- <form id="validateWithTextForm"
- onsubmit="return submitValidateWithTextForm('<%=status%>');"
- action="submit_validate_domain_ajaxprocessor.jsp" method="post">
- <input type="hidden" id="with-text-success-key" name="successKey"
- value="" /> <input type="hidden" name="domain" value="<%=domain%>" />
- <input type="hidden" id="with-text-status" name="status" value="<%=status%>"/>
- <input type="submit" value="Continue" /></form>
- </div>
- </p>
- </td>
- </tr>
- </tbody>
- </table>
- </div>
-
-
-<!-- <div id="with-dns"> -->
-
-<!-- <table class="styledLeft"> -->
-<!-- <thead> -->
-<!-- <tr> -->
-<!-- <th>Validate domain using a CName entry</th> -->
-<!-- </tr> -->
-<!-- </thead> -->
-<!-- <tbody> -->
-<!-- <tr> -->
-<!-- <td> -->
-<!-- <p>Put a CNAME entry in your DNS with following configuration: -->
-<!-- (Note that if you refresh this page, the parameters will be changed) -->
-<!-- </p> -->
-<!-- <div class="conf-info"> -->
-<%-- <p>Name: <strong><%=domainValidationKey%>.<%=domain%></strong></p> --%>
-<!-- <p>Type: <strong>CNAME</strong></p> -->
-<%-- <p>Value: <strong><%=serverRoot%></strong></p> --%>
-<!-- </div> -->
-<!-- <p class="validate-button"><em> Click the 'Validate' -->
-<!-- button, after you finish setting the CNAME entry </em> <input -->
-<!-- type="button" value="Validate" -->
-<%-- onclick="validateWithDNS('<%=domain%>', '<%=status%>')" /> <span id="busyDNS"></span> --%>
-<!-- </p> -->
-<!-- <p> -->
-<!-- <div id="with-dns-msg"></div> -->
-<!-- </p> -->
-<!-- <p> -->
-<!-- <div id="with-dns-continue" style="visibility: hidden"> -->
-<!-- <form id="validateWithDNSForm" -->
-<!-- action="submit_validate_domain_ajaxprocessor.jsp" -->
-<%-- onsubmit="return submitValidateWithDNSForm('<%=status%>');" method="post"> --%>
-<!-- <input type="hidden" id="with-dns-success-key" name="successKey" -->
-<%-- value="" /> <input type="hidden" name="domain" value="<%=domain%>" /> --%>
-<%-- <input type="hidden" id="with-dns-status" name="status" value="<%=status%>"/> --%>
-<!-- <input type="submit" value="Continue" /></form> -->
-<!-- </div> -->
-<!-- </p> -->
-<!-- </td> -->
-<!-- </tr> -->
-<!-- </tbody> -->
-<!-- </table> -->
-<!-- </div> -->
- </div>
-</fmt:bundle>
http://git-wip-us.apache.org/repos/asf/stratos/blob/bfc6d758/components/org.apache.stratos.validate.domain.ui/src/main/resources/web/validate-domain/validate_with_dns_ajaxprocessor.jsp
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.validate.domain.ui/src/main/resources/web/validate-domain/validate_with_dns_ajaxprocessor.jsp b/components/org.apache.stratos.validate.domain.ui/src/main/resources/web/validate-domain/validate_with_dns_ajaxprocessor.jsp
deleted file mode 100644
index b7d3f42..0000000
--- a/components/org.apache.stratos.validate.domain.ui/src/main/resources/web/validate-domain/validate_with_dns_ajaxprocessor.jsp
+++ /dev/null
@@ -1,40 +0,0 @@
-<%--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
---%>
-<%@ page import="org.wso2.carbon.validate.domain.ui.clients.ValidateDomainClient" %>
-<%@ page import="org.wso2.carbon.validate.domain.ui.utils.Util" %>
-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%
- String domain = request.getParameter("domain");
- String validationSuccessKey;
-
- try {
- ValidateDomainClient client = Util.getValidateDomainClient(request, config, session);
- validationSuccessKey = client.validateByDNSEntry(domain);
- } catch (Exception e) {
- validationSuccessKey = null;
- }
-
- if (validationSuccessKey == null || validationSuccessKey.equals("") ||
- validationSuccessKey.equals("false") || validationSuccessKey.equals("null")) {
- validationSuccessKey = "----false----";
- }
- else if (validationSuccessKey.equals("unavailable")) {
- validationSuccessKey = "----unavailable----";
- }
-%><%=validationSuccessKey%>
http://git-wip-us.apache.org/repos/asf/stratos/blob/bfc6d758/components/org.apache.stratos.validate.domain.ui/src/main/resources/web/validate-domain/validate_with_text_ajaxprocessor.jsp
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.validate.domain.ui/src/main/resources/web/validate-domain/validate_with_text_ajaxprocessor.jsp b/components/org.apache.stratos.validate.domain.ui/src/main/resources/web/validate-domain/validate_with_text_ajaxprocessor.jsp
deleted file mode 100644
index 249f5a0..0000000
--- a/components/org.apache.stratos.validate.domain.ui/src/main/resources/web/validate-domain/validate_with_text_ajaxprocessor.jsp
+++ /dev/null
@@ -1,40 +0,0 @@
-<%--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
---%>
-<%@ page import="org.wso2.carbon.validate.domain.ui.clients.ValidateDomainClient" %>
-<%@ page import="org.wso2.carbon.validate.domain.ui.utils.Util" %>
-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%
- String domain = request.getParameter("domain");
- String validationSuccessKey;
-
- try {
- ValidateDomainClient client = Util.getValidateDomainClient(request, config, session);
- validationSuccessKey = client.validateByTextInRoot(domain);
- } catch (Exception e) {
- validationSuccessKey = null;
- }
-
- if (validationSuccessKey == null || validationSuccessKey.equals("") ||
- validationSuccessKey.equals("false") || validationSuccessKey.equals("null")) {
- validationSuccessKey = "----false----";
- }
- else if (validationSuccessKey.equals("unavailable")) {
- validationSuccessKey = "----unavailable----";
- }
-%><%=validationSuccessKey%>
http://git-wip-us.apache.org/repos/asf/stratos/blob/bfc6d758/components/org.apache.stratos.validate.domain/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.validate.domain/pom.xml b/components/org.apache.stratos.validate.domain/pom.xml
deleted file mode 100644
index 945d564..0000000
--- a/components/org.apache.stratos.validate.domain/pom.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<!--
- # Licensed to the Apache Software Foundation (ASF) under one
- # or more contributor license agreements. See the NOTICE file
- # distributed with this work for additional information
- # regarding copyright ownership. The ASF licenses this file
- # to you under the Apache License, Version 2.0 (the
- # "License"); you may not use this file except in compliance
- # with the License. You may obtain a copy of the License at
- #
- # http://www.apache.org/licenses/LICENSE-2.0
- #
- # Unless required by applicable law or agreed to in writing,
- # software distributed under the License is distributed on an
- # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- # KIND, either express or implied. See the License for the
- # specific language governing permissions and limitations
- # under the License.
- -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <groupId>org.apache.stratos</groupId>
- <artifactId>stratos-components-parent</artifactId>
- <version>4.1.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <artifactId>org.apache.stratos.validate.domain</artifactId>
- <packaging>bundle</packaging>
- <name>Apache Stratos - Validate Domains</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>
- <Export-Package>
- org.apache.stratos.validate.domain.*,
- </Export-Package>
- <Import-Package>
- org.wso2.carbon.registry.core.*;version=1.0.1,
- !javax.xml.namespace,
- javax.xml.namespace; version=0.0.0,
- javax.servlet;version="${imp.pkg.version.javax.servlet}",
- javax.servlet.http;version="${imp.pkg.version.javax.servlet}",
- org.apache.axiom.*; version="${axiom.osgi.version.range}",
- *;resolution:=optional
- </Import-Package>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
-
- <dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.registry.core</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.stratos</groupId>
- <artifactId>org.apache.stratos.common</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
-</project>
http://git-wip-us.apache.org/repos/asf/stratos/blob/bfc6d758/components/org.apache.stratos.validate.domain/src/main/java/org/apache/stratos/validate/domain/internal/ValidateDomainServiceComponent.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.validate.domain/src/main/java/org/apache/stratos/validate/domain/internal/ValidateDomainServiceComponent.java b/components/org.apache.stratos.validate.domain/src/main/java/org/apache/stratos/validate/domain/internal/ValidateDomainServiceComponent.java
deleted file mode 100644
index 7d43629..0000000
--- a/components/org.apache.stratos.validate.domain/src/main/java/org/apache/stratos/validate/domain/internal/ValidateDomainServiceComponent.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.stratos.validate.domain.internal;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.osgi.service.component.ComponentContext;
-import org.wso2.carbon.registry.core.service.RegistryService;
-import org.apache.stratos.validate.domain.util.Util;
-import org.wso2.carbon.user.core.service.RealmService;
-import org.wso2.carbon.utils.ConfigurationContextService;
-
-/**
- * @scr.component name="org.apache.stratos.validate.domain"
- * 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"
- */
-public class ValidateDomainServiceComponent {
- private static Log log = LogFactory.getLog(ValidateDomainServiceComponent.class);
- private static ConfigurationContextService configContextService;
-
- protected void activate(ComponentContext context) {
- log.debug("******* Governance domain validation bundle is activated ******* ");
- }
-
- protected void deactivate(ComponentContext context) {
- log.debug("******* Governance domain validation 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) {
- ValidateDomainServiceComponent.configContextService = contextService;
- }
-
- protected void unsetConfigurationContextService(ConfigurationContextService contextService) {
- ValidateDomainServiceComponent.configContextService = null;
- }
-
- public static ConfigurationContextService getConfigContextService() {
- return configContextService;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/bfc6d758/components/org.apache.stratos.validate.domain/src/main/java/org/apache/stratos/validate/domain/services/ValidateDomainAdminService.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.validate.domain/src/main/java/org/apache/stratos/validate/domain/services/ValidateDomainAdminService.java b/components/org.apache.stratos.validate.domain/src/main/java/org/apache/stratos/validate/domain/services/ValidateDomainAdminService.java
deleted file mode 100644
index 2b10c24..0000000
--- a/components/org.apache.stratos.validate.domain/src/main/java/org/apache/stratos/validate/domain/services/ValidateDomainAdminService.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.stratos.validate.domain.services;
-
-import org.wso2.carbon.core.AbstractAdmin;
-import org.apache.stratos.validate.domain.util.Util;
-
-/**
- * The service allow users to validate domains before sign in.
- */
-public class ValidateDomainAdminService extends AbstractAdmin {
-
- public String getDomainValidationKey(String domain) throws Exception {
- return Util.getDomainValidationKeyWithLogin(domain);
- }
-
- public String validateByDNSEntry(String domain) throws Exception {
- return Util.validateByDNSEntry(domain);
- }
-
- public String validateByTextInRoot(String domain) throws Exception {
- return Util.validateByTextInRoot(domain);
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/bfc6d758/components/org.apache.stratos.validate.domain/src/main/java/org/apache/stratos/validate/domain/services/ValidateDomainService.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.validate.domain/src/main/java/org/apache/stratos/validate/domain/services/ValidateDomainService.java b/components/org.apache.stratos.validate.domain/src/main/java/org/apache/stratos/validate/domain/services/ValidateDomainService.java
deleted file mode 100644
index 253a397..0000000
--- a/components/org.apache.stratos.validate.domain/src/main/java/org/apache/stratos/validate/domain/services/ValidateDomainService.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.stratos.validate.domain.services;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.stratos.validate.domain.util.Util;
-
-/**
- * The service allow users to validate domains before sign in.
- */
-public class ValidateDomainService {
- private static final Log log = LogFactory.getLog(ValidateDomainService.class);
-
- /**
- * get domain validation key
- *
- * @param domain - tenant domain
- * @return domain validation key
- * @throws Exception, if getting the validation key failed.
- */
- public String getDomainValidationKey(String domain) throws Exception {
- // for the non admin case, we are not issuing validation keys if the domain already exists.
-
- // Now we register first, before coming to the domain validation.
-// if (!Util.checkDomainAvailability(domain)) {
-// String msg = "Domain " + domain + " is already taken.";
-// log.info(msg);
-// return "unavailable";
-// }
- return Util.getDomainValidationKeyWithoutLogin(domain);
- }
-
- /**
- * Validate by DNS Entry
- *
- * @param domain - tenant domain
- * @throws Exception, if validation failed.
- * @return, successkey
- */
- public String validateByDNSEntry(String domain) throws Exception {
-// if (!Util.checkDomainAvailability(domain)) {
-// String msg = "Domain " + domain + " is already taken.";
-// log.info(msg);
-// return "unavailable";
-// }
- return Util.validateByDNSEntry(domain);
- }
-
- /**
- * Validate by Text in root
- *
- * @param domain, tenant domain
- * @throws Exception, if validation failed.
- * @return, successkey
- */
- public String validateByTextInRoot(String domain) throws Exception {
- if (!Util.checkDomainAvailability(domain)) {
- String msg = "Domain " + domain + " is already taken.";
- log.info(msg);
- return "unavailable";
- }
- return Util.validateByTextInRoot(domain);
- }
-}
-
-
http://git-wip-us.apache.org/repos/asf/stratos/blob/bfc6d758/components/org.apache.stratos.validate.domain/src/main/java/org/apache/stratos/validate/domain/util/Util.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.validate.domain/src/main/java/org/apache/stratos/validate/domain/util/Util.java b/components/org.apache.stratos.validate.domain/src/main/java/org/apache/stratos/validate/domain/util/Util.java
deleted file mode 100644
index 601fe9c..0000000
--- a/components/org.apache.stratos.validate.domain/src/main/java/org/apache/stratos/validate/domain/util/Util.java
+++ /dev/null
@@ -1,320 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.stratos.validate.domain.util;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.wso2.carbon.registry.core.RegistryConstants;
-import org.wso2.carbon.registry.core.Resource;
-import org.wso2.carbon.registry.core.ResourceImpl;
-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.registry.core.utils.RegistryUtils;
-import org.wso2.carbon.registry.core.utils.UUIDGenerator;
-import org.wso2.carbon.user.core.service.RealmService;
-import org.wso2.carbon.user.core.tenant.TenantManager;
-import org.wso2.carbon.utils.CarbonUtils;
-import org.wso2.carbon.utils.multitenancy.MultitenantConstants;
-import org.apache.stratos.validate.domain.internal.ValidateDomainServiceComponent;
-import org.apache.stratos.common.constants.StratosConstants;
-import org.apache.stratos.common.util.CommonUtil;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLConnection;
-
-/**
- * Util methods for domain validationn
- */
-public class Util {
-
- private static final Log log = LogFactory.getLog(Util.class);
-
- private static RegistryService registryService;
- private static RealmService realmService;
-
- public static synchronized void setRegistryService(RegistryService service) {
- if (registryService == null) {
- registryService = service;
- }
- }
-
- public static RegistryService getRegistryService() {
- return registryService;
- }
-
- 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);
- }
-
- /**
- * validate the content
- *
- * @param sourceURL - url of the source
- * @param content - String content
- * @throws RegistryException, if validation failed.
- * @return, true if validated.
- */
- public static boolean validateContent(String sourceURL, String content)
- throws RegistryException {
- URL url;
- try {
- if (sourceURL != null && sourceURL.toLowerCase().startsWith("file:")) {
- String msg = "The source URL must not be file in the server's local file system";
- throw new RegistryException(msg);
- }
- url = new URL(sourceURL);
- } catch (MalformedURLException e) {
- String msg = "Given source URL " + sourceURL + "is not valid.";
- throw new RegistryException(msg, e);
- }
-
- try {
- URLConnection uc = url.openConnection();
- InputStream in = uc.getInputStream();
- byte[] inByteArr = RegistryUtils.getByteArray(in);
- String onlineContent = new String(inByteArr);
- return onlineContent.startsWith(content);
-
- } catch (IOException e) {
-
- String msg = "Could not read from the given URL: " + sourceURL;
- throw new RegistryException(msg, e);
- }
- }
-
- /**
- * Checks whether the domain is available to register.
- *
- * @param domainName domain name
- * @throws RegistryException, if failed.
- * @return, true if avaiable to register.
- */
- public static boolean checkDomainAvailability(String domainName) throws RegistryException {
- TenantManager tenantManager = Util.getTenantManager();
- int tenantId;
-
- try {
- tenantId = tenantManager.getTenantId(domainName);
- } catch (org.wso2.carbon.user.api.UserStoreException e) {
- String msg = "Error in checking the domain availability.";
- log.error(msg);
- // we are instead send the tenant id.
- tenantId = -1;
- }
- return tenantId < 0;
- }
-
- /**
- * Check whether the domain name entered is valid
- *
- * @param domain tenant domain
- * @return true, if valid.
- */
- public static boolean checkDomainValidity(String domain) {
- // domains with '/' will be seen as possible characters, but they need to be avoided..
- return !(domain.contains("/") || domain.contains("\\"));
- }
-
-
- /**
- * Get Domain Validation Key without Login.
- * If the user is generating the validation key without login, we will be serving them a
- * different keys for each refreshes of the page.
- *
- * @param domain - tenant domain
- * @return generated domain validation key.
- * @throws RegistryException, if failed in generating the domain validation key.
- */
- public static String getDomainValidationKeyWithoutLogin(String domain)
- throws RegistryException {
- return generateDomainValidateKey(domain);
- }
-
- /**
- * Get the domain validation key with login
- * If the user is generating the validation key with login, we will be serving them the same key
- *
- * @param domain - tenant domain.
- * @return generated domain validation key.
- * @throws RegistryException, if failed in generating the domain validation key.
- */
- public static String getDomainValidationKeyWithLogin(String domain) throws RegistryException {
- // get the super tenant system registry
- UserRegistry governanceSystemRegistry =
- Util.getGovernanceSystemRegistry(MultitenantConstants.SUPER_TENANT_ID);
- String domainValidatorInfoPath = StratosConstants.DOMAIN_VALIDATOR_INFO_PATH +
- RegistryConstants.PATH_SEPARATOR +
- domain + RegistryConstants.PATH_SEPARATOR +
- StratosConstants.VALIDATION_KEY_RESOURCE_NAME;
- if (governanceSystemRegistry.resourceExists(domainValidatorInfoPath)) {
- Resource resource = governanceSystemRegistry.get(domainValidatorInfoPath);
- Object contentObj = resource.getContent();
- if (contentObj instanceof String) {
- return (String) contentObj;
- } else if (contentObj instanceof byte[]) {
- return new String((byte[]) contentObj);
- }
- }
-
- // otherwise we will generate the key
- return generateDomainValidateKey(domain);
- }
-
- private static String generateDomainValidateKey(String domain) throws RegistryException {
- // get the super tenant system registry
- UserRegistry governanceSystemRegistry =
- Util.getGovernanceSystemRegistry(MultitenantConstants.SUPER_TENANT_ID);
- String domainValidatorInfoPath = StratosConstants.DOMAIN_VALIDATOR_INFO_PATH +
- RegistryConstants.PATH_SEPARATOR + domain +
- RegistryConstants.PATH_SEPARATOR +
- StratosConstants.VALIDATION_KEY_RESOURCE_NAME;
-
- // we have to reset the domain validation key everytime
- String domainValidationKey = UUIDGenerator.generateUUID();
- Resource resource = governanceSystemRegistry.newResource();
- resource.setContent(domainValidationKey);
- ((ResourceImpl) resource).setVersionableChange(false);
- governanceSystemRegistry.put(domainValidatorInfoPath, resource);
- CommonUtil.setAnonAuthorization(RegistryConstants.GOVERNANCE_REGISTRY_BASE_PATH +
- domainValidatorInfoPath,
- governanceSystemRegistry.getUserRealm());
-
- return domainValidationKey;
- }
-
- /**
- * validate by DNS Entry.
- *
- * @param domain - tenant domain
- * @return successkey.
- * @throws RegistryException, if validation failed.
- */
- public static String validateByDNSEntry(String domain) throws RegistryException {
- if (!Util.checkDomainValidity(domain)) {
- return "false";
- }
- // get the super tenant system registry
- UserRegistry governanceSystemRegistry =
- Util.getGovernanceSystemRegistry(MultitenantConstants.SUPER_TENANT_ID);
- String domainValidatorInfoPath = StratosConstants.DOMAIN_VALIDATOR_INFO_PATH +
- RegistryConstants.PATH_SEPARATOR +
- domain + RegistryConstants.PATH_SEPARATOR +
- StratosConstants.VALIDATION_KEY_RESOURCE_NAME;
-
- String domainValidationKey = "";
- if (!governanceSystemRegistry.resourceExists(domainValidatorInfoPath)) {
- return "false";
- }
- Resource resource = governanceSystemRegistry.get(domainValidatorInfoPath);
- Object content = resource.getContent();
- if (content instanceof String) {
- domainValidationKey = (String) content;
- } else if (content instanceof byte[]) {
- domainValidationKey = new String((byte[]) content);
- }
-
- int httpPort = CarbonUtils.getTransportPort(ValidateDomainServiceComponent.getConfigContextService(), "http");
- int httpProxyPort =
- CarbonUtils.getTransportProxyPort(ValidateDomainServiceComponent.getConfigContextService().getServerConfigContext(),
- "http");
-
-
- // check whether this is running on a different port
- int portValue = httpProxyPort != -1 ? httpProxyPort : httpPort;
-
- // we are forming the resource http url to access the domainValidationKey
- String domainValidatorInfoAbsolutePath = RegistryUtils.getAbsolutePath(governanceSystemRegistry.getRegistryContext(),
- RegistryConstants.GOVERNANCE_REGISTRY_BASE_PATH +
- domainValidatorInfoPath);
-
- String sourceUrl = "http://" + domainValidationKey + "." + domain + ":"+ portValue +
- RegistryConstants.PATH_SEPARATOR + "registry" +
- RegistryConstants.PATH_SEPARATOR + "resource" + domainValidatorInfoAbsolutePath;
- if (Util.validateContent(sourceUrl, domainValidationKey)) {
- // the validation success, so we will create the success key
- // (this is a temporary key that we keep the session
- String successKey = UUIDGenerator.generateUUID();
- resource.setProperty("successKey", successKey);
- ((ResourceImpl) resource).setVersionableChange(false);
- governanceSystemRegistry.put(domainValidatorInfoPath, resource);
- return successKey;
- }
- return "false";
- }
-
- /**
- * Validate by text in root
- *
- * @param domain - tenant domain
- * @return successkey
- * @throws RegistryException, if validation failed.
- */
- public static String validateByTextInRoot(String domain) throws RegistryException {
- if (!Util.checkDomainValidity(domain)) {
- return "false";
- }
-
- UserRegistry governanceSystemRegistry =
- Util.getGovernanceSystemRegistry(MultitenantConstants.SUPER_TENANT_ID);
- String domainValidatorInfoPath = StratosConstants.DOMAIN_VALIDATOR_INFO_PATH +
- RegistryConstants.PATH_SEPARATOR +
- domain + RegistryConstants.PATH_SEPARATOR +
- StratosConstants.VALIDATION_KEY_RESOURCE_NAME;
- String domainValidationKey = "";
- if (!governanceSystemRegistry.resourceExists(domainValidatorInfoPath)) {
- return "false";
- }
- Resource resource = governanceSystemRegistry.get(domainValidatorInfoPath);
- Object content = resource.getContent();
- if (content instanceof String) {
- domainValidationKey = (String) content;
- } else if (content instanceof byte[]) {
- domainValidationKey = new String((byte[]) content);
- }
-
-
- // the filename is hard coded now, a change in this need to be reflected at
- // validate_domain.jsp
- String sourceUrl = "http://" + domain + "/wso2multitenancy.txt";
- if (Util.validateContent(sourceUrl, domainValidationKey)) {
- // the validation success, so we will create the success key
- // this is a temporary key that we keep the session
- String successKey = UUIDGenerator.generateUUID();
- resource.setProperty("successKey", successKey);
- ((ResourceImpl) resource).setVersionableChange(false);
- governanceSystemRegistry.put(domainValidatorInfoPath, resource);
- return successKey;
- }
- return "false";
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/bfc6d758/components/org.apache.stratos.validate.domain/src/main/resources/META-INF/services.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.validate.domain/src/main/resources/META-INF/services.xml b/components/org.apache.stratos.validate.domain/src/main/resources/META-INF/services.xml
deleted file mode 100644
index a6bc24c..0000000
--- a/components/org.apache.stratos.validate.domain/src/main/resources/META-INF/services.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- # Licensed to the Apache Software Foundation (ASF) under one
- # or more contributor license agreements. See the NOTICE file
- # distributed with this work for additional information
- # regarding copyright ownership. The ASF licenses this file
- # to you under the Apache License, Version 2.0 (the
- # "License"); you may not use this file except in compliance
- # with the License. You may obtain a copy of the License at
- #
- # http://www.apache.org/licenses/LICENSE-2.0
- #
- # Unless required by applicable law or agreed to in writing,
- # software distributed under the License is distributed on an
- # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- # KIND, either express or implied. See the License for the
- # specific language governing permissions and limitations
- # under the License.
- -->
-<serviceGroup>
-
- <service name="ValidateDomainService" scope="transportsession">
- <transports>
- <transport>https</transport>
- </transports>
- <parameter name="ServiceClass" locked="false">
- org.apache.stratos.validate.domain.services.ValidateDomainService
- </parameter>
- </service>
- <service name="ValidateDomainAdminService" scope="transportsession">
- <transports>
- <transport>https</transport>
- </transports>
- <parameter name="ServiceClass" locked="false">
- org.apache.stratos.validate.domain.services.ValidateDomainAdminService
- </parameter>
- <parameter name="adminService" locked="true">true</parameter>
- <parameter name="AuthorizationAction" locked="true">/permission/admin/configure/account</parameter>
- </service>
- <parameter name="hiddenService" locked="true">true</parameter>
-</serviceGroup>
http://git-wip-us.apache.org/repos/asf/stratos/blob/bfc6d758/components/pom.xml
----------------------------------------------------------------------
diff --git a/components/pom.xml b/components/pom.xml
index 03a14f4..7bbe37d 100644
--- a/components/pom.xml
+++ b/components/pom.xml
@@ -60,14 +60,9 @@
<module>org.apache.stratos.load.balancer.extension.api</module>
<!-- Tenant Activity -->
<module>org.apache.stratos.tenant.activity</module>
- <module>org.apache.stratos.tenant.activity.ui</module>
<!-- Account Mgt -->
- <module>org.apache.stratos.account.mgt</module>
- <module>org.apache.stratos.account.mgt.ui</module>
<module>org.apache.stratos.email.sender</module>
<!-- Domain Validation -->
- <module>org.apache.stratos.validate.domain</module>
- <module>org.apache.stratos.validate.domain.ui</module>
<!-- Redirector -->
<module>org.apache.stratos.sso.redirector.ui</module>
<module>org.apache.stratos.keystore.mgt</module>
http://git-wip-us.apache.org/repos/asf/stratos/blob/bfc6d758/features/manager/tenant-activity/org.apache.stratos.tenant.activity.ui.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/tenant-activity/org.apache.stratos.tenant.activity.ui.feature/pom.xml b/features/manager/tenant-activity/org.apache.stratos.tenant.activity.ui.feature/pom.xml
deleted file mode 100644
index c4271ab..0000000
--- a/features/manager/tenant-activity/org.apache.stratos.tenant.activity.ui.feature/pom.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- # Licensed to the Apache Software Foundation (ASF) under one
- # or more contributor license agreements. See the NOTICE file
- # distributed with this work for additional information
- # regarding copyright ownership. The ASF licenses this file
- # to you under the Apache License, Version 2.0 (the
- # "License"); you may not use this file except in compliance
- # with the License. You may obtain a copy of the License at
- #
- # http://www.apache.org/licenses/LICENSE-2.0
- #
- # Unless required by applicable law or agreed to in writing,
- # software distributed under the License is distributed on an
- # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- # KIND, either express or implied. See the License for the
- # specific language governing permissions and limitations
- # under the License.
- -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
- <parent>
- <groupId>org.apache.stratos</groupId>
- <artifactId>tenant-activity-feature</artifactId>
- <version>4.1.0-SNAPSHOT</version>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <artifactId>org.apache.stratos.tenant.activity.ui.feature</artifactId>
- <packaging>pom</packaging>
- <name>Apache Stratos - Tenant Activity UI Feature</name>
- <url>http://apache.org</url>
- <description>This feature contains the bundles required for Tenant Activity front-end functionality
- </description>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.stratos</groupId>
- <artifactId>org.apache.stratos.tenant.activity.stub</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.stratos</groupId>
- <artifactId>org.apache.stratos.tenant.activity.ui</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.stratos</groupId>
- <artifactId>org.apache.stratos.tenant.activity</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
-
- <plugin>
- <groupId>org.wso2.maven</groupId>
- <artifactId>carbon-p2-plugin</artifactId>
- <version>${carbon.p2.plugin.version}</version>
- <executions>
- <execution>
- <id>4-p2-feature-generation</id>
- <phase>package</phase>
- <goals>
- <goal>p2-feature-gen</goal>
- </goals>
- <configuration>
- <id>org.apache.stratos.tenant.activity.ui</id>
- <propertiesFile>../../../etc/feature.properties</propertiesFile>
- <adviceFile>
- <properties>
- <propertyDef>org.wso2.carbon.p2.category.type:console
- </propertyDef>
- <propertyDef>org.eclipse.equinox.p2.type.group:false
- </propertyDef>
- </properties>
- </adviceFile>
- <bundles>
- <bundleDef>org.apache.stratos:org.apache.stratos.tenant.activity.stub</bundleDef>
- <bundleDef>org.apache.stratos:org.apache.stratos.tenant.activity.ui</bundleDef>
- <bundleDef>org.apache.stratos:org.apache.stratos.tenant.activity</bundleDef>
- </bundles>
- <importBundles>
- <!--<importBundleDef>org.wso2.carbon:org.wso2.carbon.identity.core</importBundleDef>-->
- </importBundles>
- <importFeatures>
- </importFeatures>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
-</project>
http://git-wip-us.apache.org/repos/asf/stratos/blob/bfc6d758/features/manager/tenant-activity/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/tenant-activity/pom.xml b/features/manager/tenant-activity/pom.xml
index 9764ea0..5679041 100644
--- a/features/manager/tenant-activity/pom.xml
+++ b/features/manager/tenant-activity/pom.xml
@@ -29,7 +29,6 @@
<name>Apache Stratos - Tenant activity Feature Aggregator Module</name>
<url>http://apache.org</url>
<modules>
- <module>org.apache.stratos.tenant.activity.ui.feature</module>
<module>org.apache.stratos.tenant.activity.server.feature</module>
</modules>
</project>
[2/5] stratos git commit: removing account mgt,
domain validation as it is not used
Posted by re...@apache.org.
http://git-wip-us.apache.org/repos/asf/stratos/blob/bfc6d758/components/org.apache.stratos.tenant.activity.ui/src/main/resources/web/tenant-activity/find-tenant.jsp
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.tenant.activity.ui/src/main/resources/web/tenant-activity/find-tenant.jsp b/components/org.apache.stratos.tenant.activity.ui/src/main/resources/web/tenant-activity/find-tenant.jsp
deleted file mode 100644
index dcf8d7f..0000000
--- a/components/org.apache.stratos.tenant.activity.ui/src/main/resources/web/tenant-activity/find-tenant.jsp
+++ /dev/null
@@ -1,111 +0,0 @@
-<%--
- ~ Licensed to the Apache Software Foundation (ASF) under one
- ~ or more contributor license agreements. See the NOTICE file
- ~ distributed with this work for additional information
- ~ regarding copyright ownership. The ASF licenses this file
- ~ to you under the Apache License, Version 2.0 (the
- ~ "License"); you may not use this file except in compliance
- ~ with the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing,
- ~ software distributed under the License is distributed on an
- ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- ~ KIND, either express or implied. See the License for the
- ~ specific language governing permissions and limitations
- ~ under the License.
- --%>
-<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
-<%@ taglib prefix="carbon" uri="http://wso2.org/projects/carbon/taglibs/carbontags.jar" %>
-<%@ page import="org.apache.stratos.tenant.activity.ui.utils.TenantMonitorUtil" %>
-<%@ page import="org.apache.stratos.common.config.CloudServiceConfig" %>
-<%@ page import="java.util.Map" %>
-<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="js/tenant_config.js"></script>
-
-<carbon:jsi18n
- resourceBundle="org.apache.stratos.tenant.activity.ui.i18n.JSResources"
- request="<%=request%>"/>
-
-<fmt:bundle basename="org.apache.stratos.tenant.activity.ui.i18n.Resources">
- <carbon:breadcrumb
- label="govern.view_tenants.menu"
- resourceBundle="org.apache.stratos.tenant.activity.ui.i18n.Resources"
- topPage="true"
- request="<%=request%>"/>
- <%
- String domainNameStr = request.getParameter("domain");
- %>
- <div id="middle">
- <h2><fmt:message key="tenant.state.on.services.for.tenant"/> "<%=domainNameStr%>"</h2>
-
- <div id="workArea">
- <table id="activeStateTable" cellpadding="0" cellspacing="0" border="0" style="width:100%"
- class="styledLeft">
- <thead>
- <tr>
- <th style="padding-left:5px;text-align:left;width:40%"><fmt:message key="service.name"/></th>
- <th style="padding-left:5px;text-align:left;"><fmt:message key="tenant.status"/></th>
- </tr>
- </thead>
- </table>
- </div>
- </div>
-</fmt:bundle>
-<%
- String domainName = request.getParameter("domain");
- Map<String, CloudServiceConfig> cloudServicesConfigs = TenantMonitorUtil.getCloudServiceConfigMap();
-%>
-
-<script type="text/javascript">
-
- function getStats() {
- var serviceArray = new Array();
- <%
- for(String serviceName : cloudServicesConfigs.keySet()){
- %>
- var serviceObj = new Object();
- serviceObj.backEndUrl = '<%=cloudServicesConfigs.get(serviceName).getLink()%>';
- serviceObj.serviceName = '<%=serviceName%>';
- serviceObj.domainName = '<%=domainName%>';
- serviceArray.push(serviceObj);
- <% }
- %>
-
- for (var i = 0; i < serviceArray.length; i++) {
-
- jQuery.ajax({
- type: 'GET',
- url: 'find-tenant-ajaxprocessor.jsp',
- data: 'backEndUrl=' + serviceArray[i].backEndUrl + '&serviceName=' + serviceArray[i].serviceName + '&domainName=' + serviceArray[i].domainName,
- dataType: 'json',
- async: true,
- success: function(msg) {
- var resp = msg;
- var active = 'Active';
- var inactive = 'Inactive';
- if (resp.isActive === true) {
- document.getElementById('activeStateTable').innerHTML += '<tr><td>' + resp.service + '</td><td>' + active + '</td></tr>';
- }
- else {
- document.getElementById('activeStateTable').innerHTML += '<tr><td>' + resp.service + '</td><td>' + inactive + '</td></tr>';
- }
- },
- error:function () {
- CARBON.showErrorDialog('Could not connect to server');
- //document.getElementById('serviceStatTable').innerHTML += '<tr><td>' + eresp.servic + '</td><td>' + resp.count + '</td></tr>';
- document.getElementById('activeStateTable').innerHTML += 'Not Available';
- }
- });
- }
- }
-</script>
-
-<body onload="getStats();">
-<div>
-</div>
-</body>
http://git-wip-us.apache.org/repos/asf/stratos/blob/bfc6d758/components/org.apache.stratos.tenant.activity.ui/src/main/resources/web/tenant-activity/get-data-ajaxprocessor.jsp
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.tenant.activity.ui/src/main/resources/web/tenant-activity/get-data-ajaxprocessor.jsp b/components/org.apache.stratos.tenant.activity.ui/src/main/resources/web/tenant-activity/get-data-ajaxprocessor.jsp
deleted file mode 100644
index 7ac0263..0000000
--- a/components/org.apache.stratos.tenant.activity.ui/src/main/resources/web/tenant-activity/get-data-ajaxprocessor.jsp
+++ /dev/null
@@ -1,67 +0,0 @@
-<%--
- ~ Licensed to the Apache Software Foundation (ASF) under one
- ~ or more contributor license agreements. See the NOTICE file
- ~ distributed with this work for additional information
- ~ regarding copyright ownership. The ASF licenses this file
- ~ to you under the Apache License, Version 2.0 (the
- ~ "License"); you may not use this file except in compliance
- ~ with the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing,
- ~ software distributed under the License is distributed on an
- ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- ~ KIND, either express or implied. See the License for the
- ~ specific language governing permissions and limitations
- ~ under the License.
- --%>
-<%@page contentType="text/html" pageEncoding="UTF-8" %>
-<%@ page import="org.json.JSONObject" %>
-<%@ page import="org.apache.stratos.billing.mgt.stub.beans.xsd.Invoice" %>
-<%@ page import="org.apache.stratos.billing.mgt.stub.beans.xsd.Payment" %>
-<%@ page import="org.wso2.carbon.billing.mgt.ui.utils.BillingUtil" %>
-<%@ page import="java.util.Date" %>
-<%@ page import="org.apache.stratos.tenant.activity.ui.clients.TenantActivityServiceClient" %>
-<%@ page import="java.io.Console" %>
-<%@ page import="javax.rmi.CORBA.Util" %>
-<%@ page import="org.apache.stratos.tenant.activity.ui.utils.TenantMonitorUtil" %>
-<%@ page import="org.apache.stratos.tenant.activity.stub.beans.xsd.PaginatedTenantDataBean" %>
-
-<%
- String serverUrl = request.getParameter("backEndUrl");
- String serviceName = request.getParameter("serviceName");
-
-
- int count = 0;
- if (serverUrl == null || "null".equals(serverUrl.trim())) {
- try {
- TenantActivityServiceClient client = new TenantActivityServiceClient(config, session);
- // TenantMonitorUtil.tenantDataList.put(serviceName, client.getAllActiveTenantList());
- count=client.getActiveTenantCount();
- } catch (Exception e) {
- }
-
- } else {
- try {
- TenantActivityServiceClient client = new TenantActivityServiceClient(serverUrl, config, session);
- // count = client.getAllActiveTenantList().length;
- count=client.getActiveTenantCount();
- if (count > 0) {
- // TenantMonitorUtil.tenantDataList.put(serviceName, client.getAllActiveTenantList());
- } else {
- TenantMonitorUtil.tenantDataList.put(serviceName, null);
- }
- } catch (Exception e) {
- }
- }
-
- try {
- JSONObject obj = new JSONObject();
- obj.put("count", count);
- obj.put("service", serviceName);
- out.write(obj.toString());
- } catch (Exception e) {
- e.printStackTrace();
- }
-%>
http://git-wip-us.apache.org/repos/asf/stratos/blob/bfc6d758/components/org.apache.stratos.tenant.activity.ui/src/main/resources/web/tenant-activity/images/instance-usage-report.gif
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.tenant.activity.ui/src/main/resources/web/tenant-activity/images/instance-usage-report.gif b/components/org.apache.stratos.tenant.activity.ui/src/main/resources/web/tenant-activity/images/instance-usage-report.gif
deleted file mode 100644
index 4a1ae6a..0000000
Binary files a/components/org.apache.stratos.tenant.activity.ui/src/main/resources/web/tenant-activity/images/instance-usage-report.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/bfc6d758/components/org.apache.stratos.tenant.activity.ui/src/main/resources/web/tenant-activity/images/search.gif
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.tenant.activity.ui/src/main/resources/web/tenant-activity/images/search.gif b/components/org.apache.stratos.tenant.activity.ui/src/main/resources/web/tenant-activity/images/search.gif
deleted file mode 100644
index cfe76b5..0000000
Binary files a/components/org.apache.stratos.tenant.activity.ui/src/main/resources/web/tenant-activity/images/search.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/bfc6d758/components/org.apache.stratos.tenant.activity.ui/src/main/resources/web/tenant-activity/images/tenant-usage-report.gif
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.tenant.activity.ui/src/main/resources/web/tenant-activity/images/tenant-usage-report.gif b/components/org.apache.stratos.tenant.activity.ui/src/main/resources/web/tenant-activity/images/tenant-usage-report.gif
deleted file mode 100644
index a9b04e2..0000000
Binary files a/components/org.apache.stratos.tenant.activity.ui/src/main/resources/web/tenant-activity/images/tenant-usage-report.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/bfc6d758/components/org.apache.stratos.tenant.activity.ui/src/main/resources/web/tenant-activity/images/user-usage-report.gif
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.tenant.activity.ui/src/main/resources/web/tenant-activity/images/user-usage-report.gif b/components/org.apache.stratos.tenant.activity.ui/src/main/resources/web/tenant-activity/images/user-usage-report.gif
deleted file mode 100644
index 9070c35..0000000
Binary files a/components/org.apache.stratos.tenant.activity.ui/src/main/resources/web/tenant-activity/images/user-usage-report.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/bfc6d758/components/org.apache.stratos.tenant.activity.ui/src/main/resources/web/tenant-activity/show-active-tenants.jsp
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.tenant.activity.ui/src/main/resources/web/tenant-activity/show-active-tenants.jsp b/components/org.apache.stratos.tenant.activity.ui/src/main/resources/web/tenant-activity/show-active-tenants.jsp
deleted file mode 100644
index c4259b7..0000000
--- a/components/org.apache.stratos.tenant.activity.ui/src/main/resources/web/tenant-activity/show-active-tenants.jsp
+++ /dev/null
@@ -1,130 +0,0 @@
-<%--
- ~ Licensed to the Apache Software Foundation (ASF) under one
- ~ or more contributor license agreements. See the NOTICE file
- ~ distributed with this work for additional information
- ~ regarding copyright ownership. The ASF licenses this file
- ~ to you under the Apache License, Version 2.0 (the
- ~ "License"); you may not use this file except in compliance
- ~ with the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing,
- ~ software distributed under the License is distributed on an
- ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- ~ KIND, either express or implied. See the License for the
- ~ specific language governing permissions and limitations
- ~ under the License.
- --%>
-<%@ page import="java.util.List" %>
-<%@ page import="org.apache.stratos.tenant.activity.ui.clients.TenantActivityServiceClient" %>
-<%@ page import="org.apache.stratos.tenant.activity.ui.utils.TenantMonitorUtil" %>
-<%@ page import="java.util.Map" %>
-<%@ page import="org.wso2.carbon.tenant.reg.agent.client.util.Util" %>
-<%@ page import="org.apache.stratos.common.config.CloudServiceConfig" %>
-<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
-<%@ taglib uri="http://wso2.org/projects/carbon/taglibs/carbontags.jar" prefix="carbon" %>
-<%@ page import="org.apache.axis2.context.ConfigurationContext" %>
-<%@ page import="org.wso2.carbon.CarbonConstants" %>
-<%@ page import="org.wso2.carbon.registry.common.ui.UIException" %>
-<%@ page import="org.wso2.carbon.ui.CarbonUIMessage" %>
-<%@ page import="org.wso2.carbon.ui.CarbonUIUtil" %>
-<%@ page import="org.wso2.carbon.utils.ServerConstants" %>
-<%@ page import="java.text.SimpleDateFormat" %>
-<%@ page import="java.util.Calendar" %>
-<%@ page import="java.util.Date" %>
-<%@ page import="org.apache.stratos.tenant.activity.stub.TenantActivityServiceStub" %>
-<%@ page import="org.apache.stratos.tenant.activity.stub.beans.xsd.TenantDataBean" %>
-<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
-<%@ taglib uri="http://wso2.org/projects/carbon/taglibs/carbontags.jar" prefix="carbon" %>
-<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="js/tenant_config.js"></script>
-
-<carbon:jsi18n
- resourceBundle="org.apache.stratos.tenant.activity.ui.i18n.JSResources"
- request="<%=request%>"/>
-
-<fmt:bundle basename="org.apache.stratos.tenant.activity.ui.i18n.Resources">
- <carbon:breadcrumb
- label="govern.view_tenants.menu"
- resourceBundle="org.apache.stratos.tenant.activity.ui.i18n.Resources"
- topPage="true"
- request="<%=request%>"/>
- <%
- String serviceNameStr = request.getParameter("serviceName");
- %>
-
- <div id="middle">
- <h2><fmt:message key="active.tenants.on"/> <%=serviceNameStr%>
- </h2>
-
- <div id="workArea">
- <table id="serviceStatTable1" cellpadding="0" cellspacing="0" border="0" style="width:100%"
- class="styledLeft">
- <thead>
- <tr>
- <th style="padding-left:5px;text-align:left;width:30%"><fmt:message key="tenant.domain"/></th>
- <th style="padding-left:5px;text-align:left;"><fmt:message
- key="active.status"/></th>
- </tr>
- </thead>
- <tbody>
- <%
- String pageNumberStr = request.getParameter("pageNumber");
- if (pageNumberStr == null) {
- pageNumberStr = "0";
-
- }
- int pageNumber = 1;
- try {
- pageNumber = Integer.parseInt(pageNumberStr);
- } catch (NumberFormatException ignored) {
- // page number format exception
- }
- int numberOfPages = 1;
- try {
- String backEndUrl = TenantMonitorUtil.getCloudServiceConfigMap().get(request.getParameter("serviceName")).getLink();
- TenantActivityServiceClient client;
- if (backEndUrl == null || "null".equals(backEndUrl.trim())) {
- client = new TenantActivityServiceClient(config, session);
- } else {
- client = new TenantActivityServiceClient(backEndUrl, config, session);
- }
- for (TenantDataBean bean : client.getPaginatedActiveTenantList(pageNumber).getTenantInfoBeans()) {
- %>
- <tr>
- <td><%=bean.getDomain()%>
- </td>
- <td>Active</td>
- </tr>
- <%
- }
- } catch (Exception e) {
- %>
- <tr>
- <td>No Data Available for this Service</td>
- </tr>
- <% }
- String reDirectPage = "show-active-tenants.jsp?serviceName=" + serviceNameStr + "&";
- %>
- <carbon:paginator pageNumber="<%=pageNumber%>" numberOfPages="<%=numberOfPages%>"
- page="<%=reDirectPage%>" pageNumberParameterName="pageNumber"/>
- </tbody>
- </table>
- <input type='hidden' name='serviceName' id="serviceName"/>
- </div>
- </div>
-</fmt:bundle>
-
-<script type="text/javascript">
-
- function getStats() {
- console.log("In the getStat() function");
-
- }
- function showTenants(serviceNameKey) {
- }
-</script>
http://git-wip-us.apache.org/repos/asf/stratos/blob/bfc6d758/components/org.apache.stratos.tenant.activity.ui/src/main/resources/web/tenant-activity/tenant-activity.jsp
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.tenant.activity.ui/src/main/resources/web/tenant-activity/tenant-activity.jsp b/components/org.apache.stratos.tenant.activity.ui/src/main/resources/web/tenant-activity/tenant-activity.jsp
deleted file mode 100644
index 014c923..0000000
--- a/components/org.apache.stratos.tenant.activity.ui/src/main/resources/web/tenant-activity/tenant-activity.jsp
+++ /dev/null
@@ -1,175 +0,0 @@
-<%--
- ~ Licensed to the Apache Software Foundation (ASF) under one
- ~ or more contributor license agreements. See the NOTICE file
- ~ distributed with this work for additional information
- ~ regarding copyright ownership. The ASF licenses this file
- ~ to you under the Apache License, Version 2.0 (the
- ~ "License"); you may not use this file except in compliance
- ~ with the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing,
- ~ software distributed under the License is distributed on an
- ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- ~ KIND, either express or implied. See the License for the
- ~ specific language governing permissions and limitations
- ~ under the License.
- --%>
-<%@ page import="java.util.List" %>
-<%@ page import="org.apache.stratos.tenant.activity.ui.clients.TenantActivityServiceClient" %>
-<%@ page import="org.apache.stratos.tenant.activity.ui.utils.TenantMonitorUtil" %>
-<%@ page import="java.util.Map" %>
-<%@ page import="org.apache.stratos.common.config.CloudServiceConfig" %>
-<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
-<%@ taglib uri="http://wso2.org/projects/carbon/taglibs/carbontags.jar" prefix="carbon" %>
-
-
-<%@ page import="org.apache.axis2.context.ConfigurationContext" %>
-<%@ page import="org.wso2.carbon.CarbonConstants" %>
-<%@ page import="org.wso2.carbon.registry.common.ui.UIException" %>
-<%@ page import="org.wso2.carbon.ui.CarbonUIMessage" %>
-<%@ page import="org.wso2.carbon.ui.CarbonUIUtil" %>
-<%@ page import="org.wso2.carbon.utils.ServerConstants" %>
-<%@ page import="java.text.SimpleDateFormat" %>
-<%@ page import="java.util.Calendar" %>
-<%@ page import="java.util.Date" %>
-<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
-<%@ taglib uri="http://wso2.org/projects/carbon/taglibs/carbontags.jar" prefix="carbon" %>
-<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="js/tenant_config.js"></script>
-
-<carbon:jsi18n
- resourceBundle="org.apache.stratos.tenant.activity.ui.i18n.JSResources"
- request="<%=request%>"/>
-
-<fmt:bundle basename="org.apache.stratos.tenant.activity.ui.i18n.Resources">
- <carbon:breadcrumb
- label="govern.view_tenants.menu"
- resourceBundle="org.apache.stratos.tenant.activity.ui.i18n.Resources"
- topPage="true"
- request="<%=request%>"/>
-
-
- <div id="middle">
- <div id="top">
- <h2><fmt:message key="active.tenants.services"/></h2>
-
- <form id="findTenantForm" action="find-tenant.jsp" method="post">
- <table class="normal-nopadding" cellspacing="0">
- <tbody>
- <tr style="border:0; !important">
- <td style="border:0; !important">
- <nobr>
-
- Enter Tenant Domain
- <input type="text" name="domain" id="domain" value="">
- </nobr>
- </td>
- <td style="border:0; !important">
- <a class="icon-link" href="#" style="background-image: url(images/search.gif);"
- onclick="domainSelected();" alt="Search"></a>
- </td>
- </tr>
- </tbody>
- </table>
- </form>
- </div>
-
- <div id="workArea">
- <table id="serviceStatTable1" cellpadding="0" cellspacing="0" border="0" style="width:100%"
- class="styledLeft">
- <thead>
- <tr>
- <th style="padding-left:5px;text-align:left;width:40%"><fmt:message key="service.name"/></th>
- <th style="padding-left:5px;text-align:left;width:150px"><fmt:message
- key="active.tenant.count"/></th>
- <th style="padding-left:5px;text-align:left;"><fmt:message key="view.list"/></th>
- </tr>
- </thead>
- </table>
- </div>
- </div>
-</fmt:bundle>
-
-<%
- Map<String, CloudServiceConfig> cloudServicesConfigs = TenantMonitorUtil.getCloudServiceConfigMap();
-%>
-
-
-<script type="text/javascript">
-
- function getStats() {
- console.log("In the getStat() function");
- var serviceArray = new Array();
-
- <%
- for(String serviceName : cloudServicesConfigs.keySet()){
-
- %>
-
- var serviceObj = new Object();
- serviceObj.backEndUrl = '<%=cloudServicesConfigs.get(serviceName).getLink()%>';
- serviceObj.serviceName = '<%=serviceName%>';
- serviceArray.push(serviceObj);
-
- <% }
- %>
-
- for (var i = 0; i < serviceArray.length; i++) {
-
- jQuery.ajax({
- type: 'GET',
- url: 'get-data-ajaxprocessor.jsp',
- data: 'backEndUrl=' + serviceArray[i].backEndUrl + '&serviceName=' + serviceArray[i].serviceName,
- dataType: 'json',
- async: true,
- success: function(msg) {
- var resp = msg;
- var view = 'View';
- if (resp.count > 0) {
- document.getElementById('serviceStatTable1').innerHTML += '<tr><td><a href="javascript:showTenants(\'' + resp.service + '\');">' + resp.service + '</a></td><td>' + resp.count + '</td><td><a href="javascript:showTenants(\'' + resp.service + '\');">' + view + '</a></td></tr>';
- }
- else {
- document.getElementById('serviceStatTable1').innerHTML += '<tr><td>' + resp.service + '</td><td>' + resp.count + '</td><td>-</td></tr>';
- }
- },
- error:function () {
- CARBON.showErrorDialog('Could not connect to server');
- //document.getElementById('serviceStatTable').innerHTML += '<tr><td>' + eresp.servic + '</td><td>' + resp.count + '</td></tr>';
- document.getElementById('serviceStatTable').innerHTML += 'Not Available';
- }
- });
-
- }
- }
- function showTenants(serviceNameKey) {
- document.getElementById("serviceName").value = serviceNameKey;
- document.myform.submit();
- }
-
- function domainSelected() {
- var findDomainForm = document.getElementById('findTenantForm');
- var domain = document.getElementById("domain").getValue();
- if(domain.length > 3){
- findDomainForm.submit();
- }
- else{
- CARBON.showErrorDialog('Enter valid domain name');
- }
-
- }
-
-</script>
-
-<body onload="getStats();">
-<div>
- <table id="serviceStatTable"></table>
- <form name="myform" method="post" action="show-active-tenants.jsp">
- <input type='hidden' name='serviceName' id="serviceName"/>
- </form>
-</div>
-</body>
http://git-wip-us.apache.org/repos/asf/stratos/blob/bfc6d758/components/org.apache.stratos.validate.domain.ui/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.validate.domain.ui/pom.xml b/components/org.apache.stratos.validate.domain.ui/pom.xml
deleted file mode 100644
index 592e1c7..0000000
--- a/components/org.apache.stratos.validate.domain.ui/pom.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- # Licensed to the Apache Software Foundation (ASF) under one
- # or more contributor license agreements. See the NOTICE file
- # distributed with this work for additional information
- # regarding copyright ownership. The ASF licenses this file
- # to you under the Apache License, Version 2.0 (the
- # "License"); you may not use this file except in compliance
- # with the License. You may obtain a copy of the License at
- #
- # http://www.apache.org/licenses/LICENSE-2.0
- #
- # Unless required by applicable law or agreed to in writing,
- # software distributed under the License is distributed on an
- # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- # KIND, either express or implied. See the License for the
- # specific language governing permissions and limitations
- # under the License.
- -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <groupId>org.apache.stratos</groupId>
- <artifactId>stratos-components-parent</artifactId>
- <version>4.1.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <artifactId>org.apache.stratos.validate.domain.ui</artifactId>
- <packaging>bundle</packaging>
- <name>Apache Stratos - Validate Domains - User Interface</name>
-
- <build>
-
- <plugins>
-
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
-
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
- <Bundle-Name>${project.artifactId}</Bundle-Name>
- <Export-Package>
- org.apache.stratos.validate.domain.ui.*,
- </Export-Package>
- <Import-Package>
- javax.servlet;version="${imp.pkg.version.javax.servlet}",
- javax.servlet.http;version="${imp.pkg.version.javax.servlet}",
- org.apache.lucene.*,
- org.apache.stratos.validate.domain.stub.*; version="${project.version}",
- *;resolution:=optional
- </Import-Package>
- <Carbon-Component>UIBundle</Carbon-Component>
- </instructions>
- </configuration>
- </plugin>
-
- </plugins>
- </build>
-
- <dependencies>
-
- <dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.registry.core</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </dependency>
- <dependency>
- <groupId>org.eclipse.equinox</groupId>
- <artifactId>javax.servlet</artifactId>
- <version>${version.javax.servlet}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.axis2.wso2</groupId>
- <artifactId>axis2</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.ws.commons.axiom.wso2</groupId>
- <artifactId>axiom</artifactId>
- <version>${orbit.version.axiom}</version>
- </dependency>
- <dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.ui</artifactId>
- <version>${wso2carbon.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.stratos</groupId>
- <artifactId>org.apache.stratos.validate.domain.stub</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
-
- <properties>
- <version.javax.servlet>3.0.0.v201112011016</version.javax.servlet>
- </properties>
-</project>
http://git-wip-us.apache.org/repos/asf/stratos/blob/bfc6d758/components/org.apache.stratos.validate.domain.ui/src/main/java/org/apache/stratos/validate/domain/ui/clients/ValidateDomainAdminClient.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.validate.domain.ui/src/main/java/org/apache/stratos/validate/domain/ui/clients/ValidateDomainAdminClient.java b/components/org.apache.stratos.validate.domain.ui/src/main/java/org/apache/stratos/validate/domain/ui/clients/ValidateDomainAdminClient.java
deleted file mode 100644
index 372c9b7..0000000
--- a/components/org.apache.stratos.validate.domain.ui/src/main/java/org/apache/stratos/validate/domain/ui/clients/ValidateDomainAdminClient.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.stratos.validate.domain.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.registry.core.exceptions.RegistryException;
-import org.wso2.carbon.ui.CarbonUIUtil;
-import org.wso2.carbon.utils.ServerConstants;
-import org.apache.stratos.validate.domain.stub.services.ValidateDomainAdminServiceStub;
-
-import javax.servlet.ServletConfig;
-import javax.servlet.http.HttpSession;
-
-public class ValidateDomainAdminClient implements ValidateDomainClient {
- private static final Log log = LogFactory.getLog(ValidateDomainAdminClient.class);
-
- private ValidateDomainAdminServiceStub stub;
- private String epr;
-
- public ValidateDomainAdminClient(String cookie, String backendServerURL,
- ConfigurationContext configContext) throws RegistryException {
-
- epr = backendServerURL + "ValidateDomainAdminService";
-
- try {
- stub = new ValidateDomainAdminServiceStub(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 Validate Domain service client. " + axisFault.getMessage();
- log.error(msg, axisFault);
- throw new RegistryException(msg, axisFault);
- }
- }
-
- public ValidateDomainAdminClient(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 + "ValidateDomainAdminService";
-
- try {
- stub = new ValidateDomainAdminServiceStub(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 String getDomainValidationKey(String domain) throws RegistryException {
- try {
- return stub.getDomainValidationKey(domain);
- } catch (Exception e) {
- String msg = "Failed to get domain validation keys. " + e.getMessage();
- log.error(msg, e);
- throw new RegistryException(msg, e);
- }
- }
-
- public String validateByDNSEntry(String domain) throws RegistryException {
- try {
- return stub.validateByDNSEntry(domain);
- } catch (Exception e) {
- String msg = "Failed to validate by dns entry. " + e.getMessage();
- log.error(msg, e);
- throw new RegistryException(msg, e);
- }
- }
-
- public String validateByTextInRoot(String domain) throws RegistryException {
- try {
- return stub.validateByTextInRoot(domain);
- } catch (Exception e) {
- String msg = "Failed to validate by dns entry. " + e.getMessage();
- log.error(msg, e);
- throw new RegistryException(msg, e);
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/bfc6d758/components/org.apache.stratos.validate.domain.ui/src/main/java/org/apache/stratos/validate/domain/ui/clients/ValidateDomainClient.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.validate.domain.ui/src/main/java/org/apache/stratos/validate/domain/ui/clients/ValidateDomainClient.java b/components/org.apache.stratos.validate.domain.ui/src/main/java/org/apache/stratos/validate/domain/ui/clients/ValidateDomainClient.java
deleted file mode 100644
index 1556c01..0000000
--- a/components/org.apache.stratos.validate.domain.ui/src/main/java/org/apache/stratos/validate/domain/ui/clients/ValidateDomainClient.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.stratos.validate.domain.ui.clients;
-
-import org.wso2.carbon.registry.core.exceptions.RegistryException;
-
-public interface ValidateDomainClient {
- public String getDomainValidationKey(String domain) throws RegistryException;
-
- public String validateByDNSEntry(String domain) throws RegistryException;
-
- public String validateByTextInRoot(String domain) throws RegistryException;
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/bfc6d758/components/org.apache.stratos.validate.domain.ui/src/main/java/org/apache/stratos/validate/domain/ui/clients/ValidateDomainNonAdminClient.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.validate.domain.ui/src/main/java/org/apache/stratos/validate/domain/ui/clients/ValidateDomainNonAdminClient.java b/components/org.apache.stratos.validate.domain.ui/src/main/java/org/apache/stratos/validate/domain/ui/clients/ValidateDomainNonAdminClient.java
deleted file mode 100644
index 2676cd3..0000000
--- a/components/org.apache.stratos.validate.domain.ui/src/main/java/org/apache/stratos/validate/domain/ui/clients/ValidateDomainNonAdminClient.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.stratos.validate.domain.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.registry.core.exceptions.RegistryException;
-import org.wso2.carbon.ui.CarbonUIUtil;
-import org.wso2.carbon.utils.ServerConstants;
-import org.apache.stratos.validate.domain.stub.services.ValidateDomainServiceStub;
-
-import javax.servlet.ServletConfig;
-import javax.servlet.http.HttpSession;
-
-public class ValidateDomainNonAdminClient implements ValidateDomainClient {
- private static final Log log = LogFactory.getLog(ValidateDomainNonAdminClient.class);
-
- private ValidateDomainServiceStub stub;
- private String epr;
-
- public ValidateDomainNonAdminClient(
- String cookie, String backendServerURL, ConfigurationContext configContext)
- throws RegistryException {
-
- epr = backendServerURL + "ValidateDomainService";
-
- try {
- stub = new ValidateDomainServiceStub(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 AddServices service client. " + axisFault.getMessage();
- log.error(msg, axisFault);
- throw new RegistryException(msg, axisFault);
- }
- }
-
- public ValidateDomainNonAdminClient(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 + "ValidateDomainService";
-
- try {
- stub = new ValidateDomainServiceStub(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 String getDomainValidationKey(String domain) throws RegistryException {
- try {
- return stub.getDomainValidationKey(domain);
- } catch (Exception e) {
- String msg = "Failed to get domain validation keys. " + e.getMessage();
- log.error(msg, e);
- throw new RegistryException(msg, e);
- }
- }
-
- public String validateByDNSEntry(String domain) throws RegistryException {
- try {
- return stub.validateByDNSEntry(domain);
- } catch (Exception e) {
- String msg = "Failed to validate by dns entry. " + e.getMessage();
- log.error(msg, e);
- throw new RegistryException(msg, e);
- }
- }
-
- public String validateByTextInRoot(String domain) throws RegistryException {
- try {
- return stub.validateByTextInRoot(domain);
- } catch (Exception e) {
- String msg = "Failed to validate by dns entry. " + e.getMessage();
- log.error(msg, e);
- throw new RegistryException(msg, e);
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/bfc6d758/components/org.apache.stratos.validate.domain.ui/src/main/java/org/apache/stratos/validate/domain/ui/utils/Util.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.validate.domain.ui/src/main/java/org/apache/stratos/validate/domain/ui/utils/Util.java b/components/org.apache.stratos.validate.domain.ui/src/main/java/org/apache/stratos/validate/domain/ui/utils/Util.java
deleted file mode 100644
index 32621f9..0000000
--- a/components/org.apache.stratos.validate.domain.ui/src/main/java/org/apache/stratos/validate/domain/ui/utils/Util.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.stratos.validate.domain.ui.utils;
-
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletRequest;
-import javax.servlet.http.HttpSession;
-
-import org.wso2.carbon.registry.core.exceptions.RegistryException;
-import org.apache.stratos.validate.domain.ui.clients.ValidateDomainAdminClient;
-import org.apache.stratos.validate.domain.ui.clients.ValidateDomainClient;
-import org.apache.stratos.validate.domain.ui.clients.ValidateDomainNonAdminClient;
-
-public class Util {
- public static ValidateDomainClient getValidateDomainClient(ServletRequest request,
- ServletConfig config, HttpSession session) throws RegistryException {
- // this doesn't make any security hole, as even a not-logged-in user try
- // manually put status parameter to logged_in, still the back-end service
- // try to validate him and he will fail.
-
- String status = request.getParameter("status");
- if ("logged_in".equals(status)) {
- return new ValidateDomainAdminClient(config, session);
- }
- return new ValidateDomainNonAdminClient(config, session);
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/bfc6d758/components/org.apache.stratos.validate.domain.ui/src/main/resources/META-INF/component.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.validate.domain.ui/src/main/resources/META-INF/component.xml b/components/org.apache.stratos.validate.domain.ui/src/main/resources/META-INF/component.xml
deleted file mode 100644
index 8f02f6d..0000000
--- a/components/org.apache.stratos.validate.domain.ui/src/main/resources/META-INF/component.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
- # Licensed to the Apache Software Foundation (ASF) under one
- # or more contributor license agreements. See the NOTICE file
- # distributed with this work for additional information
- # regarding copyright ownership. The ASF licenses this file
- # to you under the Apache License, Version 2.0 (the
- # "License"); you may not use this file except in compliance
- # with the License. You may obtain a copy of the License at
- #
- # http://www.apache.org/licenses/LICENSE-2.0
- #
- # Unless required by applicable law or agreed to in writing,
- # software distributed under the License is distributed on an
- # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- # KIND, either express or implied. See the License for the
- # specific language governing permissions and limitations
- # under the License.
- -->
-<component xmlns="http://products.wso2.org/carbon">
-
-
-</component>
http://git-wip-us.apache.org/repos/asf/stratos/blob/bfc6d758/components/org.apache.stratos.validate.domain.ui/src/main/resources/ValidateDomainAdminService.wsdl
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.validate.domain.ui/src/main/resources/ValidateDomainAdminService.wsdl b/components/org.apache.stratos.validate.domain.ui/src/main/resources/ValidateDomainAdminService.wsdl
deleted file mode 100644
index 52ceb20..0000000
--- a/components/org.apache.stratos.validate.domain.ui/src/main/resources/ValidateDomainAdminService.wsdl
+++ /dev/null
@@ -1,257 +0,0 @@
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one
- ~ or more contributor license agreements. See the NOTICE file
- ~ distributed with this work for additional information
- ~ regarding copyright ownership. The ASF licenses this file
- ~ to you under the Apache License, Version 2.0 (the
- ~ "License"); you may not use this file except in compliance
- ~ with the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing,
- ~ software distributed under the License is distributed on an
- ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- ~ KIND, either express or implied. See the License for the
- ~ specific language governing permissions and limitations
- ~ under the License.
- -->
-
-<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:ns1="http://org.apache.axis2/xsd" xmlns:ns="http://services.domain.validate.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.domain.validate.carbon.wso2.org">
- <wsdl:documentation>ValidateDomainAdminService</wsdl:documentation>
- <wsdl:types>
- <xs:schema attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://services.domain.validate.carbon.wso2.org">
- <xs:element name="validateByTextInRootException">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="validateByTextInRootException" 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="validateByTextInRoot">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="domain" nillable="true" type="xs:string" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="validateByTextInRootResponse">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="return" nillable="true" type="xs:string" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="validateByDNSEntryException">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="validateByDNSEntryException" nillable="true" type="ns:Exception" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="validateByDNSEntry">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="domain" nillable="true" type="xs:string" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="validateByDNSEntryResponse">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="return" nillable="true" type="xs:string" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="getDomainValidationKeyException">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="getDomainValidationKeyException" nillable="true" type="ns:Exception" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="getDomainValidationKey">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="domain" nillable="true" type="xs:string" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="getDomainValidationKeyResponse">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="return" nillable="true" type="xs:string" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- </xs:schema>
- </wsdl:types>
- <wsdl:message name="validateByTextInRootRequest">
- <wsdl:part name="parameters" element="ns:validateByTextInRoot" />
- </wsdl:message>
- <wsdl:message name="validateByTextInRootResponse">
- <wsdl:part name="parameters" element="ns:validateByTextInRootResponse" />
- </wsdl:message>
- <wsdl:message name="validateByTextInRootException">
- <wsdl:part name="parameters" element="ns:validateByTextInRootException" />
- </wsdl:message>
- <wsdl:message name="validateByDNSEntryRequest">
- <wsdl:part name="parameters" element="ns:validateByDNSEntry" />
- </wsdl:message>
- <wsdl:message name="validateByDNSEntryResponse">
- <wsdl:part name="parameters" element="ns:validateByDNSEntryResponse" />
- </wsdl:message>
- <wsdl:message name="validateByDNSEntryException">
- <wsdl:part name="parameters" element="ns:validateByDNSEntryException" />
- </wsdl:message>
- <wsdl:message name="getDomainValidationKeyRequest">
- <wsdl:part name="parameters" element="ns:getDomainValidationKey" />
- </wsdl:message>
- <wsdl:message name="getDomainValidationKeyResponse">
- <wsdl:part name="parameters" element="ns:getDomainValidationKeyResponse" />
- </wsdl:message>
- <wsdl:message name="getDomainValidationKeyException">
- <wsdl:part name="parameters" element="ns:getDomainValidationKeyException" />
- </wsdl:message>
- <wsdl:portType name="ValidateDomainAdminServicePortType">
- <wsdl:operation name="validateByTextInRoot">
- <wsdl:input message="ns:validateByTextInRootRequest" wsaw:Action="urn:validateByTextInRoot" />
- <wsdl:output message="ns:validateByTextInRootResponse" wsaw:Action="urn:validateByTextInRootResponse" />
- <wsdl:fault message="ns:validateByTextInRootException" name="validateByTextInRootException" wsaw:Action="urn:validateByTextInRootvalidateByTextInRootException" />
- </wsdl:operation>
- <wsdl:operation name="validateByDNSEntry">
- <wsdl:input message="ns:validateByDNSEntryRequest" wsaw:Action="urn:validateByDNSEntry" />
- <wsdl:output message="ns:validateByDNSEntryResponse" wsaw:Action="urn:validateByDNSEntryResponse" />
- <wsdl:fault message="ns:validateByDNSEntryException" name="validateByDNSEntryException" wsaw:Action="urn:validateByDNSEntryvalidateByDNSEntryException" />
- </wsdl:operation>
- <wsdl:operation name="getDomainValidationKey">
- <wsdl:input message="ns:getDomainValidationKeyRequest" wsaw:Action="urn:getDomainValidationKey" />
- <wsdl:output message="ns:getDomainValidationKeyResponse" wsaw:Action="urn:getDomainValidationKeyResponse" />
- <wsdl:fault message="ns:getDomainValidationKeyException" name="getDomainValidationKeyException" wsaw:Action="urn:getDomainValidationKeygetDomainValidationKeyException" />
- </wsdl:operation>
- </wsdl:portType>
- <wsdl:binding name="ValidateDomainAdminServiceSoap11Binding" type="ns:ValidateDomainAdminServicePortType">
- <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document" />
- <wsdl:operation name="validateByTextInRoot">
- <soap:operation soapAction="urn:validateByTextInRoot" style="document" />
- <wsdl:input>
- <soap:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap:body use="literal" />
- </wsdl:output>
- <wsdl:fault name="validateByTextInRootException">
- <soap:fault use="literal" name="validateByTextInRootException" />
- </wsdl:fault>
- </wsdl:operation>
- <wsdl:operation name="validateByDNSEntry">
- <soap:operation soapAction="urn:validateByDNSEntry" style="document" />
- <wsdl:input>
- <soap:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap:body use="literal" />
- </wsdl:output>
- <wsdl:fault name="validateByDNSEntryException">
- <soap:fault use="literal" name="validateByDNSEntryException" />
- </wsdl:fault>
- </wsdl:operation>
- <wsdl:operation name="getDomainValidationKey">
- <soap:operation soapAction="urn:getDomainValidationKey" style="document" />
- <wsdl:input>
- <soap:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap:body use="literal" />
- </wsdl:output>
- <wsdl:fault name="getDomainValidationKeyException">
- <soap:fault use="literal" name="getDomainValidationKeyException" />
- </wsdl:fault>
- </wsdl:operation>
- </wsdl:binding>
- <wsdl:binding name="ValidateDomainAdminServiceSoap12Binding" type="ns:ValidateDomainAdminServicePortType">
- <soap12:binding transport="http://schemas.xmlsoap.org/soap/http" style="document" />
- <wsdl:operation name="validateByTextInRoot">
- <soap12:operation soapAction="urn:validateByTextInRoot" style="document" />
- <wsdl:input>
- <soap12:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap12:body use="literal" />
- </wsdl:output>
- <wsdl:fault name="validateByTextInRootException">
- <soap12:fault use="literal" name="validateByTextInRootException" />
- </wsdl:fault>
- </wsdl:operation>
- <wsdl:operation name="validateByDNSEntry">
- <soap12:operation soapAction="urn:validateByDNSEntry" style="document" />
- <wsdl:input>
- <soap12:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap12:body use="literal" />
- </wsdl:output>
- <wsdl:fault name="validateByDNSEntryException">
- <soap12:fault use="literal" name="validateByDNSEntryException" />
- </wsdl:fault>
- </wsdl:operation>
- <wsdl:operation name="getDomainValidationKey">
- <soap12:operation soapAction="urn:getDomainValidationKey" style="document" />
- <wsdl:input>
- <soap12:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap12:body use="literal" />
- </wsdl:output>
- <wsdl:fault name="getDomainValidationKeyException">
- <soap12:fault use="literal" name="getDomainValidationKeyException" />
- </wsdl:fault>
- </wsdl:operation>
- </wsdl:binding>
- <wsdl:binding name="ValidateDomainAdminServiceHttpBinding" type="ns:ValidateDomainAdminServicePortType">
- <http:binding verb="POST" />
- <wsdl:operation name="validateByTextInRoot">
- <http:operation location="validateByTextInRoot" />
- <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="validateByDNSEntry">
- <http:operation location="validateByDNSEntry" />
- <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="getDomainValidationKey">
- <http:operation location="getDomainValidationKey" />
- <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="ValidateDomainAdminService">
- <wsdl:port name="ValidateDomainAdminServiceHttpsSoap11Endpoint" binding="ns:ValidateDomainAdminServiceSoap11Binding">
- <soap:address location="https://192.168.1.100:9443/services/ValidateDomainAdminService.ValidateDomainAdminServiceHttpsSoap11Endpoint/" />
- </wsdl:port>
- <wsdl:port name="ValidateDomainAdminServiceHttpsSoap12Endpoint" binding="ns:ValidateDomainAdminServiceSoap12Binding">
- <soap12:address location="https://192.168.1.100:9443/services/ValidateDomainAdminService.ValidateDomainAdminServiceHttpsSoap12Endpoint/" />
- </wsdl:port>
- <wsdl:port name="ValidateDomainAdminServiceHttpsEndpoint" binding="ns:ValidateDomainAdminServiceHttpBinding">
- <http:address location="https://192.168.1.100:9443/services/ValidateDomainAdminService.ValidateDomainAdminServiceHttpsEndpoint/" />
- </wsdl:port>
- </wsdl:service>
-</wsdl:definitions>
http://git-wip-us.apache.org/repos/asf/stratos/blob/bfc6d758/components/org.apache.stratos.validate.domain.ui/src/main/resources/ValidateDomainService.wsdl
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.validate.domain.ui/src/main/resources/ValidateDomainService.wsdl b/components/org.apache.stratos.validate.domain.ui/src/main/resources/ValidateDomainService.wsdl
deleted file mode 100644
index 4c4b656..0000000
--- a/components/org.apache.stratos.validate.domain.ui/src/main/resources/ValidateDomainService.wsdl
+++ /dev/null
@@ -1,257 +0,0 @@
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one
- ~ or more contributor license agreements. See the NOTICE file
- ~ distributed with this work for additional information
- ~ regarding copyright ownership. The ASF licenses this file
- ~ to you under the Apache License, Version 2.0 (the
- ~ "License"); you may not use this file except in compliance
- ~ with the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing,
- ~ software distributed under the License is distributed on an
- ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- ~ KIND, either express or implied. See the License for the
- ~ specific language governing permissions and limitations
- ~ under the License.
- -->
-
-<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:ns1="http://org.apache.axis2/xsd" xmlns:ns="http://services.domain.validate.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.domain.validate.carbon.wso2.org">
- <wsdl:documentation>ValidateDomainService</wsdl:documentation>
- <wsdl:types>
- <xs:schema attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://services.domain.validate.carbon.wso2.org">
- <xs:element name="validateByTextInRootException">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="validateByTextInRootException" 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="validateByTextInRoot">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="domain" nillable="true" type="xs:string" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="validateByTextInRootResponse">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="return" nillable="true" type="xs:string" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="validateByDNSEntryException">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="validateByDNSEntryException" nillable="true" type="ns:Exception" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="validateByDNSEntry">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="domain" nillable="true" type="xs:string" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="validateByDNSEntryResponse">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="return" nillable="true" type="xs:string" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="getDomainValidationKeyException">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="getDomainValidationKeyException" nillable="true" type="ns:Exception" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="getDomainValidationKey">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="domain" nillable="true" type="xs:string" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="getDomainValidationKeyResponse">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="return" nillable="true" type="xs:string" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- </xs:schema>
- </wsdl:types>
- <wsdl:message name="validateByTextInRootRequest">
- <wsdl:part name="parameters" element="ns:validateByTextInRoot" />
- </wsdl:message>
- <wsdl:message name="validateByTextInRootResponse">
- <wsdl:part name="parameters" element="ns:validateByTextInRootResponse" />
- </wsdl:message>
- <wsdl:message name="validateByTextInRootException">
- <wsdl:part name="parameters" element="ns:validateByTextInRootException" />
- </wsdl:message>
- <wsdl:message name="validateByDNSEntryRequest">
- <wsdl:part name="parameters" element="ns:validateByDNSEntry" />
- </wsdl:message>
- <wsdl:message name="validateByDNSEntryResponse">
- <wsdl:part name="parameters" element="ns:validateByDNSEntryResponse" />
- </wsdl:message>
- <wsdl:message name="validateByDNSEntryException">
- <wsdl:part name="parameters" element="ns:validateByDNSEntryException" />
- </wsdl:message>
- <wsdl:message name="getDomainValidationKeyRequest">
- <wsdl:part name="parameters" element="ns:getDomainValidationKey" />
- </wsdl:message>
- <wsdl:message name="getDomainValidationKeyResponse">
- <wsdl:part name="parameters" element="ns:getDomainValidationKeyResponse" />
- </wsdl:message>
- <wsdl:message name="getDomainValidationKeyException">
- <wsdl:part name="parameters" element="ns:getDomainValidationKeyException" />
- </wsdl:message>
- <wsdl:portType name="ValidateDomainServicePortType">
- <wsdl:operation name="validateByTextInRoot">
- <wsdl:input message="ns:validateByTextInRootRequest" wsaw:Action="urn:validateByTextInRoot" />
- <wsdl:output message="ns:validateByTextInRootResponse" wsaw:Action="urn:validateByTextInRootResponse" />
- <wsdl:fault message="ns:validateByTextInRootException" name="validateByTextInRootException" wsaw:Action="urn:validateByTextInRootvalidateByTextInRootException" />
- </wsdl:operation>
- <wsdl:operation name="validateByDNSEntry">
- <wsdl:input message="ns:validateByDNSEntryRequest" wsaw:Action="urn:validateByDNSEntry" />
- <wsdl:output message="ns:validateByDNSEntryResponse" wsaw:Action="urn:validateByDNSEntryResponse" />
- <wsdl:fault message="ns:validateByDNSEntryException" name="validateByDNSEntryException" wsaw:Action="urn:validateByDNSEntryvalidateByDNSEntryException" />
- </wsdl:operation>
- <wsdl:operation name="getDomainValidationKey">
- <wsdl:input message="ns:getDomainValidationKeyRequest" wsaw:Action="urn:getDomainValidationKey" />
- <wsdl:output message="ns:getDomainValidationKeyResponse" wsaw:Action="urn:getDomainValidationKeyResponse" />
- <wsdl:fault message="ns:getDomainValidationKeyException" name="getDomainValidationKeyException" wsaw:Action="urn:getDomainValidationKeygetDomainValidationKeyException" />
- </wsdl:operation>
- </wsdl:portType>
- <wsdl:binding name="ValidateDomainServiceSoap11Binding" type="ns:ValidateDomainServicePortType">
- <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document" />
- <wsdl:operation name="validateByTextInRoot">
- <soap:operation soapAction="urn:validateByTextInRoot" style="document" />
- <wsdl:input>
- <soap:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap:body use="literal" />
- </wsdl:output>
- <wsdl:fault name="validateByTextInRootException">
- <soap:fault use="literal" name="validateByTextInRootException" />
- </wsdl:fault>
- </wsdl:operation>
- <wsdl:operation name="validateByDNSEntry">
- <soap:operation soapAction="urn:validateByDNSEntry" style="document" />
- <wsdl:input>
- <soap:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap:body use="literal" />
- </wsdl:output>
- <wsdl:fault name="validateByDNSEntryException">
- <soap:fault use="literal" name="validateByDNSEntryException" />
- </wsdl:fault>
- </wsdl:operation>
- <wsdl:operation name="getDomainValidationKey">
- <soap:operation soapAction="urn:getDomainValidationKey" style="document" />
- <wsdl:input>
- <soap:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap:body use="literal" />
- </wsdl:output>
- <wsdl:fault name="getDomainValidationKeyException">
- <soap:fault use="literal" name="getDomainValidationKeyException" />
- </wsdl:fault>
- </wsdl:operation>
- </wsdl:binding>
- <wsdl:binding name="ValidateDomainServiceSoap12Binding" type="ns:ValidateDomainServicePortType">
- <soap12:binding transport="http://schemas.xmlsoap.org/soap/http" style="document" />
- <wsdl:operation name="validateByTextInRoot">
- <soap12:operation soapAction="urn:validateByTextInRoot" style="document" />
- <wsdl:input>
- <soap12:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap12:body use="literal" />
- </wsdl:output>
- <wsdl:fault name="validateByTextInRootException">
- <soap12:fault use="literal" name="validateByTextInRootException" />
- </wsdl:fault>
- </wsdl:operation>
- <wsdl:operation name="validateByDNSEntry">
- <soap12:operation soapAction="urn:validateByDNSEntry" style="document" />
- <wsdl:input>
- <soap12:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap12:body use="literal" />
- </wsdl:output>
- <wsdl:fault name="validateByDNSEntryException">
- <soap12:fault use="literal" name="validateByDNSEntryException" />
- </wsdl:fault>
- </wsdl:operation>
- <wsdl:operation name="getDomainValidationKey">
- <soap12:operation soapAction="urn:getDomainValidationKey" style="document" />
- <wsdl:input>
- <soap12:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap12:body use="literal" />
- </wsdl:output>
- <wsdl:fault name="getDomainValidationKeyException">
- <soap12:fault use="literal" name="getDomainValidationKeyException" />
- </wsdl:fault>
- </wsdl:operation>
- </wsdl:binding>
- <wsdl:binding name="ValidateDomainServiceHttpBinding" type="ns:ValidateDomainServicePortType">
- <http:binding verb="POST" />
- <wsdl:operation name="validateByTextInRoot">
- <http:operation location="validateByTextInRoot" />
- <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="validateByDNSEntry">
- <http:operation location="validateByDNSEntry" />
- <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="getDomainValidationKey">
- <http:operation location="getDomainValidationKey" />
- <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="ValidateDomainService">
- <wsdl:port name="ValidateDomainServiceHttpsSoap11Endpoint" binding="ns:ValidateDomainServiceSoap11Binding">
- <soap:address location="https://192.168.1.100:9443/services/ValidateDomainService.ValidateDomainServiceHttpsSoap11Endpoint/" />
- </wsdl:port>
- <wsdl:port name="ValidateDomainServiceHttpsSoap12Endpoint" binding="ns:ValidateDomainServiceSoap12Binding">
- <soap12:address location="https://192.168.1.100:9443/services/ValidateDomainService.ValidateDomainServiceHttpsSoap12Endpoint/" />
- </wsdl:port>
- <wsdl:port name="ValidateDomainServiceHttpsEndpoint" binding="ns:ValidateDomainServiceHttpBinding">
- <http:address location="https://192.168.1.100:9443/services/ValidateDomainService.ValidateDomainServiceHttpsEndpoint/" />
- </wsdl:port>
- </wsdl:service>
-</wsdl:definitions>
http://git-wip-us.apache.org/repos/asf/stratos/blob/bfc6d758/components/org.apache.stratos.validate.domain.ui/src/main/resources/org/apache/stratos/validate/domain/ui/i18n/JSResources.properties
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.validate.domain.ui/src/main/resources/org/apache/stratos/validate/domain/ui/i18n/JSResources.properties b/components/org.apache.stratos.validate.domain.ui/src/main/resources/org/apache/stratos/validate/domain/ui/i18n/JSResources.properties
deleted file mode 100644
index 1a07bee..0000000
--- a/components/org.apache.stratos.validate.domain.ui/src/main/resources/org/apache/stratos/validate/domain/ui/i18n/JSResources.properties
+++ /dev/null
@@ -1,28 +0,0 @@
-#
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-#
-
-validation.fail.with.text=Domain ownership validation failed. Make sure you have put the exact text content mentioned here in the web root.
-validation.success.with.text=Domain ownership validation succeeded.
-validation.fail.with.dns=Domain ownership validation failed. Note it may take sometime to propagate the changes in DNS. Please retry after a little break.
-validation.success.with.dns=Domain ownership validation succeeded.
-domain.empty=The domain to validate ownership is empty.
-domain.unavailable=The domain is already registered. Please choose a different domain.
-session.timed.out=Your session timed out. Please login again.
http://git-wip-us.apache.org/repos/asf/stratos/blob/bfc6d758/components/org.apache.stratos.validate.domain.ui/src/main/resources/org/apache/stratos/validate/domain/ui/i18n/Resources.properties
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.validate.domain.ui/src/main/resources/org/apache/stratos/validate/domain/ui/i18n/Resources.properties b/components/org.apache.stratos.validate.domain.ui/src/main/resources/org/apache/stratos/validate/domain/ui/i18n/Resources.properties
deleted file mode 100644
index d4ee15c..0000000
--- a/components/org.apache.stratos.validate.domain.ui/src/main/resources/org/apache/stratos/validate/domain/ui/i18n/Resources.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-#
-
-domain.ownership.validation=Domain Ownership Validation
-validate.domain.menu=Validate Domain
-validate=Validate
http://git-wip-us.apache.org/repos/asf/stratos/blob/bfc6d758/components/org.apache.stratos.validate.domain.ui/src/main/resources/web/validate-domain/css/validate_domain.css
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.validate.domain.ui/src/main/resources/web/validate-domain/css/validate_domain.css b/components/org.apache.stratos.validate.domain.ui/src/main/resources/web/validate-domain/css/validate_domain.css
deleted file mode 100644
index 02dfd96..0000000
--- a/components/org.apache.stratos.validate.domain.ui/src/main/resources/web/validate-domain/css/validate_domain.css
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
-*/
-
-div#validation-introduction {
- margin: 5px;
-}
-
-div#with-text {
- margin: 5px;
-}
-
-div#with-dns {
- margin: 5px;
-}
-p {
- padding:5px !important;
-}
-
-p.validate-button {
- padding: 15px 5px 15px 5px !important;
-}
-
-li.catagory {
- padding: 5px 0px 5px 25px !important;
-}
-
-
-
-div.conf-info {
- background: #cccccc !important;
- border: 1px solid #111 !important;
- margin: 5px !important;
- padding: 2px !important;
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/bfc6d758/components/org.apache.stratos.validate.domain.ui/src/main/resources/web/validate-domain/docs/images/domain-validation.png
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.validate.domain.ui/src/main/resources/web/validate-domain/docs/images/domain-validation.png b/components/org.apache.stratos.validate.domain.ui/src/main/resources/web/validate-domain/docs/images/domain-validation.png
deleted file mode 100644
index 382dfdb..0000000
Binary files a/components/org.apache.stratos.validate.domain.ui/src/main/resources/web/validate-domain/docs/images/domain-validation.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/bfc6d758/components/org.apache.stratos.validate.domain.ui/src/main/resources/web/validate-domain/docs/userguide.html
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.validate.domain.ui/src/main/resources/web/validate-domain/docs/userguide.html b/components/org.apache.stratos.validate.domain.ui/src/main/resources/web/validate-domain/docs/userguide.html
deleted file mode 100644
index 91fe9df..0000000
--- a/components/org.apache.stratos.validate.domain.ui/src/main/resources/web/validate-domain/docs/userguide.html
+++ /dev/null
@@ -1,48 +0,0 @@
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one
- ~ or more contributor license agreements. See the NOTICE file
- ~ distributed with this work for additional information
- ~ regarding copyright ownership. The ASF licenses this file
- ~ to you under the Apache License, Version 2.0 (the
- ~ "License"); you may not use this file except in compliance
- ~ with the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing,
- ~ software distributed under the License is distributed on an
- ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- ~ KIND, either express or implied. See the License for the
- ~ specific language governing permissions and limitations
- ~ under the License.
- -->
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
- <title>Validate Domain Ownership - User Guide</title>
- <link href="../../admin/css/documentation.css" rel="stylesheet" type="text/css" media="all" />
-</head>
-
-<body>
-<h1>Validate Domain Ownership</h1>
-
-<p>
-You can validate the ownership of your domain using two methods,
- <ul>
- <li>Creating a text file in the domain web ROOT </li>
- <li>Setting up a CNAME entry in your DNS</li>
- </ul>
-
-</p>
-
-
-<p>Instructions are shown in the following form.</p>
-
-<p>
-<img src="images/domain-validation.png" alt="Validation domain ownership"/>
-<div><strong>Figure1: Validate domain Ownership</strong></div>
-</p>
-
-</body>
-
-</html>
http://git-wip-us.apache.org/repos/asf/stratos/blob/bfc6d758/components/org.apache.stratos.validate.domain.ui/src/main/resources/web/validate-domain/images/ajax-loader.gif
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.validate.domain.ui/src/main/resources/web/validate-domain/images/ajax-loader.gif b/components/org.apache.stratos.validate.domain.ui/src/main/resources/web/validate-domain/images/ajax-loader.gif
deleted file mode 100644
index f2a1bc0..0000000
Binary files a/components/org.apache.stratos.validate.domain.ui/src/main/resources/web/validate-domain/images/ajax-loader.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/bfc6d758/components/org.apache.stratos.validate.domain.ui/src/main/resources/web/validate-domain/images/right.gif
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.validate.domain.ui/src/main/resources/web/validate-domain/images/right.gif b/components/org.apache.stratos.validate.domain.ui/src/main/resources/web/validate-domain/images/right.gif
deleted file mode 100644
index 72a64c9..0000000
Binary files a/components/org.apache.stratos.validate.domain.ui/src/main/resources/web/validate-domain/images/right.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/bfc6d758/components/org.apache.stratos.validate.domain.ui/src/main/resources/web/validate-domain/images/wrong.gif
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.validate.domain.ui/src/main/resources/web/validate-domain/images/wrong.gif b/components/org.apache.stratos.validate.domain.ui/src/main/resources/web/validate-domain/images/wrong.gif
deleted file mode 100644
index 77e1f2c..0000000
Binary files a/components/org.apache.stratos.validate.domain.ui/src/main/resources/web/validate-domain/images/wrong.gif and /dev/null differ
[4/5] stratos git commit: removing account mgt,
domain validation as it is not used
Posted by re...@apache.org.
http://git-wip-us.apache.org/repos/asf/stratos/blob/bfc6d758/components/org.apache.stratos.account.mgt.ui/src/main/resources/web/account-mgt/account_mgt.jsp
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.account.mgt.ui/src/main/resources/web/account-mgt/account_mgt.jsp b/components/org.apache.stratos.account.mgt.ui/src/main/resources/web/account-mgt/account_mgt.jsp
deleted file mode 100644
index 46aa789..0000000
--- a/components/org.apache.stratos.account.mgt.ui/src/main/resources/web/account-mgt/account_mgt.jsp
+++ /dev/null
@@ -1,530 +0,0 @@
-<%--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
---%>
-<%@ page import="org.apache.stratos.account.mgt.stub.beans.xsd.AccountInfoBean" %>
-<%@ page import="org.apache.stratos.account.mgt.ui.clients.AccountMgtClient" %>
-<%@ page import="org.apache.stratos.account.mgt.ui.clients.UsagePlanClient" %>
-<%@ page import="org.apache.stratos.common.constants.StratosConstants" %>
-<%@ page import="org.apache.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.apache.stratos.account.mgt.ui.i18n.JSResources"
- request="<%=request%>"/>
-<fmt:bundle basename="org.apache.stratos.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.apache.stratos.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.apache.stratos.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.apache.stratos.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"> </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"> </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"> </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"> </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"> </div>
- </td>
- </tr>
- </tbody>
- </table>
- </form>
- </td>
- </tr>
-
- </tbody>
-</table>
-
-<!-- This section get commented because billling component is removed. So this fuctionality didn't work -->
-<!--
-<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.apache.stratos.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/stratos/blob/bfc6d758/components/org.apache.stratos.account.mgt.ui/src/main/resources/web/account-mgt/css/account_mgt.css
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.account.mgt.ui/src/main/resources/web/account-mgt/css/account_mgt.css b/components/org.apache.stratos.account.mgt.ui/src/main/resources/web/account-mgt/css/account_mgt.css
deleted file mode 100644
index de1a38d..0000000
--- a/components/org.apache.stratos.account.mgt.ui/src/main/resources/web/account-mgt/css/account_mgt.css
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
-* Licensed to the Apache Software Foundation (ASF) under one
-* or more contributor license agreements. See the NOTICE file
-* distributed with this work for additional information
-* regarding copyright ownership. The ASF licenses this file
-* to you under the Apache License, Version 2.0 (the
-* "License"); you may not use this file except in compliance
-* with the License. You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing,
-* software distributed under the License is distributed on an
-* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-* KIND, either express or implied. See the License for the
-* specific language governing permissions and limitations
-* under the License.
-*/
-
-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/stratos/blob/bfc6d758/components/org.apache.stratos.account.mgt.ui/src/main/resources/web/account-mgt/css/update_profile.css
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.account.mgt.ui/src/main/resources/web/account-mgt/css/update_profile.css b/components/org.apache.stratos.account.mgt.ui/src/main/resources/web/account-mgt/css/update_profile.css
deleted file mode 100644
index 62eea81..0000000
--- a/components/org.apache.stratos.account.mgt.ui/src/main/resources/web/account-mgt/css/update_profile.css
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
-* Licensed to the Apache Software Foundation (ASF) under one
-* or more contributor license agreements. See the NOTICE file
-* distributed with this work for additional information
-* regarding copyright ownership. The ASF licenses this file
-* to you under the Apache License, Version 2.0 (the
-* "License"); you may not use this file except in compliance
-* with the License. You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing,
-* software distributed under the License is distributed on an
-* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-* KIND, either express or implied. See the License for the
-* specific language governing permissions and limitations
-* under the License.
-*/
-
-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/stratos/blob/bfc6d758/components/org.apache.stratos.account.mgt.ui/src/main/resources/web/account-mgt/deactivate_account_ajaxprocessor.jsp
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.account.mgt.ui/src/main/resources/web/account-mgt/deactivate_account_ajaxprocessor.jsp b/components/org.apache.stratos.account.mgt.ui/src/main/resources/web/account-mgt/deactivate_account_ajaxprocessor.jsp
deleted file mode 100644
index a111b3a..0000000
--- a/components/org.apache.stratos.account.mgt.ui/src/main/resources/web/account-mgt/deactivate_account_ajaxprocessor.jsp
+++ /dev/null
@@ -1,39 +0,0 @@
-<%--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
- --%>
-<%@ page import="org.wso2.carbon.registry.core.exceptions.RegistryException" %>
-<%@ page import="org.apache.stratos.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>
-<%
-}
-%>
http://git-wip-us.apache.org/repos/asf/stratos/blob/bfc6d758/components/org.apache.stratos.account.mgt.ui/src/main/resources/web/account-mgt/docs/aboutUsagePlans.html
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.account.mgt.ui/src/main/resources/web/account-mgt/docs/aboutUsagePlans.html b/components/org.apache.stratos.account.mgt.ui/src/main/resources/web/account-mgt/docs/aboutUsagePlans.html
deleted file mode 100644
index 7c00906..0000000
--- a/components/org.apache.stratos.account.mgt.ui/src/main/resources/web/account-mgt/docs/aboutUsagePlans.html
+++ /dev/null
@@ -1,105 +0,0 @@
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one
- ~ or more contributor license agreements. See the NOTICE file
- ~ distributed with this work for additional information
- ~ regarding copyright ownership. The ASF licenses this file
- ~ to you under the Apache License, Version 2.0 (the
- ~ "License"); you may not use this file except in compliance
- ~ with the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing,
- ~ software distributed under the License is distributed on an
- ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- ~ KIND, either express or implied. See the License for the
- ~ specific language governing permissions and limitations
- ~ under the License.
- -->
-<!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/stratos/blob/bfc6d758/components/org.apache.stratos.account.mgt.ui/src/main/resources/web/account-mgt/docs/images/account-mgt.png
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.account.mgt.ui/src/main/resources/web/account-mgt/docs/images/account-mgt.png b/components/org.apache.stratos.account.mgt.ui/src/main/resources/web/account-mgt/docs/images/account-mgt.png
deleted file mode 100644
index f67777f..0000000
Binary files a/components/org.apache.stratos.account.mgt.ui/src/main/resources/web/account-mgt/docs/images/account-mgt.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/bfc6d758/components/org.apache.stratos.account.mgt.ui/src/main/resources/web/account-mgt/docs/userguide.html
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.account.mgt.ui/src/main/resources/web/account-mgt/docs/userguide.html b/components/org.apache.stratos.account.mgt.ui/src/main/resources/web/account-mgt/docs/userguide.html
deleted file mode 100644
index cf20648..0000000
--- a/components/org.apache.stratos.account.mgt.ui/src/main/resources/web/account-mgt/docs/userguide.html
+++ /dev/null
@@ -1,45 +0,0 @@
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one
- ~ or more contributor license agreements. See the NOTICE file
- ~ distributed with this work for additional information
- ~ regarding copyright ownership. The ASF licenses this file
- ~ to you under the Apache License, Version 2.0 (the
- ~ "License"); you may not use this file except in compliance
- ~ with the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing,
- ~ software distributed under the License is distributed on an
- ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- ~ KIND, either express or implied. See the License for the
- ~ specific language governing permissions and limitations
- ~ under the License.
- -->
-<!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/stratos/blob/bfc6d758/components/org.apache.stratos.account.mgt.ui/src/main/resources/web/account-mgt/get_package_info_ajaxprocessor.jsp
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.account.mgt.ui/src/main/resources/web/account-mgt/get_package_info_ajaxprocessor.jsp b/components/org.apache.stratos.account.mgt.ui/src/main/resources/web/account-mgt/get_package_info_ajaxprocessor.jsp
deleted file mode 100644
index 5fb58ae..0000000
--- a/components/org.apache.stratos.account.mgt.ui/src/main/resources/web/account-mgt/get_package_info_ajaxprocessor.jsp
+++ /dev/null
@@ -1,40 +0,0 @@
-<%--
- ~ Licensed to the Apache Software Foundation (ASF) under one
- ~ or more contributor license agreements. See the NOTICE file
- ~ distributed with this work for additional information
- ~ regarding copyright ownership. The ASF licenses this file
- ~ to you under the Apache License, Version 2.0 (the
- ~ "License"); you may not use this file except in compliance
- ~ with the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing,
- ~ software distributed under the License is distributed on an
- ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- ~ KIND, either express or implied. See the License for the
- ~ specific language governing permissions and limitations
- ~ under the License.
- --%>
-<%@ page import="org.wso2.carbon.ui.CarbonUIUtil" %>
-<%@ page import="org.json.JSONArray" %>
-<%@ page import="org.apache.stratos.account.mgt.ui.clients.PackageInfoServiceClient" %>
-<%@ page import="org.wso2.carbon.utils.ServerConstants" %>
-<%@ page import="org.wso2.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/stratos/blob/bfc6d758/components/org.apache.stratos.account.mgt.ui/src/main/resources/web/account-mgt/images/account-mgt-icon.gif
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.account.mgt.ui/src/main/resources/web/account-mgt/images/account-mgt-icon.gif b/components/org.apache.stratos.account.mgt.ui/src/main/resources/web/account-mgt/images/account-mgt-icon.gif
deleted file mode 100644
index 7cd3939..0000000
Binary files a/components/org.apache.stratos.account.mgt.ui/src/main/resources/web/account-mgt/images/account-mgt-icon.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/bfc6d758/components/org.apache.stratos.account.mgt.ui/src/main/resources/web/account-mgt/images/ajax-loader.gif
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.account.mgt.ui/src/main/resources/web/account-mgt/images/ajax-loader.gif b/components/org.apache.stratos.account.mgt.ui/src/main/resources/web/account-mgt/images/ajax-loader.gif
deleted file mode 100644
index f2a1bc0..0000000
Binary files a/components/org.apache.stratos.account.mgt.ui/src/main/resources/web/account-mgt/images/ajax-loader.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/bfc6d758/components/org.apache.stratos.account.mgt.ui/src/main/resources/web/account-mgt/images/right.gif
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.account.mgt.ui/src/main/resources/web/account-mgt/images/right.gif b/components/org.apache.stratos.account.mgt.ui/src/main/resources/web/account-mgt/images/right.gif
deleted file mode 100644
index 72a64c9..0000000
Binary files a/components/org.apache.stratos.account.mgt.ui/src/main/resources/web/account-mgt/images/right.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/bfc6d758/components/org.apache.stratos.account.mgt.ui/src/main/resources/web/account-mgt/images/wrong.gif
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.account.mgt.ui/src/main/resources/web/account-mgt/images/wrong.gif b/components/org.apache.stratos.account.mgt.ui/src/main/resources/web/account-mgt/images/wrong.gif
deleted file mode 100644
index 77e1f2c..0000000
Binary files a/components/org.apache.stratos.account.mgt.ui/src/main/resources/web/account-mgt/images/wrong.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/bfc6d758/components/org.apache.stratos.account.mgt.ui/src/main/resources/web/account-mgt/init_payment_ajaxprocessor.jsp
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.account.mgt.ui/src/main/resources/web/account-mgt/init_payment_ajaxprocessor.jsp b/components/org.apache.stratos.account.mgt.ui/src/main/resources/web/account-mgt/init_payment_ajaxprocessor.jsp
deleted file mode 100644
index 353effb..0000000
--- a/components/org.apache.stratos.account.mgt.ui/src/main/resources/web/account-mgt/init_payment_ajaxprocessor.jsp
+++ /dev/null
@@ -1,100 +0,0 @@
-<%--
- ~ Licensed to the Apache Software Foundation (ASF) under one
- ~ or more contributor license agreements. See the NOTICE file
- ~ distributed with this work for additional information
- ~ regarding copyright ownership. The ASF licenses this file
- ~ to you under the Apache License, Version 2.0 (the
- ~ "License"); you may not use this file except in compliance
- ~ with the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing,
- ~ software distributed under the License is distributed on an
- ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- ~ KIND, either express or implied. See the License for the
- ~ specific language governing permissions and limitations
- ~ under the License.
- --%>
-<%@ page import="org.wso2.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.apache.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.apache.stratos.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>
http://git-wip-us.apache.org/repos/asf/stratos/blob/bfc6d758/components/org.apache.stratos.account.mgt.ui/src/main/resources/web/account-mgt/js/account_mgt.js
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.account.mgt.ui/src/main/resources/web/account-mgt/js/account_mgt.js b/components/org.apache.stratos.account.mgt.ui/src/main/resources/web/account-mgt/js/account_mgt.js
deleted file mode 100644
index f6ff33e..0000000
--- a/components/org.apache.stratos.account.mgt.ui/src/main/resources/web/account-mgt/js/account_mgt.js
+++ /dev/null
@@ -1,233 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
-
- * http://www.apache.org/licenses/LICENSE-2.0
-
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-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/stratos/blob/bfc6d758/components/org.apache.stratos.account.mgt.ui/src/main/resources/web/account-mgt/update_contact_ajaxprocessor.jsp
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.account.mgt.ui/src/main/resources/web/account-mgt/update_contact_ajaxprocessor.jsp b/components/org.apache.stratos.account.mgt.ui/src/main/resources/web/account-mgt/update_contact_ajaxprocessor.jsp
deleted file mode 100644
index 9ef5eef..0000000
--- a/components/org.apache.stratos.account.mgt.ui/src/main/resources/web/account-mgt/update_contact_ajaxprocessor.jsp
+++ /dev/null
@@ -1,36 +0,0 @@
-<%--
- ~ Licensed to the Apache Software Foundation (ASF) under one
- ~ or more contributor license agreements. See the NOTICE file
- ~ distributed with this work for additional information
- ~ regarding copyright ownership. The ASF licenses this file
- ~ to you under the Apache License, Version 2.0 (the
- ~ "License"); you may not use this file except in compliance
- ~ with the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing,
- ~ software distributed under the License is distributed on an
- ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- ~ KIND, either express or implied. See the License for the
- ~ specific language governing permissions and limitations
- ~ under the License.
- --%>
-<%@ page import="org.wso2.carbon.registry.core.exceptions.RegistryException" %>
-<%@ page import="org.apache.stratos.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;
-}
-
-%>
http://git-wip-us.apache.org/repos/asf/stratos/blob/bfc6d758/components/org.apache.stratos.account.mgt.ui/src/main/resources/web/account-mgt/update_profile_processor.jsp
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.account.mgt.ui/src/main/resources/web/account-mgt/update_profile_processor.jsp b/components/org.apache.stratos.account.mgt.ui/src/main/resources/web/account-mgt/update_profile_processor.jsp
deleted file mode 100644
index e8f3f57..0000000
--- a/components/org.apache.stratos.account.mgt.ui/src/main/resources/web/account-mgt/update_profile_processor.jsp
+++ /dev/null
@@ -1,63 +0,0 @@
-<%--
- ~ Licensed to the Apache Software Foundation (ASF) under one
- ~ or more contributor license agreements. See the NOTICE file
- ~ distributed with this work for additional information
- ~ regarding copyright ownership. The ASF licenses this file
- ~ to you under the Apache License, Version 2.0 (the
- ~ "License"); you may not use this file except in compliance
- ~ with the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing,
- ~ software distributed under the License is distributed on an
- ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- ~ KIND, either express or implied. See the License for the
- ~ specific language governing permissions and limitations
- ~ under the License.
- --%>
-<%@ page import="org.wso2.carbon.registry.core.exceptions.RegistryException" %>
-<%@ page import="org.apache.stratos.account.mgt.ui.clients.AccountMgtClient" %>
-<%@ page import="org.apache.stratos.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.apache.stratos.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/stratos/blob/bfc6d758/components/org.apache.stratos.account.mgt.ui/src/main/resources/web/account-mgt/update_verifier.jsp
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.account.mgt.ui/src/main/resources/web/account-mgt/update_verifier.jsp b/components/org.apache.stratos.account.mgt.ui/src/main/resources/web/account-mgt/update_verifier.jsp
deleted file mode 100644
index 5ee1530..0000000
--- a/components/org.apache.stratos.account.mgt.ui/src/main/resources/web/account-mgt/update_verifier.jsp
+++ /dev/null
@@ -1,57 +0,0 @@
-<%--
- ~ Licensed to the Apache Software Foundation (ASF) under one
- ~ or more contributor license agreements. See the NOTICE file
- ~ distributed with this work for additional information
- ~ regarding copyright ownership. The ASF licenses this file
- ~ to you under the Apache License, Version 2.0 (the
- ~ "License"); you may not use this file except in compliance
- ~ with the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing,
- ~ software distributed under the License is distributed on an
- ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- ~ KIND, either express or implied. See the License for the
- ~ specific language governing permissions and limitations
- ~ under the License.
- --%>
-<%@ page import="org.wso2.carbon.CarbonConstants" %>
-<%@ page import="org.apache.stratos.account.mgt.ui.clients.AccountMgtClient" %>
-<%@ page import="org.apache.stratos.account.mgt.ui.utils.Util" %>
-<%@ page import="org.wso2.carbon.registry.core.exceptions.RegistryException" %>
-<%@ page import="org.apache.stratos.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.apache.stratos.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/stratos/blob/bfc6d758/components/org.apache.stratos.account.mgt.ui/src/main/resources/web/account-mgt/update_verifier_redirector_ajaxprocessor.jsp
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.account.mgt.ui/src/main/resources/web/account-mgt/update_verifier_redirector_ajaxprocessor.jsp b/components/org.apache.stratos.account.mgt.ui/src/main/resources/web/account-mgt/update_verifier_redirector_ajaxprocessor.jsp
deleted file mode 100644
index 32abd97..0000000
--- a/components/org.apache.stratos.account.mgt.ui/src/main/resources/web/account-mgt/update_verifier_redirector_ajaxprocessor.jsp
+++ /dev/null
@@ -1,31 +0,0 @@
-<%--
- ~ Licensed to the Apache Software Foundation (ASF) under one
- ~ or more contributor license agreements. See the NOTICE file
- ~ distributed with this work for additional information
- ~ regarding copyright ownership. The ASF licenses this file
- ~ to you under the Apache License, Version 2.0 (the
- ~ "License"); you may not use this file except in compliance
- ~ with the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing,
- ~ software distributed under the License is distributed on an
- ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- ~ KIND, either express or implied. See the License for the
- ~ specific language governing permissions and limitations
- ~ under the License.
- --%>
-<%@ page import="org.apache.stratos.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/stratos/blob/bfc6d758/components/org.apache.stratos.account.mgt.ui/src/main/resources/web/account-mgt/validate_domain_ajaxprocessor.jsp
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.account.mgt.ui/src/main/resources/web/account-mgt/validate_domain_ajaxprocessor.jsp b/components/org.apache.stratos.account.mgt.ui/src/main/resources/web/account-mgt/validate_domain_ajaxprocessor.jsp
deleted file mode 100644
index 96f1615..0000000
--- a/components/org.apache.stratos.account.mgt.ui/src/main/resources/web/account-mgt/validate_domain_ajaxprocessor.jsp
+++ /dev/null
@@ -1,30 +0,0 @@
-<%--
- ~ Licensed to the Apache Software Foundation (ASF) under one
- ~ or more contributor license agreements. See the NOTICE file
- ~ distributed with this work for additional information
- ~ regarding copyright ownership. The ASF licenses this file
- ~ to you under the Apache License, Version 2.0 (the
- ~ "License"); you may not use this file except in compliance
- ~ with the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing,
- ~ software distributed under the License is distributed on an
- ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- ~ KIND, either express or implied. See the License for the
- ~ specific language governing permissions and limitations
- ~ under the License.
- --%>
-<%@ 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/stratos/blob/bfc6d758/components/org.apache.stratos.account.mgt.ui/src/main/resources/web/account-mgt/validation_success_ajaxprocessor.jsp
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.account.mgt.ui/src/main/resources/web/account-mgt/validation_success_ajaxprocessor.jsp b/components/org.apache.stratos.account.mgt.ui/src/main/resources/web/account-mgt/validation_success_ajaxprocessor.jsp
deleted file mode 100644
index 9ab693f..0000000
--- a/components/org.apache.stratos.account.mgt.ui/src/main/resources/web/account-mgt/validation_success_ajaxprocessor.jsp
+++ /dev/null
@@ -1,50 +0,0 @@
-<%--
- ~ Licensed to the Apache Software Foundation (ASF) under one
- ~ or more contributor license agreements. See the NOTICE file
- ~ distributed with this work for additional information
- ~ regarding copyright ownership. The ASF licenses this file
- ~ to you under the Apache License, Version 2.0 (the
- ~ "License"); you may not use this file except in compliance
- ~ with the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing,
- ~ software distributed under the License is distributed on an
- ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- ~ KIND, either express or implied. See the License for the
- ~ specific language governing permissions and limitations
- ~ under the License.
- --%>
-<%@ page import="org.apache.stratos.account.mgt.org.apache.stratos.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;
-}
-%>
http://git-wip-us.apache.org/repos/asf/stratos/blob/bfc6d758/components/org.apache.stratos.account.mgt/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.account.mgt/pom.xml b/components/org.apache.stratos.account.mgt/pom.xml
deleted file mode 100644
index 618a4df..0000000
--- a/components/org.apache.stratos.account.mgt/pom.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <groupId>org.apache.stratos</groupId>
- <artifactId>stratos-components-parent</artifactId>
- <version>4.1.0-SNAPSHOT</version>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <artifactId>org.apache.stratos.account.mgt</artifactId>
- <packaging>bundle</packaging>
- <name>Apache 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>
- <version>${wso2carbon.version}</version>
- </dependency>
- <dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.email.verification</artifactId>
- <version>${wso2carbon.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.stratos</groupId>
- <artifactId>org.apache.stratos.common</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.tenant.mgt</artifactId>
- <version>2.2.2</version>
- </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/stratos/blob/bfc6d758/components/org.apache.stratos.account.mgt/src/main/java/org/apache/stratos/account/mgt/beans/AccountInfoBean.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.account.mgt/src/main/java/org/apache/stratos/account/mgt/beans/AccountInfoBean.java b/components/org.apache.stratos.account.mgt/src/main/java/org/apache/stratos/account/mgt/beans/AccountInfoBean.java
deleted file mode 100644
index 106fc7f..0000000
--- a/components/org.apache.stratos.account.mgt/src/main/java/org/apache/stratos/account/mgt/beans/AccountInfoBean.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.stratos.account.mgt.beans;
-
-public class AccountInfoBean {
- private String firstName;
- private String lastName;
-
- public String getLastName() {
- return lastName;
- }
-
- public void setLastName(String lastName) {
- this.lastName = lastName;
- }
-
- public String getFirstName() {
- return firstName;
- }
-
- public void setFirstName(String firstName) {
- this.firstName = firstName;
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/bfc6d758/components/org.apache.stratos.account.mgt/src/main/java/org/apache/stratos/account/mgt/internal/AccountMgtServiceComponent.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.account.mgt/src/main/java/org/apache/stratos/account/mgt/internal/AccountMgtServiceComponent.java b/components/org.apache.stratos.account.mgt/src/main/java/org/apache/stratos/account/mgt/internal/AccountMgtServiceComponent.java
deleted file mode 100644
index b97145c..0000000
--- a/components/org.apache.stratos.account.mgt/src/main/java/org/apache/stratos/account/mgt/internal/AccountMgtServiceComponent.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.stratos.account.mgt.internal;
-
-import org.wso2.carbon.email.verification.util.EmailVerifcationSubscriber;
-import org.wso2.carbon.registry.core.service.RegistryService;
-import org.apache.stratos.common.TenantBillingService;
-import org.apache.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.apache.stratos.tenant.mgt.listener.service"
- * interface="org.apache.stratos.common.listeners.TenantMgtListener"
- * cardinality="0..n" policy="dynamic"
- * bind="setTenantMgtListenerService"
- * unbind="unsetTenantMgtListenerService"
- * @scr.reference name="default.tenant.billing.service"
- * interface="org.apache.stratos.common.TenantBillingService"
- * cardinality="0..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;
- }
-
-}
[5/5] stratos git commit: removing account mgt,
domain validation as it is not used
Posted by re...@apache.org.
removing account mgt, domain validation as it is not used
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/bfc6d758
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/bfc6d758
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/bfc6d758
Branch: refs/heads/master
Commit: bfc6d75863d57d8ae9eacf02515f9fa26bfb4b99
Parents: a03ff6d
Author: reka <rt...@gmail.com>
Authored: Thu May 21 15:05:11 2015 +0530
Committer: reka <rt...@gmail.com>
Committed: Thu May 21 15:07:19 2015 +0530
----------------------------------------------------------------------
.../org.apache.stratos.account.mgt.ui/pom.xml | 96 ---
.../mgt/ui/clients/AccountMgtClient.java | 178 -----
.../mgt/ui/clients/EmailValidationClient.java | 97 ---
.../ui/clients/PackageInfoServiceClient.java | 99 ---
.../account/mgt/ui/clients/UsagePlanClient.java | 109 ----
.../stratos/account/mgt/ui/utils/Util.java | 119 ----
.../src/main/resources/AccountMgtService.wsdl | 646 -------------------
.../main/resources/EmailValidationService.wsdl | 113 ----
.../src/main/resources/META-INF/component.xml | 36 --
.../account/mgt/ui/i18n/JSResources.properties | 22 -
.../account/mgt/ui/i18n/Resources.properties | 41 --
.../resources/web/account-mgt/account_mgt.jsp | 530 ---------------
.../web/account-mgt/css/account_mgt.css | 34 -
.../web/account-mgt/css/update_profile.css | 48 --
.../deactivate_account_ajaxprocessor.jsp | 39 --
.../web/account-mgt/docs/aboutUsagePlans.html | 105 ---
.../web/account-mgt/docs/images/account-mgt.png | Bin 39610 -> 0 bytes
.../web/account-mgt/docs/userguide.html | 45 --
.../get_package_info_ajaxprocessor.jsp | 40 --
.../web/account-mgt/images/account-mgt-icon.gif | Bin 1041 -> 0 bytes
.../web/account-mgt/images/ajax-loader.gif | Bin 673 -> 0 bytes
.../resources/web/account-mgt/images/right.gif | Bin 924 -> 0 bytes
.../resources/web/account-mgt/images/wrong.gif | Bin 976 -> 0 bytes
.../account-mgt/init_payment_ajaxprocessor.jsp | 100 ---
.../resources/web/account-mgt/js/account_mgt.js | 233 -------
.../update_contact_ajaxprocessor.jsp | 36 --
.../account-mgt/update_profile_processor.jsp | 63 --
.../web/account-mgt/update_verifier.jsp | 57 --
...update_verifier_redirector_ajaxprocessor.jsp | 31 -
.../validate_domain_ajaxprocessor.jsp | 30 -
.../validation_success_ajaxprocessor.jsp | 50 --
.../org.apache.stratos.account.mgt/pom.xml | 92 ---
.../account/mgt/beans/AccountInfoBean.java | 40 --
.../internal/AccountMgtServiceComponent.java | 140 ----
.../account/mgt/services/AccountMgtService.java | 413 ------------
.../mgt/services/EmailValidationService.java | 156 -----
.../apache/stratos/account/mgt/util/Util.java | 174 -----
.../src/main/resources/META-INF/component.xml | 31 -
.../src/main/resources/META-INF/services.xml | 82 ---
.../pom.xml | 133 ----
.../ui/clients/TenantActivityServiceClient.java | 156 -----
.../TenantActivityUIServiceComponent.java | 73 ---
.../ui/utils/ManagerConfigurations.java | 148 -----
.../activity/ui/utils/TenantMonitorUtil.java | 143 ----
.../src/main/resources/META-INF/component.xml | 36 --
.../activity/ui/i18n/JSResources.properties | 18 -
.../activity/ui/i18n/Resources.properties | 28 -
.../web/tenant-activity/css/tenant-usage.css | 47 --
.../tenant-activity/docs/images/view-usage.png | Bin 44786 -> 0 bytes
.../web/tenant-activity/docs/userguide.html | 77 ---
.../find-tenant-ajaxprocessor.jsp | 60 --
.../web/tenant-activity/find-tenant.jsp | 111 ----
.../tenant-activity/get-data-ajaxprocessor.jsp | 67 --
.../images/instance-usage-report.gif | Bin 849 -> 0 bytes
.../web/tenant-activity/images/search.gif | Bin 191 -> 0 bytes
.../images/tenant-usage-report.gif | Bin 1008 -> 0 bytes
.../images/user-usage-report.gif | Bin 1033 -> 0 bytes
.../web/tenant-activity/show-active-tenants.jsp | 130 ----
.../web/tenant-activity/tenant-activity.jsp | 175 -----
.../pom.xml | 105 ---
.../ui/clients/ValidateDomainAdminClient.java | 118 ----
.../domain/ui/clients/ValidateDomainClient.java | 30 -
.../clients/ValidateDomainNonAdminClient.java | 116 ----
.../stratos/validate/domain/ui/utils/Util.java | 43 --
.../src/main/resources/META-INF/component.xml | 22 -
.../resources/ValidateDomainAdminService.wsdl | 257 --------
.../main/resources/ValidateDomainService.wsdl | 257 --------
.../domain/ui/i18n/JSResources.properties | 28 -
.../domain/ui/i18n/Resources.properties | 24 -
.../web/validate-domain/css/validate_domain.css | 52 --
.../docs/images/domain-validation.png | Bin 56415 -> 0 bytes
.../web/validate-domain/docs/userguide.html | 48 --
.../web/validate-domain/images/ajax-loader.gif | Bin 673 -> 0 bytes
.../web/validate-domain/images/right.gif | Bin 924 -> 0 bytes
.../web/validate-domain/images/wrong.gif | Bin 976 -> 0 bytes
.../web/validate-domain/js/validate_domain.js | 172 -----
.../submit_validate_domain_ajaxprocessor.jsp | 37 --
.../validate_domain_logged_in.jsp | 23 -
.../validate_domain_not_logged_in.jsp | 23 -
.../validate_domain_template.jsp | 203 ------
.../validate_with_dns_ajaxprocessor.jsp | 40 --
.../validate_with_text_ajaxprocessor.jsp | 40 --
.../org.apache.stratos.validate.domain/pom.xml | 83 ---
.../ValidateDomainServiceComponent.java | 88 ---
.../services/ValidateDomainAdminService.java | 40 --
.../domain/services/ValidateDomainService.java | 83 ---
.../stratos/validate/domain/util/Util.java | 320 ---------
.../src/main/resources/META-INF/services.xml | 41 --
components/pom.xml | 5 -
.../pom.xml | 96 ---
features/manager/tenant-activity/pom.xml | 1 -
91 files changed, 7922 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/bfc6d758/components/org.apache.stratos.account.mgt.ui/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.account.mgt.ui/pom.xml b/components/org.apache.stratos.account.mgt.ui/pom.xml
deleted file mode 100644
index 5e56aba..0000000
--- a/components/org.apache.stratos.account.mgt.ui/pom.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
- -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <groupId>org.apache.stratos</groupId>
- <artifactId>stratos-components-parent</artifactId>
- <version>4.1.0-SNAPSHOT</version>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <artifactId>org.apache.stratos.account.mgt.ui</artifactId>
- <packaging>bundle</packaging>
- <name>Apache Stratos - Account Managment - User Interface</name>
-
- <build>
-
- <plugins>
-
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
-
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
- <Bundle-Name>${project.artifactId}</Bundle-Name>
- <Export-Package>
- org.apache.stratos.account.mgt.ui.*,
- </Export-Package>
- <Import-Package>
- org.wso2.carbon.tenant.mgt.stub.*; version="4.2.0",
- javax.servlet;version="${imp.pkg.version.javax.servlet}",
- javax.servlet.http;version="${imp.pkg.version.javax.servlet}",
- org.apache.stratos.account.mgt.stub.*; version="${project.version}",
- *;resolution:=optional
- </Import-Package>
- <Carbon-Component>UIBundle</Carbon-Component>
- </instructions>
- </configuration>
- </plugin>
-
- </plugins>
- </build>
-
- <dependencies>
- <dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.ui</artifactId>
- <version>${wso2carbon.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.stratos</groupId>
- <artifactId>org.apache.stratos.account.mgt.stub</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.tenant.mgt.stub</artifactId>
- <version>${wso2carbon.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.stratos</groupId>
- <artifactId>org.apache.stratos.common</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.json.wso2</groupId>
- <artifactId>json</artifactId>
- <version>${json.wso2.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.stratos</groupId>
- <artifactId>org.apache.stratos.common.stub</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
-</project>
http://git-wip-us.apache.org/repos/asf/stratos/blob/bfc6d758/components/org.apache.stratos.account.mgt.ui/src/main/java/org/apache/stratos/account/mgt/ui/clients/AccountMgtClient.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.account.mgt.ui/src/main/java/org/apache/stratos/account/mgt/ui/clients/AccountMgtClient.java b/components/org.apache.stratos.account.mgt.ui/src/main/java/org/apache/stratos/account/mgt/ui/clients/AccountMgtClient.java
deleted file mode 100644
index 15f608f..0000000
--- a/components/org.apache.stratos.account.mgt.ui/src/main/java/org/apache/stratos/account/mgt/ui/clients/AccountMgtClient.java
+++ /dev/null
@@ -1,178 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.stratos.account.mgt.ui.clients;
-
-import org.apache.axis2.AxisFault;
-import org.apache.axis2.client.Options;
-import org.apache.axis2.client.ServiceClient;
-import org.apache.axis2.context.ConfigurationContext;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.wso2.carbon.CarbonConstants;
-import org.apache.stratos.account.mgt.stub.beans.xsd.AccountInfoBean;
-import org.apache.stratos.account.mgt.stub.services.AccountMgtServiceStub;
-import org.wso2.carbon.registry.core.exceptions.RegistryException;
-import org.wso2.carbon.ui.CarbonUIUtil;
-import org.wso2.carbon.utils.ServerConstants;
-
-import javax.servlet.ServletConfig;
-import javax.servlet.http.HttpSession;
-
-public class AccountMgtClient {
- private static final Log log = LogFactory.getLog(AccountMgtClient.class);
-
- private AccountMgtServiceStub stub;
- private String epr;
-
- public AccountMgtClient(String cookie, String backendServerURL,
- ConfigurationContext configContext) throws RegistryException {
-
- epr = backendServerURL + "AccountMgtService";
-
- try {
- stub = new AccountMgtServiceStub(configContext, epr);
-
- ServiceClient client = stub._getServiceClient();
- Options option = client.getOptions();
- option.setManageSession(true);
- option.setProperty(org.apache.axis2.transport.http.HTTPConstants.COOKIE_STRING, cookie);
-
- } catch (AxisFault axisFault) {
- String msg = "Failed to initiate AccountMgt service client.";
- log.error(msg, axisFault);
- throw new RegistryException(msg, axisFault);
- }
- }
-
- public AccountMgtClient(ServletConfig config, HttpSession session) throws RegistryException {
-
- String cookie = (String) session.getAttribute(ServerConstants.ADMIN_SERVICE_COOKIE);
- String backendServerURL = CarbonUIUtil.getServerURL(config.getServletContext(), session);
- ConfigurationContext configContext =
- (ConfigurationContext) config.getServletContext().getAttribute(
- CarbonConstants.CONFIGURATION_CONTEXT);
- epr = backendServerURL + "AccountMgtService";
-
- try {
- stub = new AccountMgtServiceStub(configContext, epr);
-
- ServiceClient client = stub._getServiceClient();
- Options option = client.getOptions();
- option.setManageSession(true);
- option.setProperty(org.apache.axis2.transport.http.HTTPConstants.COOKIE_STRING, cookie);
-
- } catch (AxisFault axisFault) {
- String msg = "Failed to initiate AccountMgt service client.";
- log.error(msg, axisFault);
- throw new RegistryException(msg, axisFault);
- }
- }
-
- public void updateContact(String contactEmail) throws RegistryException {
- try {
- stub.updateContact(contactEmail);
- } catch (Exception e) {
- String msg = "Failed to update contact.";
- log.error(msg, e);
- throw new RegistryException(msg, e);
- }
- }
-
- public String getContact() throws RegistryException {
- try {
- return stub.getContact();
- } catch (Exception e) {
- String msg = "Failed to get contact.";
- log.error(msg, e);
- throw new RegistryException(msg, e);
- }
- }
-
- public boolean updateFullname(AccountInfoBean fullname) throws RegistryException {
- try {
- return stub.updateFullname(fullname);
- } catch (Exception e) {
- String msg = "Failed to update Fullname.";
- log.error(msg, e);
- throw new RegistryException(msg, e);
- }
- }
-
- public AccountInfoBean getFullname() throws RegistryException {
- try {
- return stub.getFullname();
- } catch (Exception e) {
- String msg = "Failed to get administrator full name.";
- log.error(msg, e);
- throw new RegistryException(msg, e);
- }
- }
-
- public void deactivate() throws RegistryException {
- try {
- stub.deactivate();
- } catch (Exception e) {
- String msg = "Failed to deactivate.";
- log.error(msg, e);
- throw new RegistryException(msg, e);
- }
- }
-
- public boolean isDomainValidated() throws RegistryException {
- try {
- return stub.isDomainValidated();
- } catch (Exception e) {
- String msg = "Failed to check the domain validation.";
- log.error(msg, e);
- throw new RegistryException(msg, e);
- }
- }
-
- public boolean finishedDomainValidation(String validatedDomain, String successKey)
- throws RegistryException {
- try {
- return stub.finishedDomainValidation(validatedDomain, successKey);
- } catch (Exception e) {
- String msg = "Failed to finish the domain validation.";
- log.error(msg, e);
- throw new RegistryException(msg, e);
- }
- }
-
- public boolean checkDomainAvailability(String domainName) throws RegistryException {
- try {
- return stub.checkDomainAvailability(domainName);
- } catch (Exception e) {
- String msg = "Failed to finish the domain availability.";
- log.error(msg, e);
- throw new RegistryException(msg, e);
- }
- }
-
- public boolean isEmailValidated() throws RegistryException {
- try {
- return stub.isEmailValidated();
- } catch (Exception e) {
- String msg = "Failed to check the email validation.";
- log.error(msg, e);
- throw new RegistryException(msg, e);
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/bfc6d758/components/org.apache.stratos.account.mgt.ui/src/main/java/org/apache/stratos/account/mgt/ui/clients/EmailValidationClient.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.account.mgt.ui/src/main/java/org/apache/stratos/account/mgt/ui/clients/EmailValidationClient.java b/components/org.apache.stratos.account.mgt.ui/src/main/java/org/apache/stratos/account/mgt/ui/clients/EmailValidationClient.java
deleted file mode 100644
index 190b29d..0000000
--- a/components/org.apache.stratos.account.mgt.ui/src/main/java/org/apache/stratos/account/mgt/ui/clients/EmailValidationClient.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.stratos.account.mgt.ui.clients;
-
-import org.apache.axis2.AxisFault;
-import org.apache.axis2.client.Options;
-import org.apache.axis2.client.ServiceClient;
-import org.apache.axis2.context.ConfigurationContext;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.wso2.carbon.CarbonConstants;
-import org.apache.stratos.account.mgt.stub.services.EmailValidationServiceStub;
-import org.wso2.carbon.registry.core.exceptions.RegistryException;
-import org.wso2.carbon.ui.CarbonUIUtil;
-import org.wso2.carbon.utils.ServerConstants;
-
-import javax.servlet.ServletConfig;
-import javax.servlet.http.HttpSession;
-
-public class EmailValidationClient {
- private static final Log log = LogFactory.getLog(EmailValidationClient.class);
-
- private EmailValidationServiceStub stub;
- private String epr;
-
- public EmailValidationClient(
- String cookie, String backendServerURL, ConfigurationContext configContext)
- throws RegistryException {
-
- epr = backendServerURL + "EmailValidationService";
-
- try {
- stub = new EmailValidationServiceStub(configContext, epr);
-
- ServiceClient client = stub._getServiceClient();
- Options option = client.getOptions();
- option.setManageSession(true);
- option.setProperty(org.apache.axis2.transport.http.HTTPConstants.COOKIE_STRING, cookie);
-
- } catch (AxisFault axisFault) {
- String msg = "Failed to initiate EmailValidationService service client.";
- log.error(msg, axisFault);
- throw new RegistryException(msg, axisFault);
- }
- }
-
- public EmailValidationClient(ServletConfig config, HttpSession session)
- throws RegistryException {
-
- String cookie = (String)session.getAttribute(ServerConstants.ADMIN_SERVICE_COOKIE);
- String backendServerURL = CarbonUIUtil.getServerURL(config.getServletContext(), session);
- ConfigurationContext configContext = (ConfigurationContext) config.
- getServletContext().getAttribute(CarbonConstants.CONFIGURATION_CONTEXT);
- epr = backendServerURL + "EmailValidationService";
-
- try {
- stub = new EmailValidationServiceStub(configContext, epr);
-
- ServiceClient client = stub._getServiceClient();
- Options option = client.getOptions();
- option.setManageSession(true);
- option.setProperty(org.apache.axis2.transport.http.HTTPConstants.COOKIE_STRING, cookie);
-
- } catch (AxisFault axisFault) {
- String msg = "Failed to initiate EmailValidationService service client.";
- log.error(msg, axisFault);
- throw new RegistryException(msg, axisFault);
- }
- }
-
- public void proceedUpdateContact(String domain, String email, String confirmationKey) throws RegistryException {
- try {
- stub.proceedUpdateContact(domain, email, confirmationKey);
- } catch (Exception e) {
- String msg = "Failed to proceed update contacts.";
- log.error(msg, e);
- throw new RegistryException(msg, e);
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/bfc6d758/components/org.apache.stratos.account.mgt.ui/src/main/java/org/apache/stratos/account/mgt/ui/clients/PackageInfoServiceClient.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.account.mgt.ui/src/main/java/org/apache/stratos/account/mgt/ui/clients/PackageInfoServiceClient.java b/components/org.apache.stratos.account.mgt.ui/src/main/java/org/apache/stratos/account/mgt/ui/clients/PackageInfoServiceClient.java
deleted file mode 100644
index 1425a58..0000000
--- a/components/org.apache.stratos.account.mgt.ui/src/main/java/org/apache/stratos/account/mgt/ui/clients/PackageInfoServiceClient.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.stratos.account.mgt.ui.clients;
-
-import org.apache.axis2.AxisFault;
-import org.apache.axis2.client.Options;
-import org.apache.axis2.client.ServiceClient;
-import org.apache.axis2.context.ConfigurationContext;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.json.JSONArray;
-import org.json.JSONObject;
-import org.wso2.carbon.registry.core.exceptions.RegistryException;
-import org.apache.stratos.common.packages.stub.PackageInfoServiceStub;
-import org.apache.stratos.common.packages.stub.PackageInfo;
-
-/**
- * PackageInfoService client
- */
-public class PackageInfoServiceClient {
-
- private static Log log = LogFactory.getLog(PackageInfoServiceClient.class);
-
- private PackageInfoServiceStub stub;
- private String epr;
-
- public PackageInfoServiceClient(
- String cookie, String backendServerURL, ConfigurationContext configContext)
- throws Exception {
-
- epr = backendServerURL + "PackageInfoService";
-
- try {
- stub = new PackageInfoServiceStub(configContext, epr);
-
- ServiceClient client = stub._getServiceClient();
- Options option = client.getOptions();
- option.setManageSession(true);
- option.setProperty(org.apache.axis2.transport.http.HTTPConstants.COOKIE_STRING, cookie);
-
- } catch (AxisFault axisFault) {
- String msg = "Failed to initiate PackageInfoService client. " + axisFault.getMessage();
- log.error(msg, axisFault);
- throw new RegistryException(msg, axisFault);
- }
- }
-
- public PackageInfo[] getBillingPackages() throws Exception {
-
- try {
- return stub.getPackageInfos();
- } catch (Exception e) {
- String msg = "Failed to get package information: " + e.getMessage();
- log.error(msg, e);
- throw new Exception(msg, e);
- }
- }
-
- public JSONArray getBillingPackagesJsonArray() throws Exception {
-
- try {
- PackageInfo[] packageInfoArray = stub.getPackageInfos();
- JSONArray jsonPackageInfoArray = new JSONArray();
- for (PackageInfo packageInfo : packageInfoArray) {
- JSONObject packageInfoObj = new JSONObject();
- packageInfoObj.put("name", packageInfo.getName());
- int subscriptionCharge = packageInfo.getSubscriptionCharge();
- //TODO https://wso2.org/jira/browse/STRATOS-1819
- StringBuffer charge = new StringBuffer("$" + subscriptionCharge);
- packageInfoObj.put("subscriptionCharge", charge.toString());
- jsonPackageInfoArray.put(packageInfoObj);
- }
- return jsonPackageInfoArray;
- } catch (Exception e) {
- String msg = "Failed to get package information: " + e.getMessage();
- log.error(msg, e);
- throw new Exception(msg, e);
- }
-
- }
-}
-
http://git-wip-us.apache.org/repos/asf/stratos/blob/bfc6d758/components/org.apache.stratos.account.mgt.ui/src/main/java/org/apache/stratos/account/mgt/ui/clients/UsagePlanClient.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.account.mgt.ui/src/main/java/org/apache/stratos/account/mgt/ui/clients/UsagePlanClient.java b/components/org.apache.stratos.account.mgt.ui/src/main/java/org/apache/stratos/account/mgt/ui/clients/UsagePlanClient.java
deleted file mode 100644
index 758da2f..0000000
--- a/components/org.apache.stratos.account.mgt.ui/src/main/java/org/apache/stratos/account/mgt/ui/clients/UsagePlanClient.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.stratos.account.mgt.ui.clients;
-
-import org.apache.axis2.AxisFault;
-import org.apache.axis2.client.Options;
-import org.apache.axis2.client.ServiceClient;
-import org.apache.axis2.context.ConfigurationContext;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.wso2.carbon.CarbonConstants;
-import org.apache.stratos.account.mgt.stub.services.BillingDataAccessServiceStub;
-import org.apache.stratos.account.mgt.stub.services.beans.xsd.Subscription;
-import org.wso2.carbon.registry.core.exceptions.RegistryException;
-import org.wso2.carbon.ui.CarbonUIUtil;
-import org.wso2.carbon.utils.ServerConstants;
-
-import javax.servlet.ServletConfig;
-import javax.servlet.http.HttpSession;
-
-public class UsagePlanClient {
- private BillingDataAccessServiceStub stub;
- private static final Log log = LogFactory.getLog(UsagePlanClient.class);
-
- public UsagePlanClient(ServletConfig config, HttpSession session)
- throws RegistryException {
-
- String cookie = (String) session.getAttribute(ServerConstants.ADMIN_SERVICE_COOKIE);
- String backendServerURL = CarbonUIUtil.getServerURL(config.getServletContext(), session);
- ConfigurationContext configContext = (ConfigurationContext) config.
- getServletContext().getAttribute(CarbonConstants.CONFIGURATION_CONTEXT);
- String epr = backendServerURL + "BillingDataAccessService";
-
- try {
- stub = new BillingDataAccessServiceStub(configContext, epr);
- ServiceClient client = stub._getServiceClient();
- Options option = client.getOptions();
- option.setManageSession(true);
- option.setProperty(org.apache.axis2.transport.http.HTTPConstants.COOKIE_STRING, cookie);
-
- } catch (AxisFault axisFault) {
- String msg = "Failed to initiate Add Services service client. " + axisFault.getMessage();
- log.error(msg, axisFault);
- throw new RegistryException(msg, axisFault);
- }
- }
-
-
- public boolean updateUsagePlan(String usagePlanName) {
- try {
- stub.changeSubscriptionByTenant(usagePlanName);
- } catch (Exception e) {
- return false;
- }
- return true;
- }
-
- public String getUsagePlanName(String tenantDomain) throws Exception{
- //Subscription subscription;
- try {
- // This section get commented because billing component is removed. In account_mgt jsp file get usage plan functionality removed.
- // If rewrite that functionality please uncomment below code lines.
-
- //subscription=stub.getActiveSubscriptionOfCustomerByTenant();
- //if(subscription!=null){
- // return subscription.getSubscriptionPlan();
- //} else {
- return "";
- //}
- } catch (Exception e) {
- String msg = "Error occurred while getting the usage plan for tenant: " + tenantDomain;
- log.error(msg, e);
- throw new Exception(msg, e);
- }
- }
-
- public boolean deactivateActiveUsagePlan(String tenantDomain){
- log.info("Deactivating tenant domain: " + tenantDomain);
- boolean deactivated = false;
- try{
- deactivated = stub.deactivateActiveSubscriptionByTenant();
- if(deactivated){
- log.info("Active subscription deactivated after deactivating the tenant: " + tenantDomain);
- }
- }catch (Exception e){
- log.error("Error occurred while deactivating active subscription of: " +
- tenantDomain + " " + e.getMessage(), e);
- }
-
- return deactivated;
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/bfc6d758/components/org.apache.stratos.account.mgt.ui/src/main/java/org/apache/stratos/account/mgt/ui/utils/Util.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.account.mgt.ui/src/main/java/org/apache/stratos/account/mgt/ui/utils/Util.java b/components/org.apache.stratos.account.mgt.ui/src/main/java/org/apache/stratos/account/mgt/ui/utils/Util.java
deleted file mode 100644
index 547b74c..0000000
--- a/components/org.apache.stratos.account.mgt.ui/src/main/java/org/apache/stratos/account/mgt/ui/utils/Util.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-package org.apache.stratos.account.mgt.ui.utils;
-
-import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.impl.builder.StAXOMBuilder;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.stratos.account.mgt.stub.beans.xsd.AccountInfoBean;
-import org.apache.stratos.account.mgt.ui.clients.AccountMgtClient;
-import org.apache.stratos.account.mgt.ui.clients.UsagePlanClient;
-
-import javax.servlet.ServletConfig;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLStreamReader;
-import java.io.StringReader;
-import java.util.Iterator;
-
-public class Util {
- private static final Log log = LogFactory.getLog(Util.class);
-
- public static HttpServletRequest readIntermediateData(HttpServletRequest request,String data){
- try{
- XMLStreamReader parser = XMLInputFactory.newInstance().createXMLStreamReader(new StringReader(data));
- StAXOMBuilder builder = new StAXOMBuilder(parser);
- OMElement documentElement = builder.getDocumentElement();
- Iterator it = documentElement.getChildElements();
- while(it.hasNext()){
- OMElement element = (OMElement)it.next();
- if ("admin".equals(element.getLocalName())) {
- request.setAttribute("admin",element.getText());
- } else if ("email".equals(element.getLocalName())) {
- request.setAttribute("email",element.getText());
- } else if ("tenantDomain".equals(element.getLocalName())
- && request.getAttribute("tenantDomain") == null) {
- request.setAttribute("tenantDomain",element.getText());
- } else if ("confirmationKey".equals(element.getLocalName())) {
- request.setAttribute("confirmationKey",element.getText());
- }
- }
- }catch(Exception e){
- log.error("Error parsing xml",e);
- }
- return request;
- }
-
- public static boolean updateFullname(
- HttpServletRequest request,
- ServletConfig config,
- HttpSession session) throws Exception {
-
- AccountInfoBean accountInfoBean = new AccountInfoBean();
- String firstname = "", lastname = "";
- try {
- firstname = request.getParameter("firstname");
- lastname = request.getParameter("lastname");
- accountInfoBean.setFirstname(firstname);
- accountInfoBean.setLastname(lastname);
- AccountMgtClient client = new AccountMgtClient(config, session);
- return client.updateFullname(accountInfoBean);
- } catch (Exception e) {
- String msg = "Failed to update tenant with firstname: " + firstname;
- log.error(msg, e);
- throw new Exception(msg, e);
- }
- }
- public static String getUsagePlanName(ServletConfig config,
- HttpSession session) throws Exception {
- try{
- String tenantDomain=(String)session.getAttribute("tenantDomain");
- UsagePlanClient client=new UsagePlanClient(config, session);
- return client.getUsagePlanName(tenantDomain);
- }
- catch (Exception e){
- String msg = "Failed to get usage plan for tenant";
- log.error(msg, e);
- throw new Exception(msg, e);
- }
- }
-
- public static boolean updateUsagePlan( HttpServletRequest request, ServletConfig config,
- HttpSession session) throws Exception {
- boolean updated = false;
- String tenantDomain="";
- try{
- tenantDomain=(String)session.getAttribute("tenantDomain");
- String usagePlanName=(String)request.getParameter("selectedUsagePlan");
- UsagePlanClient client=new UsagePlanClient(config, session);
- updated = client.updateUsagePlan(usagePlanName);
- }
- catch (Exception e){
- String msg = "Failed to update the usage plan for tenant: " + tenantDomain;
- log.error(msg, e);
- throw new Exception(msg, e);
- }
- return updated;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/bfc6d758/components/org.apache.stratos.account.mgt.ui/src/main/resources/AccountMgtService.wsdl
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.account.mgt.ui/src/main/resources/AccountMgtService.wsdl b/components/org.apache.stratos.account.mgt.ui/src/main/resources/AccountMgtService.wsdl
deleted file mode 100644
index ddc2fe2..0000000
--- a/components/org.apache.stratos.account.mgt.ui/src/main/resources/AccountMgtService.wsdl
+++ /dev/null
@@ -1,646 +0,0 @@
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one
- ~ or more contributor license agreements. See the NOTICE file
- ~ distributed with this work for additional information
- ~ regarding copyright ownership. The ASF licenses this file
- ~ to you under the Apache License, Version 2.0 (the
- ~ "License"); you may not use this file except in compliance
- ~ with the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing,
- ~ software distributed under the License is distributed on an
- ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- ~ KIND, either express or implied. See the License for the
- ~ specific language governing permissions and limitations
- ~ under the License.
- -->
-<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:ns1="http://org.apache.axis2/xsd" xmlns:ns="http://services.mgt.account.stratos.apache.org" xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" xmlns:ax21="http://beans.mgt.account.stratos.apache.org/xsd" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/" targetNamespace="http://services.mgt.account.stratos.apache.org">
- <wsdl:documentation>AccountMgtService</wsdl:documentation>
- <wsdl:types>
- <xs:schema xmlns:ax22="http://beans.mgt.account.stratos.apache.org/xsd" attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://services.mgt.account.stratos.apache.org">
- <xs:import namespace="http://beans.mgt.account.stratos.apache.org/xsd" />
- <xs:element name="updateFullnameException">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="updateFullnameException" nillable="true" type="ns:Exception" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:complexType name="Exception">
- <xs:sequence>
- <xs:element minOccurs="0" name="Message" nillable="true" type="xs:string" />
- </xs:sequence>
- </xs:complexType>
- <xs:element name="updateFullname">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="accountInfoBean" nillable="true" type="ax21:AccountInfoBean" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="updateFullnameResponse">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="return" type="xs:boolean" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="updateContactException">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="updateContactException" nillable="true" type="ns:Exception" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="updateContact">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="contactEmail" nillable="true" type="xs:string" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="isEmailValidatedException">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="isEmailValidatedException" nillable="true" type="ns:Exception" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="isEmailValidated">
- <xs:complexType>
- <xs:sequence />
- </xs:complexType>
- </xs:element>
- <xs:element name="isEmailValidatedResponse">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="return" type="xs:boolean" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="isDomainValidatedException">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="isDomainValidatedException" nillable="true" type="ns:Exception" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="isDomainValidated">
- <xs:complexType>
- <xs:sequence />
- </xs:complexType>
- </xs:element>
- <xs:element name="isDomainValidatedResponse">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="return" type="xs:boolean" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="getFullnameException">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="getFullnameException" nillable="true" type="ns:Exception" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="getFullname">
- <xs:complexType>
- <xs:sequence />
- </xs:complexType>
- </xs:element>
- <xs:element name="getFullnameResponse">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="return" nillable="true" type="ax21:AccountInfoBean" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="getContactException">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="getContactException" nillable="true" type="ns:Exception" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="getContact">
- <xs:complexType>
- <xs:sequence />
- </xs:complexType>
- </xs:element>
- <xs:element name="getContactResponse">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="return" nillable="true" type="xs:string" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="finishedDomainValidationException">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="finishedDomainValidationException" nillable="true" type="ns:Exception" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="finishedDomainValidation">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="validatedDomain" nillable="true" type="xs:string" />
- <xs:element minOccurs="0" name="successKey" nillable="true" type="xs:string" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="finishedDomainValidationResponse">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="return" type="xs:boolean" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="deactivateException">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="deactivateException" nillable="true" type="ns:Exception" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="deactivate">
- <xs:complexType>
- <xs:sequence />
- </xs:complexType>
- </xs:element>
- <xs:element name="checkDomainAvailabilityException">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="checkDomainAvailabilityException" nillable="true" type="ns:Exception" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="checkDomainAvailability">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="domainName" nillable="true" type="xs:string" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="checkDomainAvailabilityResponse">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="return" type="xs:boolean" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- </xs:schema>
- <xs:schema attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://beans.mgt.account.stratos.apache.org/xsd">
- <xs:complexType name="AccountInfoBean">
- <xs:sequence>
- <xs:element minOccurs="0" name="firstname" nillable="true" type="xs:string" />
- <xs:element minOccurs="0" name="lastname" nillable="true" type="xs:string" />
- </xs:sequence>
- </xs:complexType>
- </xs:schema>
- </wsdl:types>
- <wsdl:message name="checkDomainAvailabilityRequest">
- <wsdl:part name="parameters" element="ns:checkDomainAvailability" />
- </wsdl:message>
- <wsdl:message name="checkDomainAvailabilityResponse">
- <wsdl:part name="parameters" element="ns:checkDomainAvailabilityResponse" />
- </wsdl:message>
- <wsdl:message name="checkDomainAvailabilityException">
- <wsdl:part name="parameters" element="ns:checkDomainAvailabilityException" />
- </wsdl:message>
- <wsdl:message name="getContactRequest">
- <wsdl:part name="parameters" element="ns:getContact" />
- </wsdl:message>
- <wsdl:message name="getContactResponse">
- <wsdl:part name="parameters" element="ns:getContactResponse" />
- </wsdl:message>
- <wsdl:message name="getContactException">
- <wsdl:part name="parameters" element="ns:getContactException" />
- </wsdl:message>
- <wsdl:message name="isEmailValidatedRequest">
- <wsdl:part name="parameters" element="ns:isEmailValidated" />
- </wsdl:message>
- <wsdl:message name="isEmailValidatedResponse">
- <wsdl:part name="parameters" element="ns:isEmailValidatedResponse" />
- </wsdl:message>
- <wsdl:message name="isEmailValidatedException">
- <wsdl:part name="parameters" element="ns:isEmailValidatedException" />
- </wsdl:message>
- <wsdl:message name="updateFullnameRequest">
- <wsdl:part name="parameters" element="ns:updateFullname" />
- </wsdl:message>
- <wsdl:message name="updateFullnameResponse">
- <wsdl:part name="parameters" element="ns:updateFullnameResponse" />
- </wsdl:message>
- <wsdl:message name="updateFullnameException">
- <wsdl:part name="parameters" element="ns:updateFullnameException" />
- </wsdl:message>
- <wsdl:message name="isDomainValidatedRequest">
- <wsdl:part name="parameters" element="ns:isDomainValidated" />
- </wsdl:message>
- <wsdl:message name="isDomainValidatedResponse">
- <wsdl:part name="parameters" element="ns:isDomainValidatedResponse" />
- </wsdl:message>
- <wsdl:message name="isDomainValidatedException">
- <wsdl:part name="parameters" element="ns:isDomainValidatedException" />
- </wsdl:message>
- <wsdl:message name="deactivateRequest">
- <wsdl:part name="parameters" element="ns:deactivate" />
- </wsdl:message>
- <wsdl:message name="deactivateResponse" />
- <wsdl:message name="deactivateException">
- <wsdl:part name="parameters" element="ns:deactivateException" />
- </wsdl:message>
- <wsdl:message name="getFullnameRequest">
- <wsdl:part name="parameters" element="ns:getFullname" />
- </wsdl:message>
- <wsdl:message name="getFullnameResponse">
- <wsdl:part name="parameters" element="ns:getFullnameResponse" />
- </wsdl:message>
- <wsdl:message name="getFullnameException">
- <wsdl:part name="parameters" element="ns:getFullnameException" />
- </wsdl:message>
- <wsdl:message name="finishedDomainValidationRequest">
- <wsdl:part name="parameters" element="ns:finishedDomainValidation" />
- </wsdl:message>
- <wsdl:message name="finishedDomainValidationResponse">
- <wsdl:part name="parameters" element="ns:finishedDomainValidationResponse" />
- </wsdl:message>
- <wsdl:message name="finishedDomainValidationException">
- <wsdl:part name="parameters" element="ns:finishedDomainValidationException" />
- </wsdl:message>
- <wsdl:message name="updateContactRequest">
- <wsdl:part name="parameters" element="ns:updateContact" />
- </wsdl:message>
- <wsdl:message name="updateContactResponse" />
- <wsdl:message name="updateContactException">
- <wsdl:part name="parameters" element="ns:updateContactException" />
- </wsdl:message>
- <wsdl:portType name="AccountMgtServicePortType">
- <wsdl:operation name="checkDomainAvailability">
- <wsdl:input message="ns:checkDomainAvailabilityRequest" wsaw:Action="urn:checkDomainAvailability" />
- <wsdl:output message="ns:checkDomainAvailabilityResponse" wsaw:Action="urn:checkDomainAvailabilityResponse" />
- <wsdl:fault message="ns:checkDomainAvailabilityException" name="checkDomainAvailabilityException" wsaw:Action="urn:checkDomainAvailabilitycheckDomainAvailabilityException" />
- </wsdl:operation>
- <wsdl:operation name="getContact">
- <wsdl:input message="ns:getContactRequest" wsaw:Action="urn:getContact" />
- <wsdl:output message="ns:getContactResponse" wsaw:Action="urn:getContactResponse" />
- <wsdl:fault message="ns:getContactException" name="getContactException" wsaw:Action="urn:getContactgetContactException" />
- </wsdl:operation>
- <wsdl:operation name="isEmailValidated">
- <wsdl:input message="ns:isEmailValidatedRequest" wsaw:Action="urn:isEmailValidated" />
- <wsdl:output message="ns:isEmailValidatedResponse" wsaw:Action="urn:isEmailValidatedResponse" />
- <wsdl:fault message="ns:isEmailValidatedException" name="isEmailValidatedException" wsaw:Action="urn:isEmailValidatedisEmailValidatedException" />
- </wsdl:operation>
- <wsdl:operation name="updateFullname">
- <wsdl:input message="ns:updateFullnameRequest" wsaw:Action="urn:updateFullname" />
- <wsdl:output message="ns:updateFullnameResponse" wsaw:Action="urn:updateFullnameResponse" />
- <wsdl:fault message="ns:updateFullnameException" name="updateFullnameException" wsaw:Action="urn:updateFullnameupdateFullnameException" />
- </wsdl:operation>
- <wsdl:operation name="isDomainValidated">
- <wsdl:input message="ns:isDomainValidatedRequest" wsaw:Action="urn:isDomainValidated" />
- <wsdl:output message="ns:isDomainValidatedResponse" wsaw:Action="urn:isDomainValidatedResponse" />
- <wsdl:fault message="ns:isDomainValidatedException" name="isDomainValidatedException" wsaw:Action="urn:isDomainValidatedisDomainValidatedException" />
- </wsdl:operation>
- <wsdl:operation name="deactivate">
- <wsdl:input message="ns:deactivateRequest" wsaw:Action="urn:deactivate" />
- <wsdl:output message="ns:deactivateResponse" wsaw:Action="urn:deactivateResponse" />
- <wsdl:fault message="ns:deactivateException" name="deactivateException" wsaw:Action="urn:deactivatedeactivateException" />
- </wsdl:operation>
- <wsdl:operation name="getFullname">
- <wsdl:input message="ns:getFullnameRequest" wsaw:Action="urn:getFullname" />
- <wsdl:output message="ns:getFullnameResponse" wsaw:Action="urn:getFullnameResponse" />
- <wsdl:fault message="ns:getFullnameException" name="getFullnameException" wsaw:Action="urn:getFullnamegetFullnameException" />
- </wsdl:operation>
- <wsdl:operation name="finishedDomainValidation">
- <wsdl:input message="ns:finishedDomainValidationRequest" wsaw:Action="urn:finishedDomainValidation" />
- <wsdl:output message="ns:finishedDomainValidationResponse" wsaw:Action="urn:finishedDomainValidationResponse" />
- <wsdl:fault message="ns:finishedDomainValidationException" name="finishedDomainValidationException" wsaw:Action="urn:finishedDomainValidationfinishedDomainValidationException" />
- </wsdl:operation>
- <wsdl:operation name="updateContact">
- <wsdl:input message="ns:updateContactRequest" wsaw:Action="urn:updateContact" />
- <wsdl:output message="ns:updateContactResponse" wsaw:Action="urn:updateContactResponse" />
- <wsdl:fault message="ns:updateContactException" name="updateContactException" wsaw:Action="urn:updateContactupdateContactException" />
- </wsdl:operation>
- </wsdl:portType>
- <wsdl:binding name="AccountMgtServiceSoap11Binding" type="ns:AccountMgtServicePortType">
- <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document" />
- <wsdl:operation name="checkDomainAvailability">
- <soap:operation soapAction="urn:checkDomainAvailability" style="document" />
- <wsdl:input>
- <soap:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap:body use="literal" />
- </wsdl:output>
- <wsdl:fault name="checkDomainAvailabilityException">
- <soap:fault use="literal" name="checkDomainAvailabilityException" />
- </wsdl:fault>
- </wsdl:operation>
- <wsdl:operation name="getContact">
- <soap:operation soapAction="urn:getContact" style="document" />
- <wsdl:input>
- <soap:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap:body use="literal" />
- </wsdl:output>
- <wsdl:fault name="getContactException">
- <soap:fault use="literal" name="getContactException" />
- </wsdl:fault>
- </wsdl:operation>
- <wsdl:operation name="isEmailValidated">
- <soap:operation soapAction="urn:isEmailValidated" style="document" />
- <wsdl:input>
- <soap:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap:body use="literal" />
- </wsdl:output>
- <wsdl:fault name="isEmailValidatedException">
- <soap:fault use="literal" name="isEmailValidatedException" />
- </wsdl:fault>
- </wsdl:operation>
- <wsdl:operation name="updateFullname">
- <soap:operation soapAction="urn:updateFullname" style="document" />
- <wsdl:input>
- <soap:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap:body use="literal" />
- </wsdl:output>
- <wsdl:fault name="updateFullnameException">
- <soap:fault use="literal" name="updateFullnameException" />
- </wsdl:fault>
- </wsdl:operation>
- <wsdl:operation name="isDomainValidated">
- <soap:operation soapAction="urn:isDomainValidated" style="document" />
- <wsdl:input>
- <soap:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap:body use="literal" />
- </wsdl:output>
- <wsdl:fault name="isDomainValidatedException">
- <soap:fault use="literal" name="isDomainValidatedException" />
- </wsdl:fault>
- </wsdl:operation>
- <wsdl:operation name="deactivate">
- <soap:operation soapAction="urn:deactivate" style="document" />
- <wsdl:input>
- <soap:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap:body use="literal" />
- </wsdl:output>
- <wsdl:fault name="deactivateException">
- <soap:fault use="literal" name="deactivateException" />
- </wsdl:fault>
- </wsdl:operation>
- <wsdl:operation name="getFullname">
- <soap:operation soapAction="urn:getFullname" style="document" />
- <wsdl:input>
- <soap:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap:body use="literal" />
- </wsdl:output>
- <wsdl:fault name="getFullnameException">
- <soap:fault use="literal" name="getFullnameException" />
- </wsdl:fault>
- </wsdl:operation>
- <wsdl:operation name="finishedDomainValidation">
- <soap:operation soapAction="urn:finishedDomainValidation" style="document" />
- <wsdl:input>
- <soap:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap:body use="literal" />
- </wsdl:output>
- <wsdl:fault name="finishedDomainValidationException">
- <soap:fault use="literal" name="finishedDomainValidationException" />
- </wsdl:fault>
- </wsdl:operation>
- <wsdl:operation name="updateContact">
- <soap:operation soapAction="urn:updateContact" style="document" />
- <wsdl:input>
- <soap:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap:body use="literal" />
- </wsdl:output>
- <wsdl:fault name="updateContactException">
- <soap:fault use="literal" name="updateContactException" />
- </wsdl:fault>
- </wsdl:operation>
- </wsdl:binding>
- <wsdl:binding name="AccountMgtServiceSoap12Binding" type="ns:AccountMgtServicePortType">
- <soap12:binding transport="http://schemas.xmlsoap.org/soap/http" style="document" />
- <wsdl:operation name="checkDomainAvailability">
- <soap12:operation soapAction="urn:checkDomainAvailability" style="document" />
- <wsdl:input>
- <soap12:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap12:body use="literal" />
- </wsdl:output>
- <wsdl:fault name="checkDomainAvailabilityException">
- <soap12:fault use="literal" name="checkDomainAvailabilityException" />
- </wsdl:fault>
- </wsdl:operation>
- <wsdl:operation name="getContact">
- <soap12:operation soapAction="urn:getContact" style="document" />
- <wsdl:input>
- <soap12:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap12:body use="literal" />
- </wsdl:output>
- <wsdl:fault name="getContactException">
- <soap12:fault use="literal" name="getContactException" />
- </wsdl:fault>
- </wsdl:operation>
- <wsdl:operation name="isEmailValidated">
- <soap12:operation soapAction="urn:isEmailValidated" style="document" />
- <wsdl:input>
- <soap12:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap12:body use="literal" />
- </wsdl:output>
- <wsdl:fault name="isEmailValidatedException">
- <soap12:fault use="literal" name="isEmailValidatedException" />
- </wsdl:fault>
- </wsdl:operation>
- <wsdl:operation name="updateFullname">
- <soap12:operation soapAction="urn:updateFullname" style="document" />
- <wsdl:input>
- <soap12:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap12:body use="literal" />
- </wsdl:output>
- <wsdl:fault name="updateFullnameException">
- <soap12:fault use="literal" name="updateFullnameException" />
- </wsdl:fault>
- </wsdl:operation>
- <wsdl:operation name="isDomainValidated">
- <soap12:operation soapAction="urn:isDomainValidated" style="document" />
- <wsdl:input>
- <soap12:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap12:body use="literal" />
- </wsdl:output>
- <wsdl:fault name="isDomainValidatedException">
- <soap12:fault use="literal" name="isDomainValidatedException" />
- </wsdl:fault>
- </wsdl:operation>
- <wsdl:operation name="deactivate">
- <soap12:operation soapAction="urn:deactivate" style="document" />
- <wsdl:input>
- <soap12:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap12:body use="literal" />
- </wsdl:output>
- <wsdl:fault name="deactivateException">
- <soap12:fault use="literal" name="deactivateException" />
- </wsdl:fault>
- </wsdl:operation>
- <wsdl:operation name="getFullname">
- <soap12:operation soapAction="urn:getFullname" style="document" />
- <wsdl:input>
- <soap12:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap12:body use="literal" />
- </wsdl:output>
- <wsdl:fault name="getFullnameException">
- <soap12:fault use="literal" name="getFullnameException" />
- </wsdl:fault>
- </wsdl:operation>
- <wsdl:operation name="finishedDomainValidation">
- <soap12:operation soapAction="urn:finishedDomainValidation" style="document" />
- <wsdl:input>
- <soap12:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap12:body use="literal" />
- </wsdl:output>
- <wsdl:fault name="finishedDomainValidationException">
- <soap12:fault use="literal" name="finishedDomainValidationException" />
- </wsdl:fault>
- </wsdl:operation>
- <wsdl:operation name="updateContact">
- <soap12:operation soapAction="urn:updateContact" style="document" />
- <wsdl:input>
- <soap12:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap12:body use="literal" />
- </wsdl:output>
- <wsdl:fault name="updateContactException">
- <soap12:fault use="literal" name="updateContactException" />
- </wsdl:fault>
- </wsdl:operation>
- </wsdl:binding>
- <wsdl:binding name="AccountMgtServiceHttpBinding" type="ns:AccountMgtServicePortType">
- <http:binding verb="POST" />
- <wsdl:operation name="checkDomainAvailability">
- <http:operation location="checkDomainAvailability" />
- <wsdl:input>
- <mime:content type="text/xml" part="parameters" />
- </wsdl:input>
- <wsdl:output>
- <mime:content type="text/xml" part="parameters" />
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="getContact">
- <http:operation location="getContact" />
- <wsdl:input>
- <mime:content type="text/xml" part="parameters" />
- </wsdl:input>
- <wsdl:output>
- <mime:content type="text/xml" part="parameters" />
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="isEmailValidated">
- <http:operation location="isEmailValidated" />
- <wsdl:input>
- <mime:content type="text/xml" part="parameters" />
- </wsdl:input>
- <wsdl:output>
- <mime:content type="text/xml" part="parameters" />
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="updateFullname">
- <http:operation location="updateFullname" />
- <wsdl:input>
- <mime:content type="text/xml" part="parameters" />
- </wsdl:input>
- <wsdl:output>
- <mime:content type="text/xml" part="parameters" />
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="isDomainValidated">
- <http:operation location="isDomainValidated" />
- <wsdl:input>
- <mime:content type="text/xml" part="parameters" />
- </wsdl:input>
- <wsdl:output>
- <mime:content type="text/xml" part="parameters" />
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="deactivate">
- <http:operation location="deactivate" />
- <wsdl:input>
- <mime:content type="text/xml" part="parameters" />
- </wsdl:input>
- <wsdl:output>
- <mime:content type="text/xml" part="parameters" />
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="getFullname">
- <http:operation location="getFullname" />
- <wsdl:input>
- <mime:content type="text/xml" part="parameters" />
- </wsdl:input>
- <wsdl:output>
- <mime:content type="text/xml" part="parameters" />
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="finishedDomainValidation">
- <http:operation location="finishedDomainValidation" />
- <wsdl:input>
- <mime:content type="text/xml" part="parameters" />
- </wsdl:input>
- <wsdl:output>
- <mime:content type="text/xml" part="parameters" />
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="updateContact">
- <http:operation location="updateContact" />
- <wsdl:input>
- <mime:content type="text/xml" part="parameters" />
- </wsdl:input>
- <wsdl:output>
- <mime:content type="text/xml" part="parameters" />
- </wsdl:output>
- </wsdl:operation>
- </wsdl:binding>
- <wsdl:service name="AccountMgtService">
- <wsdl:port name="AccountMgtServiceHttpsSoap11Endpoint" binding="ns:AccountMgtServiceSoap11Binding">
- <soap:address location="https://192.168.1.100:9443/services/AccountMgtService.AccountMgtServiceHttpsSoap11Endpoint/" />
- </wsdl:port>
- <wsdl:port name="AccountMgtServiceHttpsSoap12Endpoint" binding="ns:AccountMgtServiceSoap12Binding">
- <soap12:address location="https://192.168.1.100:9443/services/AccountMgtService.AccountMgtServiceHttpsSoap12Endpoint/" />
- </wsdl:port>
- <wsdl:port name="AccountMgtServiceHttpsEndpoint" binding="ns:AccountMgtServiceHttpBinding">
- <http:address location="https://192.168.1.100:9443/services/AccountMgtService.AccountMgtServiceHttpsEndpoint/" />
- </wsdl:port>
- </wsdl:service>
-</wsdl:definitions>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/bfc6d758/components/org.apache.stratos.account.mgt.ui/src/main/resources/EmailValidationService.wsdl
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.account.mgt.ui/src/main/resources/EmailValidationService.wsdl b/components/org.apache.stratos.account.mgt.ui/src/main/resources/EmailValidationService.wsdl
deleted file mode 100644
index 507ef31..0000000
--- a/components/org.apache.stratos.account.mgt.ui/src/main/resources/EmailValidationService.wsdl
+++ /dev/null
@@ -1,113 +0,0 @@
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one
- ~ or more contributor license agreements. See the NOTICE file
- ~ distributed with this work for additional information
- ~ regarding copyright ownership. The ASF licenses this file
- ~ to you under the Apache License, Version 2.0 (the
- ~ "License"); you may not use this file except in compliance
- ~ with the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing,
- ~ software distributed under the License is distributed on an
- ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- ~ KIND, either express or implied. See the License for the
- ~ specific language governing permissions and limitations
- ~ under the License.
- -->
-<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:ns1="http://org.apache.axis2/xsd" xmlns:ns="http://services.mgt.account.stratos.apache.org" xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/" targetNamespace="http://services.mgt.account.stratos.apache.org">
- <wsdl:documentation>EmailValidationService</wsdl:documentation>
- <wsdl:types>
- <xs:schema attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://services.mgt.account.stratos.apache.org">
- <xs:element name="proceedUpdateContactException">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="proceedUpdateContactException" nillable="true" type="ns:Exception" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:complexType name="Exception">
- <xs:sequence>
- <xs:element minOccurs="0" name="Message" nillable="true" type="xs:string" />
- </xs:sequence>
- </xs:complexType>
- <xs:element name="proceedUpdateContact">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="domain" nillable="true" type="xs:string" />
- <xs:element minOccurs="0" name="email" nillable="true" type="xs:string" />
- <xs:element minOccurs="0" name="confirmationKey" nillable="true" type="xs:string" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- </xs:schema>
- </wsdl:types>
- <wsdl:message name="proceedUpdateContactRequest">
- <wsdl:part name="parameters" element="ns:proceedUpdateContact" />
- </wsdl:message>
- <wsdl:message name="proceedUpdateContactResponse" />
- <wsdl:message name="proceedUpdateContactException">
- <wsdl:part name="parameters" element="ns:proceedUpdateContactException" />
- </wsdl:message>
- <wsdl:portType name="EmailValidationServicePortType">
- <wsdl:operation name="proceedUpdateContact">
- <wsdl:input message="ns:proceedUpdateContactRequest" wsaw:Action="urn:proceedUpdateContact" />
- <wsdl:output message="ns:proceedUpdateContactResponse" wsaw:Action="urn:proceedUpdateContactResponse" />
- <wsdl:fault message="ns:proceedUpdateContactException" name="proceedUpdateContactException" wsaw:Action="urn:proceedUpdateContactproceedUpdateContactException" />
- </wsdl:operation>
- </wsdl:portType>
- <wsdl:binding name="EmailValidationServiceSoap11Binding" type="ns:EmailValidationServicePortType">
- <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document" />
- <wsdl:operation name="proceedUpdateContact">
- <soap:operation soapAction="urn:proceedUpdateContact" style="document" />
- <wsdl:input>
- <soap:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap:body use="literal" />
- </wsdl:output>
- <wsdl:fault name="proceedUpdateContactException">
- <soap:fault use="literal" name="proceedUpdateContactException" />
- </wsdl:fault>
- </wsdl:operation>
- </wsdl:binding>
- <wsdl:binding name="EmailValidationServiceSoap12Binding" type="ns:EmailValidationServicePortType">
- <soap12:binding transport="http://schemas.xmlsoap.org/soap/http" style="document" />
- <wsdl:operation name="proceedUpdateContact">
- <soap12:operation soapAction="urn:proceedUpdateContact" style="document" />
- <wsdl:input>
- <soap12:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap12:body use="literal" />
- </wsdl:output>
- <wsdl:fault name="proceedUpdateContactException">
- <soap12:fault use="literal" name="proceedUpdateContactException" />
- </wsdl:fault>
- </wsdl:operation>
- </wsdl:binding>
- <wsdl:binding name="EmailValidationServiceHttpBinding" type="ns:EmailValidationServicePortType">
- <http:binding verb="POST" />
- <wsdl:operation name="proceedUpdateContact">
- <http:operation location="proceedUpdateContact" />
- <wsdl:input>
- <mime:content type="text/xml" part="parameters" />
- </wsdl:input>
- <wsdl:output>
- <mime:content type="text/xml" part="parameters" />
- </wsdl:output>
- </wsdl:operation>
- </wsdl:binding>
- <wsdl:service name="EmailValidationService">
- <wsdl:port name="EmailValidationServiceHttpsSoap11Endpoint" binding="ns:EmailValidationServiceSoap11Binding">
- <soap:address location="https://192.168.1.100:9443/services/EmailValidationService.EmailValidationServiceHttpsSoap11Endpoint/" />
- </wsdl:port>
- <wsdl:port name="EmailValidationServiceHttpsSoap12Endpoint" binding="ns:EmailValidationServiceSoap12Binding">
- <soap12:address location="https://192.168.1.100:9443/services/EmailValidationService.EmailValidationServiceHttpsSoap12Endpoint/" />
- </wsdl:port>
- <wsdl:port name="EmailValidationServiceHttpsEndpoint" binding="ns:EmailValidationServiceHttpBinding">
- <http:address location="https://192.168.1.100:9443/services/EmailValidationService.EmailValidationServiceHttpsEndpoint/" />
- </wsdl:port>
- </wsdl:service>
-</wsdl:definitions>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/bfc6d758/components/org.apache.stratos.account.mgt.ui/src/main/resources/META-INF/component.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.account.mgt.ui/src/main/resources/META-INF/component.xml b/components/org.apache.stratos.account.mgt.ui/src/main/resources/META-INF/component.xml
deleted file mode 100644
index 6eae8cd..0000000
--- a/components/org.apache.stratos.account.mgt.ui/src/main/resources/META-INF/component.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
- -->
-<component xmlns="http://products.wso2.org/carbon">
- <!-- sample menu configuration -->
- <menus>
- <menu>
- <id>gaas_account_mgt_menu</id>
- <i18n-bundle>org.apache.stratos.account.mgt.ui.i18n.Resources</i18n-bundle>
- <i18n-key>account.mgt.menu</i18n-key>
- <parent-menu>configure_menu</parent-menu>
- <link>../account-mgt/account_mgt.jsp</link>
- <region>region1</region>
- <order>1</order>
- <style-class>manage</style-class>
- <icon>../account-mgt/images/account-mgt-icon.gif</icon>
- <require-permission>/permission/admin/configure/account</require-permission>
- <require-not-super-tenant>true</require-not-super-tenant>
- </menu>
- </menus>
-</component>
http://git-wip-us.apache.org/repos/asf/stratos/blob/bfc6d758/components/org.apache.stratos.account.mgt.ui/src/main/resources/org/apache/stratos/account/mgt/ui/i18n/JSResources.properties
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.account.mgt.ui/src/main/resources/org/apache/stratos/account/mgt/ui/i18n/JSResources.properties b/components/org.apache.stratos.account.mgt.ui/src/main/resources/org/apache/stratos/account/mgt/ui/i18n/JSResources.properties
deleted file mode 100644
index 09dd768..0000000
--- a/components/org.apache.stratos.account.mgt.ui/src/main/resources/org/apache/stratos/account/mgt/ui/i18n/JSResources.properties
+++ /dev/null
@@ -1,22 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-domain.available=Domain is available to register.
-domain.unavailable=Sorry!. The Domain is already registered. Please choose a different domain.
-domain.you.own=Currently you have registered an account with this domain. But you have not verified the ownership to it.
-domain.validation.failed=Domain validation Failed.
-successfully.validated=The ownership of the domain is succesfully validated.
http://git-wip-us.apache.org/repos/asf/stratos/blob/bfc6d758/components/org.apache.stratos.account.mgt.ui/src/main/resources/org/apache/stratos/account/mgt/ui/i18n/Resources.properties
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.account.mgt.ui/src/main/resources/org/apache/stratos/account/mgt/ui/i18n/Resources.properties b/components/org.apache.stratos.account.mgt.ui/src/main/resources/org/apache/stratos/account/mgt/ui/i18n/Resources.properties
deleted file mode 100644
index b39ac96..0000000
--- a/components/org.apache.stratos.account.mgt.ui/src/main/resources/org/apache/stratos/account/mgt/ui/i18n/Resources.properties
+++ /dev/null
@@ -1,41 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-account.mgt.menu=Account
-account.mgt.title=Account Management
-deactivate.account=Deactivate Account
-deactivate.account.title=Deactivate Account
-contact.information=Contact Information
-admin.information=Administrator Profile
-contact.email=Contact Email
-fullname=Full Name
-firstname=First Name
-lastname=Last Name
-update.contact=Update Contact
-update.profile=Update Profile
-validate.contact=Validate Contact
-deactive.account=Deactivate Account
-deactivate.account.msg=You can deactivate your account from here. <b>Caution: This is not undoable by the tenant.</b>
-deactivate.account.btn=Deactivate Account
-validate.domain.title=Validate Domain Ownership
-current.domain=Your Domain
-validate.domain=Validate Now!
-domain.to.validate=Domain to Validate
-successfully.validated=You have successfully validated your domain name.
-usage.plan.information= Usage Plan Information
-select.usage.plan.for.tenant=Select Usage Plan For Tenant
-select.package.message=According to the selected plan, resources will be allocated to you.\n You can update or downgrade your plan later \n according to your requirements. If you need further information on plans, click "Pricing Info".
[3/5] stratos git commit: removing account mgt,
domain validation as it is not used
Posted by re...@apache.org.
http://git-wip-us.apache.org/repos/asf/stratos/blob/bfc6d758/components/org.apache.stratos.account.mgt/src/main/java/org/apache/stratos/account/mgt/services/AccountMgtService.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.account.mgt/src/main/java/org/apache/stratos/account/mgt/services/AccountMgtService.java b/components/org.apache.stratos.account.mgt/src/main/java/org/apache/stratos/account/mgt/services/AccountMgtService.java
deleted file mode 100644
index 22835cc..0000000
--- a/components/org.apache.stratos.account.mgt/src/main/java/org/apache/stratos/account/mgt/services/AccountMgtService.java
+++ /dev/null
@@ -1,413 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.stratos.account.mgt.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.apache.stratos.common.beans.TenantInfoBean;
-import org.apache.stratos.common.constants.StratosConstants;
-import org.apache.stratos.common.util.ClaimsMgtUtil;
-import org.apache.stratos.common.util.CommonUtil;
-import org.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() + " of the tenant " + tenant.getDomain() + " 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 first name: " + 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/stratos/blob/bfc6d758/components/org.apache.stratos.account.mgt/src/main/java/org/apache/stratos/account/mgt/services/EmailValidationService.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.account.mgt/src/main/java/org/apache/stratos/account/mgt/services/EmailValidationService.java b/components/org.apache.stratos.account.mgt/src/main/java/org/apache/stratos/account/mgt/services/EmailValidationService.java
deleted file mode 100644
index 4f50d87..0000000
--- a/components/org.apache.stratos.account.mgt/src/main/java/org/apache/stratos/account/mgt/services/EmailValidationService.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.stratos.account.mgt.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.apache.stratos.common.beans.TenantInfoBean;
-import org.apache.stratos.common.constants.StratosConstants;
-import org.apache.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/stratos/blob/bfc6d758/components/org.apache.stratos.account.mgt/src/main/java/org/apache/stratos/account/mgt/util/Util.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.account.mgt/src/main/java/org/apache/stratos/account/mgt/util/Util.java b/components/org.apache.stratos.account.mgt/src/main/java/org/apache/stratos/account/mgt/util/Util.java
deleted file mode 100644
index df45f7c..0000000
--- a/components/org.apache.stratos.account.mgt/src/main/java/org/apache/stratos/account/mgt/util/Util.java
+++ /dev/null
@@ -1,174 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.stratos.account.mgt.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.apache.stratos.common.beans.TenantInfoBean;
-import org.apache.stratos.common.constants.StratosConstants;
-import org.apache.stratos.common.exception.ApacheStratosException;
-import org.apache.stratos.common.listeners.TenantMgtListener;
-import org.wso2.carbon.user.core.service.RealmService;
-import org.wso2.carbon.user.core.tenant.TenantManager;
-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 emailVerifierConfig = 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";
- emailVerifierConfig = org.wso2.carbon.email.verification.util.Util.loadeMailVerificationConfig(configXml);
- }
-
- public static EmailVerifierConfig getEmailVerifierConfig() {
- return emailVerifierConfig;
- }
-
- 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 ApacheStratosException {
-
- for (TenantMgtListener tenantMgtLister : tenantMgtListeners) {
- tenantMgtLister.onTenantRename(tenantId, oldName, newName);
- }
- }
-
- public static void alertTenantDeactivation(int tenantId) throws ApacheStratosException {
-
- for (TenantMgtListener tenantMgtLister : tenantMgtListeners) {
- tenantMgtLister.onTenantDeactivation(tenantId);
- }
- }
-
- public static void alertTenantInitialActivation(int tenantId) throws ApacheStratosException {
-
- for (TenantMgtListener tenantMgtLister : tenantMgtListeners) {
- tenantMgtLister.onTenantInitialActivation(tenantId);
- }
- }
-
- public static void alertTenantUpdate(TenantInfoBean tenantInfoBean) throws ApacheStratosException {
-
- for (TenantMgtListener tenantMgtLister : tenantMgtListeners) {
- tenantMgtLister.onTenantUpdate(tenantInfoBean);
- }
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/bfc6d758/components/org.apache.stratos.account.mgt/src/main/resources/META-INF/component.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.account.mgt/src/main/resources/META-INF/component.xml b/components/org.apache.stratos.account.mgt/src/main/resources/META-INF/component.xml
deleted file mode 100644
index 822b6b9..0000000
--- a/components/org.apache.stratos.account.mgt/src/main/resources/META-INF/component.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- # Licensed to the Apache Software Foundation (ASF) under one
- # or more contributor license agreements. See the NOTICE file
- # distributed with this work for additional information
- # regarding copyright ownership. The ASF licenses this file
- # to you under the Apache License, Version 2.0 (the
- # "License"); you may not use this file except in compliance
- # with the License. You may obtain a copy of the License at
- #
- # http://www.apache.org/licenses/LICENSE-2.0
- #
- # Unless required by applicable law or agreed to in writing,
- # software distributed under the License is distributed on an
- # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- # KIND, either express or implied. See the License for the
- # specific language governing permissions and limitations
- # under the License.
- -->
-<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>
http://git-wip-us.apache.org/repos/asf/stratos/blob/bfc6d758/components/org.apache.stratos.account.mgt/src/main/resources/META-INF/services.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.account.mgt/src/main/resources/META-INF/services.xml b/components/org.apache.stratos.account.mgt/src/main/resources/META-INF/services.xml
deleted file mode 100644
index df0ab98..0000000
--- a/components/org.apache.stratos.account.mgt/src/main/resources/META-INF/services.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- # Licensed to the Apache Software Foundation (ASF) under one
- # or more contributor license agreements. See the NOTICE file
- # distributed with this work for additional information
- # regarding copyright ownership. The ASF licenses this file
- # to you under the Apache License, Version 2.0 (the
- # "License"); you may not use this file except in compliance
- # with the License. You may obtain a copy of the License at
- #
- # http://www.apache.org/licenses/LICENSE-2.0
- #
- # Unless required by applicable law or agreed to in writing,
- # software distributed under the License is distributed on an
- # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- # KIND, either express or implied. See the License for the
- # specific language governing permissions and limitations
- # under the License.
- -->
-<serviceGroup>
-
- <service name="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/stratos/blob/bfc6d758/components/org.apache.stratos.tenant.activity.ui/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.tenant.activity.ui/pom.xml b/components/org.apache.stratos.tenant.activity.ui/pom.xml
deleted file mode 100644
index 91a7861..0000000
--- a/components/org.apache.stratos.tenant.activity.ui/pom.xml
+++ /dev/null
@@ -1,133 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <groupId>org.apache.stratos</groupId>
- <artifactId>stratos-components-parent</artifactId>
- <version>4.1.0-SNAPSHOT</version>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <artifactId>org.apache.stratos.tenant.activity.ui</artifactId>
- <packaging>bundle</packaging>
- <name>Apache Stratos - Tenant Activity - User Interface</name>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.0</version>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
- <Bundle-Name>${project.artifactId}</Bundle-Name>
- <Private-Package>
- org.apache.stratos.tenant.activity.ui.internal.*,
- </Private-Package>
- <Export-Package>
- org.apache.stratos.tenant.activity.ui.*,
- </Export-Package>
- <Import-Package>
- org.apache.stratos.tenant.activity.stub.*;
- version="${carbon.platform.package.import.version.range}",
- org.apache.stratos.common.*,
- javax.servlet;version="${imp.pkg.version.javax.servlet}",
- javax.servlet.http;version="${imp.pkg.version.javax.servlet}",
- !javax.xml.namespace,
- javax.xml.namespace; version=0.0.0,
- org.apache.lucene.*,
- *;resolution:=optional
- </Import-Package>
- <Carbon-Component>UIBundle</Carbon-Component>
- </instructions>
- </configuration>
- </plugin>
-
- </plugins>
- </build>
-
- <dependencies>
-
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-codec.wso2</groupId>
- <artifactId>commons-codec</artifactId>
- <version>${version.commons.codec}</version>
- </dependency>
- <dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.registry.common.ui</artifactId>
- <version>${wso2carbon.version}</version>
- </dependency>
- <dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.registry.core</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </dependency>
- <dependency>
- <groupId>org.eclipse.equinox</groupId>
- <artifactId>javax.servlet</artifactId>
- <version>3.0.0.v201112011016</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.axis2.wso2</groupId>
- <artifactId>axis2</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.ws.commons.axiom.wso2</groupId>
- <artifactId>axiom</artifactId>
- <version>${axiom.wso2.version}</version>
- </dependency>
- <dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.ui</artifactId>
- <version>${wso2carbon.version}</version>
- </dependency>
- <dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.stratos</groupId>
- <artifactId>org.apache.stratos.common</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.stratos</groupId>
- <artifactId>org.apache.stratos.tenant.activity.stub</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
-
- <properties>
- <version.commons.codec>1.4.0.wso2v1</version.commons.codec>
- </properties>
-
-</project>
http://git-wip-us.apache.org/repos/asf/stratos/blob/bfc6d758/components/org.apache.stratos.tenant.activity.ui/src/main/java/org/apache/stratos/tenant/activity/ui/clients/TenantActivityServiceClient.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.tenant.activity.ui/src/main/java/org/apache/stratos/tenant/activity/ui/clients/TenantActivityServiceClient.java b/components/org.apache.stratos.tenant.activity.ui/src/main/java/org/apache/stratos/tenant/activity/ui/clients/TenantActivityServiceClient.java
deleted file mode 100644
index 554bb37..0000000
--- a/components/org.apache.stratos.tenant.activity.ui/src/main/java/org/apache/stratos/tenant/activity/ui/clients/TenantActivityServiceClient.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.stratos.tenant.activity.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.authenticator.proxy.AuthenticationAdminClient;
-import org.wso2.carbon.registry.core.exceptions.RegistryException;
-import org.apache.stratos.tenant.activity.stub.TenantActivityServiceExceptionException;
-import org.apache.stratos.tenant.activity.stub.beans.xsd.*;
-import org.apache.stratos.tenant.activity.ui.internal.TenantActivityUIServiceComponent;
-import org.wso2.carbon.ui.CarbonUIUtil;
-import org.wso2.carbon.user.core.UserStoreException;
-import org.wso2.carbon.utils.ServerConstants;
-import org.apache.stratos.tenant.activity.stub.TenantActivityServiceStub;
-
-import javax.servlet.ServletConfig;
-import javax.servlet.http.HttpSession;
-import java.rmi.RemoteException;
-
-public class TenantActivityServiceClient {
- private static final Log log = LogFactory.getLog(TenantActivityServiceClient.class);
-
- private TenantActivityServiceStub stub;
- private String epr;
-
-
- public TenantActivityServiceClient(
- String cookie, String backendServerURL, ConfigurationContext configContext)
- throws RegistryException {
-
- epr = backendServerURL + "TenantMonitorService";
-
- try {
- stub = new TenantActivityServiceStub(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 TenantMonitorService service client. " + axisFault.getMessage();
- log.error(msg, axisFault);
- throw new RegistryException(msg, axisFault);
- }
- }
-
- public TenantActivityServiceClient(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 + "TenantActivityService";
-
- try {
- stub = new TenantActivityServiceStub(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 TenantMonitorService service client. " + axisFault.getMessage();
- log.error(msg, axisFault);
- throw new RegistryException(msg, axisFault);
- }
- }
-
- public TenantActivityServiceClient(String url, ServletConfig config, HttpSession session)
- throws Exception {
- //String cookie = (String) session.getAttribute(ServerConstants.ADMIN_SERVICE_COOKIE);
- ConfigurationContext configContext = (ConfigurationContext) config.
- getServletContext().getAttribute(CarbonConstants.CONFIGURATION_CONTEXT);
- try {
- String cookie = login(url + "/services/",
- TenantActivityUIServiceComponent.stratosConfiguration.getAdminUserName(),
- TenantActivityUIServiceComponent.stratosConfiguration.getAdminPassword(),
- configContext);
- epr = url + "/services/TenantActivityService";
- stub = new TenantActivityServiceStub(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 TenantMonitorService service client. ";
- log.error(msg, axisFault);
- throw new RegistryException(msg, axisFault);
- }
- }
-
-
- public int getActiveTenantCount() throws TenantActivityServiceExceptionException, RemoteException {
- int count = stub.getActiveTenantCount();
- return count;
- }
-
- /*public String[] getActiveTenantList() throws TenantActivityServiceExceptionException, RemoteException {
- return stub.getActiveTenantList();
- } */
-
- public PaginatedTenantDataBean getPaginatedActiveTenantList(int pageNumber) throws TenantActivityServiceExceptionException, RemoteException {
- return stub.retrievePaginatedActiveTenants(pageNumber);
- }
-
- /* public TenantDataBean[] getAllActiveTenantList() throws TenantActivityServiceExceptionException, RemoteException {
- return stub.getAllActiveTenantList();
- }*/
-
- public boolean isTenantActiveInService(String domainName) throws TenantActivityServiceExceptionException, RemoteException {
- return stub.isActiveTenantOnService(domainName);
- }
-
- private String login(String serverUrl, String userName,
- String password, ConfigurationContext confContext) throws UserStoreException {
- String sessionCookie = null;
- try {
- AuthenticationAdminClient client =
- new AuthenticationAdminClient(confContext, serverUrl, null, null, false);
- //TODO : get the correct IP
- boolean isLogin = client.login(userName, password, "127.0.0.1");
- if (isLogin) {
- sessionCookie = client.getAdminCookie();
- }
- } catch (Exception e) {
- throw new UserStoreException("Error in login to the server server: " + serverUrl +
- "username: " + userName + ".", e);
- }
- return sessionCookie;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/bfc6d758/components/org.apache.stratos.tenant.activity.ui/src/main/java/org/apache/stratos/tenant/activity/ui/internal/TenantActivityUIServiceComponent.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.tenant.activity.ui/src/main/java/org/apache/stratos/tenant/activity/ui/internal/TenantActivityUIServiceComponent.java b/components/org.apache.stratos.tenant.activity.ui/src/main/java/org/apache/stratos/tenant/activity/ui/internal/TenantActivityUIServiceComponent.java
deleted file mode 100644
index 3d50383..0000000
--- a/components/org.apache.stratos.tenant.activity.ui/src/main/java/org/apache/stratos/tenant/activity/ui/internal/TenantActivityUIServiceComponent.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.stratos.tenant.activity.ui.internal;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.osgi.service.component.ComponentContext;
-import org.apache.stratos.common.util.StratosConfiguration;
-import org.wso2.carbon.utils.ConfigurationContextService;
-
-/**
- * @scr.component name="org.apache.stratos.tenant.activity.ui" immediate="true"
- * @scr.reference name="config.context.service"
- * interface="org.wso2.stratos.utils.ConfigurationContextService"
- * cardinality="1..1" policy="dynamic" bind="setConfigurationContextService"
- * unbind="unsetConfigurationContextService"
- * @scr.reference name="stratos.config.service"
- * interface="org.apache.stratos.common.util.StratosConfiguration" cardinality="1..1"
- * policy="dynamic" bind="setStratosConfigurationService" unbind="unsetStratosConfigurationService"
- */
-public class TenantActivityUIServiceComponent {
- private static Log log = LogFactory.getLog(TenantActivityUIServiceComponent.class);
- public static ConfigurationContextService contextService;
- public static StratosConfiguration stratosConfiguration;
-
- protected void activate(ComponentContext context) {
- try {
- if (log.isDebugEnabled()) {
- log.error("******* Tenant Activity UI bundle is activated ******* ");
- }
- } catch (Exception e) {
- log.error("******* Error in activating Tenant Activity UI bundle ******* ", e);
- }
- }
-
- protected void deactivate(ComponentContext context) {
- if (log.isDebugEnabled()) {
- log.debug("******* Tenant Activity UI bundle is deactivated ******* ");
- }
- }
-
- protected void setStratosConfigurationService(StratosConfiguration stratosConfigService) {
- TenantActivityUIServiceComponent.stratosConfiguration = stratosConfigService;
- }
-
- protected void unsetStratosConfigurationService(StratosConfiguration ccService) {
- TenantActivityUIServiceComponent.stratosConfiguration = null;
- }
-
- protected void setConfigurationContextService(ConfigurationContextService contextService) {
- TenantActivityUIServiceComponent.contextService = contextService;
- }
-
- protected void unsetConfigurationContextService(ConfigurationContextService contextService) {
- TenantActivityUIServiceComponent.contextService = null;
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/bfc6d758/components/org.apache.stratos.tenant.activity.ui/src/main/java/org/apache/stratos/tenant/activity/ui/utils/ManagerConfigurations.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.tenant.activity.ui/src/main/java/org/apache/stratos/tenant/activity/ui/utils/ManagerConfigurations.java b/components/org.apache.stratos.tenant.activity.ui/src/main/java/org/apache/stratos/tenant/activity/ui/utils/ManagerConfigurations.java
deleted file mode 100644
index 1cf4ca1..0000000
--- a/components/org.apache.stratos.tenant.activity.ui/src/main/java/org/apache/stratos/tenant/activity/ui/utils/ManagerConfigurations.java
+++ /dev/null
@@ -1,148 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.stratos.tenant.activity.ui.utils;
-
-import org.apache.axiom.om.OMElement;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.stratos.common.constants.StratosConstants;
-import org.apache.stratos.common.util.CommonUtil;
-import org.wso2.carbon.utils.CarbonUtils;
-
-import javax.xml.namespace.QName;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
-
-public class ManagerConfigurations {
-
- private static final String CONFIG_FILE = "throttling-agent-config.xml";
-
- private static final String MANAGER_SERVICE_URL_PARAM_NAME = "managerServiceUrl";
- private static final String USERNAME_PARAM_NAME = "userName";
- private static final String PASSWORD_PARAM_NAME = "password";
-
-
- private String managerServerUrl;
- private String userName;
- private String password;
-
- private final static Log log = LogFactory.getLog(ManagerConfigurations.class);
-
- private static final String CONFIG_NS =
- "http://wso2.com/stratos/multitenancy/throttling/agent/config";
- private static final String PARAMTERS_ELEMENT_NAME = "parameters";
- private static final String PARAMTER_ELEMENT_NAME = "parameter";
- private static final String PARAMTER_NAME_ATTR_NAME = "name";
- private Map<String, String> parameters = new HashMap<String, String>();
-
-
-
-
- public String getConfigFileName() throws Exception {
-
- String configFileName = CarbonUtils.getCarbonConfigDirPath() +
- File.separator + StratosConstants.MULTITENANCY_CONFIG_FOLDER +
- File.separator + CONFIG_FILE;
-
- return configFileName;
-
- }
-
-
- public ManagerConfigurations() throws Exception {
-
- String throttlingAgentConfigFile = this.getConfigFileName();
- try {
- OMElement meteringConfig =
- CommonUtil.buildOMElement(new FileInputStream(throttlingAgentConfigFile));
- deSerialize(meteringConfig);
- Map<String, String> throttlingAgentParams = getParameters();
- this.setUserName(throttlingAgentParams.get(USERNAME_PARAM_NAME));
- this.setPassword(throttlingAgentParams.get(PASSWORD_PARAM_NAME));
- this.setManagerServerUrl(throttlingAgentParams.get(MANAGER_SERVICE_URL_PARAM_NAME));
- } catch (FileNotFoundException e) {
- String msg = "Unable to find the file: " + throttlingAgentConfigFile + ".";
- log.error(msg, e);
- }
- }
-
- public void deSerialize(OMElement throttlingConfigEle) throws Exception {
- Iterator meteringConfigChildIt = throttlingConfigEle.getChildElements();
- while (meteringConfigChildIt.hasNext()) {
- Object meteringConfigChild = meteringConfigChildIt.next();
- if (!(meteringConfigChild instanceof OMElement)) {
- continue;
- }
- OMElement meteringConfigChildEle = (OMElement) meteringConfigChild;
- if (new QName(CONFIG_NS, PARAMTERS_ELEMENT_NAME, "").equals(meteringConfigChildEle
- .getQName())) {
- Iterator parametersChildIt = meteringConfigChildEle.getChildElements();
- while (parametersChildIt.hasNext()) {
- Object taskConfigChild = parametersChildIt.next();
- if (!(taskConfigChild instanceof OMElement)) {
- continue;
- }
- OMElement parameterChildEle = (OMElement) taskConfigChild;
- if (!new QName(CONFIG_NS, PARAMTER_ELEMENT_NAME, "").equals(parameterChildEle
- .getQName())) {
- continue;
- }
- String parameterName =
- parameterChildEle.getAttributeValue(new QName(PARAMTER_NAME_ATTR_NAME));
- String parameterValue = parameterChildEle.getText();
- parameters.put(parameterName, parameterValue);
- }
- }
- }
- }
-
- public Map<String, String> getParameters() {
- return parameters;
- }
-
-
- public String getUserName() {
- return userName;
- }
-
- public void setUserName(String userName) {
- this.userName = userName;
- }
-
- public String getPassword() {
- return password;
- }
-
- public void setPassword(String password) {
- this.password = password;
- }
-
- public String getManagerServerUrl() {
- return managerServerUrl;
- }
-
- public void setManagerServerUrl(String managerServerUrl) {
- this.managerServerUrl = managerServerUrl;
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/bfc6d758/components/org.apache.stratos.tenant.activity.ui/src/main/java/org/apache/stratos/tenant/activity/ui/utils/TenantMonitorUtil.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.tenant.activity.ui/src/main/java/org/apache/stratos/tenant/activity/ui/utils/TenantMonitorUtil.java b/components/org.apache.stratos.tenant.activity.ui/src/main/java/org/apache/stratos/tenant/activity/ui/utils/TenantMonitorUtil.java
deleted file mode 100644
index 27468eb..0000000
--- a/components/org.apache.stratos.tenant.activity.ui/src/main/java/org/apache/stratos/tenant/activity/ui/utils/TenantMonitorUtil.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.stratos.tenant.activity.ui.utils;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.stratos.common.config.CloudServiceConfig;
-import org.apache.stratos.common.config.CloudServiceConfigParser;
-import org.apache.stratos.common.config.CloudServicesDescConfig;
-
-import java.util.*;
-
-import org.apache.stratos.tenant.activity.stub.beans.xsd.PaginatedTenantDataBean;
-import org.apache.stratos.tenant.activity.stub.beans.xsd.TenantDataBean;
-
-public class TenantMonitorUtil {
- private static final Log log = LogFactory.getLog(TenantMonitorUtil.class);
-
- public static Map<String, String[]> tenantList = new HashMap<String, String[]>();
- public static Map<String, TenantDataBean[]> tenantDataList = new HashMap<String, TenantDataBean[]>();
-
-
- private static ManagerConfigurations managerConfig = null;
-
-
- public static ManagerConfigurations getManagerConfig() {
- return managerConfig;
- }
-
- public static void setManagerConfig(ManagerConfigurations managerConfig) {
- TenantMonitorUtil.managerConfig = managerConfig;
- }
-
- /* public static Map<String, Integer> getActiveTenantCount(ServletConfig config, HttpSession session) throws Exception {
- Map<String, Integer> map = new HashMap<String, Integer>();
- try {
- CloudServicesDescConfig cloudServicesDescConfig = CloudServiceConfigParser.loadCloudServicesConfiguration();
-
- Map<String, CloudServiceConfig> cloudServicesConfigs = cloudServicesDescConfig.getCloudServiceConfigs();
- for (String serviceName : cloudServicesConfigs.keySet()) {
- String backEndURL = cloudServicesConfigs.get(serviceName).getLink();
- System.out.println(backEndURL);
- if (backEndURL == null) {
- try {
- TenantActivityServiceClient client = new TenantActivityServiceClient(config, session);
- map.put(serviceName, client.getActiveTenantCount());
- for (String nn : client.getActiveTenantList()) {
- System.out.println(nn);
- }
- } catch (Exception e) {
- log.error("Failed to get active tenants for manager service");
- }
-
- } else {
- try {
- TenantActivityServiceClient client = new TenantActivityServiceClient(backEndURL, config, session);
- map.put(serviceName, client.getActiveTenantCount());
- } catch (Exception e) {
- log.error("failed to get Active tenants for" + serviceName + e.toString());
- }
- }
-
- }
- } catch (Exception e) {
- log.error("Error while retrieving cloud desc configuration");
-
- }
- return map;
- }*/
-
- public static Map<String, CloudServiceConfig> getCloudServiceConfigMap() {
- try {
- CloudServicesDescConfig cloudServicesDescConfig = CloudServiceConfigParser.loadCloudServicesConfiguration();
- return cloudServicesDescConfig.getCloudServiceConfigs();
- } catch (Exception e) {
- log.error("Error while getting service names " + e.toString());
- }
- return null;
- }
-
- public static PaginatedTenantDataBean getPaginatedTenantData(int pageNumber, String serviceName) {
- int entriesPerPage = 15;
- List<TenantDataBean> tenantListOnService = Arrays.asList(tenantDataList.get(serviceName));
- List<TenantDataBean> tenantUsages = new ArrayList<TenantDataBean>();
- int i = 0;
- int numberOfPages = 0;
- for (TenantDataBean tenant : tenantListOnService) {
- if (i % entriesPerPage == 0) {
- numberOfPages++;
- }
- if (numberOfPages == pageNumber) {
- tenantUsages.add(tenant);
- }
- i++;
-
- }
- PaginatedTenantDataBean paginatedTenantInfo = new PaginatedTenantDataBean();
- paginatedTenantInfo.setTenantInfoBeans(
- tenantUsages.toArray(new TenantDataBean[tenantUsages.size()]));
- paginatedTenantInfo.setNumberOfPages(numberOfPages);
- return paginatedTenantInfo;
- }
-
- public static boolean isTenantActiveOnService(String serviceName, String domain) {
- boolean status = false;
- for (TenantDataBean tenantBean : tenantDataList.get(serviceName)) {
- if (tenantBean.getDomain().equalsIgnoreCase(domain)) {
- status = true;
- }
- }
- return status;
- }
-
- public static Map<String, String> getAdminParameters() {
- Map<String, String> adminParameters = new HashMap<String, String>();
- if (managerConfig == null) {
- try {
- managerConfig = new ManagerConfigurations();
- } catch (Exception e) {
- log.error("Failed to get administrator credentials" + e.toString());
- }
- }
- adminParameters.put("userName", managerConfig.getUserName());
- adminParameters.put("password", managerConfig.getPassword());
- return adminParameters;
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/bfc6d758/components/org.apache.stratos.tenant.activity.ui/src/main/resources/META-INF/component.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.tenant.activity.ui/src/main/resources/META-INF/component.xml b/components/org.apache.stratos.tenant.activity.ui/src/main/resources/META-INF/component.xml
deleted file mode 100644
index 99fafef..0000000
--- a/components/org.apache.stratos.tenant.activity.ui/src/main/resources/META-INF/component.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<!--
- # Licensed to the Apache Software Foundation (ASF) under one
- # or more contributor license agreements. See the NOTICE file
- # distributed with this work for additional information
- # regarding copyright ownership. The ASF licenses this file
- # to you under the Apache License, Version 2.0 (the
- # "License"); you may not use this file except in compliance
- # with the License. You may obtain a copy of the License at
- #
- # http://www.apache.org/licenses/LICENSE-2.0
- #
- # Unless required by applicable law or agreed to in writing,
- # software distributed under the License is distributed on an
- # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- # KIND, either express or implied. See the License for the
- # specific language governing permissions and limitations
- # under the License.
- -->
-<component xmlns="http://products.wso2.org/carbon">
- <!-- sample menu configuration -->
- <menus>
- <menu>
- <id>all_tenant_monitor_menu</id>
- <i18n-key>Tenant Activity Monitor</i18n-key>
- <i18n-bundle>org.apache.stratos.tenant.activity.ui.i18n.Resources</i18n-bundle>
- <parent-menu>monitor_menu</parent-menu>
- <link>../tenant-activity/tenant-activity.jsp</link>
- <region>region4</region>
- <order>50</order>
- <style-class>manage</style-class>
- <icon>../tenant-activity/images/tenant-usage-report.gif</icon>
- <require-permission>/permission/protected/monitor/userUsage</require-permission>
- <require-super-tenant>true</require-super-tenant>
- </menu>
- </menus>
-</component>
http://git-wip-us.apache.org/repos/asf/stratos/blob/bfc6d758/components/org.apache.stratos.tenant.activity.ui/src/main/resources/org/apache/stratos/tenant/activity/ui/i18n/JSResources.properties
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.tenant.activity.ui/src/main/resources/org/apache/stratos/tenant/activity/ui/i18n/JSResources.properties b/components/org.apache.stratos.tenant.activity.ui/src/main/resources/org/apache/stratos/tenant/activity/ui/i18n/JSResources.properties
deleted file mode 100644
index d207695..0000000
--- a/components/org.apache.stratos.tenant.activity.ui/src/main/resources/org/apache/stratos/tenant/activity/ui/i18n/JSResources.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-session.timed.out=Session timed out. Please login again
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/bfc6d758/components/org.apache.stratos.tenant.activity.ui/src/main/resources/org/apache/stratos/tenant/activity/ui/i18n/Resources.properties
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.tenant.activity.ui/src/main/resources/org/apache/stratos/tenant/activity/ui/i18n/Resources.properties b/components/org.apache.stratos.tenant.activity.ui/src/main/resources/org/apache/stratos/tenant/activity/ui/i18n/Resources.properties
deleted file mode 100644
index 5b4ecd8..0000000
--- a/components/org.apache.stratos.tenant.activity.ui/src/main/resources/org/apache/stratos/tenant/activity/ui/i18n/Resources.properties
+++ /dev/null
@@ -1,28 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-service.name=Service Name
-active.user.count=Active User Count
-active.tenants.services= Active Tenants on Services
-view.list=View List
-active.tenant.count=Active Tenant Count
-active.tenants.on= Active Tenants on
-tenant.domain= Tenant Domain
-active.status=State
-enter.tenant.domain=Enter Tenant Domain
-tenant.status=Tenant State
-tenant.state.on.services.for.tenant= Tenant State on Services For Tenant Domain
http://git-wip-us.apache.org/repos/asf/stratos/blob/bfc6d758/components/org.apache.stratos.tenant.activity.ui/src/main/resources/web/tenant-activity/css/tenant-usage.css
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.tenant.activity.ui/src/main/resources/web/tenant-activity/css/tenant-usage.css b/components/org.apache.stratos.tenant.activity.ui/src/main/resources/web/tenant-activity/css/tenant-usage.css
deleted file mode 100644
index 6fb3b36..0000000
--- a/components/org.apache.stratos.tenant.activity.ui/src/main/resources/web/tenant-activity/css/tenant-usage.css
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
-* Licensed to the Apache Software Foundation (ASF) under one
-* or more contributor license agreements. See the NOTICE file
-* distributed with this work for additional information
-* regarding copyright ownership. The ASF licenses this file
-* to you under the Apache License, Version 2.0 (the
-* "License"); you may not use this file except in compliance
-* with the License. You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing,
-* software distributed under the License is distributed on an
-* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-* KIND, either express or implied. See the License for the
-* specific language governing permissions and limitations
-* under the License.
-*/
-
-.disableLink {
- color: #aaaaaa;
-}
-
-.pageLinks {
- background: #FFFFFF none repeat scroll 0%;
- border: 1px solid #DDDDDD;
- padding: 2px 3px;
- text-decoration: none;
- margin: 0px;
- margin-left: 2px;
- margin-right: 2px;
-}
-
-.pageLinks-selected {
- background: #e8e9ae none repeat scroll 0%;
- border: 1px solid #DDDDDD;
- padding: 2px 3px;
- text-decoration: none;
- margin: 0px;
- margin-left: 2px;
- margin-right: 2px;
-}
-
-a {
- color: #386698;
- cursor: pointer;
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/bfc6d758/components/org.apache.stratos.tenant.activity.ui/src/main/resources/web/tenant-activity/docs/images/view-usage.png
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.tenant.activity.ui/src/main/resources/web/tenant-activity/docs/images/view-usage.png b/components/org.apache.stratos.tenant.activity.ui/src/main/resources/web/tenant-activity/docs/images/view-usage.png
deleted file mode 100644
index 3d036c0..0000000
Binary files a/components/org.apache.stratos.tenant.activity.ui/src/main/resources/web/tenant-activity/docs/images/view-usage.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/bfc6d758/components/org.apache.stratos.tenant.activity.ui/src/main/resources/web/tenant-activity/docs/userguide.html
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.tenant.activity.ui/src/main/resources/web/tenant-activity/docs/userguide.html b/components/org.apache.stratos.tenant.activity.ui/src/main/resources/web/tenant-activity/docs/userguide.html
deleted file mode 100644
index 9e7914c..0000000
--- a/components/org.apache.stratos.tenant.activity.ui/src/main/resources/web/tenant-activity/docs/userguide.html
+++ /dev/null
@@ -1,77 +0,0 @@
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one
- ~ or more contributor license agreements. See the NOTICE file
- ~ distributed with this work for additional information
- ~ regarding copyright ownership. The ASF licenses this file
- ~ to you under the Apache License, Version 2.0 (the
- ~ "License"); you may not use this file except in compliance
- ~ with the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing,
- ~ software distributed under the License is distributed on an
- ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- ~ KIND, either express or implied. See the License for the
- ~ specific language governing permissions and limitations
- ~ under the License.
- -->
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
- <title>View Usage - User Guide</title>
- <link href="../../admin/css/documentation.css" rel="stylesheet" type="text/css" media="all" />
-</head>
-
-<body>
-<h1>View Usage</h1>
-
-<p>
-You can view usage of the stratos resource by your organization from this page
-</p>
-
-<p>
-<img src="images/view-usage.png" alt="View Usage"/>
-<div><strong>Figure1: View Usage</strong></div>
-</p>
-
-<p>
-
-<table>
- <thead>
- <td>
- The Form Field
- </td>
- <td>
- Description
- </td>
- </thead>
- <tbody>
- <tr>
- <td>Year-Month</td>
- <td>The year and the month the usage is metered.</td>
- </tr>
- <tr>
- <td>Number of Users</td>
- <td>Number of users of your stratos account.</td>
- </tr>
- <tr>
- <td>Active data storage</td>
- <td>The registry data storage amount.</td>
- </tr>
- <tr>
- <td>Registry Total Bandwidth</td>
- <td>Total bandwidth consumed by the registry accesses.</td>
- </tr>
- <tr>
- <td>Service Total Bandwidth</td>
- <td>The bandwidth consumed by the web services.</td>
- </tr>
- </tbody>
-</table>
-
-</p>
-
-</body>
-
-</html>
http://git-wip-us.apache.org/repos/asf/stratos/blob/bfc6d758/components/org.apache.stratos.tenant.activity.ui/src/main/resources/web/tenant-activity/find-tenant-ajaxprocessor.jsp
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.tenant.activity.ui/src/main/resources/web/tenant-activity/find-tenant-ajaxprocessor.jsp b/components/org.apache.stratos.tenant.activity.ui/src/main/resources/web/tenant-activity/find-tenant-ajaxprocessor.jsp
deleted file mode 100644
index 5e33f77..0000000
--- a/components/org.apache.stratos.tenant.activity.ui/src/main/resources/web/tenant-activity/find-tenant-ajaxprocessor.jsp
+++ /dev/null
@@ -1,60 +0,0 @@
-<%--
- ~ Licensed to the Apache Software Foundation (ASF) under one
- ~ or more contributor license agreements. See the NOTICE file
- ~ distributed with this work for additional information
- ~ regarding copyright ownership. The ASF licenses this file
- ~ to you under the Apache License, Version 2.0 (the
- ~ "License"); you may not use this file except in compliance
- ~ with the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing,
- ~ software distributed under the License is distributed on an
- ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- ~ KIND, either express or implied. See the License for the
- ~ specific language governing permissions and limitations
- ~ under the License.
- --%>
-<%@page contentType="text/html" pageEncoding="UTF-8" %>
-<%@ page import="org.json.JSONObject" %>
-<%@ page import="org.apache.stratos.billing.mgt.stub.beans.xsd.Invoice" %>
-<%@ page import="org.apache.stratos.billing.mgt.stub.beans.xsd.Payment" %>
-<%@ page import="org.wso2.carbon.billing.mgt.ui.utils.BillingUtil" %>
-<%@ page import="java.util.Date" %>
-<%@ page import="org.apache.stratos.tenant.activity.ui.clients.TenantActivityServiceClient" %>
-<%@ page import="java.io.Console" %>
-<%@ page import="javax.rmi.CORBA.Util" %>
-<%@ page import="org.apache.stratos.tenant.activity.ui.utils.TenantMonitorUtil" %>
-<%@ page import="org.apache.stratos.tenant.activity.stub.beans.xsd.PaginatedTenantDataBean" %>
-
-<%
- String serverUrl = request.getParameter("backEndUrl");
- String serviceName = request.getParameter("serviceName");
- String domainName = request.getParameter("domainName");
-
- boolean state = false;
- if (serverUrl == null || "null".equals(serverUrl.trim())) {
- try {
- TenantActivityServiceClient client = new TenantActivityServiceClient(config, session);
- state = client.isTenantActiveInService(domainName);
- } catch (Exception e) {
- }
-
- } else {
- try {
- TenantActivityServiceClient client = new TenantActivityServiceClient(serverUrl, config, session);
- state = client.isTenantActiveInService(domainName);
- } catch (Exception e) {
- }
- }
-
- try {
- JSONObject obj = new JSONObject();
- obj.put("isActive", state);
- obj.put("service", serviceName);
- out.write(obj.toString());
- } catch (Exception e) {
- e.printStackTrace();
- }
-%>