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

[04/23] Refactoring org.wso2.carbon to org.apache.stratos

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ee2ab783/components/stratos/billing/org.wso2.carbon.billing.mgt.ui/2.1.0/src/main/resources/web/tenant-billing/adjustments.jsp
----------------------------------------------------------------------
diff --git a/components/stratos/billing/org.wso2.carbon.billing.mgt.ui/2.1.0/src/main/resources/web/tenant-billing/adjustments.jsp b/components/stratos/billing/org.wso2.carbon.billing.mgt.ui/2.1.0/src/main/resources/web/tenant-billing/adjustments.jsp
deleted file mode 100644
index d0cc589..0000000
--- a/components/stratos/billing/org.wso2.carbon.billing.mgt.ui/2.1.0/src/main/resources/web/tenant-billing/adjustments.jsp
+++ /dev/null
@@ -1,196 +0,0 @@
-<!--
-~ Copyright (c) 2005-2010, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
-~
-~ WSO2 Inc. licenses this file to you under the Apache License,
-~ Version 2.0 (the "License"); you may not use this file except
-~ in compliance with the License.
-~ You may obtain a copy of the License at
-~
-~ http://www.apache.org/licenses/LICENSE-2.0
-~
-~ Unless required by applicable law or agreed to in writing,
-~ software distributed under the License is distributed on an
-~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-~ KIND, either express or implied. See the License for the
-~ specific language governing permissions and limitations
-~ under the License.
--->
-
-<%@ 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"/>
-
-<carbon:jsi18n
-        resourceBundle="org.wso2.carbon.billing.mgt.ui.i18n.JSResources"
-        request="<%=request%>"/>
-
-<fmt:bundle basename="org.wso2.carbon.billing.mgt.ui.i18n.Resources">
-    <carbon:breadcrumb
-            label="adjustment.menu"
-            resourceBundle="org.wso2.carbon.billing.mgt.ui.i18n.Resources"
-            topPage="true"
-            request="<%=request%>"/>
-    <script type="text/javascript">
-
-        function findInvoices(){
-            document.getElementById("invoiceDetailTable").style.display="none";
-            var tenantDomain = document.getElementById('tenantDomain').value;
-            if(tenantDomain=="" || tenantDomain==null){
-                CARBON.showErrorDialog("Please enter a tenant domain");
-            }else{
-                jQuery.ajax({
-                    type: 'GET',
-                    url: '../tenant-billing/find_invoices_ajaxprocessor.jsp',
-                    data: 'tenantDomain=' + tenantDomain,
-                    dataType: 'json',
-                    async: false,
-                    success: function(msg) {
-                        var invoiceList = document.getElementById('invoices');
-                        clearOptions(invoiceList);
-                        var invoices = msg.invoices;
-                        for(i=0; i < invoices.length; i++){
-                            addToOptionList(invoiceList, invoices[i].invoiceId, invoices[i].invoiceDate);
-                        }
-                        if(invoices.length>0){
-                            document.getElementById("invoiceDetailTable").style.display="";
-                        }else{
-                            CARBON.showInfoDialog("There are no invoices for this tenant");
-                        }
-                    },
-                    error:function (xhr) {
-                        CARBON.showErrorDialog('Could not get the invoices of tenant: ' + tenantDomain );
-                    }
-                });
-            }
-
-        }
-
-        function makeAdjustment(){
-            var invoiceList = document.getElementById('invoices');
-            var invoiceId = invoiceList.options[invoiceList.selectedIndex].value;
-            if(invoiceId>0){
-                document.adjustmentForm.invoiceId.value = invoiceId;
-            }else{
-                CARBON.showErrorDialog("Please select an invoice");
-                return;
-            }
-
-            var amount = document.getElementById("amount").value;
-            amount = $.trim(amount);
-            if(amount==null || amount==""){
-                CARBON.showErrorDialog("Please enter an amount to be adjusted");
-                return;
-            }
-            var description = document.getElementById("description").value;
-            if(description==null || description==""){
-                CARBON.showErrorDialog("Please enter a description for the adjustment");
-                return;
-            }
-
-            document.adjustmentForm.submit();
-
-
-        }
-
-        function clearOptions(OptionList) {
-
-            // Always clear an option list from the last entry to the first
-            for (x = OptionList.length; x >= 0; x = x - 1) {
-                OptionList[x] = null;
-            }
-        }
-
-        function addToOptionList(OptionList, OptionValue, OptionText) {
-            // Add option to the bottom of the list
-            OptionList[OptionList.length] = new Option(OptionText, OptionValue);
-        }
-
-        function cancel(){
-            location.href = "adjustments.jsp";
-        }
-    </script>
-
-    <%
-        String adjustmentIdStr=null;
-        if(session.getAttribute("adjustmentId")!=null){
-            adjustmentIdStr = String.valueOf(session.getAttribute("adjustmentId"));
-            session.removeAttribute("adjustmentId");
-        }
-
-        if(adjustmentIdStr!=null && !"".equals(adjustmentIdStr)){
-            int adjustmentId = Integer.parseInt(adjustmentIdStr);
-            if(adjustmentId>0){
-    %>
-    <script type="text/javascript">
-        jQuery(document).ready(function() {
-            CARBON.showInfoDialog("Adjustment was made successfully");
-        });
-    </script>
-    <%
-    }else{
-    %>
-    <script type="text/javascript">
-        jQuery(document).ready(function() {
-            CARBON.showErrorDialog("An error occurred while making the adjustment");
-        });
-    </script>
-    <%
-            }
-
-        }
-    %>
-
-    <div id="middle">
-        <h2><fmt:message key="invoice.adjustments"/></h2>
-        <div id="workArea">
-            <form name="adjustmentForm" action="make_adjustment_ajaxprocessor.jsp" method="post">
-                <input type="hidden" name="invoiceId" id="invoiceId" />
-                <table class="styledLeft" cellspacing="0">
-                    <thead>
-                    <tr>
-                        <th colspan="3"><fmt:message key="find.invoices"/></th>
-                    </tr>
-                    </thead>
-                    <tbody>
-                    <tr>
-                        <td style="width:180px"><fmt:message key="enter.tenant.domain"/></td>
-                        <td colspan="2"><input type="text" name="tenantDomain" id="tenantDomain"
-                                               style="width:300px"/>
-                            <input type="button" onclick="javascript:findInvoices();" value="<fmt:message key="find.invoices"/>"/>
-                        </td>
-                    </tr>
-                    <tr><td colspan="3"></td></tr>
-                    </tbody>
-                </table>
-
-                <table id="invoiceDetailTable" class="styledLeft" cellspacing="0" style="display: none">
-                    <thead>
-                    <tr>
-                        <th colspan="3"><fmt:message key="adjustment.information"/></th>
-                    </tr>
-                    </thead>
-                    <tbody>
-                    <tr>
-                        <td style="width:180px"><fmt:message key="select.invoice"/></td>
-                        <td colspan="2"><select id="invoices"></select></td>
-                    </tr>
-                    <tr>
-                        <td style="width:180px"><fmt:message key="amount"/></td>
-                        <td colspan="2"><input type="text" name="amount" id="amount"></td>
-                    </tr>
-                    <tr>
-                        <td style="width:180px"><fmt:message key="description"/></td>
-                        <td colspan="2"><input type="text" name="description" id="description"></td>
-                    </tr>
-                    <tr>
-                        <td colspan="3">
-                            <input type="button" class="button" value="<fmt:message key="submit"/>" onclick="makeAdjustment();">
-                            <input type="button" class="button" value="<fmt:message key="cancel"/>" onclick="cancel();">
-                        </td>
-                    </tr>
-                    </tbody>
-                </table>
-            </form>
-        </div>
-    </div>
-</fmt:bundle>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ee2ab783/components/stratos/billing/org.wso2.carbon.billing.mgt.ui/2.1.0/src/main/resources/web/tenant-billing/css/billing.cs
----------------------------------------------------------------------
diff --git a/components/stratos/billing/org.wso2.carbon.billing.mgt.ui/2.1.0/src/main/resources/web/tenant-billing/css/billing.cs b/components/stratos/billing/org.wso2.carbon.billing.mgt.ui/2.1.0/src/main/resources/web/tenant-billing/css/billing.cs
deleted file mode 100644
index 2ebbe74..0000000
--- a/components/stratos/billing/org.wso2.carbon.billing.mgt.ui/2.1.0/src/main/resources/web/tenant-billing/css/billing.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-td.packageCol {
-    border-bottom: 1 solid #CCC !important;
-}
-
-div#exp {
-    color: #0f0;
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ee2ab783/components/stratos/billing/org.wso2.carbon.billing.mgt.ui/2.1.0/src/main/resources/web/tenant-billing/css/billing.css
----------------------------------------------------------------------
diff --git a/components/stratos/billing/org.wso2.carbon.billing.mgt.ui/2.1.0/src/main/resources/web/tenant-billing/css/billing.css b/components/stratos/billing/org.wso2.carbon.billing.mgt.ui/2.1.0/src/main/resources/web/tenant-billing/css/billing.css
deleted file mode 100644
index 62e0509..0000000
--- a/components/stratos/billing/org.wso2.carbon.billing.mgt.ui/2.1.0/src/main/resources/web/tenant-billing/css/billing.css
+++ /dev/null
@@ -1,58 +0,0 @@
-/*td.packageCol {
-    border-bottom: 1 solid #CCC !important;
-}
-
-div#exp {
-    color: #0f0;
-}*/
-.invoice-header td{
-    background-color:#e7e7e7;
-    font-weight:bold;
-}
-.invoiceTable{
-    border-collapse:collapse;
-}
-.invice-data-table{
-    border-collapse:collapse;
-    border-top:solid 1px #e7e7e7;
-    border-right:solid 1px #e7e7e7;
-    width:100%;
-}
-.invice-data-table tr.invoice-content-row td{
-    border-bottom:solid 1px #e7e7e7;
-    border-left:solid 1px #e7e7e7;
-}
-.invoiceTable tr td{
-    padding:5px !important;    
-}
-.name-field{
-    font-weight:bold;
-}
-.invoice-heading{
-    text-transform:uppercase;
-    font-size:30px;
-    font-weight:bold;
-    line-height:40px;
-}
-.invoice-sub-heading{
-    text-transform:uppercase;
-    font-size:20px;
-    font-weight:bold;
-    line-height:40px;    
-}
-ul.invoice-inside-listing{
-    margin-top:10px;
-}
-ul.invoice-inside-listing li{
-    height:25px;
-    letter-spacing:1.2px;
-}
-.terms-section-header{
-    font-weight:bold;
-}
-.terms-section{
-    width:200px;
-    text-align:justify;
-    color: #666666;
-    margin-left:20px;
-}

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ee2ab783/components/stratos/billing/org.wso2.carbon.billing.mgt.ui/2.1.0/src/main/resources/web/tenant-billing/discounts.jsp
----------------------------------------------------------------------
diff --git a/components/stratos/billing/org.wso2.carbon.billing.mgt.ui/2.1.0/src/main/resources/web/tenant-billing/discounts.jsp b/components/stratos/billing/org.wso2.carbon.billing.mgt.ui/2.1.0/src/main/resources/web/tenant-billing/discounts.jsp
deleted file mode 100644
index b3ab062..0000000
--- a/components/stratos/billing/org.wso2.carbon.billing.mgt.ui/2.1.0/src/main/resources/web/tenant-billing/discounts.jsp
+++ /dev/null
@@ -1,182 +0,0 @@
-<!--
-~ Copyright (c) 2005-2010, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
-~
-~ WSO2 Inc. licenses this file to you under the Apache License,
-~ Version 2.0 (the "License"); you may not use this file except
-~ in compliance with the License.
-~ You may obtain a copy of the License at
-~
-~ http://www.apache.org/licenses/LICENSE-2.0
-~
-~ Unless required by applicable law or agreed to in writing,
-~ software distributed under the License is distributed on an
-~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-~ KIND, either express or implied. See the License for the
-~ specific language governing permissions and limitations
-~ under the License.
--->
-
-<%@ 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"/>
-
-<carbon:jsi18n
-        resourceBundle="org.wso2.carbon.billing.mgt.ui.i18n.JSResources"
-        request="<%=request%>"/>
-
-<fmt:bundle basename="org.wso2.carbon.billing.mgt.ui.i18n.Resources">
-    <carbon:breadcrumb
-            label="adjustment.menu"
-            resourceBundle="org.wso2.carbon.billing.mgt.ui.i18n.Resources"
-            topPage="true"
-            request="<%=request%>"/>
-    <script type="text/javascript">
-
-        function submitDiscountForm(){
-            var tenantDomain = document.getElementById("tenantDomain").value;
-            if(tenantDomain==null || tenantDomain==""){
-                CARBON.showErrorDialog("Please provide a tenant domain.");
-                return;
-            }
-
-            var discountType = document.getElementById("discountType").value;
-            var discountRadio = document.discountForm.discountTypeRadio;
-            for(var i=0; i<discountRadio.length; i++){
-                if(discountRadio[i].checked){
-                    discountType = discountRadio[i].value;
-                    break;
-                }
-            }
-            //if the hidden variable is not set properly, we should set it
-            //just making sure it is set..
-            document.getElementById("discountType").value = discountType;
-
-            if(discountType=="percentage"){
-                var percentage = document.getElementById("percentage").value;
-                if(percentage==null || percentage==""){
-                    CARBON.showErrorDialog("Please enter a valid discount percentage.");
-                    return;
-                }
-            }else if(discountType=="amount"){
-                var amount = document.getElementById("amount").value;
-                if(amount==null || amount==""){
-                    CARBON.showErrorDialog("Please enter a valid discount amount.");
-                    return;
-                }
-            }
-
-            var startDate = document.getElementById("startDate").value;
-            if(startDate==null || startDate==""){
-                CARBON.showErrorDialog("Please enter a valid start date.");
-                return;
-            }
-
-            var endDate = document.getElementById("endDate").value;
-            if(endDate==null || endDate==""){
-                CARBON.showErrorDialog("Please enter a valid end date.");
-                return;
-            }
-
-            document.discountForm.submit();
-        }
-
-        function manageDiscountTypeRow(discountType){
-            document.discountForm.discountType.value = discountType;
-
-            if(discountType=="percentage"){
-                document.getElementById("percentageRow").style.display="";
-                document.getElementById("amountRow").style.display="none";
-            }else if(discountType=="amount"){
-                document.getElementById("percentageRow").style.display="none";
-                document.getElementById("amountRow").style.display="";
-            }else{
-                //do nothing
-            }
-        }
-
-        function cancel(){
-            location.href = "discounts.jsp";
-        }
-    </script>
-
-    <%
-        String discountAdded = null;
-        if(session.getAttribute("discountAdded")!=null){
-            discountAdded = String.valueOf(session.getAttribute("discountAdded"));
-            session.removeAttribute("discountAdded");
-        }
-
-        if(discountAdded!=null){
-            if("true".equals(discountAdded)){
-
-    %>
-    <script type="text/javascript">
-        jQuery(document).ready(function() {
-            CARBON.showInfoDialog("Discount was added successfully");
-        });
-    </script>
-    <%
-    }else{
-    %>
-    <script type="text/javascript">
-        jQuery(document).ready(function() {
-            CARBON.showErrorDialog("An error occurred while adding the discount");
-        });
-    </script>
-    <%
-            }
-
-        }
-    %>
-
-    <div id="middle">
-        <h2><fmt:message key="discounts"/></h2>
-        <div id="workArea">
-            <form name="discountForm" action="add_discount_ajaxprocessor.jsp" method="post">
-                <input type="hidden" name="discountType" id="discountType"/>
-                <table class="styledLeft" cellspacing="0">
-                    <thead>
-                    <tr>
-                        <th colspan="3"><fmt:message key="discounts.table.title"/></th>
-                    </tr>
-                    </thead>
-                    <tbody>
-                    <tr>
-                        <td style="width:180px"><fmt:message key="tenant.domain"/></td>
-                        <td colspan="2"><input type="text" name="tenantDomain" id="tenantDomain"></td>
-                    </tr>
-                    <tr>
-                        <td style="width:180px"><fmt:message key="discount.type"/></td>
-                        <td colspan="2">
-                            <input type="radio" name="discountTypeRadio" value="percentage" checked onclick="manageDiscountTypeRow(this.value);" ><fmt:message key="type.percentage"/>
-                            <input type="radio" name="discountTypeRadio" value="amount" onclick="manageDiscountTypeRow(this.value);" ><fmt:message key="type.amount"/>
-                        </td>
-                    </tr>
-                    <tr id="percentageRow">
-                        <td style="width:180px"><fmt:message key="discount.percentage"/></td>
-                        <td colspan="2"><input type="text" name="percentage" id="percentage"></td>
-                    </tr>
-                    <tr id="amountRow" style="display: none;">
-                        <td style="width:180px"><fmt:message key="amount"/></td>
-                        <td colspan="2"><input type="text" name="amount" id="amount"></td>
-                    </tr>
-                    <tr>
-                        <td style="width:180px"><fmt:message key="discount.start.date"/></td>
-                        <td colspan="2"><input type="text" name="startDate" id="startDate"></td>
-                    </tr>
-                    <tr>
-                        <td style="width:180px"><fmt:message key="discount.end.date"/></td>
-                        <td colspan="2"><input type="text" name="endDate" id="endDate"></td>
-                    </tr>
-                    <tr>
-                        <td colspan="3">
-                            <input type="button" class="button" value="<fmt:message key="submit"/>" onclick="submitDiscountForm();">
-                            <input type="button" class="button" value="<fmt:message key="cancel"/>" onclick="cancel();">
-                        </td>
-                    </tr>
-                    </tbody>
-                </table>
-            </form>
-        </div>
-    </div>
-</fmt:bundle>

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

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

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

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ee2ab783/components/stratos/billing/org.wso2.carbon.billing.mgt.ui/2.1.0/src/main/resources/web/tenant-billing/docs/userguide.html
----------------------------------------------------------------------
diff --git a/components/stratos/billing/org.wso2.carbon.billing.mgt.ui/2.1.0/src/main/resources/web/tenant-billing/docs/userguide.html b/components/stratos/billing/org.wso2.carbon.billing.mgt.ui/2.1.0/src/main/resources/web/tenant-billing/docs/userguide.html
deleted file mode 100644
index c790c9f..0000000
--- a/components/stratos/billing/org.wso2.carbon.billing.mgt.ui/2.1.0/src/main/resources/web/tenant-billing/docs/userguide.html
+++ /dev/null
@@ -1,75 +0,0 @@
-<!--
- ~ Copyright (c) 2005-2010, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
- ~
- ~ WSO2 Inc. licenses this file to you under the Apache License,
- ~ Version 2.0 (the "License"); you may not use this file except
- ~ in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~    http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing,
- ~ software distributed under the License is distributed on an
- ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- ~ KIND, either express or implied.  See the License for the
- ~ specific language governing permissions and limitations
- ~ under the License.
- -->
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-    <title>Billing and Metering - User Guide</title>
-    <link href="../../admin/css/documentation.css" rel="stylesheet" type="text/css" media="all"/>
-</head>
-
-<body>
-<h1>Billing and Metering</h1>
-
-
-<p>
-    You can check charges for your subscription and payments you have made through Billing & Metering component. Invoice
-    data can be viewed in two ways.
-</p>
-
-<ol>
-    <li>View Invoice</li>
-    <li>Interim Invoice</li>
-</ol>
-
-<p>
-    <img src="images/billing.png" alt="Billing and Metering"/>
-
-<div><strong>Figure1: Billing and Metering</strong></div>
-</p>
-
-<h2>View Invoice</h2>
-
-
-<p style="text-align: left;">
-
-    In 'View Invoice' page, you can view invoices generated at each billing cycle. Online payments are available through
-    Paypal if you are a Paypal account holder.
-    For doing payments in a secure manner with Paypal click the Paypal button at the bottom of the invoice.
-</p>
-
-<p>
-    <img src="images/paypal.png" alt="Payments through Paypal"/>
-
-    <div><strong>Figure2: Payments through Paypal</strong></div>
-
-</p>
-
-<h2>Interim Invoice</h2>
-
-
-<p style="text-align: left;">
-
-Interim invoice shows your current state of billing.
-This includes the amount brought forward and the amount accumulated for the period starting from last date on which bill is being generated to the current date.
-
-</p>
-
-
-</body>
-
-</html>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ee2ab783/components/stratos/billing/org.wso2.carbon.billing.mgt.ui/2.1.0/src/main/resources/web/tenant-billing/find_invoices_ajaxprocessor.jsp
----------------------------------------------------------------------
diff --git a/components/stratos/billing/org.wso2.carbon.billing.mgt.ui/2.1.0/src/main/resources/web/tenant-billing/find_invoices_ajaxprocessor.jsp b/components/stratos/billing/org.wso2.carbon.billing.mgt.ui/2.1.0/src/main/resources/web/tenant-billing/find_invoices_ajaxprocessor.jsp
deleted file mode 100644
index 0b59e37..0000000
--- a/components/stratos/billing/org.wso2.carbon.billing.mgt.ui/2.1.0/src/main/resources/web/tenant-billing/find_invoices_ajaxprocessor.jsp
+++ /dev/null
@@ -1,47 +0,0 @@
-<%--
- ~ Copyright (c) 2005-2010, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
- ~
- ~ WSO2 Inc. licenses this file to you under the Apache License,
- ~ Version 2.0 (the "License"); you may not use this file except
- ~ in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~    http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing,
- ~ software distributed under the License is distributed on an
- ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- ~ KIND, either express or implied.  See the License for the
- ~ specific language governing permissions and limitations
- ~ under the License.
- --%>
-<%@ page contentType="text/html" pageEncoding="UTF-8"%>
-<%@ page import="org.wso2.carbon.billing.mgt.ui.utils.BillingUtil" %>
-<%@ page import="org.wso2.carbon.billing.mgt.stub.beans.xsd.BillingPeriod" %>
-<%@ page import="org.json.JSONArray" %>
-<%@ page import="org.json.JSONObject" %>
-<%
-    String tenantDomain = request.getParameter("tenantDomain");
-    BillingPeriod[] billingPeriods = BillingUtil.getAvailableBillingPeriodsBySuperTenant(config, session, tenantDomain);
-
-    try{
-        JSONArray invoiceArray = new JSONArray();
-
-        if(billingPeriods!=null && billingPeriods.length>0){
-            for(BillingPeriod bp : billingPeriods){
-
-                JSONObject obj = new JSONObject();
-                obj.put("invoiceId", bp.getInvoiceId());
-                obj.put("invoiceDate", bp.getInvoiceDate().toString());
-
-                invoiceArray.put(obj);
-            }
-        }
-
-        JSONObject invoicesObj = new JSONObject();
-        invoicesObj.put("invoices", invoiceArray);
-        out.write(invoicesObj.toString());
-    }catch(Exception e){
-        e.printStackTrace();
-    }
-%>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ee2ab783/components/stratos/billing/org.wso2.carbon.billing.mgt.ui/2.1.0/src/main/resources/web/tenant-billing/get_invoice_by_id_ajaxprocessor.jsp
----------------------------------------------------------------------
diff --git a/components/stratos/billing/org.wso2.carbon.billing.mgt.ui/2.1.0/src/main/resources/web/tenant-billing/get_invoice_by_id_ajaxprocessor.jsp b/components/stratos/billing/org.wso2.carbon.billing.mgt.ui/2.1.0/src/main/resources/web/tenant-billing/get_invoice_by_id_ajaxprocessor.jsp
deleted file mode 100644
index 8e6d721..0000000
--- a/components/stratos/billing/org.wso2.carbon.billing.mgt.ui/2.1.0/src/main/resources/web/tenant-billing/get_invoice_by_id_ajaxprocessor.jsp
+++ /dev/null
@@ -1,25 +0,0 @@
-<!--
- ~ Copyright (c) 2005-2010, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
- ~
- ~ WSO2 Inc. licenses this file to you under the Apache License,
- ~ Version 2.0 (the "License"); you may not use this file except
- ~ in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~    http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing,
- ~ software distributed under the License is distributed on an
- ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- ~ KIND, either express or implied.  See the License for the
- ~ specific language governing permissions and limitations
- ~ under the License.
- -->
-<%@ page import="org.wso2.carbon.billing.mgt.stub.beans.xsd.MultitenancyInvoice" %>
-<%@ page import="org.wso2.carbon.billing.mgt.ui.utils.BillingUtil" %>
-<%
-    int invoiceId = Integer.parseInt(request.getParameter("invoiceId"));
-    MultitenancyInvoice invoice = BillingUtil.getPastInvoice(config, session, invoiceId);
-
-    session.setAttribute("invoice", invoice);
-%>
\ No newline at end of file

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

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ee2ab783/components/stratos/billing/org.wso2.carbon.billing.mgt.ui/2.1.0/src/main/resources/web/tenant-billing/images/view-invoice.gif
----------------------------------------------------------------------
diff --git a/components/stratos/billing/org.wso2.carbon.billing.mgt.ui/2.1.0/src/main/resources/web/tenant-billing/images/view-invoice.gif b/components/stratos/billing/org.wso2.carbon.billing.mgt.ui/2.1.0/src/main/resources/web/tenant-billing/images/view-invoice.gif
deleted file mode 100644
index 47ca2fd..0000000
Binary files a/components/stratos/billing/org.wso2.carbon.billing.mgt.ui/2.1.0/src/main/resources/web/tenant-billing/images/view-invoice.gif and /dev/null differ

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ee2ab783/components/stratos/billing/org.wso2.carbon.billing.mgt.ui/2.1.0/src/main/resources/web/tenant-billing/interim_invoice.jsp
----------------------------------------------------------------------
diff --git a/components/stratos/billing/org.wso2.carbon.billing.mgt.ui/2.1.0/src/main/resources/web/tenant-billing/interim_invoice.jsp b/components/stratos/billing/org.wso2.carbon.billing.mgt.ui/2.1.0/src/main/resources/web/tenant-billing/interim_invoice.jsp
deleted file mode 100644
index 12dda0d..0000000
--- a/components/stratos/billing/org.wso2.carbon.billing.mgt.ui/2.1.0/src/main/resources/web/tenant-billing/interim_invoice.jsp
+++ /dev/null
@@ -1,355 +0,0 @@
-<!--
-~ Copyright (c) 2005-2010, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
-~
-~ WSO2 Inc. licenses this file to you under the Apache License,
-~ Version 2.0 (the "License"); you may not use this file except
-~ in compliance with the License.
-~ You may obtain a copy of the License at
-~
-~ http://www.apache.org/licenses/LICENSE-2.0
-~
-~ Unless required by applicable law or agreed to in writing,
-~ software distributed under the License is distributed on an
-~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-~ KIND, either express or implied. See the License for the
-~ specific language governing permissions and limitations
-~ under the License.
--->
-<%@ page import="org.wso2.carbon.billing.mgt.stub.beans.xsd.*" %>
-<%@ page import="org.wso2.carbon.billing.mgt.ui.utils.BillingUtil" %>
-<%@ page import="java.text.SimpleDateFormat" %>
-<%@ page import="java.util.Date" %>
-<%@ page import="java.util.Enumeration" %>
-<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
-<%@ taglib uri="http://wso2.org/projects/carbon/taglibs/carbontags.jar" prefix="carbon" %>
-
-<carbon:jsi18n
-		resourceBundle="org.wso2.carbon.billing.mgt.ui.i18n.JSResources"
-		request="<%=request%>" />
-
-
-
-<fmt:bundle basename="org.wso2.carbon.billing.mgt.ui.i18n.Resources">
-<carbon:breadcrumb
-            label="view.invoice.menu"
-            resourceBundle="org.wso2.carbon.billing.mgt.ui.i18n.Resources"
-            topPage="true"
-            request="<%=request%>" />
-
-
-<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/register_config.js"></script>
-<link href="../tenant-billing/css/billing.css" rel="stylesheet" type="text/css" media="all"/>
-<style>
-    h2.trigger{
-    -moz-box-shadow:none;
-    box-shadow:none;
-    }
-    .toggle_container {
-    -moz-box-shadow:none;
-    box-shadow:none;
-}
-</style>
-<script type="text/javascript">
-    jQuery(document).ready(function() {
-
-      jQuery(".toggle_container").show();
-      /*Hide (Collapse) the toggle containers on load use show() insted of hide() in the
-      above code if you want to keep the content section expanded. */
-
-      jQuery("h2.trigger").click(function() {
-          if (jQuery(this).next().is(":visible")) {
-              this.className = "active trigger";
-          } else {
-              this.className = "trigger";
-          }
-
-          jQuery(this).next().slideToggle("fast");
-          return false; //Prevent the browser jump to the link anchor
-      });
-  });
-</script>
-<%
-    MultitenancyInvoice invoice = BillingUtil.getCurrentInvoice(config, session);
-
-    if (invoice == null) {
-
-%>
-<div id="middle">
-
-    <h2><fmt:message key="interim.invoice"/></h2>
-    <div id="workArea">
-
-
-        <table class="styledLeft">
-		<thead>
-		<tr>
-		<th>
-			<fmt:message key="invoice.information.head"/>
-		</th>
-		</tr>
-		</thead>
-        <tbody>
-                 <tr class="packagerow">
-                    <td class="packageCol">
-                        <fmt:message key="no.invoice.information.details"/>
-                    </td>
-                </tr>
-        </tbody>
-        </table>
-    </div>
-</div>
-<%
-    }else{
-        SimpleDateFormat dateFormat = new SimpleDateFormat("dd-MMM-yyyy");
-            SimpleDateFormat titleDateFormat = new SimpleDateFormat("MMM yyyy");
-            int invoiceId = invoice.getInvoiceId();
-            Date billingDate = invoice.getBillingDate();
-            Date startDate = invoice.getStartDate();
-            Date endDate = invoice.getEndDate();
-            String broughtForward = invoice.getBoughtForward();
-            String carriedForward = invoice.getCarriedForward();
-            String totalPayments = invoice.getTotalPayments();
-            String totalCost = invoice.getTotalCost();
-            boolean lastInvoice = invoice.getLastInvoice();
-            MultitenancySubscription[] subscriptions = invoice.getSubscriptions();
-            MultitenancyPurchaseOrder[] purchaseOrders = invoice.getPurchaseOrders();
-%>
-<div id="middle">
-        <h2><fmt:message key="interim.invoice"/></h2>
-
-        <div id="workArea">
-
-    <div style="border:solid 1px #ccc;margin-top:20px;padding:15px !important">
-            <table style="width:600px;" class="invoiceTable">
-                <tr>
-                    <td>
-                        <img alt="WSO2" src="images/logo.png" align="top" style="display:block;"/>
-                        <div style="margin-top:10px;">Federal Tax ID 87-0750575</div>
-
-                    </td>
-                    <td>
-                        <div class="invoice-heading"> Interim Invoice</div>
-                        <!--<div class="invoice-sub-heading">for xxxy</div>
-                        <div class="invoice-sub-heading">INVOICE NO: xxxxx</div>-->
-
-                    </td>
-                </tr>
-                <tr>
-                    <td> <ul class="invoice-inside-listing">
-                            <li>4131, El Camino Real Suite 200,
-                            </li>
-                            <li>Palo Alto, CA 94306
-                            </li>
-                            <li>Tel: (408) 754 7388
-                            </li>
-                            <li>Fax: (408) 689 4328
-                            </li>
-                            <li>Email: billing@wso2.com
-                            </li>
-                        </ul>
-					</td>
-                    <td>
-                   
-                
-<!--                         <ul class="invoice-inside-listing"> -->
-<%--                             <li><fmt:message key="invoice.date"/>: <%=dateFormat.format(billingDate)%></li> --%>
-<%--                             <li><fmt:message key="start.date"/>: <%=dateFormat.format(startDate)%></li> --%>
-<%--                             <li><fmt:message key="end.date"/>: <%=dateFormat.format(endDate)%></li> --%>
-<!--                          </ul> -->
-                         <table border="0" class="normal">
-								<tr> <td><fmt:message key="invoice.date"/> </td>
-								     <td>: <%=dateFormat.format(billingDate)%></td>
-								</tr>
-									<tr> <td><fmt:message key="start.date"/> </td>
-								     <td>: <%=dateFormat.format(startDate)%></td>
-								</tr>
-									<tr> <td><fmt:message key="end.date"/></td>
-								     <td>: <%=dateFormat.format(endDate)%></td>
-								</tr>
-						</table>
-                    </td>
-                </tr>
-                <tr>
-                    <td colspan="2">
-                        
-                        <table class="invice-data-table">
-                        <tr class="invoice-header">
-                                <td>Particulars</td>
-                                <td style="text-align:right">Value (USD)</td>
-                            </tr>
-           <tr class="invoice-content-row">
-                	<td colspan="2"><strong style="color:#555"><fmt:message key="charges.subscriptions"/></strong></td>
-                </tr>
-                <%
-                    if(subscriptions!=null){
-                    for (MultitenancySubscription subscription: subscriptions) {
-
-                        String subscribedPackage = subscription.getSubscribedPackage();
-                        BilledEntry[] billedEntries = subscription.getBilledEntries();
-                        Date activeSince = subscription.getActiveSince();
-                        Date activeUntil = subscription.getActiveUntil();
-                %>
-                <!--<tr class="invoice-content-row">
-                    <td class="leftCol-med" colspan="2"></td>
-                </tr>-->
-                <tr class="invoice-content-row">
-                    <td class="leftCol-med" style="padding-top:20px !important" colspan="2">
-                        <fmt:message key="subscription"/> Type: <strong><%=subscribedPackage%></strong>
-                    </td>
-                </tr>
-                <tr class="invoice-content-row">
-                    <td colspan="2">
-                        <fmt:message key="active.since"/>: <%=dateFormat.format(activeSince)%>
-                    </td>
-                </tr>
-                <%
-                    if(subscription.getActive()){
-                %>
-                <tr class="invoice-content-row">
-                    <td colspan="2">
-                        <fmt:message key="active.until"/>: <fmt:message key="this.is.active.subscription"/>
-                    </td>
-                </tr>
-                <%
-                    }
-                    else{
-                %>
-                <tr class="invoice-content-row">
-                    <td colspan="2">
-                        <fmt:message key="active.until"/>: <%=dateFormat.format(activeUntil)%>
-                    </td>
-                </tr>
-                <%
-                    }
-                %>
-
-                <%
-                    if(billedEntries!=null && billedEntries.length>0){
-                       for (BilledEntry billedEntry: billedEntries) {
-                           if(billedEntry!=null){
-                            String name = billedEntry.getName();
-                            String cost = billedEntry.getCost();
-                %>
-                <tr class="invoice-content-row">
-                    <td>
-                        <%=name%>
-                    </td>
-                    <td style="text-align:right;font-weight:bold;">
-                        <%=cost%>
-                    </td>
-                </tr>
-                <%
-                                    }
-                                }
-                            }
-                        }
-                    }
-                %>
-                	<tr class="invoice-content-row">
-                		<td colspan="2" style="padding-top:20px !important"><strong style="color:#555"><fmt:message key="payment.details"/></strong></td>
-                	</tr>
-                <%
-                if (purchaseOrders == null || purchaseOrders.length == 0) {
-                %>
-                 
-                 <tr class="invoice-content-row">
-                		<td colspan="2">You don't have any payment details for this period.</td></tr>                 
-                <%
-                } else {
-                    for (MultitenancyPurchaseOrder purchaseOrder: purchaseOrders) {
-                        if (purchaseOrder == null) {
-                            continue;
-                        }
-                        int id = purchaseOrder.getId();
-                        Date paymentDate = purchaseOrder.getPaymentDate();
-                        String payment = purchaseOrder.getPayment();
-                %>
-				<tr class="invoice-content-row">
-				<td class="leftCol-med"><fmt:message key="payment"/> : <strong><%=purchaseOrder.getTransactionId()%></strong> on <%=dateFormat.format(paymentDate)%></td>
-				<td style="text-align:right;font-weight:bold;"><%=payment%></td>
-				</tr>
-                
-                <%
-                    }
-                }
-                %>
-				<tr class="invoice-content-row"><td colspan="2" style="padding-top:20px !important"><strong style="color:#555"><fmt:message key="invoice.summary"/></strong></td></tr>
-
-                <tr class="invoice-content-row">
-                    <td>
-                        <fmt:message key="brought.forward"/>
-                    </td>
-                
-                    <td style="text-align:right;font-weight:bold;">
-                        <%=broughtForward%>
-                    </td>
-                </tr>
-
-                <tr class="invoice-content-row">
-                    <td>
-                        <fmt:message key="total.cost"/>
-                    </td>
-                    <td style="text-align:right;font-weight:bold;">
-                        <%=totalCost%>
-                    </td>
-                </tr>
-
-
-                <tr class="invoice-content-row">
-                    <td>
-                        <fmt:message key="total.payments"/>
-                    </td>
-
-                    <td style="text-align:right;font-weight:bold;">
-                        <%=totalPayments%>
-                    </td>
-                </tr>
-
-                <tr class="invoice-content-row">
-                    <td>
-                        <fmt:message key="carried.forward"/>
-                    </td>
-
-                    <td style="text-align:right;font-weight:bold;">
-                        <%=carriedForward%>
-                    </td>
-                </tr>
-                <tr class="invoice-content-row">
-                    <td colspan="2" id="messageTd">&nbsp;</td>
-                </tr>
-                </table>
-                </td>
-                </tr>
-                
-                <!--<tr>
-                    <td colspan="2">
-                        <div class="name-field">Padmika Dissanaike,</div>
-                        Director- Finance
-                    </td>
-                </tr>-->
-            </table>
-            <!--<div style="background-color:#e2edf9;padding:10px;">
-		    <form name="startPaymentForm" method='POST'>
-                            <input type="hidden" name="successUrl" id="successUrl" value=""/>
-                            <input type="hidden" name="cancelUrl" id="cancelUrl" value=""/>
-                            <input type="hidden" name="amount" id="amount" value=""/>
-                            <a href="#"><img src='http://images.paypal.com/images/x-click-but6.gif'
-                                    border='0' align='top' alt='PayPal' onclick="setExpressCheckout('');"/>
-                            </a>
-                        </form>
-                        <div style="color:#494949">Pay the invoice securely online</div>
-                        </div>
-                        </div>-->
-             <%
-        		}
-    		%>
-    		
-        </div>
-</div>
-
- </fmt:bundle>
-

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ee2ab783/components/stratos/billing/org.wso2.carbon.billing.mgt.ui/2.1.0/src/main/resources/web/tenant-billing/make_adjustment_ajaxprocessor.jsp
----------------------------------------------------------------------
diff --git a/components/stratos/billing/org.wso2.carbon.billing.mgt.ui/2.1.0/src/main/resources/web/tenant-billing/make_adjustment_ajaxprocessor.jsp b/components/stratos/billing/org.wso2.carbon.billing.mgt.ui/2.1.0/src/main/resources/web/tenant-billing/make_adjustment_ajaxprocessor.jsp
deleted file mode 100644
index f33576c..0000000
--- a/components/stratos/billing/org.wso2.carbon.billing.mgt.ui/2.1.0/src/main/resources/web/tenant-billing/make_adjustment_ajaxprocessor.jsp
+++ /dev/null
@@ -1,49 +0,0 @@
-<%--
- ~ Copyright (c) 2005-2010, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
- ~
- ~ WSO2 Inc. licenses this file to you under the Apache License,
- ~ Version 2.0 (the "License"); you may not use this file except
- ~ in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~    http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing,
- ~ software distributed under the License is distributed on an
- ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- ~ KIND, either express or implied.  See the License for the
- ~ specific language governing permissions and limitations
- ~ under the License.
- --%>
-<%@ page import="org.wso2.carbon.billing.mgt.stub.beans.xsd.MultitenancyInvoice" %>
-<%@ page import="org.wso2.carbon.billing.mgt.ui.utils.BillingUtil" %>
-<%@ page import="org.wso2.carbon.billing.mgt.stub.beans.xsd.Payment" %>
-<%@ page import="org.wso2.carbon.billing.mgt.stub.beans.xsd.Invoice" %>
-<%@ page import="org.wso2.carbon.billing.mgt.stub.beans.xsd.Cash" %>
-<%@ page import="java.util.Date" %>
-<%
-    int invoiceId = Integer.parseInt(request.getParameter("invoiceId"));
-    String amount = request.getParameter("amount").trim();
-    String description = request.getParameter("description").trim();
-
-    //We are making the adjustment as a payment...
-    Payment adjustment = new Payment();
-    Invoice invoice = new Invoice();
-    invoice.setId(invoiceId);
-    adjustment.setInvoice(invoice);
-    adjustment.setDescription(description);
-    adjustment.setDate(new Date(System.currentTimeMillis()));
-
-    int adjustmentId=0;
-    try{
-        adjustmentId = BillingUtil.makeAdjustment(config, session, adjustment,  amount);
-    }catch(Exception e){
-        e.printStackTrace();
-    }
-
-    session.setAttribute("adjustmentId", adjustmentId);
-
-
-%>
-
-<jsp:forward page="adjustments.jsp"/>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ee2ab783/components/stratos/billing/org.wso2.carbon.billing.mgt.ui/2.1.0/src/main/resources/web/tenant-billing/past_invoice.jsp
----------------------------------------------------------------------
diff --git a/components/stratos/billing/org.wso2.carbon.billing.mgt.ui/2.1.0/src/main/resources/web/tenant-billing/past_invoice.jsp b/components/stratos/billing/org.wso2.carbon.billing.mgt.ui/2.1.0/src/main/resources/web/tenant-billing/past_invoice.jsp
deleted file mode 100644
index 67bf09a..0000000
--- a/components/stratos/billing/org.wso2.carbon.billing.mgt.ui/2.1.0/src/main/resources/web/tenant-billing/past_invoice.jsp
+++ /dev/null
@@ -1,470 +0,0 @@
-<!--
-~ Copyright (c) 2005-2010, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
-~
-~ WSO2 Inc. licenses this file to you under the Apache License,
-~ Version 2.0 (the "License"); you may not use this file except
-~ in compliance with the License.
-~ You may obtain a copy of the License at
-~
-~ http://www.apache.org/licenses/LICENSE-2.0
-~
-~ Unless required by applicable law or agreed to in writing,
-~ software distributed under the License is distributed on an
-~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-~ KIND, either express or implied. See the License for the
-~ specific language governing permissions and limitations
-~ under the License.
--->
-<%@ page import="org.wso2.carbon.billing.mgt.stub.beans.xsd.*" %>
-<%@ page import="org.wso2.carbon.billing.mgt.ui.utils.BillingUtil" %>
-<%@ page import="org.wso2.carbon.stratos.common.util.CommonUtil" %>
-<%@ page import="org.wso2.carbon.ui.CarbonUIUtil" %>
-<%@ page import="java.text.SimpleDateFormat" %>
-<%@ page import="java.util.Date" %>
-<%@ page import="java.util.Enumeration" %>
-<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
-<%@ taglib uri="http://wso2.org/projects/carbon/taglibs/carbontags.jar" prefix="carbon" %>
-
-<carbon:jsi18n
-		resourceBundle="org.wso2.carbon.billing.mgt.ui.i18n.JSResources"
-		request="<%=request%>" />
-
-
-
-<fmt:bundle basename="org.wso2.carbon.billing.mgt.ui.i18n.Resources">
-<carbon:breadcrumb
-            label="view.invoice.menu"
-            resourceBundle="org.wso2.carbon.billing.mgt.ui.i18n.Resources"
-            topPage="true"
-            request="<%=request%>" />
-
-<script type="text/javascript">
-
-    function setExpressCheckout(paypalUrl) {
-        var successUrl = document.startPaymentForm.successUrl.value;
-        var cancelUrl = document.startPaymentForm.cancelUrl.value;
-        var amount = document.startPaymentForm.amount.value;
-	    if(amount=='$0.00'){
-            CARBON.showInfoDialog('Your total payment is '+amount+'. You are not allowed to connect to Paypal');
-        }else{
-            document.getElementById('messageTd').style.display='';
-            jQuery.ajax({
-            type: 'GET',
-            url: '../payment/setEC-ajaxprocessor.jsp',
-            data: 'successUrl=' + successUrl + '&cancelUrl=' + cancelUrl + '&amount=' + amount,
-            dataType: 'json',
-            async: false,
-            success: function(msg) {
-                var resp = msg;
-                if(resp.ack=='Success'){
-                    location.href = paypalUrl + resp.token;
-                }else{
-                    if(resp.error){
-                        CARBON.showErrorDialog('Could not connect to Paypal at the moment: ' + resp.error);
-                    }else{
-                        CARBON.showErrorDialog('Could not connect to Paypal at the moment');
-                    }
-                    document.getElementById('messageTd').style.display='none';
-                }
-            },
-            error:function () {
-                CARBON.showErrorDialog('Could not connect to PayPal site at the moment' );
-                document.getElementById('messageTd').style.display='none';
-            }
-            });
-	    }
-    }
-
-    function getInvoice(){
-
-        var index = document.getElementById('yearMonth').selectedIndex;
-        var invoiceId = document.getElementById('yearMonth').options[index].value;
-        if(invoiceId<0){
-            CARBON.showInfoDialog('Please select a month to view the invoice');
-        }else{
-            jQuery.ajax({
-                type: 'POST',
-                url: 'get_invoice_by_id_ajaxprocessor.jsp',
-                data: 'invoiceId=' + invoiceId,
-                success: function() {
-                    location.href = 'past_invoice.jsp'
-                },
-                error:function (xhr, ajaxOptions, thrownError) {
-                    CARBON.showErrorDialog('Could not get the invoice.');
-                }
-            });    
-        }
-
-
-        
-    }
-</script>
-<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/register_config.js"></script>
-<link href="../tenant-billing/css/billing.css" rel="stylesheet" type="text/css" media="all"/>
-<style>
-    h2.trigger{
-    -moz-box-shadow:none;
-    box-shadow:none;
-    }
-    .toggle_container {
-    -moz-box-shadow:none;
-    box-shadow:none;
-}
-</style>
-<script type="text/javascript">
-    jQuery(document).ready(function() {
-
-      jQuery(".toggle_container").show();
-      /*Hide (Collapse) the toggle containers on load use show() insted of hide() in the
-      above code if you want to keep the content section expanded. */
-
-      jQuery("h2.trigger").click(function() {
-          if (jQuery(this).next().is(":visible")) {
-              this.className = "active trigger";
-          } else {
-              this.className = "trigger";
-          }
-
-          jQuery(this).next().slideToggle("fast");
-          return false; //Prevent the browser jump to the link anchor
-      });
-  });
-</script>
-<%
-    String paypalUrl = "";
-    if(CommonUtil.getStratosConfig()!=null){
-        paypalUrl = CommonUtil.getStratosConfig().getPaypalUrl();
-    }
-
-    String adminConsoleURL = CarbonUIUtil.getAdminConsoleURL(request);
-    adminConsoleURL = adminConsoleURL.substring(0, adminConsoleURL.indexOf("carbon"));
-    String tenantDomain = (String) session.getAttribute("tenantDomain");
-    String successUrl = adminConsoleURL + "t/" + tenantDomain + "/carbon/payment/success.jsp";
-    String cancelUrl = adminConsoleURL + "t/" + tenantDomain + "/carbon/tenant-billing/past_invoice.jsp";
-
-    BillingPeriod[] billingPeriods = BillingUtil.getAvailableBillingPeriods(config, session);
-    String[] billingMonths = BillingUtil.getAvailableBillingMonths(billingPeriods);
-
-    //invoice is retrieved at get_invoice_by_id_ajaxprocessor.jsp and it is added to session
-    MultitenancyInvoice invoice = (MultitenancyInvoice) session.getAttribute("invoice");
-    session.removeAttribute("invoice");
-    session.removeAttribute("invoiceId");
-    if(invoice!=null){
-        session.setAttribute("invoiceId", invoice.getInvoiceId());
-    }
-
-%>
-<div id="middle">
-        <h2><fmt:message key="view.invoice"/></h2>
-
-        <div id="workArea">
-            <%
-                if(billingMonths.length>0){
-            %>
-            <table class="styledLeft">
-				<thead>
-				<tr>
-				<th colspan="3" width="100%">
-					<fmt:message key="select.invoice"/>
-				</th>
-				</tr>
-				</thead>
-				<tbody>
-				         <tr class="packagerow">
-				            <td class="packageCol" width="20%">
-				                <fmt:message key="invoice"/>
-				            </td>
-				            <td colspan="2">
-				                <select name="yearMonth" id="yearMonth">
-				                    <option value="-1">--Select the Invoice--</option>
-				                    <%
-				                        for(int i=0; i< billingMonths.length; i++){
-				                    %>
-				                    <option value="<%=billingPeriods[i].getInvoiceId()%>"><%=billingMonths[i]%></option>
-				                    <%
-				                        }
-				                    %>
-				                </select>
-				                <input type="button" class="button" value="View Invoice" onclick="getInvoice();"/>
-				            </td>
-				        </tr>
-				</tbody>
-			</table>
-            <%
-                    }else{
-            %>
-                <table class="styledLeft">
-                    <thead>
-                        <tr>
-                            <th>
-                                <fmt:message key="invoice.information.head"/>
-                            </th>
-                        </tr>
-                    </thead>
-                    <tbody>
-                        <tr class="packagerow">
-                            <td class="packageCol">
-                                <fmt:message key="no.invoice.at.the.moment"/>
-                            </td>
-                        </tr>
-                    </tbody>
-                </table>
-            <%
-                    }
-            %>
-
-			
-			 <%
-        if(invoice!=null){
-            SimpleDateFormat dateFormat = new SimpleDateFormat("dd-MMM-yyyy");
-            SimpleDateFormat titleDateFormat = new SimpleDateFormat("MMM yyyy");
-            int invoiceId = invoice.getInvoiceId();
-            Date billingDate = invoice.getBillingDate();
-            Date startDate = invoice.getStartDate();
-            Date endDate = invoice.getEndDate();
-            String broughtForward = invoice.getBoughtForward();
-            String carriedForward = invoice.getCarriedForward();
-            String totalPayments = invoice.getTotalPayments();
-            String totalCost = invoice.getTotalCost();
-            boolean lastInvoice = invoice.getLastInvoice();
-            MultitenancySubscription[] subscriptions = invoice.getSubscriptions();
-            MultitenancyPurchaseOrder[] purchaseOrders = invoice.getPurchaseOrders();
-
-    %>
-    <div style="border:solid 1px #ccc;margin-top:20px;padding:15px !important">
-            <table style="width:600px;" class="invoiceTable">
-                <tr>
-                    <td>
-                        <img alt="WSO2" src="images/logo.png" align="top" style="display:block;"/>
-                        <div style="margin-top:10px;">Federal Tax ID 87-0750575</div>
-
-                    </td>
-                    <td>
-                        <div class="invoice-heading">Invoice</div>
-                        <div class="invoice-sub-heading"><%=titleDateFormat.format(billingDate)%></div>
-                        <div class="invoice-sub-heading">INVOICE NO: <%=invoiceId%></div>
-
-                    </td>
-                </tr>
-                <tr>
-                    <td> <ul class="invoice-inside-listing">
-                            <li>4131, El Camino Real Suite 200,
-                            </li>
-                            <li>Palo Alto, CA 94306
-                            </li>
-                            <li>Tel: (408) 754 7388
-                            </li>
-                            <li>Fax: (408) 689 4328
-                            </li>
-                            <li>Email: billing@wso2.com
-                            </li>
-                        </ul>
-					</td>
-                    <td>
-                   
-                
-<!--                         <ul class="invoice-inside-listing"> -->
-<%--                             <li><fmt:message key="invoice.date"/>: <%=dateFormat.format(billingDate)%></li> --%>
-<%--                             <li><fmt:message key="start.date"/>: <%=dateFormat.format(startDate)%></li> --%>
-<%--                             <li><fmt:message key="end.date"/>: <%=dateFormat.format(endDate)%></li> --%>
-                            
-<!--                          </ul> -->
-						  <table border="0" class="normal">
-								<tr> <td><fmt:message key="invoice.date"/> </td>
-								     <td>: <%=dateFormat.format(billingDate)%></td>
-								</tr>
-									<tr> <td><fmt:message key="start.date"/> </td>
-								     <td>: <%=dateFormat.format(startDate)%></td>
-								</tr>
-									<tr> <td><fmt:message key="end.date"/></td>
-								     <td>: <%=dateFormat.format(endDate)%></td>
-								</tr>
-						</table>		
-                    </td>
-                </tr>
-                <tr>
-                    <td colspan="2">
-                        
-                        <table class="invice-data-table">
-                        <tr class="invoice-header">
-                                <td>Particulars</td>
-                                 <td style="text-align:right">Value (USD)</td>
-                            </tr>
-           <tr class="invoice-content-row">
-                	<td colspan="2"><strong style="color:#555"><fmt:message key="charges.subscriptions"/></strong></td>
-                </tr>
-                <%
-                    if(subscriptions!=null){
-                    for (MultitenancySubscription subscription: subscriptions) {
-
-                        String subscribedPackage = subscription.getSubscribedPackage();
-                        BilledEntry[] billedEntries = subscription.getBilledEntries();
-                        Date activeSince = subscription.getActiveSince();
-                        Date activeUntil = subscription.getActiveUntil();
-                %>
-                
-                <tr class="invoice-content-row">
-                    <td class="leftCol-med" style="padding-top:20px !important" colspan="2">
-                        <fmt:message key="subscription"/> Type: <strong><%=subscribedPackage%></strong>
-                    </td>
-                </tr>
-                <tr class="invoice-content-row">
-                    <td colspan="2">
-                        <fmt:message key="active.since"/>: <%=dateFormat.format(activeSince)%>
-                    </td>
-                </tr>
-                <%
-                    if(subscription.getActive()){
-                %>
-                <tr class="invoice-content-row">
-                    <td colspan="2">
-                        <fmt:message key="active.until"/>: <fmt:message key="this.is.active.subscription"/>
-                    </td>
-                </tr>
-                <%
-                    }
-                    else{
-                %>
-                <tr class="invoice-content-row">
-                    <td colspan="2">
-                        <fmt:message key="active.until"/>: <%=dateFormat.format(activeUntil)%> 
-                    </td>
-                </tr>
-                <%
-                    }
-                %>
-
-                <%
-                    if(billedEntries!=null && billedEntries.length>0){
-                       for (BilledEntry billedEntry: billedEntries) {
-                           if(billedEntry!=null){
-                            String name = billedEntry.getName();
-                            String cost = billedEntry.getCost();
-                %>
-                <tr class="invoice-content-row">
-                    <td>
-                        <%=name%>
-                    </td>
-                    <td style="text-align:right;font-weight:bold;">
-                        <%=cost%>
-                    </td>
-                </tr>
-                <%
-                                    }
-                                }
-                            }
-                        }
-                    }
-                %>
-                	<tr class="invoice-content-row">
-                		<td colspan="2" style="padding-top:20px !important"><strong style="color:#555"><fmt:message key="payment.details"/></strong></td>
-                	</tr>
-                <%
-                if (purchaseOrders == null || purchaseOrders.length == 0) {
-                %>
-                 
-                 <tr class="invoice-content-row">
-                		<td colspan="2">You don't have any payment details for this period.</td></tr>                 
-                <%
-                } else {
-                    for (MultitenancyPurchaseOrder purchaseOrder: purchaseOrders) {
-                        if (purchaseOrder == null) {
-                            continue;
-                        }
-                        int id = purchaseOrder.getId();
-                        Date paymentDate = purchaseOrder.getPaymentDate();
-                        String payment = purchaseOrder.getPayment();
-                %>
-				<tr class="invoice-content-row">
-				<td class="leftCol-med"><fmt:message key="payment"/> : <strong><%=purchaseOrder.getTransactionId()%></strong> on <%=dateFormat.format(paymentDate)%></td>
-				<td style="text-align:right;font-weight:bold;"><%=payment%></td>
-				</tr>
-                
-                <%
-                    }
-                }
-                %>
-			
-				<tr class="invoice-content-row"><td colspan="2" style="padding-top:20px !important"><strong style="color:#555"><fmt:message key="invoice.summary"/></strong></td></tr>
-
-
-                <tr class="invoice-content-row">
-                    <td>
-                        <fmt:message key="brought.forward"/>
-                    </td>
-                
-                    <td style="text-align:right;font-weight:bold;">
-                        <%=broughtForward%>
-                    </td>
-                </tr>
-
-                <tr class="invoice-content-row">
-                    <td>
-                        <fmt:message key="total.cost"/>
-                    </td>
-                    <td style="text-align:right;font-weight:bold;">
-                        <%=totalCost%>
-                    </td>
-                </tr>
-
-
-                <tr class="invoice-content-row">
-                    <td>
-                        <fmt:message key="total.payments"/>
-                    </td>
-
-                    <td style="text-align:right;font-weight:bold;">
-                        <%=totalPayments%>
-                    </td>
-                </tr>
-
-                <tr class="invoice-content-row">
-                    <td>
-                        <fmt:message key="carried.forward"/>
-                    </td>
-
-                    <td style="text-align:right;font-weight:bold;">
-                        <%=carriedForward%>
-                    </td>
-                </tr>
-                <!--<tr class="invoice-content-row">
-                    <td colspan="2" id="messageTd">&nbsp;</td>
-                </tr>-->
-            </table>
-                
-                
-                    </td>
-                </tr>
-                
-                <tr>
-                    <td colspan="2">
-                        <div class="name-field">Padmika Dissanaike,</div>
-                        Director- Finance
-                    </td>
-                </tr>
-            </table>
-                    <div style="background-color:#e2edf9;padding:10px;">
-                        <form name="startPaymentForm" method='POST'>
-                            <input type="hidden" name="successUrl" id="successUrl" value="<%=successUrl%>"/>
-                            <input type="hidden" name="cancelUrl" id="cancelUrl" value="<%=cancelUrl%>"/>
-                            <input type="hidden" name="amount" id="amount" value="<%=carriedForward%>"/>
-                            <a href="#"><img src='http://images.paypal.com/images/x-click-but6.gif'
-                                             border='0' align='top' alt='PayPal' onclick="setExpressCheckout('<%=paypalUrl%>');"/>
-                            </a>
-                        </form>
-                        <div style="color:#494949">Pay the invoice securely online</div>
-                    </div>
-                    <div style="color:#494949; display:none;" id="messageTd">Please wait until you are connected to Paypal <img src="../admin/images/loading-small.gif" /></div>
-                        </div>	
-             <%
-        		}
-    		%>
-    		
-        </div>
-</div>
-
- </fmt:bundle>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ee2ab783/components/stratos/billing/org.wso2.carbon.billing.mgt.ui/2.1.0/src/main/resources/web/tenant-billing/prepare_checkout_ajaxprocessor.jsp
----------------------------------------------------------------------
diff --git a/components/stratos/billing/org.wso2.carbon.billing.mgt.ui/2.1.0/src/main/resources/web/tenant-billing/prepare_checkout_ajaxprocessor.jsp b/components/stratos/billing/org.wso2.carbon.billing.mgt.ui/2.1.0/src/main/resources/web/tenant-billing/prepare_checkout_ajaxprocessor.jsp
deleted file mode 100644
index 648086f..0000000
--- a/components/stratos/billing/org.wso2.carbon.billing.mgt.ui/2.1.0/src/main/resources/web/tenant-billing/prepare_checkout_ajaxprocessor.jsp
+++ /dev/null
@@ -1,28 +0,0 @@
-<!--
- ~ Copyright (c) 2005-2010, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
- ~
- ~ WSO2 Inc. licenses this file to you under the Apache License,
- ~ Version 2.0 (the "License"); you may not use this file except
- ~ in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~    http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing,
- ~ software distributed under the License is distributed on an
- ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- ~ KIND, either express or implied.  See the License for the
- ~ specific language governing permissions and limitations
- ~ under the License.
- -->
-<%@ page import="org.wso2.carbon.billing.mgt.stub.beans.xsd.MultitenancyInvoice" %>
-<%@ page import="org.wso2.carbon.billing.mgt.ui.utils.BillingUtil" %>
-<%
-MultitenancyInvoice invoice = BillingUtil.getCurrentInvoice(config, session);
-
-// carried forward is the amount left to pay
-String carriedForward = invoice.getCarriedForward();
-session.setAttribute("requiredPaymentAmount", carriedForward);
-
-response.sendRedirect("../payment-paypal/prepare_payment.jsp");
-%>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ee2ab783/components/stratos/billing/org.wso2.carbon.billing.mgt.ui/2.1.0/src/main/resources/web/tenant-billing/view_balance.jsp
----------------------------------------------------------------------
diff --git a/components/stratos/billing/org.wso2.carbon.billing.mgt.ui/2.1.0/src/main/resources/web/tenant-billing/view_balance.jsp b/components/stratos/billing/org.wso2.carbon.billing.mgt.ui/2.1.0/src/main/resources/web/tenant-billing/view_balance.jsp
deleted file mode 100644
index 53354b8..0000000
--- a/components/stratos/billing/org.wso2.carbon.billing.mgt.ui/2.1.0/src/main/resources/web/tenant-billing/view_balance.jsp
+++ /dev/null
@@ -1,171 +0,0 @@
-<!--
-~ Copyright (c) 2005-2010, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
-~
-~ WSO2 Inc. licenses this file to you under the Apache License,
-~ Version 2.0 (the "License"); you may not use this file except
-~ in compliance with the License.
-~ You may obtain a copy of the License at
-~
-~ http://www.apache.org/licenses/LICENSE-2.0
-~
-~ Unless required by applicable law or agreed to in writing,
-~ software distributed under the License is distributed on an
-~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-~ KIND, either express or implied. See the License for the
-~ specific language governing permissions and limitations
-~ under the License.
--->
-<%@ page import="org.wso2.carbon.registry.common.ui.UIException" %>
-<%@ page import="org.wso2.carbon.ui.CarbonUIMessage" %>
-<%@ page import="java.text.SimpleDateFormat" %>
-<%@ page import="org.wso2.carbon.billing.mgt.stub.beans.xsd.PaginatedBalanceInfoBean" %>
-<%@ page import="org.wso2.carbon.billing.mgt.ui.utils.BillingUtil" %>
-<%@ page import="org.wso2.carbon.billing.mgt.stub.beans.xsd.OutstandingBalanceInfoBean" %>
-<%@ 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"/>
-
-<carbon:jsi18n
-        resourceBundle="org.wso2.carbon.billing.mgt.ui.i18n.JSResources"
-        request="<%=request%>"/>
-
-<fmt:bundle basename="org.wso2.carbon.billing.mgt.ui.i18n.Resources">
-    <carbon:breadcrumb
-            label="view.balance.menu"
-            resourceBundle="org.wso2.carbon.billing.mgt.ui.i18n.Resources"
-            topPage="true"
-            request="<%=request%>"/>
-
-    <div id="top">
-        <form id="findTenantForm" action="view_balance.jsp" method="post">
-            <table class="normal-nopadding" cellspacing="0">
-                <tbody>
-                <tr>
-                    <td><fmt:message key="enter.tenant.domain"/></td>
-                    <td colspan="2"><input type="text" name="tenantDomain" id="tenantDomain"
-                                           style="width:300px"/>
-                        <input type="button" onclick="javascript:document.getElementById
-                    ('findTenantForm').submit();" value="Find"/>
-                    </td>
-                </tr>
-                </tbody>
-            </table>
-        </form>
-    </div>
-
-    <div id="middle">
-
-        <%
-            String tenantDomain = request.getParameter("tenantDomain");
-            String pageNumberStr = request.getParameter("pageNumber");
-            if (pageNumberStr == null) {
-                pageNumberStr = "0";
-            }
-            int pageNumber = 0;
-            try {
-                pageNumber = Integer.parseInt(pageNumberStr);
-            } catch (NumberFormatException ignored) {
-                // page number format exception
-            }
-            int numberOfPages = 0;
-            int noOfPageLinksToDisplay = 5;  //default value is set to 5
-
-            PaginatedBalanceInfoBean paginatedBalance;
-            OutstandingBalanceInfoBean[] balanceInfoArr;
-            try {
-                if (tenantDomain == null || "".equals(tenantDomain.trim())) {
-                    paginatedBalance = BillingUtil.getPaginatedBalanceInfo(config, session, pageNumber);
-                    balanceInfoArr = paginatedBalance.getBalanceInfoBeans();
-                    numberOfPages = paginatedBalance.getNumberOfPages();
-                } else {
-                    balanceInfoArr = BillingUtil.getOutstandingBalance(config, session, tenantDomain);
-                }
-            } catch (UIException e) {
-                String error1 = "Error in viewing balance of customers: " + e.getMessage();
-                request.setAttribute(CarbonUIMessage.ID, new CarbonUIMessage(error1, error1, null));
-        %>
-
-        <jsp:forward page="../admin/error.jsp"/>
-        <%
-                return;
-            }
-        %>
-        <br/>
-        <carbon:paginator pageNumber="<%=pageNumber%>" numberOfPages="<%=numberOfPages%>"
-                          noOfPageLinksToDisplay="<%=noOfPageLinksToDisplay%>"
-                          page="view_balance.jsp" pageNumberParameterName="pageNumber"/>
-        <br/>
-
-        <h2><fmt:message key="invoice.summary"/></h2>
-
-        <div id="workArea">
-
-            <table cellpadding="0" cellspacing="0" border="0" style="width:100%" class="styledLeft">
-                <thead>
-                <tr>
-                    <th style="padding-left:5px;text-align:left;">Domain</th>
-                    <th style="padding-left:5px;text-align:left;">Active Usage Plan</th>
-                    <th style="padding-left:5px;text-align:left;">Balance at Last Invoice</th>
-                    <th style="padding-left:5px;text-align:left;">Last Invoice Date</th>
-                    <th style="padding-left:5px;text-align:left;">Last Payment Date</th>
-                    <th style="padding-left:5px;text-align:left;">Last Paid Amount</th>
-                </tr>
-                </thead>
-                <tbody>
-                <%
-                    SimpleDateFormat dateFormat = new SimpleDateFormat("dd-MMM-yyyy");
-                    if (balanceInfoArr != null && balanceInfoArr.length > 0) {
-                        for (OutstandingBalanceInfoBean balanceInfo : balanceInfoArr) {
-                            if (balanceInfo == null) {
-                                continue;
-                            }
-                            String carriedForwardBalance = "Not Available";
-                            String lastInvoiceDate = "Not Available";
-                            String lastPaymentDate = "Not Available";
-                            String lastPaidAmount = "Not Available";
-                            if (balanceInfo.getCarriedForward() != null) {
-                                carriedForwardBalance = balanceInfo.getCarriedForward();
-                            }
-                            if (balanceInfo.getLastInvoiceDate() != null) {
-                                lastInvoiceDate = dateFormat.format(balanceInfo.getLastInvoiceDate());
-                            }
-                            if (balanceInfo.getLastPaymentDate() != null) {
-                                lastPaymentDate = dateFormat.format(balanceInfo.getLastPaymentDate());
-                            }
-                            if (balanceInfo.getLastPaidAmount() != null) {
-                                lastPaidAmount = balanceInfo.getLastPaidAmount();
-                            }
-                %>
-                <tr>
-                    <td style="padding-left:5px;padding-top:3px;text-align:left;"><%=balanceInfo.getCustomerName()%>
-                    </td>
-                    <td style="padding-left:5px;padding-top:3px;text-align:left;"><%=balanceInfo.getSubscription()%>
-                    </td>
-                    <td style="padding-left:5px;padding-top:3px;text-align:left;"><%=carriedForwardBalance%>
-                    </td>
-                    <td style="padding-left:5px;padding-top:3px;text-align:left;"><%=lastInvoiceDate%>
-                    </td>
-                    <td style="padding-left:5px;padding-top:3px;text-align:left;"><%=lastPaymentDate%>
-                    </td>
-                    <td style="padding-left:5px;padding-top:3px;text-align:left;"><%=lastPaidAmount%>
-                    </td>
-                </tr>
-                <% }
-                } else {
-                %>
-                <tr>
-                    <td colspan="6" style="padding-left:5px;padding-top:3px;text-align:center;">
-                        Could not find information for domain <%=tenantDomain%>
-                    </td>
-                </tr>
-                <%
-                    }
-                %>
-                <carbon:paginator pageNumber="<%=pageNumber%>" numberOfPages="<%=numberOfPages%>"
-                                  noOfPageLinksToDisplay="<%=noOfPageLinksToDisplay%>"
-                                  page="view_balance.jsp" pageNumberParameterName="pageNumber"/>
-                </tbody>
-            </table>
-        </div>
-    </div>
-</fmt:bundle>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ee2ab783/components/stratos/billing/org.wso2.carbon.billing.mgt/2.1.0/pom.xml
----------------------------------------------------------------------
diff --git a/components/stratos/billing/org.wso2.carbon.billing.mgt/2.1.0/pom.xml b/components/stratos/billing/org.wso2.carbon.billing.mgt/2.1.0/pom.xml
deleted file mode 100644
index ff01860..0000000
--- a/components/stratos/billing/org.wso2.carbon.billing.mgt/2.1.0/pom.xml
+++ /dev/null
@@ -1,116 +0,0 @@
-<!--
-# Copyright (c) 2008, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <parent>
-        <groupId>org.wso2.carbon</groupId>
-        <artifactId>billing-parent</artifactId>
-        <version>2.1.0</version>
-<relativePath>../../pom.xml</relativePath>
-    </parent>
-
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>org.wso2.carbon.billing.mgt</artifactId>
-    <version>2.1.0</version>
-    <packaging>bundle</packaging>
-    <name>WSO2 Stratos - Billing</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>
-                        <!--<Require-Bundle>
-                            drools;visibility:=reexport
-                        </Require-Bundle>-->
-                        <Private-Package>
-                            org.wso2.carbon.billing.mgt.internal.*,
-                            org.wso2.carbon.billing.mgt.beans.*,
-                            org.wso2.carbon.billing.mgt.util.*,
-                        </Private-Package>
-                        <Export-Package>
-                            org.wso2.carbon.billing.mgt.dataobjects.*,
-                            org.wso2.carbon.billing.mgt.handlers.*,
-                            org.wso2.carbon.billing.mgt.api.*,
-                            org.wso2.carbon.billing.mgt.services.*,
-                        </Export-Package>
-                        <Import-Package>
-                            org.wso2.carbon.rule.*,
-                            org.quartz.*; version=2.1.1,
-                            org.apache.synapse.task.*,
-                            org.wso2.carbon.stratos.common.*,
-                            org.wso2.carbon.throttling.agent.client.*,
-                            org.wso2.carbon.throttling.agent.*,
-                            org.wso2.carbon.registry.core.*;version=1.0.1,
-                            org.wso2.carbon.registry.resource.*,
-                            !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>org.wso2.carbon</groupId>
-            <artifactId>org.wso2.carbon.user.core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.wso2.carbon</groupId>
-			<artifactId>org.wso2.carbon.billing.core</artifactId>
-			<version>2.1.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.wso2.carbon</groupId>
-            <artifactId>org.wso2.carbon.usage</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.wso2.carbon</groupId>
-            <artifactId>org.wso2.carbon.stratos.common</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.wso2.carbon</groupId>
-            <artifactId>org.wso2.carbon.throttling.agent</artifactId>
-        </dependency>
-    </dependencies>
-</project>