You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@synapse.apache.org by in...@apache.org on 2009/03/18 06:05:44 UTC
svn commit: r755477 - in
/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse: aspects/
aspects/statistics/ config/xml/ config/xml/endpoints/ core/axis2/
endpoints/ mediators/ startup/tasks/
Author: indika
Date: Wed Mar 18 05:05:43 2009
New Revision: 755477
URL: http://svn.apache.org/viewvc?rev=755477&view=rev
Log:
Just a Class rename
Added:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/aspects/AspectConfigurable.java
- copied, changed from r755476, synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/aspects/AuditConfigurable.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/aspects/AspectConfiguration.java
- copied, changed from r755476, synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/aspects/AuditConfiguration.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/aspects/AspectHelper.java
- copied, changed from r755476, synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/aspects/AuditHelper.java
Removed:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/aspects/AuditConfigurable.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/aspects/AuditConfiguration.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/aspects/AuditHelper.java
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/aspects/statistics/StatisticsRecord.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/aspects/statistics/StatisticsReporter.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/AbstractMediatorFactory.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/AbstractMediatorSerializer.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/DefaultEndpointFactory.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2SynapseEnvironment.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/ProxyServiceMessageReceiver.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseCallbackReceiver.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseMessageReceiver.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/EndpointDefinition.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/AbstractMediator.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/startup/tasks/MessageInjector.java
Copied: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/aspects/AspectConfigurable.java (from r755476, synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/aspects/AuditConfigurable.java)
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/aspects/AspectConfigurable.java?p2=synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/aspects/AspectConfigurable.java&p1=synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/aspects/AuditConfigurable.java&r1=755476&r2=755477&rev=755477&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/aspects/AuditConfigurable.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/aspects/AspectConfigurable.java Wed Mar 18 05:05:43 2009
@@ -21,7 +21,7 @@
/**
* Capability for configurable auditing
*/
-public interface AuditConfigurable {
+public interface AspectConfigurable {
/**
* Returns audit id , identifier for a particular audit
Copied: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/aspects/AspectConfiguration.java (from r755476, synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/aspects/AuditConfiguration.java)
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/aspects/AspectConfiguration.java?p2=synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/aspects/AspectConfiguration.java&p1=synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/aspects/AuditConfiguration.java&r1=755476&r2=755477&rev=755477&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/aspects/AuditConfiguration.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/aspects/AspectConfiguration.java Wed Mar 18 05:05:43 2009
@@ -22,19 +22,19 @@
* Audit configuration
* Currently contains only statistics configuration related things
*/
-public class AuditConfiguration implements AuditConfigurable {
+public class AspectConfiguration implements AspectConfigurable {
/* Whether statistics enable */
private boolean statisticsEnable = false;
/* Identifier for a particular aspects configuration */
private String auditId;
- public AuditConfiguration(String auditId, boolean statisticsEnable) {
+ public AspectConfiguration(String auditId, boolean statisticsEnable) {
this.statisticsEnable = statisticsEnable;
this.auditId = auditId;
}
- public AuditConfiguration(String auditId) {
+ public AspectConfiguration(String auditId) {
this.auditId = auditId;
}
Copied: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/aspects/AspectHelper.java (from r755476, synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/aspects/AuditHelper.java)
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/aspects/AspectHelper.java?p2=synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/aspects/AspectHelper.java&p1=synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/aspects/AuditHelper.java&r1=755476&r2=755477&rev=755477&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/aspects/AuditHelper.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/aspects/AspectHelper.java Wed Mar 18 05:05:43 2009
@@ -29,9 +29,9 @@
* Contains helper methods required for auditing.
* This class need to evolved as any audit related things are adding
*/
-public class AuditHelper {
+public class AspectHelper {
- private static final Log log = LogFactory.getLog(AuditHelper.class);
+ private static final Log log = LogFactory.getLog(AspectHelper.class);
/**
* Sets the Global audit configuration if it has been forced by setting
@@ -43,15 +43,15 @@
if (XMLConfigConstants.STATISTICS_ENABLE.equals(
synCtx.getConfiguration().getProperty(SynapseConstants.SYNAPSE_AUDIT_STATE))) {
- AuditConfigurable auditConfigurable = new AuditConfiguration(SynapseConstants.SYNAPSE_AUDIT, true);
+ AspectConfigurable aspectConfigurable = new AspectConfiguration(SynapseConstants.SYNAPSE_AUDIT, true);
if (log.isDebugEnabled()) {
log.debug("Global Audit is enabled. System-wide auditing will be occurred.");
}
- StatisticsReporter.collect(synCtx, auditConfigurable);
+ StatisticsReporter.collect(synCtx, aspectConfigurable);
synCtx.setProperty(SynapseConstants.SYNAPSE_AUDIT_CONFIGURATION,
- auditConfigurable);
+ aspectConfigurable);
}
}
@@ -62,14 +62,14 @@
*/
public static void reportGlobalAudit(MessageContext synCtx) {
- AuditConfigurable auditConfigurable = (AuditConfigurable) synCtx.getProperty(
+ AspectConfigurable aspectConfigurable = (AspectConfigurable) synCtx.getProperty(
SynapseConstants.SYNAPSE_AUDIT_CONFIGURATION);
- if (auditConfigurable != null) {
+ if (aspectConfigurable != null) {
if (log.isDebugEnabled()) {
log.debug("System-wide aspects record is reported.");
}
- StatisticsReporter.report(synCtx, auditConfigurable);
+ StatisticsReporter.report(synCtx, aspectConfigurable);
}
}
}
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/aspects/statistics/StatisticsRecord.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/aspects/statistics/StatisticsRecord.java?rev=755477&r1=755476&r2=755477&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/aspects/statistics/StatisticsRecord.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/aspects/statistics/StatisticsRecord.java Wed Mar 18 05:05:43 2009
@@ -21,7 +21,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.synapse.Mediator;
-import org.apache.synapse.aspects.AuditConfigurable;
+import org.apache.synapse.aspects.AspectConfigurable;
import org.apache.synapse.core.axis2.ProxyService;
import org.apache.synapse.endpoints.Endpoint;
@@ -76,21 +76,21 @@
/**
* Collecting statistics for a particular component
*
- * @param auditConfigurable audit configurable component
+ * @param aspectConfigurable audit configurable component
*/
- public void collect(AuditConfigurable auditConfigurable) {
+ public void collect(AspectConfigurable aspectConfigurable) {
- if (isValid(auditConfigurable)) {
+ if (isValid(aspectConfigurable)) {
- String auditID = auditConfigurable.getAuditId();
+ String auditID = aspectConfigurable.getAuditId();
if (log.isDebugEnabled()) {
log.debug("Start to collect statistics for : " + auditID);
}
- if (auditConfigurable instanceof Endpoint) {
+ if (aspectConfigurable instanceof Endpoint) {
endPointsStatisticsRecordMap.put(auditID, new StatisticsLog(auditID));
- } else if (auditConfigurable instanceof ProxyService) {
+ } else if (aspectConfigurable instanceof ProxyService) {
proxyServicesStatisticsRecordMap.put(auditID, new StatisticsLog(auditID));
- } else if (auditConfigurable instanceof Mediator) {
+ } else if (aspectConfigurable instanceof Mediator) {
mediatorsStatisticsRecordMap.put(auditID, new StatisticsLog(auditID));
}
}
@@ -99,37 +99,37 @@
/**
* Reporting statistics for a particular component
*
- * @param auditConfigurable audit configurable component
+ * @param aspectConfigurable audit configurable component
*/
- public void commit(AuditConfigurable auditConfigurable) {
+ public void commit(AspectConfigurable aspectConfigurable) {
- if (isValid(auditConfigurable)) {
+ if (isValid(aspectConfigurable)) {
- String auditID = auditConfigurable.getAuditId();
+ String auditID = aspectConfigurable.getAuditId();
if (log.isDebugEnabled()) {
log.debug("Reporting statistics for : " + auditID);
}
- if (auditConfigurable instanceof Endpoint) {
+ if (aspectConfigurable instanceof Endpoint) {
commit(auditID, endPointsStatisticsRecordMap);
- } else if (auditConfigurable instanceof ProxyService) {
+ } else if (aspectConfigurable instanceof ProxyService) {
commit(auditID, proxyServicesStatisticsRecordMap);
- } else if (auditConfigurable instanceof Mediator) {
+ } else if (aspectConfigurable instanceof Mediator) {
commit(auditID, mediatorsStatisticsRecordMap);
}
}
}
- private boolean isValid(AuditConfigurable auditConfigurable) {
+ private boolean isValid(AspectConfigurable aspectConfigurable) {
- if (auditConfigurable == null) {
+ if (aspectConfigurable == null) {
if (log.isDebugEnabled()) {
log.debug("Invalid aspects configuration , It is null.");
}
return false;
}
- if (auditConfigurable.isStatisticsEnable()) {
- String auditID = auditConfigurable.getAuditId();
+ if (aspectConfigurable.isStatisticsEnable()) {
+ String auditID = aspectConfigurable.getAuditId();
if (auditID == null || "".equals(auditID)) {
if (log.isDebugEnabled()) {
log.debug("Invalid aspects configuration , Audit name is null.");
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/aspects/statistics/StatisticsReporter.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/aspects/statistics/StatisticsReporter.java?rev=755477&r1=755476&r2=755477&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/aspects/statistics/StatisticsReporter.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/aspects/statistics/StatisticsReporter.java Wed Mar 18 05:05:43 2009
@@ -22,7 +22,7 @@
import org.apache.commons.logging.LogFactory;
import org.apache.synapse.MessageContext;
import org.apache.synapse.SynapseConstants;
-import org.apache.synapse.aspects.AuditConfigurable;
+import org.apache.synapse.aspects.AspectConfigurable;
/**
* A utility to process statistics
@@ -36,9 +36,9 @@
* Initialize the audit details collection by setting a AuditConfiguration
*
* @param synCtx Current Message through synapse
- * @param auditConfigurable Instance that can be configured it's audit
+ * @param aspectConfigurable Instance that can be configured it's audit
*/
- public static void collect(MessageContext synCtx, AuditConfigurable auditConfigurable) {
+ public static void collect(MessageContext synCtx, AspectConfigurable aspectConfigurable) {
StatisticsRecord statisticsRecord = StatisticsReporter.getStatisticsRecord(synCtx);
if (statisticsRecord == null) {
@@ -49,7 +49,7 @@
statisticsRecord = StatisticsRecordFactory.getStatisticsRecord(synCtx);
synCtx.setProperty(SynapseConstants.STATISTICS_STACK, statisticsRecord);
}
- statisticsRecord.collect(auditConfigurable);
+ statisticsRecord.collect(aspectConfigurable);
StatisticsCollector collector = synCtx.getEnvironment().getStatisticsCollector();
if (collector == null) {
@@ -69,13 +69,13 @@
* Reporting audit for a particular resource
*
* @param synCtx Current Message through synapse
- * @param auditConfigurable Instance that can be configured it's audit
+ * @param aspectConfigurable Instance that can be configured it's audit
*/
- public static void report(MessageContext synCtx, AuditConfigurable auditConfigurable) {
+ public static void report(MessageContext synCtx, AspectConfigurable aspectConfigurable) {
StatisticsRecord statisticsRecord = StatisticsReporter.getStatisticsRecord(synCtx);
if (statisticsRecord != null) {
- statisticsRecord.commit(auditConfigurable);
+ statisticsRecord.commit(aspectConfigurable);
}
}
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/AbstractMediatorFactory.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/AbstractMediatorFactory.java?rev=755477&r1=755476&r2=755477&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/AbstractMediatorFactory.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/AbstractMediatorFactory.java Wed Mar 18 05:05:43 2009
@@ -25,7 +25,7 @@
import org.apache.commons.logging.LogFactory;
import org.apache.synapse.Mediator;
import org.apache.synapse.SynapseException;
-import org.apache.synapse.aspects.AuditConfigurable;
+import org.apache.synapse.aspects.AspectConfigurable;
import javax.xml.namespace.QName;
import java.util.Iterator;
@@ -107,9 +107,9 @@
if (statistics != null) {
String statisticsValue = statistics.getAttributeValue();
if (statisticsValue != null) {
- if (mediator instanceof AuditConfigurable) {
+ if (mediator instanceof AspectConfigurable) {
if (XMLConfigConstants.STATISTICS_ENABLE.equals(statisticsValue)) {
- ((AuditConfigurable) mediator).enableStatistics();
+ ((AspectConfigurable) mediator).enableStatistics();
}
}
}
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/AbstractMediatorSerializer.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/AbstractMediatorSerializer.java?rev=755477&r1=755476&r2=755477&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/AbstractMediatorSerializer.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/AbstractMediatorSerializer.java Wed Mar 18 05:05:43 2009
@@ -28,7 +28,7 @@
import org.apache.commons.logging.LogFactory;
import org.apache.synapse.Mediator;
import org.apache.synapse.SynapseException;
-import org.apache.synapse.aspects.AuditConfigurable;
+import org.apache.synapse.aspects.AspectConfigurable;
import org.apache.synapse.mediators.MediatorProperty;
import javax.xml.namespace.QName;
@@ -77,8 +77,8 @@
XMLConfigConstants.TRACE_ATTRIB_NAME, nullNS, traceValue));
}
- if (mediator instanceof AuditConfigurable) {
- if (((AuditConfigurable) mediator).isStatisticsEnable()) {
+ if (mediator instanceof AspectConfigurable) {
+ if (((AspectConfigurable) mediator).isStatisticsEnable()) {
mediatorOmElement.addAttribute(fac.createOMAttribute(
XMLConfigConstants.STATISTICS_ATTRIB_NAME, nullNS,
XMLConfigConstants.STATISTICS_ENABLE));
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/DefaultEndpointFactory.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/DefaultEndpointFactory.java?rev=755477&r1=755476&r2=755477&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/DefaultEndpointFactory.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/DefaultEndpointFactory.java Wed Mar 18 05:05:43 2009
@@ -22,7 +22,7 @@
import org.apache.axiom.om.OMAttribute;
import org.apache.axiom.om.OMElement;
import org.apache.synapse.SynapseConstants;
-import org.apache.synapse.aspects.AuditConfigurable;
+import org.apache.synapse.aspects.AspectConfigurable;
import org.apache.synapse.config.xml.XMLConfigConstants;
import org.apache.synapse.endpoints.DefaultEndpoint;
import org.apache.synapse.endpoints.Endpoint;
@@ -141,9 +141,9 @@
if (statistics != null) {
String statisticsValue = statistics.getAttributeValue();
if (statisticsValue != null) {
- if (endpoint instanceof AuditConfigurable) {
+ if (endpoint instanceof AspectConfigurable) {
if (XMLConfigConstants.STATISTICS_ENABLE.equals(statisticsValue)) {
- ((AuditConfigurable) endpoint).enableStatistics();
+ ((AspectConfigurable) endpoint).enableStatistics();
}
}
}
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2SynapseEnvironment.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2SynapseEnvironment.java?rev=755477&r1=755476&r2=755477&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2SynapseEnvironment.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2SynapseEnvironment.java Wed Mar 18 05:05:43 2009
@@ -30,7 +30,7 @@
import org.apache.synapse.MessageContext;
import org.apache.synapse.SynapseConstants;
import org.apache.synapse.SynapseException;
-import org.apache.synapse.aspects.AuditHelper;
+import org.apache.synapse.aspects.AspectHelper;
import org.apache.synapse.aspects.statistics.StatisticsCollector;
import org.apache.synapse.commons.util.TemporaryData;
import org.apache.synapse.config.SynapseConfiguration;
@@ -169,7 +169,7 @@
public void send(EndpointDefinition endpoint, MessageContext synCtx) {
if (synCtx.isResponse()) {
- AuditHelper.reportGlobalAudit(synCtx);
+ AspectHelper.reportGlobalAudit(synCtx);
if (endpoint != null) {
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/ProxyServiceMessageReceiver.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/ProxyServiceMessageReceiver.java?rev=755477&r1=755476&r2=755477&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/ProxyServiceMessageReceiver.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/ProxyServiceMessageReceiver.java Wed Mar 18 05:05:43 2009
@@ -23,7 +23,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.synapse.*;
-import org.apache.synapse.aspects.AuditHelper;
+import org.apache.synapse.aspects.AspectHelper;
import org.apache.synapse.endpoints.Endpoint;
import org.apache.synapse.mediators.MediatorFaultHandler;
@@ -71,7 +71,7 @@
MessageContext synCtx = MessageContextCreatorForAxis2.getSynapseMessageContext(mc);
- AuditHelper.setGlobalAudit(synCtx);
+ AspectHelper.setGlobalAudit(synCtx);
// get service log for this message and attach to the message context also set proxy name
Log serviceLog = LogFactory.getLog(SynapseConstants.SERVICE_LOGGER_PREFIX + name);
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseCallbackReceiver.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseCallbackReceiver.java?rev=755477&r1=755476&r2=755477&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseCallbackReceiver.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseCallbackReceiver.java Wed Mar 18 05:05:43 2009
@@ -36,7 +36,7 @@
import org.apache.synapse.FaultHandler;
import org.apache.synapse.SynapseConstants;
import org.apache.synapse.SynapseException;
-import org.apache.synapse.aspects.AuditConfigurable;
+import org.apache.synapse.aspects.AspectConfigurable;
import org.apache.synapse.aspects.statistics.StatisticsReporter;
import org.apache.synapse.config.SynapseConfigUtils;
import org.apache.synapse.config.SynapseConfiguration;
@@ -159,8 +159,8 @@
Endpoint endpoint = (Endpoint) synapseOutMsgCtx.getProperty(
SynapseConstants.LAST_ENDPOINT);
- if (endpoint instanceof AuditConfigurable) {
- StatisticsReporter.report(synapseOutMsgCtx, (AuditConfigurable) endpoint);
+ if (endpoint instanceof AspectConfigurable) {
+ StatisticsReporter.report(synapseOutMsgCtx, (AspectConfigurable) endpoint);
}
Object o = response.getProperty(SynapseConstants.SENDING_FAULT);
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseMessageReceiver.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseMessageReceiver.java?rev=755477&r1=755476&r2=755477&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseMessageReceiver.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseMessageReceiver.java Wed Mar 18 05:05:43 2009
@@ -27,7 +27,7 @@
import org.apache.synapse.MessageContext;
import org.apache.synapse.SynapseConstants;
import org.apache.synapse.SynapseException;
-import org.apache.synapse.aspects.AuditHelper;
+import org.apache.synapse.aspects.AspectHelper;
import org.apache.synapse.mediators.MediatorFaultHandler;
/**
@@ -44,7 +44,7 @@
MessageContext synCtx = MessageContextCreatorForAxis2.getSynapseMessageContext(mc);
- AuditHelper.setGlobalAudit(synCtx);
+ AspectHelper.setGlobalAudit(synCtx);
boolean traceOn = synCtx.getMainSequence().getTraceState() == SynapseConstants.TRACING_ON;
boolean traceOrDebugOn = traceOn || log.isDebugEnabled();
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/EndpointDefinition.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/EndpointDefinition.java?rev=755477&r1=755476&r2=755477&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/EndpointDefinition.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/EndpointDefinition.java Wed Mar 18 05:05:43 2009
@@ -20,8 +20,8 @@
package org.apache.synapse.endpoints;
import org.apache.synapse.SynapseConstants;
-import org.apache.synapse.aspects.AuditConfigurable;
-import org.apache.synapse.aspects.AuditConfiguration;
+import org.apache.synapse.aspects.AspectConfigurable;
+import org.apache.synapse.aspects.AspectConfiguration;
import java.util.ArrayList;
import java.util.List;
@@ -31,7 +31,7 @@
* An Endpoint definition contains the information about an endpoint. It is used by leaf
* level endpoints to store this information (e.g. AddressEndpoint and WSDLEndpoint).
*/
-public class EndpointDefinition implements AuditConfigurable {
+public class EndpointDefinition implements AspectConfigurable {
/** Who is the leaf level Endpoint which uses me? */
private Endpoint leafEndpoint = null;
@@ -138,7 +138,7 @@
/** A list of error codes which puts the endpoint into timeout mode */
private final List<Integer> timeoutErrorCodes = new ArrayList<Integer>();
- private AuditConfigurable auditConfigurable = new AuditConfiguration(SynapseConstants.ANONYMOUS_ENDPOINT);
+ private AspectConfigurable aspectConfigurable = new AspectConfiguration(SynapseConstants.ANONYMOUS_ENDPOINT);
/**
* The variable that indicate tracing on or off for the current mediator
*/
@@ -501,22 +501,22 @@
}
public String getAuditId() {
- return this.auditConfigurable.getAuditId();
+ return this.aspectConfigurable.getAuditId();
}
public void setAuditId(String id) {
- this.auditConfigurable.setAuditId(id);
+ this.aspectConfigurable.setAuditId(id);
}
public boolean isStatisticsEnable() {
- return this.auditConfigurable.isStatisticsEnable();
+ return this.aspectConfigurable.isStatisticsEnable();
}
public void disableStatistics() {
- this.auditConfigurable.disableStatistics();
+ this.aspectConfigurable.disableStatistics();
}
public void enableStatistics() {
- this.auditConfigurable.enableStatistics();
+ this.aspectConfigurable.enableStatistics();
}
}
\ No newline at end of file
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/AbstractMediator.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/AbstractMediator.java?rev=755477&r1=755476&r2=755477&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/AbstractMediator.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/AbstractMediator.java Wed Mar 18 05:05:43 2009
@@ -22,8 +22,8 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.synapse.*;
-import org.apache.synapse.aspects.AuditConfigurable;
-import org.apache.synapse.aspects.AuditConfiguration;
+import org.apache.synapse.aspects.AspectConfigurable;
+import org.apache.synapse.aspects.AspectConfiguration;
import org.apache.synapse.core.SynapseEnvironment;
/**
@@ -31,7 +31,7 @@
* for all mediators who extend from this.
* elements of a mediator class.
*/
-public abstract class AbstractMediator implements Mediator, AuditConfigurable, ManagedLifecycle {
+public abstract class AbstractMediator implements Mediator, AspectConfigurable, ManagedLifecycle {
/** the standard log for mediators, will assign the logger for the actual subclass */
protected Log log;
@@ -43,7 +43,7 @@
*/
protected int traceState = SynapseConstants.TRACING_UNSET;
- private final AuditConfigurable auditConfigurable = new AuditConfiguration(
+ private final AspectConfigurable aspectConfigurable = new AspectConfiguration(
SynapseConstants.ANONYMOUS_SEQUENCE);
/**
@@ -278,23 +278,23 @@
}
public boolean isStatisticsEnable() {
- return this.auditConfigurable.isStatisticsEnable();
+ return this.aspectConfigurable.isStatisticsEnable();
}
public void disableStatistics() {
- this.auditConfigurable.disableStatistics();
+ this.aspectConfigurable.disableStatistics();
}
public void enableStatistics() {
- this.auditConfigurable.disableStatistics();
+ this.aspectConfigurable.disableStatistics();
}
public String getAuditId() {
- return this.auditConfigurable.getAuditId();
+ return this.aspectConfigurable.getAuditId();
}
public void setAuditId(String id) {
- this.auditConfigurable.setAuditId(id);
+ this.aspectConfigurable.setAuditId(id);
}
public void init(SynapseEnvironment se) {
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/startup/tasks/MessageInjector.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/startup/tasks/MessageInjector.java?rev=755477&r1=755476&r2=755477&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/startup/tasks/MessageInjector.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/startup/tasks/MessageInjector.java Wed Mar 18 05:05:43 2009
@@ -28,7 +28,7 @@
import org.apache.synapse.ManagedLifecycle;
import org.apache.synapse.MessageContext;
import org.apache.synapse.SynapseException;
-import org.apache.synapse.aspects.AuditHelper;
+import org.apache.synapse.aspects.AspectHelper;
import org.apache.synapse.core.SynapseEnvironment;
import org.apache.synapse.mediators.MediatorFaultHandler;
import org.apache.synapse.startup.Task;
@@ -145,7 +145,7 @@
}
MessageContext mc = synapseEnvironment.createMessageContext();
- AuditHelper.setGlobalAudit(mc);
+ AspectHelper.setGlobalAudit(mc);
mc.pushFaultHandler(new MediatorFaultHandler(mc.getFaultSequence()));
mc.setTo(new EndpointReference(to));
if (format == null) {