You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by la...@apache.org on 2013/07/11 07:18:00 UTC
[09/27] aplying 0001-Refactor-usage-module-to-apache-stratos.patch
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/df3475cc/components/stratos/usage/org.wso2.carbon.usage.ui/2.1.2/src/main/resources/UsageService.wsdl
----------------------------------------------------------------------
diff --git a/components/stratos/usage/org.wso2.carbon.usage.ui/2.1.2/src/main/resources/UsageService.wsdl b/components/stratos/usage/org.wso2.carbon.usage.ui/2.1.2/src/main/resources/UsageService.wsdl
deleted file mode 100644
index a974e17..0000000
--- a/components/stratos/usage/org.wso2.carbon.usage.ui/2.1.2/src/main/resources/UsageService.wsdl
+++ /dev/null
@@ -1,604 +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.
- -->
-<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
- xmlns:ns1="http://org.apache.axis2/xsd"
- xmlns:ns="http://services.usage.carbon.wso2.org"
- xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
- xmlns:http="http://schemas.xmlsoap.org/wsdl/http/"
- xmlns:xs="http://www.w3.org/2001/XMLSchema"
- xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
- xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/"
- xmlns:ax2249="http://beans.usage.carbon.wso2.org/xsd"
- xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/"
- targetNamespace="http://services.usage.carbon.wso2.org">
- <wsdl:documentation>UsageService</wsdl:documentation>
- <wsdl:types>
- <xs:schema attributeFormDefault="qualified" elementFormDefault="qualified"
- targetNamespace="http://beans.usage.carbon.wso2.org/xsd">
- <xs:complexType name="TenantUsage">
- <xs:sequence>
- <xs:element minOccurs="0" name="domain" nillable="true" type="xs:string"/>
- <xs:element minOccurs="0" name="numberOfUsers" type="xs:int"/>
- <xs:element maxOccurs="unbounded" minOccurs="0"
- name="registryBandwidthStatistics" nillable="true"
- type="ax2249:BandwidthStatistics"/>
-
- <xs:element minOccurs="0" name="registryCapacity" nillable="true"
- type="ax2249:TenantDataCapacity"/>
- <xs:element minOccurs="0" name="registryContentCapacity" type="xs:long"/>
- <xs:element minOccurs="0" name="registryContentHistoryCapacity" type="xs:long"/>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="requestStatistics"
- nillable="true" type="ax2249:RequestStatistics"/>
- <xs:element maxOccurs="unbounded" minOccurs="0"
- name="serviceBandwidthStatistics" nillable="true"
- type="ax2249:BandwidthStatistics"/>
- <xs:element minOccurs="0" name="tenantId" type="xs:int"/>
- <xs:element minOccurs="0" name="totalIncomingBandwidth" type="xs:long"/>
- <xs:element minOccurs="0" name="totalOutgoingBandwidth" type="xs:long"/>
- <xs:element minOccurs="0" name="totalRegistryBandwidth" nillable="true"
- type="ax2249:BandwidthStatistics"/>
-
- <xs:element minOccurs="0" name="totalRequestStatistics" nillable="true"
- type="ax2249:RequestStatistics"/>
- <xs:element minOccurs="0" name="totalServiceBandwidth" nillable="true"
- type="ax2249:BandwidthStatistics"/>
- <xs:element minOccurs="0" name="totalWebappBandwidth" nillable="true"
- type="ax2249:BandwidthStatistics"/>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="usageEntries"
- nillable="true" type="ax2249:UsageEntry"/>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="webappBandwidthStatistics"
- nillable="true" type="ax2249:BandwidthStatistics"/>
- </xs:sequence>
- </xs:complexType>
- <xs:complexType name="BandwidthStatistics">
- <xs:sequence>
-
- <xs:element minOccurs="0" name="incomingBandwidth" type="xs:long"/>
- <xs:element minOccurs="0" name="key" nillable="true" type="xs:string"/>
- <xs:element minOccurs="0" name="outgoingBandwidth" type="xs:long"/>
- </xs:sequence>
- </xs:complexType>
- <xs:complexType name="TenantDataCapacity">
- <xs:sequence>
- <xs:element minOccurs="0" name="registryContentCapacity" type="xs:long"/>
- <xs:element minOccurs="0" name="registryContentHistoryCapacity" type="xs:long"/>
-
- </xs:sequence>
- </xs:complexType>
- <xs:complexType name="RequestStatistics">
- <xs:sequence>
- <xs:element minOccurs="0" name="faultCount" type="xs:long"/>
- <xs:element minOccurs="0" name="key" nillable="true" type="xs:string"/>
- <xs:element minOccurs="0" name="requestCount" type="xs:long"/>
- <xs:element minOccurs="0" name="responseCount" type="xs:long"/>
- </xs:sequence>
-
- </xs:complexType>
- <xs:complexType name="UsageEntry">
- <xs:sequence>
- <xs:element minOccurs="0" name="key" nillable="true" type="xs:string"/>
- <xs:element minOccurs="0" name="value" nillable="true" type="xs:string"/>
- </xs:sequence>
- </xs:complexType>
- <xs:complexType name="PaginatedTenantUsageInfo">
- <xs:sequence>
-
- <xs:element minOccurs="0" name="numberOfPages" type="xs:int"/>
- <xs:element minOccurs="0" name="pageNumber" type="xs:int"/>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="tenantUsages"
- nillable="true" type="ax2249:TenantUsage"/>
- </xs:sequence>
- </xs:complexType>
- <xs:complexType name="PaginatedInstanceUsage">
- <xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="instanceUsages"
- nillable="true" type="ax2249:InstanceUsageStatics"/>
- <xs:element minOccurs="0" name="numberOfPages" type="xs:int"/>
-
- <xs:element minOccurs="0" name="pageNumber" type="xs:int"/>
- </xs:sequence>
- </xs:complexType>
- <xs:complexType name="InstanceUsageStatics">
- <xs:sequence>
- <xs:element minOccurs="0" name="instanceID" nillable="true" type="xs:int"/>
- <xs:element minOccurs="0" name="instanceURL" nillable="true" type="xs:string"/>
- <xs:element minOccurs="0" name="running" type="xs:boolean"/>
- <xs:element minOccurs="0" name="startTime" nillable="true" type="xs:dateTime"/>
-
- <xs:element minOccurs="0" name="stopTime" nillable="true" type="xs:dateTime"/>
- <xs:element minOccurs="0" name="usedTimeInSeconds" type="xs:long"/>
- </xs:sequence>
- </xs:complexType>
- </xs:schema>
- <xs:schema xmlns:ax2250="http://beans.usage.carbon.wso2.org/xsd"
- attributeFormDefault="qualified" elementFormDefault="qualified"
- targetNamespace="http://services.usage.carbon.wso2.org">
- <xs:import namespace="http://beans.usage.carbon.wso2.org/xsd"/>
- <xs:element name="Exception">
- <xs:complexType>
-
- <xs:sequence>
- <xs:element minOccurs="0" name="Exception" nillable="true"
- type="ns:Exception"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:complexType name="Exception">
- <xs:sequence>
- <xs:element minOccurs="0" name="Message" nillable="true" type="xs:string"/>
- </xs:sequence>
-
- </xs:complexType>
- <xs:element name="retrieveTenantUsages">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="yearMonth" nillable="true"
- type="xs:string"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="retrieveTenantUsagesResponse">
-
- <xs:complexType>
- <xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="return"
- nillable="true" type="ax2250:TenantUsage"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="retrieveTenantUsage">
- <xs:complexType>
- <xs:sequence>
-
- <xs:element minOccurs="0" name="yearMonth" nillable="true"
- type="xs:string"/>
- <xs:element minOccurs="0" name="tenantId" type="xs:int"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="retrieveTenantUsageResponse">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="return" nillable="true"
- type="ax2250:TenantUsage"/>
-
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="retrievePaginatedTenantUsages">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="yearMonth" nillable="true"
- type="xs:string"/>
- <xs:element minOccurs="0" name="pageNumber" type="xs:int"/>
- <xs:element minOccurs="0" name="entriesPerPage" type="xs:int"/>
-
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="retrievePaginatedTenantUsagesResponse">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="return" nillable="true"
- type="ax2250:PaginatedTenantUsageInfo"/>
- </xs:sequence>
- </xs:complexType>
-
- </xs:element>
- <xs:element name="retrievePaginatedInstanceUsage">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="yearMonth" nillable="true"
- type="xs:string"/>
- <xs:element minOccurs="0" name="pageNumber" type="xs:int"/>
- <xs:element minOccurs="0" name="entriesPerPage" type="xs:int"/>
- </xs:sequence>
- </xs:complexType>
-
- </xs:element>
- <xs:element name="retrievePaginatedInstanceUsageResponse">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="return" nillable="true"
- type="ax2250:PaginatedInstanceUsage"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="retrieveInstanceUsageResponse">
-
- <xs:complexType>
- <xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="return"
- nillable="true" type="ax2250:InstanceUsageStatics"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="retrieveCurrentTenantUsage">
- <xs:complexType>
- <xs:sequence>
-
- <xs:element minOccurs="0" name="yearMonth" nillable="true"
- type="xs:string"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="retrieveCurrentTenantUsageResponse">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="return" nillable="true"
- type="ax2250:TenantUsage"/>
- </xs:sequence>
-
- </xs:complexType>
- </xs:element>
- </xs:schema>
- </wsdl:types>
- <wsdl:message name="retrievePaginatedTenantUsagesRequest">
- <wsdl:part name="parameters" element="ns:retrievePaginatedTenantUsages"/>
- </wsdl:message>
- <wsdl:message name="retrievePaginatedTenantUsagesResponse">
- <wsdl:part name="parameters" element="ns:retrievePaginatedTenantUsagesResponse"/>
-
- </wsdl:message>
- <wsdl:message name="Exception">
- <wsdl:part name="parameters" element="ns:Exception"/>
- </wsdl:message>
- <wsdl:message name="retrieveCurrentTenantUsageRequest">
- <wsdl:part name="parameters" element="ns:retrieveCurrentTenantUsage"/>
- </wsdl:message>
- <wsdl:message name="retrieveCurrentTenantUsageResponse">
- <wsdl:part name="parameters" element="ns:retrieveCurrentTenantUsageResponse"/>
-
- </wsdl:message>
- <wsdl:message name="retrieveTenantUsagesRequest">
- <wsdl:part name="parameters" element="ns:retrieveTenantUsages"/>
- </wsdl:message>
- <wsdl:message name="retrieveTenantUsagesResponse">
- <wsdl:part name="parameters" element="ns:retrieveTenantUsagesResponse"/>
- </wsdl:message>
- <wsdl:message name="retrieveTenantUsageRequest">
- <wsdl:part name="parameters" element="ns:retrieveTenantUsage"/>
-
- </wsdl:message>
- <wsdl:message name="retrieveTenantUsageResponse">
- <wsdl:part name="parameters" element="ns:retrieveTenantUsageResponse"/>
- </wsdl:message>
- <wsdl:message name="retrieveInstanceUsageRequest"/>
- <wsdl:message name="retrieveInstanceUsageResponse">
- <wsdl:part name="parameters" element="ns:retrieveInstanceUsageResponse"/>
- </wsdl:message>
- <wsdl:message name="retrievePaginatedInstanceUsageRequest">
-
- <wsdl:part name="parameters" element="ns:retrievePaginatedInstanceUsage"/>
- </wsdl:message>
- <wsdl:message name="retrievePaginatedInstanceUsageResponse">
- <wsdl:part name="parameters" element="ns:retrievePaginatedInstanceUsageResponse"/>
- </wsdl:message>
- <wsdl:portType name="UsageServicePortType">
- <wsdl:operation name="retrievePaginatedTenantUsages">
- <wsdl:input message="ns:retrievePaginatedTenantUsagesRequest"
- wsaw:Action="urn:retrievePaginatedTenantUsages"/>
- <wsdl:output message="ns:retrievePaginatedTenantUsagesResponse"
- wsaw:Action="urn:retrievePaginatedTenantUsagesResponse"/>
-
- <wsdl:fault message="ns:Exception" name="Exception"
- wsaw:Action="urn:retrievePaginatedTenantUsagesException"/>
- </wsdl:operation>
- <wsdl:operation name="retrieveCurrentTenantUsage">
- <wsdl:input message="ns:retrieveCurrentTenantUsageRequest"
- wsaw:Action="urn:retrieveCurrentTenantUsage"/>
- <wsdl:output message="ns:retrieveCurrentTenantUsageResponse"
- wsaw:Action="urn:retrieveCurrentTenantUsageResponse"/>
- <wsdl:fault message="ns:Exception" name="Exception"
- wsaw:Action="urn:retrieveCurrentTenantUsageException"/>
- </wsdl:operation>
- <wsdl:operation name="retrieveTenantUsages">
- <wsdl:input message="ns:retrieveTenantUsagesRequest"
- wsaw:Action="urn:retrieveTenantUsages"/>
-
- <wsdl:output message="ns:retrieveTenantUsagesResponse"
- wsaw:Action="urn:retrieveTenantUsagesResponse"/>
- <wsdl:fault message="ns:Exception" name="Exception"
- wsaw:Action="urn:retrieveTenantUsagesException"/>
- </wsdl:operation>
- <wsdl:operation name="retrieveTenantUsage">
- <wsdl:input message="ns:retrieveTenantUsageRequest"
- wsaw:Action="urn:retrieveTenantUsage"/>
- <wsdl:output message="ns:retrieveTenantUsageResponse"
- wsaw:Action="urn:retrieveTenantUsageResponse"/>
- <wsdl:fault message="ns:Exception" name="Exception"
- wsaw:Action="urn:retrieveTenantUsageException"/>
- </wsdl:operation>
- <wsdl:operation name="retrieveInstanceUsage">
-
- <wsdl:input message="ns:retrieveInstanceUsageRequest"
- wsaw:Action="urn:retrieveInstanceUsage"/>
- <wsdl:output message="ns:retrieveInstanceUsageResponse"
- wsaw:Action="urn:retrieveInstanceUsageResponse"/>
- <wsdl:fault message="ns:Exception" name="Exception"
- wsaw:Action="urn:retrieveInstanceUsageException"/>
- </wsdl:operation>
- <wsdl:operation name="retrievePaginatedInstanceUsage">
- <wsdl:input message="ns:retrievePaginatedInstanceUsageRequest"
- wsaw:Action="urn:retrievePaginatedInstanceUsage"/>
- <wsdl:output message="ns:retrievePaginatedInstanceUsageResponse"
- wsaw:Action="urn:retrievePaginatedInstanceUsageResponse"/>
- <wsdl:fault message="ns:Exception" name="Exception"
- wsaw:Action="urn:retrievePaginatedInstanceUsageException"/>
- </wsdl:operation>
-
- </wsdl:portType>
- <wsdl:binding name="UsageServiceSoap11Binding" type="ns:UsageServicePortType">
- <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/>
- <wsdl:operation name="retrievePaginatedTenantUsages">
- <soap:operation soapAction="urn:retrievePaginatedTenantUsages" style="document"/>
- <wsdl:input>
- <soap:body use="literal"/>
- </wsdl:input>
- <wsdl:output>
-
- <soap:body use="literal"/>
- </wsdl:output>
- <wsdl:fault name="Exception">
- <soap:fault use="literal" name="Exception"/>
- </wsdl:fault>
- </wsdl:operation>
- <wsdl:operation name="retrieveCurrentTenantUsage">
- <soap:operation soapAction="urn:retrieveCurrentTenantUsage" style="document"/>
- <wsdl:input>
-
- <soap:body use="literal"/>
- </wsdl:input>
- <wsdl:output>
- <soap:body use="literal"/>
- </wsdl:output>
- <wsdl:fault name="Exception">
- <soap:fault use="literal" name="Exception"/>
- </wsdl:fault>
- </wsdl:operation>
-
- <wsdl:operation name="retrieveTenantUsages">
- <soap:operation soapAction="urn:retrieveTenantUsages" style="document"/>
- <wsdl:input>
- <soap:body use="literal"/>
- </wsdl:input>
- <wsdl:output>
- <soap:body use="literal"/>
- </wsdl:output>
- <wsdl:fault name="Exception">
-
- <soap:fault use="literal" name="Exception"/>
- </wsdl:fault>
- </wsdl:operation>
- <wsdl:operation name="retrieveTenantUsage">
- <soap:operation soapAction="urn:retrieveTenantUsage" style="document"/>
- <wsdl:input>
- <soap:body use="literal"/>
- </wsdl:input>
- <wsdl:output>
-
- <soap:body use="literal"/>
- </wsdl:output>
- <wsdl:fault name="Exception">
- <soap:fault use="literal" name="Exception"/>
- </wsdl:fault>
- </wsdl:operation>
- <wsdl:operation name="retrieveInstanceUsage">
- <soap:operation soapAction="urn:retrieveInstanceUsage" style="document"/>
- <wsdl:input>
-
- <soap:body use="literal"/>
- </wsdl:input>
- <wsdl:output>
- <soap:body use="literal"/>
- </wsdl:output>
- <wsdl:fault name="Exception">
- <soap:fault use="literal" name="Exception"/>
- </wsdl:fault>
- </wsdl:operation>
-
- <wsdl:operation name="retrievePaginatedInstanceUsage">
- <soap:operation soapAction="urn:retrievePaginatedInstanceUsage" style="document"/>
- <wsdl:input>
- <soap:body use="literal"/>
- </wsdl:input>
- <wsdl:output>
- <soap:body use="literal"/>
- </wsdl:output>
- <wsdl:fault name="Exception">
-
- <soap:fault use="literal" name="Exception"/>
- </wsdl:fault>
- </wsdl:operation>
- </wsdl:binding>
- <wsdl:binding name="UsageServiceSoap12Binding" type="ns:UsageServicePortType">
- <soap12:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/>
- <wsdl:operation name="retrievePaginatedTenantUsages">
- <soap12:operation soapAction="urn:retrievePaginatedTenantUsages" style="document"/>
- <wsdl:input>
-
- <soap12:body use="literal"/>
- </wsdl:input>
- <wsdl:output>
- <soap12:body use="literal"/>
- </wsdl:output>
- <wsdl:fault name="Exception">
- <soap12:fault use="literal" name="Exception"/>
- </wsdl:fault>
- </wsdl:operation>
-
- <wsdl:operation name="retrieveCurrentTenantUsage">
- <soap12:operation soapAction="urn:retrieveCurrentTenantUsage" style="document"/>
- <wsdl:input>
- <soap12:body use="literal"/>
- </wsdl:input>
- <wsdl:output>
- <soap12:body use="literal"/>
- </wsdl:output>
- <wsdl:fault name="Exception">
-
- <soap12:fault use="literal" name="Exception"/>
- </wsdl:fault>
- </wsdl:operation>
- <wsdl:operation name="retrieveTenantUsages">
- <soap12:operation soapAction="urn:retrieveTenantUsages" style="document"/>
- <wsdl:input>
- <soap12:body use="literal"/>
- </wsdl:input>
- <wsdl:output>
-
- <soap12:body use="literal"/>
- </wsdl:output>
- <wsdl:fault name="Exception">
- <soap12:fault use="literal" name="Exception"/>
- </wsdl:fault>
- </wsdl:operation>
- <wsdl:operation name="retrieveTenantUsage">
- <soap12:operation soapAction="urn:retrieveTenantUsage" style="document"/>
- <wsdl:input>
-
- <soap12:body use="literal"/>
- </wsdl:input>
- <wsdl:output>
- <soap12:body use="literal"/>
- </wsdl:output>
- <wsdl:fault name="Exception">
- <soap12:fault use="literal" name="Exception"/>
- </wsdl:fault>
- </wsdl:operation>
-
- <wsdl:operation name="retrieveInstanceUsage">
- <soap12:operation soapAction="urn:retrieveInstanceUsage" style="document"/>
- <wsdl:input>
- <soap12:body use="literal"/>
- </wsdl:input>
- <wsdl:output>
- <soap12:body use="literal"/>
- </wsdl:output>
- <wsdl:fault name="Exception">
-
- <soap12:fault use="literal" name="Exception"/>
- </wsdl:fault>
- </wsdl:operation>
- <wsdl:operation name="retrievePaginatedInstanceUsage">
- <soap12:operation soapAction="urn:retrievePaginatedInstanceUsage" style="document"/>
- <wsdl:input>
- <soap12:body use="literal"/>
- </wsdl:input>
- <wsdl:output>
-
- <soap12:body use="literal"/>
- </wsdl:output>
- <wsdl:fault name="Exception">
- <soap12:fault use="literal" name="Exception"/>
- </wsdl:fault>
- </wsdl:operation>
- </wsdl:binding>
- <wsdl:binding name="UsageServiceHttpBinding" type="ns:UsageServicePortType">
- <http:binding verb="POST"/>
-
- <wsdl:operation name="retrievePaginatedTenantUsages">
- <http:operation location="retrievePaginatedTenantUsages"/>
- <wsdl:input>
- <mime:content type="text/xml" part="parameters"/>
- </wsdl:input>
- <wsdl:output>
- <mime:content type="text/xml" part="parameters"/>
- </wsdl:output>
- </wsdl:operation>
-
- <wsdl:operation name="retrieveCurrentTenantUsage">
- <http:operation location="retrieveCurrentTenantUsage"/>
- <wsdl:input>
- <mime:content type="text/xml" part="parameters"/>
- </wsdl:input>
- <wsdl:output>
- <mime:content type="text/xml" part="parameters"/>
- </wsdl:output>
- </wsdl:operation>
-
- <wsdl:operation name="retrieveTenantUsages">
- <http:operation location="retrieveTenantUsages"/>
- <wsdl:input>
- <mime:content type="text/xml" part="parameters"/>
- </wsdl:input>
- <wsdl:output>
- <mime:content type="text/xml" part="parameters"/>
- </wsdl:output>
- </wsdl:operation>
-
- <wsdl:operation name="retrieveTenantUsage">
- <http:operation location="retrieveTenantUsage"/>
- <wsdl:input>
- <mime:content type="text/xml" part="parameters"/>
- </wsdl:input>
- <wsdl:output>
- <mime:content type="text/xml" part="parameters"/>
- </wsdl:output>
- </wsdl:operation>
-
- <wsdl:operation name="retrieveInstanceUsage">
- <http:operation location="retrieveInstanceUsage"/>
- <wsdl:input>
- <mime:content type="text/xml" part="parameters"/>
- </wsdl:input>
- <wsdl:output>
- <mime:content type="text/xml" part="parameters"/>
- </wsdl:output>
- </wsdl:operation>
-
- <wsdl:operation name="retrievePaginatedInstanceUsage">
- <http:operation location="retrievePaginatedInstanceUsage"/>
- <wsdl:input>
- <mime:content type="text/xml" part="parameters"/>
- </wsdl:input>
- <wsdl:output>
- <mime:content type="text/xml" part="parameters"/>
- </wsdl:output>
- </wsdl:operation>
-
- </wsdl:binding>
- <wsdl:service name="UsageService">
- <wsdl:port name="UsageServiceHttpsSoap11Endpoint" binding="ns:UsageServiceSoap11Binding">
- <soap:address
- location="https://10.100.0.19:9446/services/UsageService.UsageServiceHttpsSoap11Endpoint/"/>
- </wsdl:port>
- <wsdl:port name="UsageServiceHttpSoap11Endpoint" binding="ns:UsageServiceSoap11Binding">
- <soap:address
- location="http://10.100.0.19:9765/services/UsageService.UsageServiceHttpSoap11Endpoint/"/>
- </wsdl:port>
- <wsdl:port name="UsageServiceHttpSoap12Endpoint" binding="ns:UsageServiceSoap12Binding">
-
- <soap12:address
- location="http://10.100.0.19:9765/services/UsageService.UsageServiceHttpSoap12Endpoint/"/>
- </wsdl:port>
- <wsdl:port name="UsageServiceHttpsSoap12Endpoint" binding="ns:UsageServiceSoap12Binding">
- <soap12:address
- location="https://10.100.0.19:9446/services/UsageService.UsageServiceHttpsSoap12Endpoint/"/>
- </wsdl:port>
- <wsdl:port name="UsageServiceHttpEndpoint" binding="ns:UsageServiceHttpBinding">
- <http:address
- location="http://10.100.0.19:9765/services/UsageService.UsageServiceHttpEndpoint/"/>
- </wsdl:port>
- <wsdl:port name="UsageServiceHttpsEndpoint" binding="ns:UsageServiceHttpBinding">
-
- <http:address
- location="https://10.100.0.19:9446/services/UsageService.UsageServiceHttpsEndpoint/"/>
- </wsdl:port>
- </wsdl:service>
-</wsdl:definitions>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/df3475cc/components/stratos/usage/org.wso2.carbon.usage.ui/2.1.2/src/main/resources/org/wso2/carbon/usage/ui/i18n/JSResources.properties
----------------------------------------------------------------------
diff --git a/components/stratos/usage/org.wso2.carbon.usage.ui/2.1.2/src/main/resources/org/wso2/carbon/usage/ui/i18n/JSResources.properties b/components/stratos/usage/org.wso2.carbon.usage.ui/2.1.2/src/main/resources/org/wso2/carbon/usage/ui/i18n/JSResources.properties
deleted file mode 100644
index e7490b0..0000000
--- a/components/stratos/usage/org.wso2.carbon.usage.ui/2.1.2/src/main/resources/org/wso2/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
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/df3475cc/components/stratos/usage/org.wso2.carbon.usage.ui/2.1.2/src/main/resources/org/wso2/carbon/usage/ui/i18n/Resources.properties
----------------------------------------------------------------------
diff --git a/components/stratos/usage/org.wso2.carbon.usage.ui/2.1.2/src/main/resources/org/wso2/carbon/usage/ui/i18n/Resources.properties b/components/stratos/usage/org.wso2.carbon.usage.ui/2.1.2/src/main/resources/org/wso2/carbon/usage/ui/i18n/Resources.properties
deleted file mode 100644
index 71ffd1d..0000000
--- a/components/stratos/usage/org.wso2.carbon.usage.ui/2.1.2/src/main/resources/org/wso2/carbon/usage/ui/i18n/Resources.properties
+++ /dev/null
@@ -1,53 +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
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/df3475cc/components/stratos/usage/org.wso2.carbon.usage.ui/2.1.2/src/main/resources/web/tenant-usage/all_tenant_instance_usage.jsp
----------------------------------------------------------------------
diff --git a/components/stratos/usage/org.wso2.carbon.usage.ui/2.1.2/src/main/resources/web/tenant-usage/all_tenant_instance_usage.jsp b/components/stratos/usage/org.wso2.carbon.usage.ui/2.1.2/src/main/resources/web/tenant-usage/all_tenant_instance_usage.jsp
deleted file mode 100644
index e4c9510..0000000
--- a/components/stratos/usage/org.wso2.carbon.usage.ui/2.1.2/src/main/resources/web/tenant-usage/all_tenant_instance_usage.jsp
+++ /dev/null
@@ -1,216 +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.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 contentType="text/html;charset=UTF-8" language="java" %>
-<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
-<%@ taglib uri="http://wso2.org/projects/carbon/taglibs/carbontags.jar" prefix="carbon" %>
-
-<carbon:jsi18n
- resourceBundle="org.wso2.carbon.usage.ui.i18n.JSResources"
- request="<%=request%>"/>
-
-
-<fmt:bundle basename="org.wso2.carbon.usage.ui.i18n.Resources">
- <carbon:breadcrumb
- label="tenants.usage.report"
- resourceBundle="org.wso2.carbon.usage.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="../tenant-usage/js/tenant-usage.js"></script>
- <script type="text/javascript" src="js/all-tenant-usage-report.js"></script>
- <link rel="stylesheet" type="text/css" href="../tenant-usage/css/tenant-usage.css"/>
-
-
- <%
- String yearMonth = request.getParameter("year-month");
- session.setAttribute("year-month", yearMonth);
- int pageNumber=0;
- int rowCount = 5;
- int numberOfPages=0;
- InstanceUsageStatics[] instanceUsages=null;
- if (yearMonth == null) {
- // get the current year month
- yearMonth = UsageUtil.getCurrentYearMonth();
- }
- try{
- PaginatedInstanceUsage instanceInfo =
- UsageUtil.retrievePaginatedInstanceUsages(request, config, session);
- instanceUsages = instanceInfo.getInstanceUsages();
- pageNumber = instanceInfo.getPageNumber();
- numberOfPages = instanceInfo.getNumberOfPages();
-
- String currentYearMonth = UsageUtil.getCurrentYearMonth();
-
- if (yearMonth.equals(currentYearMonth)) {
- rowCount = 7;
- }
- }
- catch (Exception e){
- //No need to handle here it here.Error will show in next try block
- //To avoid dead page
- }
- %>
-
- <div id="middle">
-
- <h2><fmt:message key="instance.usage.report"/> for the Month - <%=yearMonth%> (With All
- Running Instances)</h2>
-
- <div id="report_ui">
- <carbon:reportNew
- component="org.wso2.carbon.usage"
- template="all_tenant_usage_report"
- pdfReport="true"
- htmlReport="true"
- excelReport="true"
- reportDataSession="all_tenant_usage_data"
- jsFunction="getUsageReportData()"/>
- </div>
-
- <div id="workArea">
-
- <form id="usageForm" action="all_tenant_instance_usage.jsp" method="post">
-
-
- <table class="styledLeft">
- <thead>
- <tr>
- <th>
- <fmt:message key="report.duration"/>
- </th>
- </tr>
- </thead>
- <tbody>
- <tr>
- <td class="nopadding">
- <table class="normal-nopadding" cellspacing="0">
- <tbody>
- <tr>
- <td><fmt:message key="year.month"/></td>
- <td colspan="2">
- <select onchange="this.form.submit()" name="year-month"
- id="year-month" style="width:400px">
- <%
- for (String ym : UsageUtil.getYearMonths()) {
- String selectedStr = "";
- if (ym.equals(yearMonth)) {
- selectedStr = "selected=\"true\" ";
- }
- %>
- <option <%=selectedStr%> value="<%=ym%>"><%=ym%>
- </option>
- <%
- }
- %>
- </select>
- <input type="hidden" name="requestedPage" id="requestedPage"
- value="<%=pageNumber%>"/>
- </td>
- </tr>
-
- <tr>
- <td colspan="<%=rowCount%>" class="middle-header"><fmt:message
- key="instances.data"/></td>
- </tr>
- <tr>
- <th><fmt:message key="instance.id"/></th>
- <th><fmt:message key="server.name"/></th>
- <th><fmt:message key="start.time"/></th>
- <th><fmt:message key="stop.time"/></th>
- <th><fmt:message key="used.time.in.hours"/></th>
- </tr>
- <%
- try{
- InstanceUsageStatics[] iu = UsageUtil.retrieveInstanceUsage(request, config, session);
- java.text.SimpleDateFormat dateFormatter = new java.text.SimpleDateFormat("yyyy.MM.dd 'at' hh:mm:ss a zzz");
- if (!iu.equals(null)) {
- for (InstanceUsageStatics usage : instanceUsages) {
- String endDate;
- if (usage.getRunning() == true) {
- endDate="Instance Still Running";
- }
- else{
- endDate=dateFormatter.format(usage.getStopTime().getTime());
- }
- String startDate=dateFormatter.format(usage.getStartTime().getTime());
- long usedHours;
- long usedTimeInSeconds=usage.getUsedTimeInSeconds();
- if(usedTimeInSeconds%3600==0){
- usedHours=usedTimeInSeconds/3600;
- }
- else{
- usedHours=(usedTimeInSeconds/3600)+1;
- }
- %>
- <tr>
- <td>
- <%=usage.getInstanceID()%>
- </td>
- <td>
- <%=usage.getInstanceURL().toString()%>
- </td>
- <td>
- <%=startDate%>
- </td>
- <td>
- <%=endDate%>
- </td>
- <td>
-
- <%=usedHours%>
- </td>
- </tr>
- <%
-
- }
- }
- else{
- %>
- <td><fmt:message key="empty.instance.data"/></td>
- <%
- }
- }
- catch (Exception e){ %>
- <td><fmt:message key="failed.to.get.instance.data"/></td>
- <% }
- %>
- <carbon:resourcePaginator pageNumber="<%=pageNumber%>"
- numberOfPages="<%=numberOfPages%>"
- resourceBundle="org.wso2.carbon.usage.ui.i18n.Resources"
- nextKey="next" prevKey="prev"
- tdColSpan="6"
- paginationFunction="submitAllTenantPaginatedUsage({0})"/>
- </tbody>
- </table>
- </td>
- </tr>
- </tbody>
- </table>
- </form>
- <br/>
- </div>
- </div>
-</fmt:bundle>
-
-
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/df3475cc/components/stratos/usage/org.wso2.carbon.usage.ui/2.1.2/src/main/resources/web/tenant-usage/all_tenant_usage.jsp
----------------------------------------------------------------------
diff --git a/components/stratos/usage/org.wso2.carbon.usage.ui/2.1.2/src/main/resources/web/tenant-usage/all_tenant_usage.jsp b/components/stratos/usage/org.wso2.carbon.usage.ui/2.1.2/src/main/resources/web/tenant-usage/all_tenant_usage.jsp
deleted file mode 100644
index 6036a19..0000000
--- a/components/stratos/usage/org.wso2.carbon.usage.ui/2.1.2/src/main/resources/web/tenant-usage/all_tenant_usage.jsp
+++ /dev/null
@@ -1,208 +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.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="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" %>
-
-<carbon:jsi18n
- resourceBundle="org.wso2.carbon.usage.ui.i18n.JSResources"
- request="<%=request%>"/>
-
-
-<fmt:bundle basename="org.wso2.carbon.usage.ui.i18n.Resources">
- <carbon:breadcrumb
- label="tenants.usage.report"
- resourceBundle="org.wso2.carbon.usage.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="../tenant-usage/js/tenant-usage.js"></script>
- <script type="text/javascript" src="js/all-tenant-usage-report.js"></script>
- <link rel="stylesheet" type="text/css" href="../tenant-usage/css/tenant-usage.css"/>
-
-
- <%
- PaginatedTenantUsageInfo tenantsInfo =
- UsageUtil.retrievePaginatedTenantUsages(request, config, session);
- TenantUsage[] tenantUsages = tenantsInfo.getTenantUsages();
- int pageNumber = tenantsInfo.getPageNumber();
- int numberOfPages = tenantsInfo.getNumberOfPages();
- String yearMonth = request.getParameter("year-month");
- session.setAttribute("year-month", yearMonth);
-
-
- if (yearMonth == null) {
- // get the current year month
- yearMonth = UsageUtil.getCurrentYearMonth();
- }
- String currentYearMonth = UsageUtil.getCurrentYearMonth();
- int rowCount = 5;
- if (yearMonth.equals(currentYearMonth)) {
- rowCount = 7;
- }
- %>
-
-
- <%
- //AllTenantUsageReport usageReport = new AllTenantUsageReport(config, session, request);
- //List<AllTenantUsageData> reportDataArray = usageReport.getUsageReportData();
- //request.getSession().setAttribute("all_tenant_usage_data", reportDataArray);
- %>
-
- <div id="middle">
- <h2><fmt:message key="tenants.usage.report"/> for the Month - <%=yearMonth%> (All
- Tenants)</h2>
- </div>
-
- <div id="workArea">
-
- <form id="usageForm" action="all_tenant_usage.jsp" method="post">
-
-
- <table class="styledLeft">
- <thead>
- <tr>
- <th>
- <fmt:message key="report.duration"/>
- </th>
- </tr>
- </thead>
- <tbody>
- <tr>
- <td class="nopadding">
- <table class="normal-nopadding" cellspacing="0">
- <tbody>
- <tr>
- <td><fmt:message key="year.month"/></td>
- <td colspan="2">
- <select onchange="this.form.submit()" name="year-month"
- id="year-month" style="width:400px">
- <%
- for (String ym : UsageUtil.getYearMonths()) {
- String selectedStr = "";
- if (ym.equals(yearMonth)) {
- selectedStr = "selected=\"true\" ";
- }
- %>
- <option <%=selectedStr%> value="<%=ym%>"><%=ym%>
- </option>
- <%
- }
- %>
- </select>
- <input type="hidden" name="requestedPage" id="requestedPage"
- value="<%=pageNumber%>"/>
- </td>
- </tr>
-
- <tr>
- <td colspan="<%=rowCount%>" class="middle-header"><fmt:message
- key="users"/></td>
- </tr>
- <tr>
- <th><fmt:message key="tenant.domain"/></th>
- <%
- if (yearMonth.equals(currentYearMonth)) {
- %>
- <th><fmt:message key="number.of.users"/></th>
- <th><fmt:message key="storage.usage"/></th><%}%>
- <%--<th><fmt:message key="registry.total.bandwidth"/></th>--%>
- <th><fmt:message key="service.total.bandwidth"/></th>
- <th><fmt:message key="webapp.total.bandwidth"/></th>
- <th><fmt:message key="service.total.request"/></th>
- <th><fmt:message key="full.report"/></th>
- </tr>
- <%
- if (tenantUsages != null) {
- for (TenantUsage usage : tenantUsages) {
- String currentDataStorage = UsageUtil.getTotalDataStorage(usage);
- String regBandwidth = UsageUtil.getTotalBandwidth(usage.getTotalRegistryBandwidth());
- String svcBandwidth = UsageUtil.getTotalBandwidth(usage.getTotalServiceBandwidth());
- String webBandwidth = UsageUtil.getTotalBandwidth(usage.getTotalWebappBandwidth());
- long svcTotalRequest = usage.getTotalRequestStatistics().getRequestCount();
- int numberOfUsers = usage.getNumberOfUsers();
-
- String username = (String) request.getSession().getAttribute("logged-user");
- String tenantName = usage.getDomain();
- int tenantId = usage.getTenantId();
- String fullReportLink = "any_tenant_usage.jsp?tenant-id=" + tenantId + "&year-month=" + yearMonth;
- %>
-
- <tr>
- <td><%=tenantName%>
- </td>
- <%
- if (yearMonth.equals(currentYearMonth)) {
- %>
- <td><%=numberOfUsers%>
- </td>
- <td><%=currentDataStorage%>
- </td>
- <%
- }
- %>
- <%--<td><%=regBandwidth%>
- </td>--%>
- <td><%=svcBandwidth%>
- </td>
- <td><%=webBandwidth%>
- </td>
- <td><%=svcTotalRequest%>
- </td>
- <td><a href="<%=fullReportLink%>">Full Report</a></td>
- </tr>
- <%
-
- }
- } else {
- %>
- <tr>
- <td><fmt:message key="empty.usage.data"/></td>
- </tr>
- </tr>
- <%
- }
-
- %>
- <carbon:resourcePaginator pageNumber="<%=pageNumber%>"
- numberOfPages="<%=numberOfPages%>"
- resourceBundle="org.wso2.carbon.usage.ui.i18n.Resources"
- nextKey="next" prevKey="prev"
- tdColSpan="6"
- paginationFunction="submitAllTenantPaginatedUsage({0})"/>
- </tbody>
- </table>
- </td>
- </tr>
- </tbody>
- </table>
- </form>
- <br/>
- </div>
- </div>
-</fmt:bundle>
-
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/df3475cc/components/stratos/usage/org.wso2.carbon.usage.ui/2.1.2/src/main/resources/web/tenant-usage/all_tenant_usage_report.jsp
----------------------------------------------------------------------
diff --git a/components/stratos/usage/org.wso2.carbon.usage.ui/2.1.2/src/main/resources/web/tenant-usage/all_tenant_usage_report.jsp b/components/stratos/usage/org.wso2.carbon.usage.ui/2.1.2/src/main/resources/web/tenant-usage/all_tenant_usage_report.jsp
deleted file mode 100644
index ce67752..0000000
--- a/components/stratos/usage/org.wso2.carbon.usage.ui/2.1.2/src/main/resources/web/tenant-usage/all_tenant_usage_report.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.usage.ui.report.AllTenantUsageReport" %>
-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%
- AllTenantUsageReport usageReport = new AllTenantUsageReport(config, session, request);
- String[] reportDataArray = usageReport.getUsageReportData();
- System.out.println("Report lenth "+reportDataArray.length);
- request.getSession().setAttribute("all_tenant_usage_data", reportDataArray);
-%>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/df3475cc/components/stratos/usage/org.wso2.carbon.usage.ui/2.1.2/src/main/resources/web/tenant-usage/any_tenant_usage.jsp
----------------------------------------------------------------------
diff --git a/components/stratos/usage/org.wso2.carbon.usage.ui/2.1.2/src/main/resources/web/tenant-usage/any_tenant_usage.jsp b/components/stratos/usage/org.wso2.carbon.usage.ui/2.1.2/src/main/resources/web/tenant-usage/any_tenant_usage.jsp
deleted file mode 100644
index 7dfde24..0000000
--- a/components/stratos/usage/org.wso2.carbon.usage.ui/2.1.2/src/main/resources/web/tenant-usage/any_tenant_usage.jsp
+++ /dev/null
@@ -1,414 +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.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 contentType="text/html;charset=UTF-8" language="java" %>
-<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
-<%@ taglib uri="http://wso2.org/projects/carbon/taglibs/carbontags.jar" prefix="carbon" %>
-
-<carbon:jsi18n
- resourceBundle="org.wso2.carbon.usage.ui.i18n.JSResources"
- request="<%=request%>"/>
-
-
-<fmt:bundle basename="org.wso2.carbon.usage.ui.i18n.Resources">
-<carbon:breadcrumb
- label="tenant.usage.report"
- resourceBundle="org.wso2.carbon.usage.ui.i18n.Resources"
- topPage="false"
- 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>
-<%
-
- TenantUsage usage = UsageUtil.retrieveTenantUsage(request, config, session);
- int numberOfUsers = usage.getNumberOfUsers();
- String yearMonth = request.getParameter("year-month");
- if (yearMonth == null) {
- // get the current year month
- yearMonth = UsageUtil.getCurrentYearMonth();
- }
- String username = (String) request.getSession().getAttribute("logged-user");
- String tenantName = usage.getDomain();
- int tenantId = usage.getTenantId();
- String currentYearMonth = UsageUtil.getCurrentYearMonth();
-%>
-
-<div id="middle">
-
-<h2><fmt:message key="tenant.usage.report"/> for the Month - <%=yearMonth%> (Tenant: <%=tenantName%>
- )</h2>
-
-<div id="workArea">
-
-<form id="usageForm" action="any_tenant_usage.jsp" method="get">
-
-<table class="styledLeft">
-<thead>
-<tr>
- <th>
- <fmt:message key="report.duration"/>
- </th>
-</tr>
-</thead>
-<tbody>
-<tr>
-<td class="nopadding">
-<table class="normal-nopadding" cellspacing="0">
-<tbody>
-<tr>
- <td><fmt:message key="year.month"/></td>
- <td colspan="3">
- <input type="hidden" name="tenant-id" value="<%=tenantId%>"/>
- <select onchange="this.form.submit()" name="year-month" id="year-month" style="width:200px">
- <%
- for (String ym : UsageUtil.getYearMonths()) {
- String selectedStr = "";
- if (ym.equals(yearMonth)) {
- selectedStr = "selected=\"true\" ";
- }
- %>
- <option <%=selectedStr%> value="<%=ym%>"><%=ym%>
- </option>
- <%
- }
- %>
- </select>
- </td>
-</tr>
-
-<%
- if (currentYearMonth.equals(yearMonth)) {
-%>
-<tr>
- <td colspan="4" class="middle-header"><fmt:message key="users"/></td>
-</tr>
-<tr>
- <td><fmt:message key="number.of.users"/></td>
- <td colspan="3">
- <input readonly="1" type="text" name="userCount" id="userCount" style="width:200px"
- value="<%=numberOfUsers%>"/>
- </td>
-</tr>
-
-<tr>
- <td colspan="4" class="middle-header"><fmt:message key="storage.usage"/></td>
-</tr>
-
-<tr>
- <td><fmt:message key="data.storage.name"/></td>
- <td><fmt:message key="current.data.storage"/></td>
- <td><fmt:message key="history.data.storage"/></td>
- <td><fmt:message key="total.data.storage"/></td>
-</tr>
-<%
- String totalDataStorage = UsageUtil.getTotalDataStorage(usage);
- String currentDataStorage = UsageUtil.getCurrentDataStorage(usage);
- String historyDataStorage = UsageUtil.getHistoryDataStorage(usage);
-%>
-<tr>
- <td><fmt:message key="registry.content.storage.name"/></td>
- <td colspan="1">
- <input readonly="1" type="text" name="currentData" id="currentData" style="width:200px"
- value="<%=currentDataStorage%>"/>
- </td>
- <td colspan="1">
- <input readonly="1" type="text" name="historyData" id="historyData" style="width:200px"
- value="<%=historyDataStorage%>"/>
- </td>
- <td colspan="1">
- <input readonly="1" type="text" name="totalData" id="totalData" style="width:200px"
- value="<%=totalDataStorage%>"/>
- </td>
-</tr>
-
-<%
- }
-%>
-
-
-<tr>
- <td colspan="4" class="middle-header"><fmt:message key="api.usage"/></td>
-</tr>
-<tr>
- <td><fmt:message key="server.name"/></td>
- <td><fmt:message key="number.of.api.calls"/></td>
-</tr>
-<%
- String apiCallCount = UsageUtil.getAPIUsage(usage);
-%>
-
-<tr>
- <td><fmt:message key="all.server.name"/></td>
- <td>
- <input readonly="1" type="text" name="totalAPICalls" id="APICalls"
- style="width:200px" value="<%=apiCallCount%>"/>
- </td>
-</tr>
-
-
-
-
-<tr>
- <td colspan="4" class="middle-header"><fmt:message key="registry.bandwidth.usage"/></td>
-</tr>
-<tr>
- <td><fmt:message key="server.name"/></td>
- <td><fmt:message key="incoming.bandwidth"/></td>
- <td><fmt:message key="outgoing.bandwidth"/></td>
- <td><fmt:message key="total.bandwidth"/></td>
-</tr>
-<%
- String totRegInBandwidth = UsageUtil.getIncomingBandwidth(usage.getTotalRegistryBandwidth());
- String totRegOutBandwidth = UsageUtil.getOutgoingBandwidth(usage.getTotalRegistryBandwidth());
- String totRegBandwidth = UsageUtil.getTotalBandwidth(usage.getTotalRegistryBandwidth());
- BandwidthStatistics[] regBWStats = usage.getRegistryBandwidthStatistics();
- if (regBWStats != null) {
- for (BandwidthStatistics stat : regBWStats) {
- String regInBandwidth = UsageUtil.getIncomingBandwidth(stat);
- String regOutBandwidth = UsageUtil.getOutgoingBandwidth(stat);
- String regBandwidth = UsageUtil.getTotalBandwidth(stat);
-%>
-<tr>
- <td><%=stat.getKey()%>
- </td>
- <td>
- <input readonly="1" type="text" name="registryIncomingBW" id="registryIncomingBW"
- style="width:200px" value="<%=regInBandwidth%>"/>
- </td>
- <td>
- <input readonly="1" type="text" name="registryOutgoingBW" id="registryOutgoingBW"
- style="width:200px" value="<%=regOutBandwidth%>"/>
- </td>
- <td>
- <input readonly="1" type="text" name="registryTotalBW" id="registryTotalBW"
- style="width:200px" value="<%=regBandwidth%>"/>
- </td>
-</tr>
-<%
- }
- }
-%>
-<tr>
- <td><fmt:message key="all.server.name"/></td>
- <td>
- <input readonly="1" type="text" name="totRegistryIncomingBW" id="totRegistryIncomingBW"
- style="width:200px" value="<%=totRegInBandwidth%>"/>
- </td>
- <td>
- <input readonly="1" type="text" name="totRegistryOutgoingBW" id="totRegistryOutgoingBW"
- style="width:200px" value="<%=totRegOutBandwidth%>"/>
- </td>
- <td>
- <input readonly="1" type="text" name="totRegistryTotalBW" id="totRegistryTotalBW"
- style="width:200px" value="<%=totRegBandwidth%>"/>
- </td>
-</tr>
-
-
-<tr>
- <td colspan="4" class="middle-header"><fmt:message key="service.bandwidth.usage"/></td>
-</tr>
-<tr>
- <td><fmt:message key="server.name"/></td>
- <td><fmt:message key="incoming.bandwidth"/></td>
- <td><fmt:message key="outgoing.bandwidth"/></td>
- <td><fmt:message key="total.bandwidth"/></td>
-</tr>
-<%
- String totSvcInBandwidth = UsageUtil.getIncomingBandwidth(usage.getTotalServiceBandwidth());
- String totSvcOutBandwidth = UsageUtil.getOutgoingBandwidth(usage.getTotalServiceBandwidth());
- String totSvcBandwidth = UsageUtil.getTotalBandwidth(usage.getTotalServiceBandwidth());
- BandwidthStatistics[] svcBWStats = usage.getServiceBandwidthStatistics();
- if (svcBWStats != null) {
- for (BandwidthStatistics stat : svcBWStats) {
- String svcInBandwidth = UsageUtil.getIncomingBandwidth(stat);
- String svcOutBandwidth = UsageUtil.getOutgoingBandwidth(stat);
- String svcBandwidth = UsageUtil.getTotalBandwidth(stat);
-%>
-<tr>
- <td><%=stat.getKey()%>
- </td>
- <td>
- <input readonly="1" type="text" name="serviceIncomingBW" id="serviceIncomingBW"
- style="width:200px" value="<%=svcInBandwidth%>"/>
- </td>
- <td>
- <input readonly="1" type="text" name="serviceOutgoingBW" id="serviceOutgoingBW"
- style="width:200px" value="<%=svcOutBandwidth%>"/>
- </td>
- <td>
- <input readonly="1" type="text" name="serviceTotalBW" id="serviceTotalBW"
- style="width:200px" value="<%=svcBandwidth%>"/>
- </td>
-</tr>
-<%
- }
- }
-%>
-<tr>
- <td><fmt:message key="all.server.name"/></td>
- <td>
- <input readonly="1" type="text" name="totServiceIncomingBW" id="totServiceIncomingBW"
- style="width:200px" value="<%=totSvcInBandwidth%>"/>
- </td>
- <td>
- <input readonly="1" type="text" name="totServiceOutgoingBW" id="totServiceOutgoingBW"
- style="width:200px" value="<%=totSvcOutBandwidth%>"/>
- </td>
- <td>
- <input readonly="1" type="text" name="totServiceTotalBW" id="totServiceTotalBW"
- style="width:200px" value="<%=totSvcBandwidth%>"/>
- </td>
-</tr>
-
-
-<tr>
- <td colspan="4" class="middle-header"><fmt:message key="webapp.bandwidth.usage"/></td>
-</tr>
-<tr>
- <td><fmt:message key="server.name"/></td>
- <td><fmt:message key="incoming.bandwidth"/></td>
- <td><fmt:message key="outgoing.bandwidth"/></td>
- <td><fmt:message key="total.bandwidth"/></td>
-</tr>
-<%
- String totWebappInBandwidth = UsageUtil.getIncomingBandwidth(usage.getTotalWebappBandwidth());
- String totWebappOutBandwidth = UsageUtil.getOutgoingBandwidth(usage.getTotalWebappBandwidth());
- String totWebappBandwidth = UsageUtil.getTotalBandwidth(usage.getTotalWebappBandwidth());
- BandwidthStatistics[] webappBWStats = usage.getWebappBandwidthStatistics();
- if (webappBWStats != null) {
- for (BandwidthStatistics stat : webappBWStats) {
- String webappInBandwidth = UsageUtil.getIncomingBandwidth(stat);
- String webappOutBandwidth = UsageUtil.getOutgoingBandwidth(stat);
- String webappBandwidth = UsageUtil.getTotalBandwidth(stat);
-%>
-<tr>
- <td><%=stat.getKey()%>
- </td>
- <td>
- <input readonly="1" type="text" name="webappIncomingBW" id="webappIncomingBW"
- style="width:200px" value="<%=webappInBandwidth%>"/>
- </td>
- <td>
- <input readonly="1" type="text" name="webappOutgoingBW" id="webappOutgoingBW"
- style="width:200px" value="<%=webappOutBandwidth%>"/>
- </td>
- <td>
- <input readonly="1" type="text" name="webappTotalBW" id="webappTotalBW" style="width:200px"
- value="<%=webappBandwidth%>"/>
- </td>
-</tr>
-<%
- }
- }
-%>
-<tr>
- <td><fmt:message key="all.server.name"/></td>
- <td>
- <input readonly="1" type="text" name="totWebappIncomingBW" id="totWebappIncomingBW"
- style="width:200px" value="<%=totWebappInBandwidth%>"/>
- </td>
- <td>
- <input readonly="1" type="text" name="totWebappOutgoingBW" id="totWebappOutgoingBW"
- style="width:200px" value="<%=totWebappOutBandwidth%>"/>
- </td>
- <td>
- <input readonly="1" type="text" name="totWebappTotalBW" id="totWebappTotalBW"
- style="width:200px" value="<%=totWebappBandwidth%>"/>
- </td>
-</tr>
-
-
-<tr>
- <td colspan="4" class="middle-header"><fmt:message key="service.usage.stat"/></td>
-</tr>
-<tr>
- <td><fmt:message key="server.name"/></td>
- <td><fmt:message key="service.usage.request"/></td>
- <td><fmt:message key="service.usage.response"/></td>
- <td><fmt:message key="service.usage.fault"/></td>
-</tr>
-<%
- long totSvcReqCount = usage.getTotalRequestStatistics().getRequestCount();
- long totSvcRespCount = usage.getTotalRequestStatistics().getResponseCount();
- long totSvcFaultCount = usage.getTotalRequestStatistics().getFaultCount();
- RequestStatistics[] svcStats = usage.getRequestStatistics();
- if (svcStats != null) {
- for (RequestStatistics stat : svcStats) {
- long svcReqCount = stat.getRequestCount();
- long svcResCount = stat.getResponseCount();
- long svcFaultCount = stat.getFaultCount();
-%>
-<tr>
- <td><%=stat.getKey()%>
- </td>
- <td>
- <input readonly="1" type="text" name="serviceRequestCount" id="serviceRequestCount"
- style="width:200px" value="<%=svcReqCount%>"/>
- </td>
- <td>
- <input readonly="1" type="text" name="serviceResponseCount" id="serviceResponseCount"
- style="width:200px" value="<%=svcResCount%>"/>
- </td>
- <td>
- <input readonly="1" type="text" name="serviceFaultCount" id="serviceFaultCount"
- style="width:200px" value="<%=svcFaultCount%>"/>
- </td>
-</tr>
-<%
- }
- }
-%>
-<tr>
- <td><fmt:message key="all.server.name"/></td>
- <td>
- <input readonly="1" type="text" name="totServiceRequestCount" id="totServiceRequestCount"
- style="width:200px" value="<%=totSvcReqCount%>"/>
- </td>
- <td>
- <input readonly="1" type="text" name="totServiceResponseCount" id="totServiceResponseCount"
- style="width:200px" value="<%=totSvcRespCount%>"/>
- </td>
- <td>
- <input readonly="1" type="text" name="totServiceFaultCount" id="totServiceFaultCount"
- style="width:200px" value="<%=totSvcFaultCount%>"/>
- </td>
-</tr>
-
-</tbody>
-</table>
-</td>
-</tr>
-</tbody>
-</table>
-<br/>
-<input type='button' class='button' style="align:right" id="backButtonID"
- onclick='window.location="../tenant-usage/all_tenant_usage.jsp?region=region4&item=all_tenant_usage_menu"'
- value='<fmt:message key="back"/>'/>
-</form>
-<br/>
-</div>
-</div>
-</fmt:bundle>
-
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/df3475cc/components/stratos/usage/org.wso2.carbon.usage.ui/2.1.2/src/main/resources/web/tenant-usage/css/tenant-usage.css
----------------------------------------------------------------------
diff --git a/components/stratos/usage/org.wso2.carbon.usage.ui/2.1.2/src/main/resources/web/tenant-usage/css/tenant-usage.css b/components/stratos/usage/org.wso2.carbon.usage.ui/2.1.2/src/main/resources/web/tenant-usage/css/tenant-usage.css
deleted file mode 100644
index 5c85728..0000000
--- a/components/stratos/usage/org.wso2.carbon.usage.ui/2.1.2/src/main/resources/web/tenant-usage/css/tenant-usage.css
+++ /dev/null
@@ -1,28 +0,0 @@
-.disableLink {
- color: #aaaaaa;
-}
-
-.pageLinks {
- background: #FFFFFF none repeat scroll 0%;
- border: 1px solid #DDDDDD;
- padding: 2px 3px;
- text-decoration: none;
- margin: 0px;
- margin-left: 2px;
- margin-right: 2px;
-}
-
-.pageLinks-selected {
- background: #e8e9ae none repeat scroll 0%;
- border: 1px solid #DDDDDD;
- padding: 2px 3px;
- text-decoration: none;
- margin: 0px;
- margin-left: 2px;
- margin-right: 2px;
-}
-
-a {
- color: #386698;
- cursor: pointer;
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/df3475cc/components/stratos/usage/org.wso2.carbon.usage.ui/2.1.2/src/main/resources/web/tenant-usage/docs/images/view-usage.png
----------------------------------------------------------------------
diff --git a/components/stratos/usage/org.wso2.carbon.usage.ui/2.1.2/src/main/resources/web/tenant-usage/docs/images/view-usage.png b/components/stratos/usage/org.wso2.carbon.usage.ui/2.1.2/src/main/resources/web/tenant-usage/docs/images/view-usage.png
deleted file mode 100644
index 4080da3..0000000
Binary files a/components/stratos/usage/org.wso2.carbon.usage.ui/2.1.2/src/main/resources/web/tenant-usage/docs/images/view-usage.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/df3475cc/components/stratos/usage/org.wso2.carbon.usage.ui/2.1.2/src/main/resources/web/tenant-usage/docs/userguide.html
----------------------------------------------------------------------
diff --git a/components/stratos/usage/org.wso2.carbon.usage.ui/2.1.2/src/main/resources/web/tenant-usage/docs/userguide.html b/components/stratos/usage/org.wso2.carbon.usage.ui/2.1.2/src/main/resources/web/tenant-usage/docs/userguide.html
deleted file mode 100644
index 9dd0f6c..0000000
--- a/components/stratos/usage/org.wso2.carbon.usage.ui/2.1.2/src/main/resources/web/tenant-usage/docs/userguide.html
+++ /dev/null
@@ -1,77 +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>View Tenant Usage - User Guide</title>
- <link href="../../admin/css/documentation.css" rel="stylesheet" type="text/css" media="all" />
-</head>
-
-<body>
-<h1>View Usage</h1>
-
-<p>
-You can view usage of the stratos resource by your organization(Tenant) from this page
-</p>
-
-<p>
-<img src="images/view-usage.png" alt="View Usage"/>
-<div><strong>Figure1: View Usage</strong></div>
-</p>
- <h2> <b>Description of usage data report fields</b></h2>
-<p>
-<table border="1">
-<tr>
-<th>The Form Field</th>
-<th>Description</th>
-</tr>
-<tr>
-<td>Report Duration </td>
-<td>The year and the month the usage is metered.</td>
-</tr>
- <tr>
- <td>Number of Users</td>
- <td>Number of users of your stratos account.(This is valid only for current month)</td>
- </tr>
- <tr>
- <tr>
- <td>Storage Usage</td>
- <td>The registry data storage amount.</td>
- </tr>
- <tr>
- <td>Registry Bandwidth Usage</td>
- <td>Registry bandwidth consumed by the registry resource accesses(registry uploads, downloads).</td>
- </tr>
- <tr>
- <td>Service Bandwidth Usage</td>
- <td>The bandwidth consumed by the web services hosted by you.</td>
- </tr>
- <tr>
- <td>Webapp Bandwidth Usage</td>
- <td>The bandwidth consumed by the web services.</td>
- </tr>
- <tr>
- <td>Service Usage Statistics</td>
- <td>Service statistics of requests and responses of services.</td>
- </tr>
- </tbody>
-</table>
-</p>
-<div><strong>Table1: Description of usage data report fields</strong></div>
-</body>
-</html>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/df3475cc/components/stratos/usage/org.wso2.carbon.usage.ui/2.1.2/src/main/resources/web/tenant-usage/images/instance-usage-report.gif
----------------------------------------------------------------------
diff --git a/components/stratos/usage/org.wso2.carbon.usage.ui/2.1.2/src/main/resources/web/tenant-usage/images/instance-usage-report.gif b/components/stratos/usage/org.wso2.carbon.usage.ui/2.1.2/src/main/resources/web/tenant-usage/images/instance-usage-report.gif
deleted file mode 100644
index 4a1ae6a..0000000
Binary files a/components/stratos/usage/org.wso2.carbon.usage.ui/2.1.2/src/main/resources/web/tenant-usage/images/instance-usage-report.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/df3475cc/components/stratos/usage/org.wso2.carbon.usage.ui/2.1.2/src/main/resources/web/tenant-usage/images/tenant-usage-report.gif
----------------------------------------------------------------------
diff --git a/components/stratos/usage/org.wso2.carbon.usage.ui/2.1.2/src/main/resources/web/tenant-usage/images/tenant-usage-report.gif b/components/stratos/usage/org.wso2.carbon.usage.ui/2.1.2/src/main/resources/web/tenant-usage/images/tenant-usage-report.gif
deleted file mode 100644
index a9b04e2..0000000
Binary files a/components/stratos/usage/org.wso2.carbon.usage.ui/2.1.2/src/main/resources/web/tenant-usage/images/tenant-usage-report.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/df3475cc/components/stratos/usage/org.wso2.carbon.usage.ui/2.1.2/src/main/resources/web/tenant-usage/images/user-usage-report.gif
----------------------------------------------------------------------
diff --git a/components/stratos/usage/org.wso2.carbon.usage.ui/2.1.2/src/main/resources/web/tenant-usage/images/user-usage-report.gif b/components/stratos/usage/org.wso2.carbon.usage.ui/2.1.2/src/main/resources/web/tenant-usage/images/user-usage-report.gif
deleted file mode 100644
index 9070c35..0000000
Binary files a/components/stratos/usage/org.wso2.carbon.usage.ui/2.1.2/src/main/resources/web/tenant-usage/images/user-usage-report.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/df3475cc/components/stratos/usage/org.wso2.carbon.usage.ui/2.1.2/src/main/resources/web/tenant-usage/js/all-tenant-usage-report.js
----------------------------------------------------------------------
diff --git a/components/stratos/usage/org.wso2.carbon.usage.ui/2.1.2/src/main/resources/web/tenant-usage/js/all-tenant-usage-report.js b/components/stratos/usage/org.wso2.carbon.usage.ui/2.1.2/src/main/resources/web/tenant-usage/js/all-tenant-usage-report.js
deleted file mode 100644
index 61043f0..0000000
--- a/components/stratos/usage/org.wso2.carbon.usage.ui/2.1.2/src/main/resources/web/tenant-usage/js/all-tenant-usage-report.js
+++ /dev/null
@@ -1,49 +0,0 @@
-function createXmlHttpRequest() {
- var request;
-
- // Lets try using ActiveX to instantiate the XMLHttpRequest
- // object
- try {
- request = new ActiveXObject("Microsoft.XMLHTTP");
- } catch(ex1) {
- try {
- request = new ActiveXObject("Msxml2.XMLHTTP");
- } catch(ex2) {
- request = null;
- }
- }
-
- // If the previous didn't work, lets check if the browser natively support XMLHttpRequest
- if (!request && typeof XMLHttpRequest != "undefined") {
- //The browser does, so lets instantiate the object
- request = new XMLHttpRequest();
- }
- function removeCarriageReturns(string) {
- return string.replace(/\n/g, "");
- }
-
- return request;
-}
-function getUsageReportData() {
- alert(1);
- var xmlHttpReq = createXmlHttpRequest();
- alert(2);
- // Make sure the XMLHttpRequest object was instantiated
- if (xmlHttpReq) {
- // This is a synchronous POST, hence UI blocking.
- xmlHttpReq.open("GET", "all_tenant_usage_report.jsp", false);
- xmlHttpReq.send(null);
-
- if (xmlHttpReq.status == 200) {
- return removeCarriageReturns(xmlHttpReq.responseText);
- }
-
- return false;
- }
-
- return false;
-}
-function removeCarriageReturns(string) {
- alert(string);
- return string.replace(/\n/g, "");
-}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/df3475cc/components/stratos/usage/org.wso2.carbon.usage.ui/2.1.2/src/main/resources/web/tenant-usage/js/tenant-usage.js
----------------------------------------------------------------------
diff --git a/components/stratos/usage/org.wso2.carbon.usage.ui/2.1.2/src/main/resources/web/tenant-usage/js/tenant-usage.js b/components/stratos/usage/org.wso2.carbon.usage.ui/2.1.2/src/main/resources/web/tenant-usage/js/tenant-usage.js
deleted file mode 100644
index 76c4363..0000000
--- a/components/stratos/usage/org.wso2.carbon.usage.ui/2.1.2/src/main/resources/web/tenant-usage/js/tenant-usage.js
+++ /dev/null
@@ -1,7 +0,0 @@
-function submitAllTenantPaginatedUsage(pageNumber) {
- sessionAwareFunction(function() {
- document.getElementById("requestedPage").value = pageNumber;
- var usageForm = document.getElementById("usageForm");
- usageForm.submit();
- }, jsi18n["session.timed.out"]);
-}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/df3475cc/components/stratos/usage/org.wso2.carbon.usage.ui/2.1.2/src/main/resources/web/tenant-usage/js/usage-report.js
----------------------------------------------------------------------
diff --git a/components/stratos/usage/org.wso2.carbon.usage.ui/2.1.2/src/main/resources/web/tenant-usage/js/usage-report.js b/components/stratos/usage/org.wso2.carbon.usage.ui/2.1.2/src/main/resources/web/tenant-usage/js/usage-report.js
deleted file mode 100644
index ed9e306..0000000
--- a/components/stratos/usage/org.wso2.carbon.usage.ui/2.1.2/src/main/resources/web/tenant-usage/js/usage-report.js
+++ /dev/null
@@ -1,48 +0,0 @@
-function createXmlHttpRequest() {
- var request;
-
- // Lets try using ActiveX to instantiate the XMLHttpRequest
- // object
- try {
- request = new ActiveXObject("Microsoft.XMLHTTP");
- } catch(ex1) {
- try {
- request = new ActiveXObject("Msxml2.XMLHTTP");
- } catch(ex2) {
- request = null;
- }
- }
-
- // If the previous didn't work, lets check if the browser natively support XMLHttpRequest
- if (!request && typeof XMLHttpRequest != "undefined") {
- //The browser does, so lets instantiate the object
- request = new XMLHttpRequest();
- }
- function removeCarriageReturns(string) {
- return string.replace(/\n/g, "");
- }
-
- return request;
-}
-function getUsageReportData() {
-
- var xmlHttpReq = createXmlHttpRequest();
-
- // Make sure the XMLHttpRequest object was instantiated
- if (xmlHttpReq) {
- // This is a synchronous POST, hence UI blocking.
- xmlHttpReq.open("GET", "usage_report.jsp", false);
- xmlHttpReq.send(null);
-
- if (xmlHttpReq.status == 200) {
- return removeCarriageReturns(xmlHttpReq.responseText);
- }
-
- return false;
- }
-
- return false;
-}
-function removeCarriageReturns(string) {
- return string.replace(/\n/g, "");
-}
\ No newline at end of file