[Carbon-commits] [Carbon-Components] svn commit r91742 - in trunk/carbon/components/bam-data-publishers: org.wso2.carbon.bam.data.publisher.servicestats.ui/src/main/resources/web/bampubsvcstat org.wso2.carbon.bam.data.publisher.servicestats/src/main/java/org/wso2/carbon/bam/data/publisher/servicestats org.wso2.carbon.bam.data.publisher.servicestats/src/main/java/org/wso2/carbon/bam/data/publisher/servicestats/config org.wso2.carbon.bam.data.publisher.servicestats/src/main/java/org/wso2/carbon/bam/data/publisher/servicestats/modules
kasunw at wso2.com
kasunw at wso2.com
Wed Apr 6 22:34:41 PDT 2011
Author: kasunw
Date: Wed Apr 6 22:34:40 2011
New Revision: 91742
URL: http://wso2.org/svn/browse/wso2?view=rev&revision=91742
Log:
ui change after fixing BAM-384, and did some code cleanup.
Modified:
trunk/carbon/components/bam-data-publishers/org.wso2.carbon.bam.data.publisher.servicestats.ui/src/main/resources/web/bampubsvcstat/configure_eventing.jsp
trunk/carbon/components/bam-data-publishers/org.wso2.carbon.bam.data.publisher.servicestats/src/main/java/org/wso2/carbon/bam/data/publisher/servicestats/ServiceStatisticsPublisherConstants.java
trunk/carbon/components/bam-data-publishers/org.wso2.carbon.bam.data.publisher.servicestats/src/main/java/org/wso2/carbon/bam/data/publisher/servicestats/config/EventingConfigData.java
trunk/carbon/components/bam-data-publishers/org.wso2.carbon.bam.data.publisher.servicestats/src/main/java/org/wso2/carbon/bam/data/publisher/servicestats/config/RegistryPersistenceManager.java
trunk/carbon/components/bam-data-publishers/org.wso2.carbon.bam.data.publisher.servicestats/src/main/java/org/wso2/carbon/bam/data/publisher/servicestats/modules/StatisticsHandler.java
Modified: trunk/carbon/components/bam-data-publishers/org.wso2.carbon.bam.data.publisher.servicestats.ui/src/main/resources/web/bampubsvcstat/configure_eventing.jsp
URL: http://wso2.org/svn/browse/wso2/trunk/carbon/components/bam-data-publishers/org.wso2.carbon.bam.data.publisher.servicestats.ui/src/main/resources/web/bampubsvcstat/configure_eventing.jsp?rev=91742&r1=91741&r2=91742&view=diff
==============================================================================
--- trunk/carbon/components/bam-data-publishers/org.wso2.carbon.bam.data.publisher.servicestats.ui/src/main/resources/web/bampubsvcstat/configure_eventing.jsp (original)
+++ trunk/carbon/components/bam-data-publishers/org.wso2.carbon.bam.data.publisher.servicestats.ui/src/main/resources/web/bampubsvcstat/configure_eventing.jsp Wed Apr 6 22:34:40 2011
@@ -44,24 +44,6 @@
}
}
- int serviceRequestThreshold = 0;
- if (request.getParameter("serviceRequestThreshold") != null) {
- try {
- serviceRequestThreshold = Integer.parseInt(request.getParameter("serviceRequestThreshold"));
- } catch (NumberFormatException ignored) {
- // let serviceRequestThreshold be 0, meaning it is not set
- }
- }
-
- int operationRequestThreshold = 0;
- if (request.getParameter("operationRequestThreshold") != null) {
- try {
- operationRequestThreshold = Integer.parseInt(request.getParameter("operationRequestThreshold"));
- } catch (NumberFormatException ignored) {
- // let operationRequestThreshold be 0, meaning it is not set
- }
- }
-
String setConfig = request.getParameter("setConfig"); // hidden parameter to check if the form is being submitted
String enableEventing = request.getParameter("enableEventing"); // String value is "on" of checkbox clicked, else null
@@ -78,8 +60,6 @@
if (enableEventing != null) {
eventingConfigData.setEnableEventing(Utils.EVENTING_ON);
eventingConfigData.setSystemRequestCountThreshold(systemRequestThreshold);
- eventingConfigData.setServiceRequestCountThreshold(serviceRequestThreshold);
- eventingConfigData.setOperationRequestCountThreshold(operationRequestThreshold);
} else {
eventingConfigData.setEnableEventing("OFF");
}
@@ -124,8 +104,6 @@
if (eventingOn) {
systemRequestThreshold = eventingConfigData.getSystemRequestCountThreshold();
- serviceRequestThreshold = eventingConfigData.getServiceRequestCountThreshold();
- operationRequestThreshold = eventingConfigData.getOperationRequestCountThreshold();
}
%>
<script id="source" type="text/javascript">
@@ -198,26 +176,6 @@
maxlength="4"/>
</td>
</tr>
- <tr>
- <td width="20%">
- <fmt:message key="service.request.threshold"/>
- </td>
- <td width="30%">
- <input type="text" size="5" value="<%= serviceRequestThreshold%>"
- name="serviceRequestThreshold"
- maxlength="4"/>
- </td>
- </tr>
- <tr>
- <td width="20%">
- <fmt:message key="operation.request.threshold"/>
- </td>
- <td width="30%">
- <input type="text" size="5" value="<%= operationRequestThreshold%>"
- name="operationRequestThreshold"
- maxlength="4"/>
- </td>
- </tr>
</table>
</td>
</tr>
Modified: trunk/carbon/components/bam-data-publishers/org.wso2.carbon.bam.data.publisher.servicestats/src/main/java/org/wso2/carbon/bam/data/publisher/servicestats/ServiceStatisticsPublisherConstants.java
URL: http://wso2.org/svn/browse/wso2/trunk/carbon/components/bam-data-publishers/org.wso2.carbon.bam.data.publisher.servicestats/src/main/java/org/wso2/carbon/bam/data/publisher/servicestats/ServiceStatisticsPublisherConstants.java?rev=91742&r1=91741&r2=91742&view=diff
==============================================================================
--- trunk/carbon/components/bam-data-publishers/org.wso2.carbon.bam.data.publisher.servicestats/src/main/java/org/wso2/carbon/bam/data/publisher/servicestats/ServiceStatisticsPublisherConstants.java (original)
+++ trunk/carbon/components/bam-data-publishers/org.wso2.carbon.bam.data.publisher.servicestats/src/main/java/org/wso2/carbon/bam/data/publisher/servicestats/ServiceStatisticsPublisherConstants.java Wed Apr 6 22:34:40 2011
@@ -30,12 +30,8 @@
public static final String EVENTING_ON = "ON";
public static final String EVENTING_OFF = "OFF";
public static final String SYSTEM_REQUEST_COUNT_THRESHOLD = "SystemRequestCountThreshold";
- public static final String SERVICE_REQUEST_COUNT_THRESHOLD = "ServiceRequestCountThreshold";
- public static final String OPERATION_REQUEST_COUNT_THRESHOLD = "OperationRequestCountThreshold";
public static final String ENABLE_EVENTING_DEFAULT = EVENTING_ON;
public static final int SYSTEM_REQUEST_COUNT_THRESHOLD_DEFAULT = 20;
- public static final int SERVICE_REQUEST_COUNT_THRESHOLD_DEFAULT = 10;
- public static final int OPERATION_REQUEST_COUNT_THRESHOLD_DEFAULT = 5;
public static final String BAM_SERVICE_STAT_RECEIVER_SERVICE = "BAMServiceStatisticsSubscriberService";
public static final String BAM_SERVER_URL = "BamServerURL";
Modified: trunk/carbon/components/bam-data-publishers/org.wso2.carbon.bam.data.publisher.servicestats/src/main/java/org/wso2/carbon/bam/data/publisher/servicestats/config/EventingConfigData.java
URL: http://wso2.org/svn/browse/wso2/trunk/carbon/components/bam-data-publishers/org.wso2.carbon.bam.data.publisher.servicestats/src/main/java/org/wso2/carbon/bam/data/publisher/servicestats/config/EventingConfigData.java?rev=91742&r1=91741&r2=91742&view=diff
==============================================================================
--- trunk/carbon/components/bam-data-publishers/org.wso2.carbon.bam.data.publisher.servicestats/src/main/java/org/wso2/carbon/bam/data/publisher/servicestats/config/EventingConfigData.java (original)
+++ trunk/carbon/components/bam-data-publishers/org.wso2.carbon.bam.data.publisher.servicestats/src/main/java/org/wso2/carbon/bam/data/publisher/servicestats/config/EventingConfigData.java Wed Apr 6 22:34:40 2011
@@ -26,8 +26,6 @@
public class EventingConfigData {
private String enableEventing;
private int systemRequestCountThreshold;
- private int serviceRequestCountThreshold;
- private int operationRequestCountThreshold;
public EventingConfigData() {
}
@@ -51,20 +49,4 @@
public void setSystemRequestCountThreshold(int systemRequestCountThreshold) {
this.systemRequestCountThreshold = systemRequestCountThreshold;
}
-
- public int getServiceRequestCountThreshold() {
- return serviceRequestCountThreshold;
- }
-
- public void setServiceRequestCountThreshold(int serviceRequestCountThreshold) {
- this.serviceRequestCountThreshold = serviceRequestCountThreshold;
- }
-
- public int getOperationRequestCountThreshold() {
- return operationRequestCountThreshold;
- }
-
- public void setOperationRequestCountThreshold(int operationRequestCountThreshold) {
- this.operationRequestCountThreshold = operationRequestCountThreshold;
- }
}
\ No newline at end of file
Modified: trunk/carbon/components/bam-data-publishers/org.wso2.carbon.bam.data.publisher.servicestats/src/main/java/org/wso2/carbon/bam/data/publisher/servicestats/config/RegistryPersistenceManager.java
URL: http://wso2.org/svn/browse/wso2/trunk/carbon/components/bam-data-publishers/org.wso2.carbon.bam.data.publisher.servicestats/src/main/java/org/wso2/carbon/bam/data/publisher/servicestats/config/RegistryPersistenceManager.java?rev=91742&r1=91741&r2=91742&view=diff
==============================================================================
--- trunk/carbon/components/bam-data-publishers/org.wso2.carbon.bam.data.publisher.servicestats/src/main/java/org/wso2/carbon/bam/data/publisher/servicestats/config/RegistryPersistenceManager.java (original)
+++ trunk/carbon/components/bam-data-publishers/org.wso2.carbon.bam.data.publisher.servicestats/src/main/java/org/wso2/carbon/bam/data/publisher/servicestats/config/RegistryPersistenceManager.java Wed Apr 6 22:34:40 2011
@@ -85,12 +85,6 @@
eventingConfigData
.setSystemRequestCountThreshold(
ServiceStatisticsPublisherConstants.SYSTEM_REQUEST_COUNT_THRESHOLD_DEFAULT);
- eventingConfigData
- .setServiceRequestCountThreshold(
- ServiceStatisticsPublisherConstants.SERVICE_REQUEST_COUNT_THRESHOLD_DEFAULT);
- eventingConfigData
- .setOperationRequestCountThreshold(
- ServiceStatisticsPublisherConstants.OPERATION_REQUEST_COUNT_THRESHOLD_DEFAULT);
// then load it from registry
try {
@@ -101,12 +95,6 @@
eventingConfigData
.setSystemRequestCountThreshold(Integer.parseInt(getConfigurationProperty(
ServiceStatisticsPublisherConstants.SYSTEM_REQUEST_COUNT_THRESHOLD)));
- eventingConfigData
- .setServiceRequestCountThreshold(Integer.parseInt(getConfigurationProperty(
- ServiceStatisticsPublisherConstants.SERVICE_REQUEST_COUNT_THRESHOLD)));
- eventingConfigData
- .setOperationRequestCountThreshold(Integer.parseInt(getConfigurationProperty(
- ServiceStatisticsPublisherConstants.OPERATION_REQUEST_COUNT_THRESHOLD)));
} else { // Registry does not have eventing config. Set to defaults.
update(eventingConfigData);
}
@@ -129,10 +117,6 @@
.getEnableEventing());
updateConfigurationProperty(ServiceStatisticsPublisherConstants.SYSTEM_REQUEST_COUNT_THRESHOLD,
Integer.toString(eventingConfigData.getSystemRequestCountThreshold()));
- updateConfigurationProperty(ServiceStatisticsPublisherConstants.SERVICE_REQUEST_COUNT_THRESHOLD,
- Integer.toString(eventingConfigData.getServiceRequestCountThreshold()));
- updateConfigurationProperty(ServiceStatisticsPublisherConstants.OPERATION_REQUEST_COUNT_THRESHOLD,
- Integer.toString(eventingConfigData.getOperationRequestCountThreshold()));
RegistryPersistenceManager.eventingConfigData = eventingConfigData;
}
Modified: trunk/carbon/components/bam-data-publishers/org.wso2.carbon.bam.data.publisher.servicestats/src/main/java/org/wso2/carbon/bam/data/publisher/servicestats/modules/StatisticsHandler.java
URL: http://wso2.org/svn/browse/wso2/trunk/carbon/components/bam-data-publishers/org.wso2.carbon.bam.data.publisher.servicestats/src/main/java/org/wso2/carbon/bam/data/publisher/servicestats/modules/StatisticsHandler.java?rev=91742&r1=91741&r2=91742&view=diff
==============================================================================
--- trunk/carbon/components/bam-data-publishers/org.wso2.carbon.bam.data.publisher.servicestats/src/main/java/org/wso2/carbon/bam/data/publisher/servicestats/modules/StatisticsHandler.java (original)
+++ trunk/carbon/components/bam-data-publishers/org.wso2.carbon.bam.data.publisher.servicestats/src/main/java/org/wso2/carbon/bam/data/publisher/servicestats/modules/StatisticsHandler.java Wed Apr 6 22:34:40 2011
@@ -55,7 +55,7 @@
.getEventingConfigData();
if (eventingConfigData != null && eventingConfigData.eventingEnabled()
- && eventingConfigData.getOperationRequestCountThreshold() > 0) {
+ && eventingConfigData.getSystemRequestCountThreshold() > 0) {
SystemStatistics systemStatistics = systemStatisticsUtil.getSystemStatistics(msgContext
.getConfigurationContext().getAxisConfiguration());
More information about the Carbon-commits
mailing list