[Carbon-commits] [Carbon] svn commit r113793 - in trunk/carbon/components/bam-data-publishers/org.wso2.carbon.bam.service.data.publisher/src/main/java/org/wso2/carbon/bam/service/data/publisher: conf internal modules publish util
kasunw at wso2.com
kasunw at wso2.com
Wed Oct 12 14:07:12 EDT 2011
Author: kasunw
Date: Wed Oct 12 11:07:11 2011
New Revision: 113793
URL: http://wso2.org/svn/browse/wso2?view=rev&revision=113793
Log:
Change bam service data publisher to support ui
Modified:
trunk/carbon/components/bam-data-publishers/org.wso2.carbon.bam.service.data.publisher/src/main/java/org/wso2/carbon/bam/service/data/publisher/conf/EventingConfigData.java
trunk/carbon/components/bam-data-publishers/org.wso2.carbon.bam.service.data.publisher/src/main/java/org/wso2/carbon/bam/service/data/publisher/conf/RegistryPersistenceManager.java
trunk/carbon/components/bam-data-publishers/org.wso2.carbon.bam.service.data.publisher/src/main/java/org/wso2/carbon/bam/service/data/publisher/internal/StatisticsServiceComponent.java
trunk/carbon/components/bam-data-publishers/org.wso2.carbon.bam.service.data.publisher/src/main/java/org/wso2/carbon/bam/service/data/publisher/modules/ActivityInHandler.java
trunk/carbon/components/bam-data-publishers/org.wso2.carbon.bam.service.data.publisher/src/main/java/org/wso2/carbon/bam/service/data/publisher/modules/ActivityOutHandler.java
trunk/carbon/components/bam-data-publishers/org.wso2.carbon.bam.service.data.publisher/src/main/java/org/wso2/carbon/bam/service/data/publisher/modules/StatisticsHandler.java
trunk/carbon/components/bam-data-publishers/org.wso2.carbon.bam.service.data.publisher/src/main/java/org/wso2/carbon/bam/service/data/publisher/publish/DataPublisher.java
trunk/carbon/components/bam-data-publishers/org.wso2.carbon.bam.service.data.publisher/src/main/java/org/wso2/carbon/bam/service/data/publisher/publish/ThriftUtil.java
trunk/carbon/components/bam-data-publishers/org.wso2.carbon.bam.service.data.publisher/src/main/java/org/wso2/carbon/bam/service/data/publisher/util/ActivityPublisherConstants.java
trunk/carbon/components/bam-data-publishers/org.wso2.carbon.bam.service.data.publisher/src/main/java/org/wso2/carbon/bam/service/data/publisher/util/CommonConstants.java
trunk/carbon/components/bam-data-publishers/org.wso2.carbon.bam.service.data.publisher/src/main/java/org/wso2/carbon/bam/service/data/publisher/util/ServiceStatisticsPublisherConstants.java
Modified: trunk/carbon/components/bam-data-publishers/org.wso2.carbon.bam.service.data.publisher/src/main/java/org/wso2/carbon/bam/service/data/publisher/conf/EventingConfigData.java
URL: http://wso2.org/svn/browse/wso2/trunk/carbon/components/bam-data-publishers/org.wso2.carbon.bam.service.data.publisher/src/main/java/org/wso2/carbon/bam/service/data/publisher/conf/EventingConfigData.java?rev=113793&r1=113792&r2=113793&view=diff
==============================================================================
--- trunk/carbon/components/bam-data-publishers/org.wso2.carbon.bam.service.data.publisher/src/main/java/org/wso2/carbon/bam/service/data/publisher/conf/EventingConfigData.java (original)
+++ trunk/carbon/components/bam-data-publishers/org.wso2.carbon.bam.service.data.publisher/src/main/java/org/wso2/carbon/bam/service/data/publisher/conf/EventingConfigData.java Wed Oct 12 11:07:11 2011
@@ -20,6 +20,9 @@
private boolean isServiceStatsEnable;
private boolean isMsgDumpingEnable;
+ private String url;
+ private String userName;
+ private String password;
public boolean isServiceStatsEnable() {
return isServiceStatsEnable;
@@ -37,4 +40,28 @@
isMsgDumpingEnable = msgDumpingEnable;
}
+ public String getUrl() {
+ return url;
+ }
+
+ public void setUrl(String url) {
+ this.url = url;
+ }
+
+ public String getUserName() {
+ return userName;
+ }
+
+ public void setUserName(String userName) {
+ this.userName = userName;
+ }
+
+ public String getPassword() {
+ return password;
+ }
+
+ public void setPassword(String password) {
+ this.password = password;
+ }
+
}
Modified: trunk/carbon/components/bam-data-publishers/org.wso2.carbon.bam.service.data.publisher/src/main/java/org/wso2/carbon/bam/service/data/publisher/conf/RegistryPersistenceManager.java
URL: http://wso2.org/svn/browse/wso2/trunk/carbon/components/bam-data-publishers/org.wso2.carbon.bam.service.data.publisher/src/main/java/org/wso2/carbon/bam/service/data/publisher/conf/RegistryPersistenceManager.java?rev=113793&r1=113792&r2=113793&view=diff
==============================================================================
--- trunk/carbon/components/bam-data-publishers/org.wso2.carbon.bam.service.data.publisher/src/main/java/org/wso2/carbon/bam/service/data/publisher/conf/RegistryPersistenceManager.java (original)
+++ trunk/carbon/components/bam-data-publishers/org.wso2.carbon.bam.service.data.publisher/src/main/java/org/wso2/carbon/bam/service/data/publisher/conf/RegistryPersistenceManager.java Wed Oct 12 11:07:11 2011
@@ -17,6 +17,7 @@
import org.wso2.carbon.bam.service.data.publisher.util.ActivityPublisherConstants;
+import org.wso2.carbon.bam.service.data.publisher.util.CommonConstants;
import org.wso2.carbon.bam.service.data.publisher.util.ServiceStatisticsPublisherConstants;
import org.wso2.carbon.registry.core.Registry;
import org.wso2.carbon.registry.core.Resource;
@@ -26,17 +27,84 @@
private static Registry registry;
private static EventingConfigData eventingConfigData = new EventingConfigData();
+ public static final String EMPTY_STRING = "";
public static void setRegistry(Registry registryParam) {
registry = registryParam;
}
public RegistryPersistenceManager() {
+ load();
+ }
+
+ /**
+ * Updates configuration property to a new value.
+ *
+ * @param propertyName Name of the property to be updated.
+ * @param value New value of the property
+ * @throws RegistryException
+ */
+ public void updateConfigurationProperty(String propertyName, String value)
+ throws RegistryException {
+ String resourcePath = ServiceStatisticsPublisherConstants.SERVICE_STATISTICS_REG_PATH + propertyName;
+ Resource resource;
+ if (!registry.resourceExists(resourcePath)) {
+ resource = registry.newResource();
+ resource.addProperty(propertyName, value);
+ registry.put(resourcePath, resource);
+ } else {
+ resource = registry.get(resourcePath);
+ resource.setProperty(propertyName, value);
+ registry.put(resourcePath, resource);
+ }
+ }
+ /**
+ * Loads configuration from Registry.
+ */
+ private void load() {
+
+ // First set it to defaults, but do not persist
+ eventingConfigData.setServiceStatsEnable(false);
+ eventingConfigData.setMsgDumpingEnable(false);
+ eventingConfigData.setUrl(EMPTY_STRING);
+ eventingConfigData.setPassword(EMPTY_STRING);
+ eventingConfigData.setUserName(EMPTY_STRING);
+
+ // then load it from registry
+ try {
+ String serviceStatsStatus = getConfigurationProperty(
+ ServiceStatisticsPublisherConstants.SERVICE_STATISTICS_REG_PATH,
+ ServiceStatisticsPublisherConstants.ENABLE_SERVICE_STATS_EVENTING);
+
+ String activityStatus = getConfigurationProperty(
+ ActivityPublisherConstants.ACTIVITY_REG_PATH,
+ ActivityPublisherConstants.ENABLE_ACTIVITY);
+
+ String bamUrl = getConfigurationProperty(CommonConstants.SERVICE_COMMON_REG_PATH,
+ CommonConstants.BAM_URL);
+ String bamUserName = getConfigurationProperty(CommonConstants.SERVICE_COMMON_REG_PATH,
+ CommonConstants.BAM_USER_NAME);
+ String bamPassword = getConfigurationProperty(CommonConstants.SERVICE_COMMON_REG_PATH,
+ CommonConstants.BAM_PASSWORD);
+
+ if (serviceStatsStatus != null && activityStatus != null && bamUrl != null && bamUserName != null &&
+ bamPassword != null) {
+ eventingConfigData.setServiceStatsEnable(Boolean.parseBoolean(serviceStatsStatus));
+ eventingConfigData.setMsgDumpingEnable(Boolean.parseBoolean(activityStatus));
+ eventingConfigData.setUrl(bamUrl);
+ eventingConfigData.setUserName(bamUserName);
+ eventingConfigData.setPassword(bamPassword);
+ } else { // Registry does not have eventing config. Set to defaults.
+ update(eventingConfigData);
+ }
+ } catch (Exception ignored) {
+ // If something went wrong, then we have the default, or whatever loaded so far
+ }
}
- /**
+ /**
* Updates configuration property to a new value.
*
* @param propertyName Name of the property to be updated.
@@ -44,7 +112,7 @@
* @throws org.wso2.carbon.registry.core.exceptions.RegistryException
*
*/
- public void updateConfigurationProperty(String propertyName, boolean value, String registryPath)
+ public void updateConfigurationProperty(String propertyName, Object value, String registryPath)
throws RegistryException {
String resourcePath = registryPath + propertyName;
Resource resource;
@@ -60,7 +128,7 @@
}
- /**
+ /**
* Updates the Registry with given config data.
*
* @param eventingConfigData eventing configuration data
@@ -69,15 +137,43 @@
*/
public void update(EventingConfigData eventingConfigData) throws RegistryException {
- updateConfigurationProperty(ServiceStatisticsPublisherConstants.ENABLE_SERVICE_STATS_EVENTING
- , eventingConfigData.isServiceStatsEnable(), ServiceStatisticsPublisherConstants.SERVICE_STATISTICS_REG_PATH);
- updateConfigurationProperty(ActivityPublisherConstants.ENABLE_ACTIVITY
- , eventingConfigData.isMsgDumpingEnable(), ActivityPublisherConstants.ACTIVITY_REG_PATH);
+ updateConfigurationProperty(ServiceStatisticsPublisherConstants.ENABLE_SERVICE_STATS_EVENTING,
+ eventingConfigData.isServiceStatsEnable(),
+ ServiceStatisticsPublisherConstants.SERVICE_STATISTICS_REG_PATH);
+ updateConfigurationProperty(ActivityPublisherConstants.ENABLE_ACTIVITY,
+ eventingConfigData.isMsgDumpingEnable(),
+ ActivityPublisherConstants.ACTIVITY_REG_PATH);
+ updateConfigurationProperty(CommonConstants.BAM_URL, eventingConfigData.getUrl(),
+ CommonConstants.SERVICE_COMMON_REG_PATH);
+ updateConfigurationProperty(CommonConstants.BAM_USER_NAME, eventingConfigData.getUserName(),
+ CommonConstants.SERVICE_COMMON_REG_PATH);
+ updateConfigurationProperty(CommonConstants.BAM_PASSWORD, eventingConfigData.getPassword(),
+ CommonConstants.SERVICE_COMMON_REG_PATH);
RegistryPersistenceManager.eventingConfigData = eventingConfigData;
}
+ /**
+ * Fetches the value of the property with propertyName from registry. Returns null if no property
+ * exists with the given name.
+ *
+ * @param propertyName Name of the property to be fetched.
+ * @return
+ * @throws RegistryException
+ */
+ public String getConfigurationProperty(String registryPath, String propertyName)
+ throws RegistryException {
+ String resourcePath = registryPath + propertyName;
+ String value = null;
+ if (registry.resourceExists(resourcePath)) {
+ Resource resource = registry.get(resourcePath);
+ value = resource.getProperty(propertyName);
+ }
+ return value;
+ }
+
+
public EventingConfigData getEventingConfigData() {
return eventingConfigData;
}
Modified: trunk/carbon/components/bam-data-publishers/org.wso2.carbon.bam.service.data.publisher/src/main/java/org/wso2/carbon/bam/service/data/publisher/internal/StatisticsServiceComponent.java
URL: http://wso2.org/svn/browse/wso2/trunk/carbon/components/bam-data-publishers/org.wso2.carbon.bam.service.data.publisher/src/main/java/org/wso2/carbon/bam/service/data/publisher/internal/StatisticsServiceComponent.java?rev=113793&r1=113792&r2=113793&view=diff
==============================================================================
--- trunk/carbon/components/bam-data-publishers/org.wso2.carbon.bam.service.data.publisher/src/main/java/org/wso2/carbon/bam/service/data/publisher/internal/StatisticsServiceComponent.java (original)
+++ trunk/carbon/components/bam-data-publishers/org.wso2.carbon.bam.service.data.publisher/src/main/java/org/wso2/carbon/bam/service/data/publisher/internal/StatisticsServiceComponent.java Wed Oct 12 11:07:11 2011
@@ -27,6 +27,7 @@
import org.wso2.carbon.bam.service.data.publisher.publish.StatsProcessor;
import org.wso2.carbon.bam.service.data.publisher.queue.ActivityQueue;
import org.wso2.carbon.bam.service.data.publisher.queue.ServiceStatisticsQueue;
+import org.wso2.carbon.bam.service.data.publisher.services.ServiceDataPublisherAdmin;
import org.wso2.carbon.bam.service.data.publisher.util.ServiceStatisticsPublisherConstants;
import org.wso2.carbon.registry.core.service.RegistryService;
import org.wso2.carbon.statistics.services.SystemStatisticsUtil;
@@ -54,6 +55,7 @@
private static ConfigurationContext configurationContext;
private static ServiceStatisticsQueue serviceStatisticsQueue;
private static ActivityQueue activityQueue;
+ private static ServiceDataPublisherAdmin serviceDataPublisherAdmin;
private static Log log = LogFactory.getLog(StatisticsServiceComponent.class);
protected void activate(ComponentContext context) {
@@ -74,6 +76,8 @@
activityQueue = new ActivityQueue(statsProcessor);
DataPublisherUtil.setActivityInQueue(activityQueue);
+ serviceDataPublisherAdmin = new ServiceDataPublisherAdmin();
+
log.info("BAM service statistics data publisher bundle is activated");
} catch (AxisFault axisFault) {
if (log.isErrorEnabled()) {
@@ -120,6 +124,10 @@
}
}
+ public static ServiceDataPublisherAdmin getServiceStatisticsPublisherAdmin() {
+ return serviceDataPublisherAdmin;
+ }
+
protected void unsetRegistryService(RegistryService registryService) {
RegistryPersistenceManager.setRegistry(null);
Modified: trunk/carbon/components/bam-data-publishers/org.wso2.carbon.bam.service.data.publisher/src/main/java/org/wso2/carbon/bam/service/data/publisher/modules/ActivityInHandler.java
URL: http://wso2.org/svn/browse/wso2/trunk/carbon/components/bam-data-publishers/org.wso2.carbon.bam.service.data.publisher/src/main/java/org/wso2/carbon/bam/service/data/publisher/modules/ActivityInHandler.java?rev=113793&r1=113792&r2=113793&view=diff
==============================================================================
--- trunk/carbon/components/bam-data-publishers/org.wso2.carbon.bam.service.data.publisher/src/main/java/org/wso2/carbon/bam/service/data/publisher/modules/ActivityInHandler.java (original)
+++ trunk/carbon/components/bam-data-publishers/org.wso2.carbon.bam.service.data.publisher/src/main/java/org/wso2/carbon/bam/service/data/publisher/modules/ActivityInHandler.java Wed Oct 12 11:07:11 2011
@@ -32,7 +32,9 @@
import org.apache.axis2.handlers.AbstractHandler;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.wso2.carbon.bam.service.data.publisher.conf.EventingConfigData;
import org.wso2.carbon.bam.service.data.publisher.data.ActivityData;
+import org.wso2.carbon.bam.service.data.publisher.internal.StatisticsServiceComponent;
import org.wso2.carbon.bam.service.data.publisher.publish.DataPublisherUtil;
import org.wso2.carbon.bam.service.data.publisher.util.ActivityPublisherConstants;
import org.wso2.carbon.bam.service.data.publisher.util.CommonConstants;
@@ -51,74 +53,77 @@
public InvocationResponse invoke(MessageContext messageContext) throws AxisFault {
- Timestamp timestamp;
- AxisService service = messageContext.getAxisService();
- Parameter adminServiceParam = service.getParameter(CommonConstants.ADMIN_SERVICE_PARAMETER);
- Parameter hiddenServiceParam = service.getParameter(CommonConstants.HIDDEN_SERVICE_PARAMETER);
-
- if (adminServiceParam == null && hiddenServiceParam == null) {
-
- SOAPFactory soapFactory = null;
- SOAPHeaderBlock soapHeaderBlock = null;
- Date currentDate = new Date();
- timestamp = new Timestamp(currentDate.getTime());
- SOAPEnvelope soapEnvelope = messageContext.getEnvelope();
- String soapNamespaceURI = soapEnvelope.getNamespace().getNamespaceURI();
- UUID activityUUID = UUID.randomUUID();
-
- if (messageContext.getMessageID() == null) {
- UUID msgUUID = UUID.randomUUID();
- messageContext.setMessageID(msgUUID.toString());
- }
+ EventingConfigData eventingConfigData = StatisticsServiceComponent.getServiceStatisticsPublisherAdmin().getEventingConfigData();
- if (soapNamespaceURI.equals(SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI)) {
- soapFactory = OMAbstractFactory.getSOAP11Factory();
- } else if (soapNamespaceURI.equals(SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI)) {
- soapFactory = OMAbstractFactory.getSOAP12Factory();
- } else {
- log.error("Not a standard soap message");
- }
+ if (eventingConfigData.isMsgDumpingEnable()) {
+ Timestamp timestamp;
+ AxisService service = messageContext.getAxisService();
+ Parameter adminServiceParam = service.getParameter(CommonConstants.ADMIN_SERVICE_PARAMETER);
+ Parameter hiddenServiceParam = service.getParameter(CommonConstants.HIDDEN_SERVICE_PARAMETER);
+
+ if (adminServiceParam == null && hiddenServiceParam == null) {
+
+ SOAPFactory soapFactory = null;
+ SOAPHeaderBlock soapHeaderBlock = null;
+ Date currentDate = new Date();
+ timestamp = new Timestamp(currentDate.getTime());
+ SOAPEnvelope soapEnvelope = messageContext.getEnvelope();
+ String soapNamespaceURI = soapEnvelope.getNamespace().getNamespaceURI();
+ UUID activityUUID = UUID.randomUUID();
+
+ if (messageContext.getMessageID() == null) {
+ UUID msgUUID = UUID.randomUUID();
+ messageContext.setMessageID(msgUUID.toString());
+ }
- if (soapEnvelope.getHeader() != null) {
- Iterator itr = soapEnvelope.getHeader().getChildrenWithName(new QName(
- ActivityPublisherConstants.BAM_ACTIVITY_ID_HEADER_NAMESPACE_URI,
- ActivityPublisherConstants.ACTIVITY_ID_HEADER_BLOCK_NAME));
- //Go through the header and see whether the AID is present or not. If not add.
- if (!itr.hasNext()) {
- OMFactory fac = OMAbstractFactory.getOMFactory();
- OMNamespace omNs = fac.createOMNamespace(
- ActivityPublisherConstants.BAM_ACTIVITY_ID_HEADER_NAMESPACE_URI, "ns");
- soapHeaderBlock = soapEnvelope.getHeader().addHeaderBlock(
- ActivityPublisherConstants.ACTIVITY_ID_HEADER_BLOCK_NAME, omNs);
- soapHeaderBlock.addAttribute(ActivityPublisherConstants.ACTIVITY_ID, activityUUID.toString(), null);
+ if (soapNamespaceURI.equals(SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI)) {
+ soapFactory = OMAbstractFactory.getSOAP11Factory();
+ } else if (soapNamespaceURI.equals(SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI)) {
+ soapFactory = OMAbstractFactory.getSOAP12Factory();
} else {
- OMElement element = (OMElement) itr.next();
- String aid = element.getAttributeValue(new QName(ActivityPublisherConstants.ACTIVITY_ID));
- if (aid != null) {
- if (aid.equals("")) {
+ log.error("Not a standard soap message");
+ }
+
+ if (soapEnvelope.getHeader() != null) {
+ Iterator itr = soapEnvelope.getHeader().getChildrenWithName(new QName(
+ ActivityPublisherConstants.BAM_ACTIVITY_ID_HEADER_NAMESPACE_URI,
+ ActivityPublisherConstants.ACTIVITY_ID_HEADER_BLOCK_NAME));
+ //Go through the header and see whether the AID is present or not. If not add.
+ if (!itr.hasNext()) {
+ OMFactory fac = OMAbstractFactory.getOMFactory();
+ OMNamespace omNs = fac.createOMNamespace(
+ ActivityPublisherConstants.BAM_ACTIVITY_ID_HEADER_NAMESPACE_URI, "ns");
+ soapHeaderBlock = soapEnvelope.getHeader().addHeaderBlock(
+ ActivityPublisherConstants.ACTIVITY_ID_HEADER_BLOCK_NAME, omNs);
+ soapHeaderBlock.addAttribute(ActivityPublisherConstants.ACTIVITY_ID, activityUUID.toString(), null);
+ } else {
+ OMElement element = (OMElement) itr.next();
+ String aid = element.getAttributeValue(new QName(ActivityPublisherConstants.ACTIVITY_ID));
+ if (aid != null) {
+ if (aid.equals("")) {
+ element.addAttribute(ActivityPublisherConstants.ACTIVITY_ID, activityUUID.toString(), null);
+ }
+ } else {
element.addAttribute(ActivityPublisherConstants.ACTIVITY_ID, activityUUID.toString(), null);
}
- } else {
- element.addAttribute(ActivityPublisherConstants.ACTIVITY_ID, activityUUID.toString(), null);
+ }
+ } else {
+ if (soapFactory != null) {
+ soapFactory.createSOAPHeader(soapEnvelope);
+ OMFactory fac = OMAbstractFactory.getOMFactory();
+ OMNamespace omNs = fac.createOMNamespace(
+ ActivityPublisherConstants.BAM_ACTIVITY_ID_HEADER_NAMESPACE_URI, "ns");
+ soapHeaderBlock = soapEnvelope.getHeader().addHeaderBlock(
+ ActivityPublisherConstants.ACTIVITY_ID_HEADER_BLOCK_NAME, omNs);
+ soapHeaderBlock.addAttribute(ActivityPublisherConstants.ACTIVITY_ID,
+ activityUUID.toString(), null);
}
}
- } else {
- if (soapFactory != null) {
- soapFactory.createSOAPHeader(soapEnvelope);
- OMFactory fac = OMAbstractFactory.getOMFactory();
- OMNamespace omNs = fac.createOMNamespace(
- ActivityPublisherConstants.BAM_ACTIVITY_ID_HEADER_NAMESPACE_URI, "ns");
- soapHeaderBlock = soapEnvelope.getHeader().addHeaderBlock(
- ActivityPublisherConstants.ACTIVITY_ID_HEADER_BLOCK_NAME, omNs);
- soapHeaderBlock.addAttribute(ActivityPublisherConstants.ACTIVITY_ID,
- activityUUID.toString(), null);
- }
- }
- ActivityData activityData = addDetailsOfTheMessage(timestamp, activityUUID, messageContext);
- DataPublisherUtil.publishActivityStats(activityData);
+ ActivityData activityData = addDetailsOfTheMessage(timestamp, activityUUID, messageContext);
+ DataPublisherUtil.publishActivityStats(activityData);
+ }
}
-
return InvocationResponse.CONTINUE;
}
@@ -128,11 +133,11 @@
ActivityData activityData = new ActivityData();
activityData.setActivityId(randomUUID.toString());
activityData.setTimestamp(timestamp);
- String msgBody=null;
- try{
+ String msgBody = null;
+ try {
msgBody = messageContext.getEnvelope().getBody().toString();
- }catch (OMException e){
- log.warn("Exception occurred while getting soap envelop",e);
+ } catch (OMException e) {
+ log.warn("Exception occurred while getting soap envelop", e);
}
activityData.setMsgBody(msgBody);
activityData.setMessageDirection(ActivityPublisherConstants.ACTIVITY_DATA_MESSAGE_DIRECTION_IN);
Modified: trunk/carbon/components/bam-data-publishers/org.wso2.carbon.bam.service.data.publisher/src/main/java/org/wso2/carbon/bam/service/data/publisher/modules/ActivityOutHandler.java
URL: http://wso2.org/svn/browse/wso2/trunk/carbon/components/bam-data-publishers/org.wso2.carbon.bam.service.data.publisher/src/main/java/org/wso2/carbon/bam/service/data/publisher/modules/ActivityOutHandler.java?rev=113793&r1=113792&r2=113793&view=diff
==============================================================================
--- trunk/carbon/components/bam-data-publishers/org.wso2.carbon.bam.service.data.publisher/src/main/java/org/wso2/carbon/bam/service/data/publisher/modules/ActivityOutHandler.java (original)
+++ trunk/carbon/components/bam-data-publishers/org.wso2.carbon.bam.service.data.publisher/src/main/java/org/wso2/carbon/bam/service/data/publisher/modules/ActivityOutHandler.java Wed Oct 12 11:07:11 2011
@@ -33,7 +33,9 @@
import org.apache.axis2.handlers.AbstractHandler;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.wso2.carbon.bam.service.data.publisher.conf.EventingConfigData;
import org.wso2.carbon.bam.service.data.publisher.data.ActivityData;
+import org.wso2.carbon.bam.service.data.publisher.internal.StatisticsServiceComponent;
import org.wso2.carbon.bam.service.data.publisher.publish.DataPublisherUtil;
import org.wso2.carbon.bam.service.data.publisher.util.ActivityPublisherConstants;
import org.wso2.carbon.bam.service.data.publisher.util.CommonConstants;
@@ -49,39 +51,46 @@
private static Log log = LogFactory.getLog(ActivityOutHandler.class);
public InvocationResponse invoke(MessageContext messageContext) throws AxisFault {
- Timestamp timestamp;
- AxisService service = messageContext.getAxisService();
- Parameter adminServiceParam = service.getParameter(CommonConstants.ADMIN_SERVICE_PARAMETER);
- Parameter hiddenServiceParam = service.getParameter(CommonConstants.HIDDEN_SERVICE_PARAMETER);
-
- if (adminServiceParam == null && hiddenServiceParam == null) {
-
- Date date = new Date();
- timestamp = new Timestamp(date.getTime());
- if (messageContext.getMessageID() == null) {
- UUID msgUUID = UUID.randomUUID();
- messageContext.setMessageID(msgUUID.toString());
- }
- //get IN Message Context from OutMessageContext to track request and response
- MessageContext inMessageContext = messageContext.getOperationContext().getMessageContext(
- WSDL2Constants.MESSAGE_LABEL_IN);
-
- Iterator itr = inMessageContext.getEnvelope().getHeader().getChildrenWithName(new QName(
- ActivityPublisherConstants.BAM_ACTIVITY_ID_HEADER_NAMESPACE_URI, ActivityPublisherConstants.ACTIVITY_ID_HEADER_BLOCK_NAME));
- String activityID = null;
- if (itr.hasNext()) {
- OMElement element = (OMElement) itr.next();
- activityID = element.getAttributeValue(new QName(ActivityPublisherConstants.ACTIVITY_ID));
- }
- ActivityData activityData = addDetailsOfTheMessage(timestamp, activityID, messageContext);
- DataPublisherUtil.publishActivityStats(activityData);
+ EventingConfigData eventingConfigData = StatisticsServiceComponent.getServiceStatisticsPublisherAdmin().getEventingConfigData();
+
+ if (eventingConfigData.isMsgDumpingEnable()) {
+
+ Timestamp timestamp;
+ AxisService service = messageContext.getAxisService();
+ Parameter adminServiceParam = service.getParameter(CommonConstants.ADMIN_SERVICE_PARAMETER);
+ Parameter hiddenServiceParam = service.getParameter(CommonConstants.HIDDEN_SERVICE_PARAMETER);
+
+ if (adminServiceParam == null && hiddenServiceParam == null) {
+
+ Date date = new Date();
+ timestamp = new Timestamp(date.getTime());
+ if (messageContext.getMessageID() == null) {
+ UUID msgUUID = UUID.randomUUID();
+ messageContext.setMessageID(msgUUID.toString());
+ }
+ //get IN Message Context from OutMessageContext to track request and response
+ MessageContext inMessageContext = messageContext.getOperationContext().getMessageContext(
+ WSDL2Constants.MESSAGE_LABEL_IN);
+
+ Iterator itr = inMessageContext.getEnvelope().getHeader().getChildrenWithName(new QName(
+ ActivityPublisherConstants.BAM_ACTIVITY_ID_HEADER_NAMESPACE_URI, ActivityPublisherConstants.ACTIVITY_ID_HEADER_BLOCK_NAME));
+ String activityID = null;
+ if (itr.hasNext()) {
+ OMElement element = (OMElement) itr.next();
+ activityID = element.getAttributeValue(new QName(ActivityPublisherConstants.ACTIVITY_ID));
+ }
+
+ ActivityData activityData = addDetailsOfTheMessage(timestamp, activityID, messageContext);
+ DataPublisherUtil.publishActivityStats(activityData);
- // Now set all values to response
- engageSOAPHeaders(messageContext, activityID);
+ // Now set all values to response
+ engageSOAPHeaders(messageContext, activityID);
+ }
}
+
return InvocationResponse.CONTINUE;
}
Modified: trunk/carbon/components/bam-data-publishers/org.wso2.carbon.bam.service.data.publisher/src/main/java/org/wso2/carbon/bam/service/data/publisher/modules/StatisticsHandler.java
URL: http://wso2.org/svn/browse/wso2/trunk/carbon/components/bam-data-publishers/org.wso2.carbon.bam.service.data.publisher/src/main/java/org/wso2/carbon/bam/service/data/publisher/modules/StatisticsHandler.java?rev=113793&r1=113792&r2=113793&view=diff
==============================================================================
--- trunk/carbon/components/bam-data-publishers/org.wso2.carbon.bam.service.data.publisher/src/main/java/org/wso2/carbon/bam/service/data/publisher/modules/StatisticsHandler.java (original)
+++ trunk/carbon/components/bam-data-publishers/org.wso2.carbon.bam.service.data.publisher/src/main/java/org/wso2/carbon/bam/service/data/publisher/modules/StatisticsHandler.java Wed Oct 12 11:07:11 2011
@@ -23,6 +23,7 @@
import org.apache.axis2.handlers.AbstractHandler;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.wso2.carbon.bam.service.data.publisher.conf.EventingConfigData;
import org.wso2.carbon.bam.service.data.publisher.data.StatisticData;
import org.wso2.carbon.bam.service.data.publisher.internal.StatisticsServiceComponent;
import org.wso2.carbon.bam.service.data.publisher.publish.DataPublisherUtil;
@@ -43,47 +44,50 @@
public Handler.InvocationResponse invoke(MessageContext msgContext) throws AxisFault {
SystemStatisticsUtil systemStatisticsUtil;
-
SystemStatistics systemStatistics;
ServiceStatistics serviceStatistics;
OperationStatistics operationStatistics;
Timestamp timestamp;
try {
- //Check event enable -- if true -- go
- StatisticData statisticData = new StatisticData();
- Date currentDate = new java.util.Date();
- timestamp = new Timestamp(currentDate.getTime());
- systemStatisticsUtil = StatisticsServiceComponent.getSystemStatisticsUtil();
- AxisConfiguration axisConfiguration = msgContext.getConfigurationContext().getAxisConfiguration();
- systemStatistics = systemStatisticsUtil.getSystemStatistics(axisConfiguration);
- AxisOperation axisOperation = msgContext.getAxisOperation();
- if (axisOperation != null) {
- operationStatistics = systemStatisticsUtil.getOperationStatistics(
- axisOperation);
- if (operationStatistics.getTotalRequestCount() == 0) {
+ EventingConfigData eventingConfigData = StatisticsServiceComponent.getServiceStatisticsPublisherAdmin().getEventingConfigData();
+ //Check service stats enable -- if true -- go
+ if (eventingConfigData.isServiceStatsEnable()) {
+
+ StatisticData statisticData = new StatisticData();
+ Date currentDate = new java.util.Date();
+ timestamp = new Timestamp(currentDate.getTime());
+ systemStatisticsUtil = StatisticsServiceComponent.getSystemStatisticsUtil();
+ AxisConfiguration axisConfiguration = msgContext.getConfigurationContext().getAxisConfiguration();
+ systemStatistics = systemStatisticsUtil.getSystemStatistics(axisConfiguration);
+ AxisOperation axisOperation = msgContext.getAxisOperation();
+ if (axisOperation != null) {
+ operationStatistics = systemStatisticsUtil.getOperationStatistics(
+ axisOperation);
+ if (operationStatistics.getTotalRequestCount() == 0) {
+ return Handler.InvocationResponse.CONTINUE;
+ }
+ }//In very rare cases msgContext.getAxisOperation() becomes null, then we can't get statistics.
+ else {
return Handler.InvocationResponse.CONTINUE;
}
- }//In very rare cases msgContext.getAxisOperation() becomes null, then we can't get statistics.
- else {
- return Handler.InvocationResponse.CONTINUE;
- }
-
- serviceStatistics = systemStatisticsUtil.getServiceStatistics(msgContext.getAxisService());
- statisticData.setSystemStatistics(systemStatistics);
- statisticData.setServiceStatistics(serviceStatistics);
- statisticData.setOperationStatistics(operationStatistics);
- statisticData.setOperationName(axisOperation.getName().getLocalPart());
- statisticData.setServiceName(msgContext.getAxisService().getName());
- statisticData.setTimestamp(timestamp);
- DataPublisherUtil.publishServiceStats(statisticData);
+ serviceStatistics = systemStatisticsUtil.getServiceStatistics(msgContext.getAxisService());
+ statisticData.setSystemStatistics(systemStatistics);
+ statisticData.setServiceStatistics(serviceStatistics);
+ statisticData.setOperationStatistics(operationStatistics);
+ statisticData.setOperationName(axisOperation.getName().getLocalPart());
+ statisticData.setServiceName(msgContext.getAxisService().getName());
+ statisticData.setTimestamp(timestamp);
+ DataPublisherUtil.publishServiceStats(statisticData);
+ }
} catch (Throwable ignore) {
log.error("Error at SystemStatisticsHandler. " +
"But continuing message processing for message id: " +
msgContext.getMessageID(), ignore);
}
+
return Handler.InvocationResponse.CONTINUE;
}
}
Modified: trunk/carbon/components/bam-data-publishers/org.wso2.carbon.bam.service.data.publisher/src/main/java/org/wso2/carbon/bam/service/data/publisher/publish/DataPublisher.java
URL: http://wso2.org/svn/browse/wso2/trunk/carbon/components/bam-data-publishers/org.wso2.carbon.bam.service.data.publisher/src/main/java/org/wso2/carbon/bam/service/data/publisher/publish/DataPublisher.java?rev=113793&r1=113792&r2=113793&view=diff
==============================================================================
--- trunk/carbon/components/bam-data-publishers/org.wso2.carbon.bam.service.data.publisher/src/main/java/org/wso2/carbon/bam/service/data/publisher/publish/DataPublisher.java (original)
+++ trunk/carbon/components/bam-data-publishers/org.wso2.carbon.bam.service.data.publisher/src/main/java/org/wso2/carbon/bam/service/data/publisher/publish/DataPublisher.java Wed Oct 12 11:07:11 2011
@@ -25,6 +25,8 @@
import org.wso2.carbon.bam.service.Event;
import org.wso2.carbon.bam.service.ReceiverService;
import org.wso2.carbon.bam.service.SessionTimeOutException;
+import org.wso2.carbon.bam.service.data.publisher.conf.EventingConfigData;
+import org.wso2.carbon.bam.service.data.publisher.internal.StatisticsServiceComponent;
import java.lang.Thread;
import java.util.ArrayList;
@@ -37,10 +39,12 @@
public void process(ArrayList<Event> events) {
THttpClient client = null;
TProtocol protocol = null;
+ EventingConfigData eventingConfigData =null;
String sessionId = ThriftUtil.getSessionId();
int i = 0;
try {
- client = new THttpClient("https://localhost:9447/thriftReceiver");
+ eventingConfigData = StatisticsServiceComponent.getServiceStatisticsPublisherAdmin().getEventingConfigData();
+ client = new THttpClient(eventingConfigData.getUrl() + "thriftReceiver");
protocol = new TBinaryProtocol(client);
} catch (TTransportException e) {
e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates.
@@ -59,7 +63,7 @@
} catch (TException e) {
e.printStackTrace();
} catch (SessionTimeOutException e) {
- publishRetry(events, i);
+ publishRetry(events,eventingConfigData, i);
log.warn("Session Timeout, retrying .........");
} finally {
client.close();
@@ -67,7 +71,7 @@
}
- private void publishRetry(ArrayList<Event> events, int i) {
+ private void publishRetry(ArrayList<Event> events, EventingConfigData eventingConfigData, int i) {
ArrayList<Event> newEventList = new ArrayList<Event>();
for (int j = i; j < events.size(); j++) {
@@ -88,7 +92,7 @@
TProtocol protocol = null;
String sessionId = ThriftUtil.getSessionId();
try {
- client = new THttpClient("https://localhost:9447/thriftReceiver");
+ client = new THttpClient(eventingConfigData.getUrl() + "thriftReceiver");
protocol = new TBinaryProtocol(client);
} catch (TTransportException e) {
e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates.
Modified: trunk/carbon/components/bam-data-publishers/org.wso2.carbon.bam.service.data.publisher/src/main/java/org/wso2/carbon/bam/service/data/publisher/publish/ThriftUtil.java
URL: http://wso2.org/svn/browse/wso2/trunk/carbon/components/bam-data-publishers/org.wso2.carbon.bam.service.data.publisher/src/main/java/org/wso2/carbon/bam/service/data/publisher/publish/ThriftUtil.java?rev=113793&r1=113792&r2=113793&view=diff
==============================================================================
--- trunk/carbon/components/bam-data-publishers/org.wso2.carbon.bam.service.data.publisher/src/main/java/org/wso2/carbon/bam/service/data/publisher/publish/ThriftUtil.java (original)
+++ trunk/carbon/components/bam-data-publishers/org.wso2.carbon.bam.service.data.publisher/src/main/java/org/wso2/carbon/bam/service/data/publisher/publish/ThriftUtil.java Wed Oct 12 11:07:11 2011
@@ -8,16 +8,17 @@
import org.apache.thrift.transport.TTransportException;
import org.wso2.carbon.bam.service.AuthenticationException;
import org.wso2.carbon.bam.service.AuthenticatorService;
-import org.wso2.carbon.bam.service.data.publisher.util.CommonConstants;
+import org.wso2.carbon.bam.service.data.publisher.conf.EventingConfigData;
+import org.wso2.carbon.bam.service.data.publisher.internal.StatisticsServiceComponent;
import org.wso2.carbon.utils.CarbonUtils;
-import java.lang.String;
-
public class ThriftUtil {
private static volatile TTransport client = null;
private static volatile String sessionId = null;
+ private static EventingConfigData eventingConfigData;
+
public static String getSessionId() {
TTransport client = getClient();
@@ -28,8 +29,8 @@
if (sessionId == null) {
AuthenticatorService.Client authClient = new AuthenticatorService.Client(protocol);
client.open();
- sessionId = authClient.authenticate(CommonConstants.BAM_USER_NAME,
- CommonConstants.BAM_PASSWORD);
+ sessionId = authClient.authenticate(eventingConfigData.getUserName(),
+ eventingConfigData.getPassword());
client.close();
}
}
@@ -52,7 +53,8 @@
String trustStore = CarbonUtils.getCarbonHome() + "/repository/resources/security";
System.setProperty("javax.net.ssl.trustStore", trustStore + "/client-truststore.jks");
System.setProperty("javax.net.ssl.trustStorePassword", "wso2carbon");
- client = new THttpClient("https://localhost:9447/thriftAuthenticator");
+ eventingConfigData = StatisticsServiceComponent.getServiceStatisticsPublisherAdmin().getEventingConfigData();
+ client = new THttpClient(eventingConfigData.getUrl() +"thriftAuthenticator");
}
}
}
Modified: trunk/carbon/components/bam-data-publishers/org.wso2.carbon.bam.service.data.publisher/src/main/java/org/wso2/carbon/bam/service/data/publisher/util/ActivityPublisherConstants.java
URL: http://wso2.org/svn/browse/wso2/trunk/carbon/components/bam-data-publishers/org.wso2.carbon.bam.service.data.publisher/src/main/java/org/wso2/carbon/bam/service/data/publisher/util/ActivityPublisherConstants.java?rev=113793&r1=113792&r2=113793&view=diff
==============================================================================
--- trunk/carbon/components/bam-data-publishers/org.wso2.carbon.bam.service.data.publisher/src/main/java/org/wso2/carbon/bam/service/data/publisher/util/ActivityPublisherConstants.java (original)
+++ trunk/carbon/components/bam-data-publishers/org.wso2.carbon.bam.service.data.publisher/src/main/java/org/wso2/carbon/bam/service/data/publisher/util/ActivityPublisherConstants.java Wed Oct 12 11:07:11 2011
@@ -34,8 +34,9 @@
public static final String ENABLE_ACTIVITY = "EnableActivity";
+
public static final String ACTIVITY_REG_PATH = RegistryResources.COMPONENTS
- + "org.wso2.carbon.bam.data.publisher.service.stats/activity";
+ + "org.wso2.carbon.bam.service.data.publisher/activity";
}
Modified: trunk/carbon/components/bam-data-publishers/org.wso2.carbon.bam.service.data.publisher/src/main/java/org/wso2/carbon/bam/service/data/publisher/util/CommonConstants.java
URL: http://wso2.org/svn/browse/wso2/trunk/carbon/components/bam-data-publishers/org.wso2.carbon.bam.service.data.publisher/src/main/java/org/wso2/carbon/bam/service/data/publisher/util/CommonConstants.java?rev=113793&r1=113792&r2=113793&view=diff
==============================================================================
--- trunk/carbon/components/bam-data-publishers/org.wso2.carbon.bam.service.data.publisher/src/main/java/org/wso2/carbon/bam/service/data/publisher/util/CommonConstants.java (original)
+++ trunk/carbon/components/bam-data-publishers/org.wso2.carbon.bam.service.data.publisher/src/main/java/org/wso2/carbon/bam/service/data/publisher/util/CommonConstants.java Wed Oct 12 11:07:11 2011
@@ -16,6 +16,8 @@
package org.wso2.carbon.bam.service.data.publisher.util;
+import org.wso2.carbon.core.RegistryResources;
+
public class CommonConstants {
public static final String TIMESTAMP = "timestamp";
@@ -28,7 +30,11 @@
public static final String ADMIN_SERVICE_PARAMETER = "adminService";
public static final String HIDDEN_SERVICE_PARAMETER = "hiddenService";
- public static final String BAM_USER_NAME = "admin";
- public static final String BAM_PASSWORD = "admin";
+ public static final String BAM_URL = "BAMUrl";
+ public static final String BAM_USER_NAME = "BAMUserName";
+ public static final String BAM_PASSWORD = "BAMPassword";
+
+ public static final String SERVICE_COMMON_REG_PATH = RegistryResources.COMPONENTS
+ + "org.wso2.carbon.bam.service.data.publisher/common";
}
Modified: trunk/carbon/components/bam-data-publishers/org.wso2.carbon.bam.service.data.publisher/src/main/java/org/wso2/carbon/bam/service/data/publisher/util/ServiceStatisticsPublisherConstants.java
URL: http://wso2.org/svn/browse/wso2/trunk/carbon/components/bam-data-publishers/org.wso2.carbon.bam.service.data.publisher/src/main/java/org/wso2/carbon/bam/service/data/publisher/util/ServiceStatisticsPublisherConstants.java?rev=113793&r1=113792&r2=113793&view=diff
==============================================================================
--- trunk/carbon/components/bam-data-publishers/org.wso2.carbon.bam.service.data.publisher/src/main/java/org/wso2/carbon/bam/service/data/publisher/util/ServiceStatisticsPublisherConstants.java (original)
+++ trunk/carbon/components/bam-data-publishers/org.wso2.carbon.bam.service.data.publisher/src/main/java/org/wso2/carbon/bam/service/data/publisher/util/ServiceStatisticsPublisherConstants.java Wed Oct 12 11:07:11 2011
@@ -37,7 +37,7 @@
// Registry persistence related constants
public static final String SERVICE_STATISTICS_REG_PATH = RegistryResources.COMPONENTS
- + "org.wso2.carbon.bam.data.publisher.service.stats/service_stats";
+ + "org.wso2.carbon.bam.service.data.publisher/service_stats";
public static final String ENABLE_SERVICE_STATS_EVENTING = "EnableServiceStats";
More information about the Carbon-commits
mailing list