Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/AbstractEndpoint.java URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/AbstractEndpoint.java?rev=755915&r1=755914&r2=755915&view=diff ============================================================================== --- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/AbstractEndpoint.java (original) +++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/AbstractEndpoint.java Thu Mar 19 10:52:47 2009 @@ -25,6 +25,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.synapse.*; +import org.apache.synapse.aspects.ComponentType; import org.apache.synapse.aspects.statistics.StatisticsReporter; import org.apache.synapse.commons.util.MBeanRegistrar; import org.apache.synapse.core.SynapseEnvironment; @@ -338,9 +339,10 @@ * @param synCtx the current message */ protected void prepareForEndpointStatistics(MessageContext synCtx) { - // Setting Required property to collect the End Point aspects + // Setting Required property to reportForComponent the End Point aspects if (definition != null && definition.isStatisticsEnable()) { - StatisticsReporter.collect(synCtx, definition); + StatisticsReporter.reportForComponent(synCtx, definition.getAspectConfiguration(), + ComponentType.ENDPOINT); } }
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=755915&r1=755914&r2=755915&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 Thu Mar 19 10:52:47 2009 @@ -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 AspectConfigurable aspectConfigurable = new AspectConfiguration(SynapseConstants.ANONYMOUS_ENDPOINT); + private AspectConfiguration aspectConfiguration; /** * The variable that indicate tracing on or off for the current mediator */ @@ -500,23 +500,27 @@ this.leafEndpoint = leafEndpoint; } - public String getAuditId() { - return this.aspectConfigurable.getAuditId(); + public boolean isStatisticsEnable() { + return this.aspectConfiguration != null && this.aspectConfiguration.isStatisticsEnable(); } - public void setAuditId(String id) { - this.aspectConfigurable.setAuditId(id); + public void disableStatistics() { + if (this.aspectConfiguration != null) { + this.aspectConfiguration.disableStatistics(); + } } - public boolean isStatisticsEnable() { - return this.aspectConfigurable.isStatisticsEnable(); + public void enableStatistics() { + if (this.aspectConfiguration != null) { + this.aspectConfiguration.enableStatistics(); + } } - public void disableStatistics() { - this.aspectConfigurable.disableStatistics(); + public void configure(AspectConfiguration aspectConfiguration) { + this.aspectConfiguration = aspectConfiguration; } - public void enableStatistics() { - this.aspectConfigurable.enableStatistics(); + public AspectConfiguration getAspectConfiguration() { + return this.aspectConfiguration; } } \ 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=755915&r1=755914&r2=755915&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 Thu Mar 19 10:52:47 2009 @@ -43,8 +43,7 @@ */ protected int traceState = SynapseConstants.TRACING_UNSET; - private final AspectConfigurable aspectConfigurable = new AspectConfiguration( - SynapseConstants.ANONYMOUS_SEQUENCE); + private AspectConfiguration aspectConfiguration; /** * A constructor that makes subclasses pick up the correct logger @@ -278,23 +277,38 @@ } public boolean isStatisticsEnable() { - return this.aspectConfigurable.isStatisticsEnable(); + return this.aspectConfiguration != null + && this.aspectConfiguration.isStatisticsEnable(); } public void disableStatistics() { - this.aspectConfigurable.disableStatistics(); + if (this.aspectConfiguration != null) { + this.aspectConfiguration.disableStatistics(); + } } public void enableStatistics() { - this.aspectConfigurable.disableStatistics(); + if (this.aspectConfiguration != null) { + this.aspectConfiguration.disableStatistics(); + } } - public String getAuditId() { - return this.aspectConfigurable.getAuditId(); + /** + * Configure aspects according to the given configuration + * + * @param aspectConfiguration AspectConfiguration instance + */ + public void configure(AspectConfiguration aspectConfiguration) { + this.aspectConfiguration = aspectConfiguration; } - public void setAuditId(String id) { - this.aspectConfigurable.setAuditId(id); + /** + * Get the aspects configuration + * + * @return AspectConfiguration instance + */ + public AspectConfiguration getAspectConfiguration() { + return aspectConfiguration; } public void init(SynapseEnvironment se) { Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/MediatorFaultHandler.java URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/MediatorFaultHandler.java?rev=755915&r1=755914&r2=755915&view=diff ============================================================================== --- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/MediatorFaultHandler.java (original) +++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/MediatorFaultHandler.java Thu Mar 19 10:52:47 2009 @@ -72,7 +72,7 @@ name = faultMediator.getClass().getName(); } - StatisticsReporter.reportFault(synCtx); + StatisticsReporter.reportFaultForAll(synCtx); if (traceOrDebugOn) { traceOrDebugWarn(traceOn, "Executing fault handler mediator : " + name); Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/base/SequenceMediator.java URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/base/SequenceMediator.java?rev=755915&r1=755914&r2=755915&view=diff ============================================================================== --- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/base/SequenceMediator.java (original) +++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/base/SequenceMediator.java Thu Mar 19 10:52:47 2009 @@ -21,7 +21,9 @@ import org.apache.synapse.Mediator; import org.apache.synapse.MessageContext; +import org.apache.synapse.Namable; import org.apache.synapse.SynapseLog; +import org.apache.synapse.aspects.ComponentType; import org.apache.synapse.aspects.statistics.StatisticsReporter; import org.apache.synapse.core.SynapseEnvironment; import org.apache.synapse.mediators.AbstractListMediator; @@ -38,7 +40,7 @@ * sequence mediator, the errorHandler will not have a meaning, and if an error in * encountered in the referred sequence, its errorHandler would execute. */ -public class SequenceMediator extends AbstractListMediator { +public class SequenceMediator extends AbstractListMediator implements Namable { /** The name of the this sequence */ private String name = null; @@ -69,7 +71,7 @@ SynapseLog synLog = getLog(synCtx); if (isStatisticsEnable()) { - StatisticsReporter.collect(synCtx, this); + StatisticsReporter.reportForComponent(synCtx, getAspectConfiguration(), ComponentType.SEQUENCE); } if (synLog.isTraceOrDebugEnabled()) { @@ -87,7 +89,7 @@ // mediation through this sequence Mediator errorHandlerMediator = null; - // Setting Required property to collect the sequence aspects + // Setting Required property to reportForComponent the sequence aspects try { @@ -139,7 +141,8 @@ } finally { if (isStatisticsEnable()) { - StatisticsReporter.report(synCtx, this); + StatisticsReporter.reportForComponent(synCtx, + getAspectConfiguration(),ComponentType.SEQUENCE); } } 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=755915&r1=755914&r2=755915&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 Thu Mar 19 10:52:47 2009 @@ -28,7 +28,6 @@ import org.apache.synapse.ManagedLifecycle; import org.apache.synapse.MessageContext; import org.apache.synapse.SynapseException; -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 +144,7 @@ } MessageContext mc = synapseEnvironment.createMessageContext(); - AspectHelper.setGlobalAudit(mc); +// AspectHelper.setGlobalAudit(mc); TODO mc.pushFaultHandler(new MediatorFaultHandler(mc.getFaultSequence())); mc.setTo(new EndpointReference(to)); if (format == null) { Modified: synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/db/DBReportMediatorTest.java URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/db/DBReportMediatorTest.java?rev=755915&r1=755914&r2=755915&view=diff ============================================================================== --- synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/db/DBReportMediatorTest.java (original) +++ synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/db/DBReportMediatorTest.java Thu Mar 19 10:52:47 2009 @@ -19,18 +19,18 @@ package org.apache.synapse.mediators.db; -import org.apache.synapse.mediators.AbstractMediatorTestCase; -import org.apache.synapse.mediators.TestUtils; +import junit.extensions.TestSetup; +import junit.framework.Test; +import junit.framework.TestSuite; import org.apache.synapse.MessageContext; import org.apache.synapse.config.xml.DBReportMediatorFactory; -import junit.framework.TestSuite; -import junit.framework.Test; -import junit.extensions.TestSetup; +import org.apache.synapse.mediators.AbstractMediatorTestCase; +import org.apache.synapse.mediators.TestUtils; -import java.sql.SQLException; +import java.io.File; import java.sql.Connection; import java.sql.ResultSet; -import java.io.File; +import java.sql.SQLException; public class DBReportMediatorTest extends AbstractMediatorTestCase {
