From 598111d2d3325621b1fa3637bfa4de51aead45a3 Mon Sep 17 00:00:00 2001 From: Manula Thantriwatte Date: Fri, 12 Jul 2013 19:45:44 +0530 Subject: [PATCH 2/2] Refactor usage ui component according to the usage stub modifications. --- components/org.apache.stratos.usage.ui/pom.xml | 10 ++-- .../usage/ui/clients/UsageServiceClient.java | 10 ++-- .../usage/ui/report/AllTenantUsageReport.java | 2 +- .../stratos/usage/ui/report/UsageReport.java | 6 +-- .../apache/stratos/usage/ui/utils/UsageUtil.java | 2 +- .../carbon/usage/ui/i18n/JSResources.properties | 2 - .../carbon/usage/ui/i18n/Resources.properties | 57 -------------------- .../stratos/usage/ui/i18n/JSResources.properties | 2 + .../stratos/usage/ui/i18n/Resources.properties | 57 ++++++++++++++++++++ .../web/tenant-usage/all_tenant_instance_usage.jsp | 14 ++--- .../web/tenant-usage/all_tenant_usage.jsp | 18 +++---- .../web/tenant-usage/all_tenant_usage_report.jsp | 2 +- .../web/tenant-usage/any_tenant_usage.jsp | 16 +++--- .../resources/web/tenant-usage/tenant_usage.jsp | 18 +++---- .../resources/web/tenant-usage/usage_report.jsp | 4 +- 15 files changed, 110 insertions(+), 110 deletions(-) delete mode 100644 components/org.apache.stratos.usage.ui/src/main/resources/org/apache/carbon/usage/ui/i18n/JSResources.properties delete mode 100644 components/org.apache.stratos.usage.ui/src/main/resources/org/apache/carbon/usage/ui/i18n/Resources.properties create mode 100644 components/org.apache.stratos.usage.ui/src/main/resources/org/apache/stratos/usage/ui/i18n/JSResources.properties create mode 100644 components/org.apache.stratos.usage.ui/src/main/resources/org/apache/stratos/usage/ui/i18n/Resources.properties diff --git a/components/org.apache.stratos.usage.ui/pom.xml b/components/org.apache.stratos.usage.ui/pom.xml index 3cd0ec8..2c3c42e 100644 --- a/components/org.apache.stratos.usage.ui/pom.xml +++ b/components/org.apache.stratos.usage.ui/pom.xml @@ -59,7 +59,7 @@ org.wso2.carbon.usage.ui.*, - org.wso2.carbon.usage.stub.*; version="${carbon.platform.package.import.version.range}", + org.apache.stratos.usage.stub.*; version="${carbon.platform.package.import.version.range}", javax.servlet;version="${imp.pkg.version.javax.servlet}", javax.servlet.http;version="${imp.pkg.version.javax.servlet}", !javax.xml.namespace, @@ -126,12 +126,12 @@ org.apache.stratos org.apache.stratos.common - 2.1.2 + ${apache.stratos.version} - org.wso2.carbon - org.wso2.carbon.usage.stub - 4.1.3 + org.apache.stratos + org.apache.stratos.usage.stub + ${apache.stratos.version} diff --git a/components/org.apache.stratos.usage.ui/src/main/java/org/apache/stratos/usage/ui/clients/UsageServiceClient.java b/components/org.apache.stratos.usage.ui/src/main/java/org/apache/stratos/usage/ui/clients/UsageServiceClient.java index 350fb82..b0b21f5 100644 --- a/components/org.apache.stratos.usage.ui/src/main/java/org/apache/stratos/usage/ui/clients/UsageServiceClient.java +++ b/components/org.apache.stratos.usage.ui/src/main/java/org/apache/stratos/usage/ui/clients/UsageServiceClient.java @@ -27,11 +27,11 @@ 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.usage.stub.beans.xsd.InstanceUsageStatics; -import org.wso2.carbon.usage.stub.beans.xsd.PaginatedInstanceUsage; -import org.wso2.carbon.usage.stub.beans.xsd.PaginatedTenantUsageInfo; -import org.wso2.carbon.usage.stub.beans.xsd.TenantUsage; -import org.wso2.carbon.usage.stub.services.UsageServiceStub; +import org.apache.stratos.usage.stub.beans.xsd.InstanceUsageStatics; +import org.apache.stratos.usage.stub.beans.xsd.PaginatedInstanceUsage; +import org.apache.stratos.usage.stub.beans.xsd.PaginatedTenantUsageInfo; +import org.apache.stratos.usage.stub.beans.xsd.TenantUsage; +import org.apache.stratos.usage.stub.services.UsageServiceStub; import org.wso2.carbon.utils.ServerConstants; import javax.servlet.ServletConfig; diff --git a/components/org.apache.stratos.usage.ui/src/main/java/org/apache/stratos/usage/ui/report/AllTenantUsageReport.java b/components/org.apache.stratos.usage.ui/src/main/java/org/apache/stratos/usage/ui/report/AllTenantUsageReport.java index fb5b0a4..3b7ed7d 100644 --- a/components/org.apache.stratos.usage.ui/src/main/java/org/apache/stratos/usage/ui/report/AllTenantUsageReport.java +++ b/components/org.apache.stratos.usage.ui/src/main/java/org/apache/stratos/usage/ui/report/AllTenantUsageReport.java @@ -22,7 +22,7 @@ package org.apache.stratos.usage.ui.report; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.wso2.carbon.usage.stub.beans.xsd.TenantUsage; +import org.apache.stratos.usage.stub.beans.xsd.TenantUsage; import org.apache.stratos.usage.ui.utils.UsageUtil; import javax.servlet.ServletConfig; diff --git a/components/org.apache.stratos.usage.ui/src/main/java/org/apache/stratos/usage/ui/report/UsageReport.java b/components/org.apache.stratos.usage.ui/src/main/java/org/apache/stratos/usage/ui/report/UsageReport.java index 264266d..59aff53 100644 --- a/components/org.apache.stratos.usage.ui/src/main/java/org/apache/stratos/usage/ui/report/UsageReport.java +++ b/components/org.apache.stratos.usage.ui/src/main/java/org/apache/stratos/usage/ui/report/UsageReport.java @@ -18,9 +18,9 @@ */ package org.apache.stratos.usage.ui.report; -import org.wso2.carbon.usage.stub.beans.xsd.BandwidthStatistics; -import org.wso2.carbon.usage.stub.beans.xsd.RequestStatistics; -import org.wso2.carbon.usage.stub.beans.xsd.TenantUsage; +import org.apache.stratos.usage.stub.beans.xsd.BandwidthStatistics; +import org.apache.stratos.usage.stub.beans.xsd.RequestStatistics; +import org.apache.stratos.usage.stub.beans.xsd.TenantUsage; import org.apache.stratos.usage.ui.utils.UsageUtil; import javax.servlet.ServletConfig; diff --git a/components/org.apache.stratos.usage.ui/src/main/java/org/apache/stratos/usage/ui/utils/UsageUtil.java b/components/org.apache.stratos.usage.ui/src/main/java/org/apache/stratos/usage/ui/utils/UsageUtil.java index 0b7089f..9d7c71a 100644 --- a/components/org.apache.stratos.usage.ui/src/main/java/org/apache/stratos/usage/ui/utils/UsageUtil.java +++ b/components/org.apache.stratos.usage.ui/src/main/java/org/apache/stratos/usage/ui/utils/UsageUtil.java @@ -22,7 +22,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.stratos.common.util.CommonUtil; import org.wso2.carbon.registry.common.ui.UIException; -import org.wso2.carbon.usage.stub.beans.xsd.*; +import org.apache.stratos.usage.stub.beans.xsd.*; import org.apache.stratos.usage.ui.clients.UsageServiceClient; import javax.servlet.ServletConfig; diff --git a/components/org.apache.stratos.usage.ui/src/main/resources/org/apache/carbon/usage/ui/i18n/JSResources.properties b/components/org.apache.stratos.usage.ui/src/main/resources/org/apache/carbon/usage/ui/i18n/JSResources.properties deleted file mode 100644 index e7490b0..0000000 --- a/components/org.apache.stratos.usage.ui/src/main/resources/org/apache/carbon/usage/ui/i18n/JSResources.properties +++ /dev/null @@ -1,2 +0,0 @@ -empty=To make sure the js properties file is not empty -session.timed.out=Session timed out. Please login again \ No newline at end of file diff --git a/components/org.apache.stratos.usage.ui/src/main/resources/org/apache/carbon/usage/ui/i18n/Resources.properties b/components/org.apache.stratos.usage.ui/src/main/resources/org/apache/carbon/usage/ui/i18n/Resources.properties deleted file mode 100644 index d7eda93..0000000 --- a/components/org.apache.stratos.usage.ui/src/main/resources/org/apache/carbon/usage/ui/i18n/Resources.properties +++ /dev/null @@ -1,57 +0,0 @@ -usage.menu=User Usage -user.usage.report=User Usage Report -tenant.menu=Tenant Usage -tenants.usage.report=Tenant Usage Report -tenant.usage.report=Usage Report -data.storage.name=Data Storage -current.data.storage=Current Data Storage -history.data.storage=Historical Data Storage -total.data.storage=Total Data Storage -registry.content.storage.name=Registry Content -registry.bandwidth.usage=Registry Bandwidth Usage -service.bandwidth.usage=Service Bandwidth Usage -webapp.bandwidth.usage=Webapp Bandwidth Usage -server.name=Server Name -all.server.name=All Server Total -incoming.bandwidth=Incoming Bandwidth -outgoing.bandwidth=Outgoing Bandwidth -total.bandwidth=Total Bandwidth -storage.usage=Storage Usage -number.of.users=Number of Users -users=Users -usage.monitoring=Usage Monitoring -all.tenant.usage.report=All Tenant Usage -tenant.domain=Domain -tenant.id=Id -full.report=Full Report -report.duration=Report Duration -year.month=Year-Month -back=Back -page.x.to.y=Page {0} -prev=Prev -next=Next -service.usage.stat=Service Usage Statistics -service.usage.request=Request Count -service.usage.response=Response Count -service.usage.fault=Fault Count -service.total.request=Service Requests -registry.total.bandwidth=Total Registry Bandwidth -service.total.bandwidth=Total Service Bandwidth -instance.usage.report=Instance Usage Report -instance.server.url=Instance Server URL -instance.id=Instance ID -start.time=Start Time -stop.time=Stop Time -used.time.in.hours=Used Time In Hours -instances.data=Instances Data -failed.to.get.instance.data=Failed To Get Instance Data -empty.instance.data=Instance Data Not Found -usage.data.not.available=Usage Data not available -empty.usage.data=Usage Data Not Found -webapp.total.bandwidth=Total WebApp Bandwidth -number.of.api.calls= Number of API Calls -api.usage=API Usage -cartridge.stat=Cartridge Usage -cartridge.type=Cartridge Type -image.id=Image ID -cartridge.hours=Hours \ No newline at end of file diff --git a/components/org.apache.stratos.usage.ui/src/main/resources/org/apache/stratos/usage/ui/i18n/JSResources.properties b/components/org.apache.stratos.usage.ui/src/main/resources/org/apache/stratos/usage/ui/i18n/JSResources.properties new file mode 100644 index 0000000..e7490b0 --- /dev/null +++ b/components/org.apache.stratos.usage.ui/src/main/resources/org/apache/stratos/usage/ui/i18n/JSResources.properties @@ -0,0 +1,2 @@ +empty=To make sure the js properties file is not empty +session.timed.out=Session timed out. Please login again \ No newline at end of file diff --git a/components/org.apache.stratos.usage.ui/src/main/resources/org/apache/stratos/usage/ui/i18n/Resources.properties b/components/org.apache.stratos.usage.ui/src/main/resources/org/apache/stratos/usage/ui/i18n/Resources.properties new file mode 100644 index 0000000..d7eda93 --- /dev/null +++ b/components/org.apache.stratos.usage.ui/src/main/resources/org/apache/stratos/usage/ui/i18n/Resources.properties @@ -0,0 +1,57 @@ +usage.menu=User Usage +user.usage.report=User Usage Report +tenant.menu=Tenant Usage +tenants.usage.report=Tenant Usage Report +tenant.usage.report=Usage Report +data.storage.name=Data Storage +current.data.storage=Current Data Storage +history.data.storage=Historical Data Storage +total.data.storage=Total Data Storage +registry.content.storage.name=Registry Content +registry.bandwidth.usage=Registry Bandwidth Usage +service.bandwidth.usage=Service Bandwidth Usage +webapp.bandwidth.usage=Webapp Bandwidth Usage +server.name=Server Name +all.server.name=All Server Total +incoming.bandwidth=Incoming Bandwidth +outgoing.bandwidth=Outgoing Bandwidth +total.bandwidth=Total Bandwidth +storage.usage=Storage Usage +number.of.users=Number of Users +users=Users +usage.monitoring=Usage Monitoring +all.tenant.usage.report=All Tenant Usage +tenant.domain=Domain +tenant.id=Id +full.report=Full Report +report.duration=Report Duration +year.month=Year-Month +back=Back +page.x.to.y=Page {0} +prev=Prev +next=Next +service.usage.stat=Service Usage Statistics +service.usage.request=Request Count +service.usage.response=Response Count +service.usage.fault=Fault Count +service.total.request=Service Requests +registry.total.bandwidth=Total Registry Bandwidth +service.total.bandwidth=Total Service Bandwidth +instance.usage.report=Instance Usage Report +instance.server.url=Instance Server URL +instance.id=Instance ID +start.time=Start Time +stop.time=Stop Time +used.time.in.hours=Used Time In Hours +instances.data=Instances Data +failed.to.get.instance.data=Failed To Get Instance Data +empty.instance.data=Instance Data Not Found +usage.data.not.available=Usage Data not available +empty.usage.data=Usage Data Not Found +webapp.total.bandwidth=Total WebApp Bandwidth +number.of.api.calls= Number of API Calls +api.usage=API Usage +cartridge.stat=Cartridge Usage +cartridge.type=Cartridge Type +image.id=Image ID +cartridge.hours=Hours \ No newline at end of file diff --git a/components/org.apache.stratos.usage.ui/src/main/resources/web/tenant-usage/all_tenant_instance_usage.jsp b/components/org.apache.stratos.usage.ui/src/main/resources/web/tenant-usage/all_tenant_instance_usage.jsp index 32e03ba..2dff466 100644 --- a/components/org.apache.stratos.usage.ui/src/main/resources/web/tenant-usage/all_tenant_instance_usage.jsp +++ b/components/org.apache.stratos.usage.ui/src/main/resources/web/tenant-usage/all_tenant_instance_usage.jsp @@ -16,22 +16,22 @@ ~ specific language governing permissions and limitations ~ under the License. --> -<%@ page import="org.wso2.carbon.usage.stub.beans.xsd.InstanceUsageStatics" %> -<%@ page import="org.wso2.carbon.usage.stub.beans.xsd.PaginatedInstanceUsage" %> -<%@ page import="org.wso2.carbon.usage.ui.utils.UsageUtil" %> +<%@ page import="org.apache.stratos.usage.stub.beans.xsd.InstanceUsageStatics" %> +<%@ page import="org.apache.stratos.usage.stub.beans.xsd.PaginatedInstanceUsage" %> +<%@ page import="org.apache.stratos.usage.ui.utils.UsageUtil" %> <%@ 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" %> - + @@ -198,7 +198,7 @@ %> diff --git a/components/org.apache.stratos.usage.ui/src/main/resources/web/tenant-usage/all_tenant_usage.jsp b/components/org.apache.stratos.usage.ui/src/main/resources/web/tenant-usage/all_tenant_usage.jsp index 14c24d5..d2b5010 100644 --- a/components/org.apache.stratos.usage.ui/src/main/resources/web/tenant-usage/all_tenant_usage.jsp +++ b/components/org.apache.stratos.usage.ui/src/main/resources/web/tenant-usage/all_tenant_usage.jsp @@ -16,25 +16,25 @@ ~ specific language governing permissions and limitations ~ under the License. --> -<%@ page import="org.wso2.carbon.usage.stub.beans.xsd.PaginatedTenantUsageInfo" %> -<%@ page import="org.wso2.carbon.usage.stub.beans.xsd.TenantUsage" %> -<%@ page import="org.wso2.carbon.usage.ui.utils.UsageUtil" %> -<%@ page import="org.wso2.carbon.usage.ui.report.AllTenantUsageData" %> -<%@ page import="org.wso2.carbon.usage.ui.report.AllTenantUsageReport" %> +<%@ page import="org.apache.stratos.usage.stub.beans.xsd.PaginatedTenantUsageInfo" %> +<%@ page import="org.apache.stratos.usage.stub.beans.xsd.TenantUsage" %> +<%@ page import="org.apache.stratos.usage.ui.utils.UsageUtil" %> +<%@ page import="org.apache.stratos.usage.ui.report.AllTenantUsageData" %> +<%@ page import="org.apache.stratos.usage.ui.report.AllTenantUsageReport" %> <%@ page import="java.util.List" %> <%@ 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" %> - + @@ -191,7 +191,7 @@ %> diff --git a/components/org.apache.stratos.usage.ui/src/main/resources/web/tenant-usage/all_tenant_usage_report.jsp b/components/org.apache.stratos.usage.ui/src/main/resources/web/tenant-usage/all_tenant_usage_report.jsp index 5da662b..45ffec8 100644 --- a/components/org.apache.stratos.usage.ui/src/main/resources/web/tenant-usage/all_tenant_usage_report.jsp +++ b/components/org.apache.stratos.usage.ui/src/main/resources/web/tenant-usage/all_tenant_usage_report.jsp @@ -16,7 +16,7 @@ ~ specific language governing permissions and limitations ~ under the License. --> -<%@ page import="org.wso2.carbon.usage.ui.report.AllTenantUsageReport" %> +<%@ page import="org.apache.stratos.usage.ui.report.AllTenantUsageReport" %> <%@ page contentType="text/html;charset=UTF-8" language="java" %> <% AllTenantUsageReport usageReport = new AllTenantUsageReport(config, session, request); diff --git a/components/org.apache.stratos.usage.ui/src/main/resources/web/tenant-usage/any_tenant_usage.jsp b/components/org.apache.stratos.usage.ui/src/main/resources/web/tenant-usage/any_tenant_usage.jsp index 16970ff..5d54553 100644 --- a/components/org.apache.stratos.usage.ui/src/main/resources/web/tenant-usage/any_tenant_usage.jsp +++ b/components/org.apache.stratos.usage.ui/src/main/resources/web/tenant-usage/any_tenant_usage.jsp @@ -16,24 +16,24 @@ ~ specific language governing permissions and limitations ~ under the License. --> -<%@ page import="org.wso2.carbon.usage.stub.beans.xsd.BandwidthStatistics" %> -<%@ page import="org.wso2.carbon.usage.stub.beans.xsd.RequestStatistics" %> -<%@ page import="org.wso2.carbon.usage.stub.beans.xsd.TenantUsage" %> -<%@ page import="org.wso2.carbon.usage.ui.utils.UsageUtil" %> -<%@ page import="org.wso2.carbon.usage.stub.beans.xsd.CartridgeStatistics" %> +<%@ page import="org.apache.stratos.usage.stub.beans.xsd.BandwidthStatistics" %> +<%@ page import="org.apache.stratos.usage.stub.beans.xsd.RequestStatistics" %> +<%@ page import="org.apache.stratos.usage.stub.beans.xsd.TenantUsage" %> +<%@ page import="org.apache.stratos.usage.ui.utils.UsageUtil" %> +<%@ page import="org.apache.stratos.usage.stub.beans.xsd.CartridgeStatistics" %> <%@ 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" %> - + diff --git a/components/org.apache.stratos.usage.ui/src/main/resources/web/tenant-usage/tenant_usage.jsp b/components/org.apache.stratos.usage.ui/src/main/resources/web/tenant-usage/tenant_usage.jsp index ee0ffd6..c859177 100644 --- a/components/org.apache.stratos.usage.ui/src/main/resources/web/tenant-usage/tenant_usage.jsp +++ b/components/org.apache.stratos.usage.ui/src/main/resources/web/tenant-usage/tenant_usage.jsp @@ -16,26 +16,26 @@ ~ specific language governing permissions and limitations ~ under the License. --> -<%@ page import="org.wso2.carbon.usage.stub.beans.xsd.BandwidthStatistics" %> -<%@ page import="org.wso2.carbon.usage.stub.beans.xsd.RequestStatistics" %> -<%@ page import="org.wso2.carbon.usage.ui.report.UsageReport" %> -<%@ page import="org.wso2.carbon.usage.stub.beans.xsd.TenantUsage" %> +<%@ page import="org.apache.stratos.usage.stub.beans.xsd.BandwidthStatistics" %> +<%@ page import="org.apache.stratos.usage.stub.beans.xsd.RequestStatistics" %> +<%@ page import="org.apache.stratos.usage.ui.report.UsageReport" %> +<%@ page import="org.apache.stratos.usage.stub.beans.xsd.TenantUsage" %> <%@ page import="java.util.List" %> -<%@ page import="org.wso2.carbon.usage.ui.utils.UsageUtil" %> -<%@ page import="org.wso2.carbon.usage.stub.beans.xsd.CartridgeStatistics" %> +<%@ page import="org.apache.stratos.usage.ui.utils.UsageUtil" %> +<%@ page import="org.apache.stratos.usage.stub.beans.xsd.CartridgeStatistics" %> <%@ 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" %> - + diff --git a/components/org.apache.stratos.usage.ui/src/main/resources/web/tenant-usage/usage_report.jsp b/components/org.apache.stratos.usage.ui/src/main/resources/web/tenant-usage/usage_report.jsp index ed85ae0..c8ef604 100644 --- a/components/org.apache.stratos.usage.ui/src/main/resources/web/tenant-usage/usage_report.jsp +++ b/components/org.apache.stratos.usage.ui/src/main/resources/web/tenant-usage/usage_report.jsp @@ -1,4 +1,4 @@ -<%@ page import="org.wso2.carbon.usage.ui.report.UsageReport" %> +<%@ page import="org.apache.stratos.usage.ui.report.UsageReport" %> <%@ page contentType="text/html;charset=UTF-8" language="java" %> <% -- 1.7.9.5