Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/filters/OutMediator.java URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/filters/OutMediator.java?rev=720091&r1=720090&r2=720091&view=diff ============================================================================== --- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/filters/OutMediator.java (original) +++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/filters/OutMediator.java Sun Nov 23 17:30:09 2008 @@ -20,6 +20,7 @@ package org.apache.synapse.mediators.filters; import org.apache.synapse.MessageContext; +import org.apache.synapse.SynapseLog; import org.apache.synapse.mediators.AbstractListMediator; /** @@ -38,33 +39,26 @@ */ public boolean mediate(MessageContext synCtx) { - boolean traceOn = isTraceOn(synCtx); - boolean traceOrDebugOn = isTraceOrDebugOn(traceOn); + SynapseLog synLog = getLog(synCtx); - if (traceOrDebugOn) { - traceOrDebug(traceOn, "Start : Out mediator"); + if (synLog.isTraceOrDebugEnabled()) { + synLog.traceOrDebug("Start : Out mediator"); - if (traceOn && trace.isTraceEnabled()) { - trace.trace("Message : " + synCtx.getEnvelope()); + if (synLog.isTraceTraceEnabled()) { + synLog.traceTrace("Message : " + synCtx.getEnvelope()); } } boolean result = true; if (test(synCtx)) { - if (traceOrDebugOn) { - traceOrDebug(traceOn, "Current message is outgoing - executing child mediators"); - } + synLog.traceOrDebug("Current message is outgoing - executing child mediators"); result = super.mediate(synCtx); } else { - if (traceOrDebugOn) { - traceOrDebug(traceOn, "Current message is a request - skipping child mediators"); - } + synLog.traceOrDebug("Current message is a request - skipping child mediators"); } - if (traceOrDebugOn) { - traceOrDebug(traceOn, "End : Out mediator"); - } + synLog.traceOrDebug("End : Out mediator"); return result; }
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/filters/SwitchMediator.java URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/filters/SwitchMediator.java?rev=720091&r1=720090&r2=720091&view=diff ============================================================================== --- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/filters/SwitchMediator.java (original) +++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/filters/SwitchMediator.java Sun Nov 23 17:30:09 2008 @@ -21,6 +21,7 @@ import org.apache.synapse.ManagedLifecycle; import org.apache.synapse.MessageContext; +import org.apache.synapse.SynapseLog; import org.apache.synapse.config.xml.SwitchCase; import org.apache.synapse.core.SynapseEnvironment; import org.apache.synapse.mediators.AbstractMediator; @@ -72,14 +73,13 @@ */ public boolean mediate(MessageContext synCtx) { - boolean traceOn = isTraceOn(synCtx); - boolean traceOrDebugOn = isTraceOrDebugOn(traceOn); + SynapseLog synLog = getLog(synCtx); - if (traceOrDebugOn) { - traceOrDebug(traceOn, "Start : Switch mediator"); + if (synLog.isTraceOrDebugEnabled()) { + synLog.traceOrDebug("Start : Switch mediator"); - if (traceOn && trace.isTraceEnabled()) { - trace.trace("Message : " + synCtx.getEnvelope()); + if (synLog.isTraceTraceEnabled()) { + synLog.traceTrace("Message : " + synCtx.getEnvelope()); } } @@ -90,16 +90,14 @@ int myEffectiveTraceState = synCtx.getTracingState(); String sourceText = source.stringValueOf(synCtx); - if (traceOrDebugOn) { - traceOrDebug(traceOn, "XPath : " + source + " evaluates to : " + sourceText); + if (synLog.isTraceOrDebugEnabled()) { + synLog.traceOrDebug("XPath : " + source + " evaluates to : " + sourceText); } try { if ((sourceText == null || cases.isEmpty()) && defaultCase != null) { - if (traceOrDebugOn) { - traceOrDebug(traceOn, "Source XPath evaluated to : null or no switch " + + synLog.traceOrDebug("Source XPath evaluated to : null or no switch " + "cases found. Executing the default case"); - } return defaultCase.mediate(synCtx); @@ -107,8 +105,8 @@ for (SwitchCase swCase : cases) { if (swCase != null) { if (swCase.matches(sourceText)) { - if (traceOrDebugOn) { - traceOrDebug(traceOn, "Matching case found : " + swCase.getRegex()); + if (synLog.isTraceOrDebugEnabled()) { + synLog.traceOrDebug("Matching case found : " + swCase.getRegex()); } return swCase.mediate(synCtx); } @@ -117,14 +115,10 @@ if (defaultCase != null) { // if any of the switch cases did not match - if (traceOrDebugOn) { - traceOrDebug(traceOn, "None of the switch cases matched - executing default"); - } + synLog.traceOrDebug("None of the switch cases matched - executing default"); return defaultCase.mediate(synCtx); } else { - if (traceOrDebugOn) { - traceOrDebug(traceOn, "None of the switch cases matched - no default case"); - } + synLog.traceOrDebug("None of the switch cases matched - no default case"); } } @@ -132,9 +126,7 @@ synCtx.setTracingState(parentsEffectiveTraceState); } - if (traceOrDebugOn) { - traceOrDebug(traceOn, "End : Switch mediator"); - } + synLog.traceOrDebug("End : Switch mediator"); return true; } Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/transform/FaultMediator.java URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/transform/FaultMediator.java?rev=720091&r1=720090&r2=720091&view=diff ============================================================================== --- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/transform/FaultMediator.java (original) +++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/transform/FaultMediator.java Sun Nov 23 17:30:09 2008 @@ -28,6 +28,7 @@ import org.apache.axis2.addressing.RelatesTo; import org.apache.synapse.MessageContext; import org.apache.synapse.SynapseException; +import org.apache.synapse.SynapseLog; import org.apache.synapse.core.axis2.Axis2MessageContext; import org.apache.synapse.mediators.AbstractMediator; import org.apache.synapse.util.xpath.SynapseXPath; @@ -83,30 +84,29 @@ public boolean mediate(MessageContext synCtx) { - boolean traceOn = isTraceOn(synCtx); - boolean traceOrDebugOn = isTraceOrDebugOn(traceOn); + SynapseLog synLog = getLog(synCtx); - if (traceOrDebugOn) { - traceOrDebug(traceOn, "Start : Fault mediator"); + if (synLog.isTraceOrDebugEnabled()) { + synLog.traceOrDebug("Start : Fault mediator"); - if (traceOn && trace.isTraceEnabled()) { - trace.trace("Message : " + synCtx.getEnvelope()); + if (synLog.isTraceTraceEnabled()) { + synLog.traceTrace("Message : " + synCtx.getEnvelope()); } } switch (soapVersion) { case SOAP11: - makeSOAPFault(synCtx, SOAP11, traceOrDebugOn, traceOn); + makeSOAPFault(synCtx, SOAP11, synLog); case SOAP12: - makeSOAPFault(synCtx, SOAP12, traceOrDebugOn, traceOn); + makeSOAPFault(synCtx, SOAP12, synLog); case POX: - makePOXFault(synCtx, traceOrDebugOn, traceOn); + makePOXFault(synCtx, synLog); default : { // if this is a POX or REST message then make a POX fault if (synCtx.isDoingPOX() || synCtx.isDoingGET()) { - makePOXFault(synCtx, traceOrDebugOn, traceOn); + makePOXFault(synCtx, synLog); } else { @@ -118,16 +118,16 @@ envelop.getNamespace().getNamespaceURI())) { soapVersion = SOAP12; - makeSOAPFault(synCtx, SOAP12, traceOrDebugOn, traceOn); + makeSOAPFault(synCtx, SOAP12, synLog); } else { soapVersion = SOAP11; - makeSOAPFault(synCtx, SOAP11, traceOrDebugOn, traceOn); + makeSOAPFault(synCtx, SOAP11, synLog); } } else { // default to SOAP 11 - makeSOAPFault(synCtx, SOAP11, traceOrDebugOn, traceOn); + makeSOAPFault(synCtx, SOAP11, synLog); } } } @@ -142,15 +142,15 @@ return true; } - private void makePOXFault(MessageContext synCtx, boolean traceOrDebugOn, boolean traceOn) { + private void makePOXFault(MessageContext synCtx, SynapseLog synLog) { OMFactory fac = synCtx.getEnvelope().getOMFactory(); OMElement faultPayload = fac.createOMElement(new QName("Exception")); if (faultDetail != null) { - if (traceOrDebugOn) { - traceOrDebug(traceOn, "Setting the fault detail : " + if (synLog.isTraceOrDebugEnabled()) { + synLog.traceOrDebug("Setting the fault detail : " + faultDetail + " as the POX Fault"); } @@ -160,8 +160,8 @@ String faultDetail = faultDetailExpr.stringValueOf(synCtx); - if (traceOrDebugOn) { - traceOrDebug(traceOn, "Setting the fault detail : " + if (synLog.isTraceOrDebugEnabled()) { + synLog.traceOrDebug("Setting the fault detail : " + faultDetail + " as the POX Fault"); } @@ -169,8 +169,8 @@ } else if (faultReasonValue != null) { - if (traceOrDebugOn) { - traceOrDebug(traceOn, "Setting the fault reason : " + if (synLog.isTraceOrDebugEnabled()) { + synLog.traceOrDebug("Setting the fault reason : " + faultReasonValue + " as the POX Fault"); } @@ -181,8 +181,8 @@ String faultReason = faultReasonExpr.stringValueOf(synCtx); faultPayload.setText(faultReason); - if (traceOrDebugOn) { - traceOrDebug(traceOn, "Setting the fault reason : " + if (synLog.isTraceOrDebugEnabled()) { + synLog.traceOrDebug("Setting the fault reason : " + faultReason + " as the POX Fault"); } } @@ -197,12 +197,10 @@ synCtx.setFaultResponse(true); ((Axis2MessageContext) synCtx).getAxis2MessageContext().setProcessingFault(true); - if (traceOrDebugOn) { + if (synLog.isTraceOrDebugEnabled()) { String msg = "Original SOAP Message : " + synCtx.getEnvelope().toString() + "POXFault Message created : " + faultPayload.toString(); - if (traceOn && trace.isTraceEnabled()) { - trace.trace(msg); - } + synLog.traceTrace(msg); if (log.isTraceEnabled()) { log.trace(msg); } @@ -216,14 +214,13 @@ * Actual transformation of the current message into a fault message * @param synCtx the current message context * @param soapVersion SOAP version of the resulting fault desired - * @param traceOrDebugOn is trace or debug logging on? - * @param traceOn is tracing on? + * @param synLog the Synapse log to use */ private void makeSOAPFault(MessageContext synCtx, int soapVersion, - boolean traceOrDebugOn, boolean traceOn) { + SynapseLog synLog) { - if (traceOrDebugOn) { - traceOrDebug(traceOn, "Creating a SOAP " + if (synLog.isTraceOrDebugEnabled()) { + synLog.traceOrDebug("Creating a SOAP " + (soapVersion == SOAP11 ? "1.1" : "1.2") + " fault"); } @@ -265,12 +262,12 @@ } } - if (traceOrDebugOn) { + if (synLog.isTraceOrDebugEnabled()) { String msg = "Original SOAP Message : " + synCtx.getEnvelope().toString() + "Fault Message created : " + faultEnvelope.toString(); - if (traceOn && trace.isTraceEnabled()) { - trace.trace(msg); + if (synLog.isTraceTraceEnabled()) { + synLog.traceTrace(msg); } if (log.isTraceEnabled()) { log.trace(msg); @@ -299,9 +296,7 @@ synCtx.setRelatesTo(new RelatesTo[] { relatesTo }); } - if (traceOrDebugOn) { - traceOrDebug(traceOn, "End : Fault mediator"); - } + synLog.traceOrDebug("End : Fault mediator"); } private void setFaultCode(MessageContext synCtx, SOAPFactory factory, SOAPFault fault) { Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/transform/HeaderMediator.java URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/transform/HeaderMediator.java?rev=720091&r1=720090&r2=720091&view=diff ============================================================================== --- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/transform/HeaderMediator.java (original) +++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/transform/HeaderMediator.java Sun Nov 23 17:30:09 2008 @@ -28,6 +28,7 @@ import org.apache.axis2.addressing.RelatesTo; import org.apache.synapse.MessageContext; import org.apache.synapse.SynapseConstants; +import org.apache.synapse.SynapseLog; import org.apache.synapse.mediators.AbstractMediator; import org.apache.synapse.util.xpath.SynapseXPath; @@ -64,14 +65,13 @@ */ public boolean mediate(MessageContext synCtx) { - boolean traceOn = isTraceOn(synCtx); - boolean traceOrDebugOn = isTraceOrDebugOn(traceOn); + SynapseLog synLog = getLog(synCtx); - if (traceOrDebugOn) { - traceOrDebug(traceOn, "Start : Header mediator"); + if (synLog.isTraceOrDebugEnabled()) { + synLog.traceOrDebug("Start : Header mediator"); - if (traceOn && trace.isTraceEnabled()) { - trace.trace("Message : " + synCtx.getEnvelope()); + if (synLog.isTraceTraceEnabled()) { + synLog.traceTrace("Message : " + synCtx.getEnvelope()); } } @@ -80,8 +80,8 @@ String value = (getExpression() == null ? getValue() : expression.stringValueOf(synCtx)); - if (traceOrDebugOn) { - traceOrDebug(traceOn, "Set SOAP header : " + qName + " to : " + value); + if (synLog.isTraceOrDebugEnabled()) { + synLog.traceOrDebug("Set SOAP header : " + qName + " to : " + value); } if (qName.getNamespaceURI() == null || "".equals(qName.getNamespaceURI())) { @@ -108,8 +108,8 @@ } else { - if (traceOrDebugOn) { - traceOrDebug(traceOn, "Removing SOAP Header : " + qName); + if (synLog.isTraceOrDebugEnabled()) { + synLog.traceOrDebug("Removing SOAP Header : " + qName); } if (qName.getNamespaceURI() == null || "".equals(qName.getNamespaceURI())) { @@ -150,9 +150,7 @@ } } - if (traceOrDebugOn) { - traceOrDebug(traceOn, "End : Header mediator"); - } + synLog.traceOrDebug("End : Header mediator"); return true; } Modified: synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/ScriptMediator.java URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/ScriptMediator.java?rev=720091&r1=720090&r2=720091&view=diff ============================================================================== --- synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/ScriptMediator.java (original) +++ synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/ScriptMediator.java Sun Nov 23 17:30:09 2008 @@ -24,6 +24,7 @@ import org.apache.bsf.xml.XMLHelper; import org.apache.synapse.MessageContext; import org.apache.synapse.SynapseException; +import org.apache.synapse.SynapseLog; import org.apache.synapse.config.Entry; import org.apache.synapse.mediators.AbstractMediator; @@ -146,19 +147,18 @@ */ public boolean mediate(MessageContext synCtx) { - boolean traceOn = isTraceOn(synCtx); - boolean traceOrDebugOn = isTraceOrDebugOn(traceOn); + SynapseLog synLog = getLog(synCtx); - if (traceOrDebugOn) { - traceOrDebug(traceOn, "Start : Script mediator"); + if (synLog.isTraceOrDebugEnabled()) { + synLog.traceOrDebug("Start : Script mediator"); - if (traceOn && trace.isTraceEnabled()) { - trace.trace("Message : " + synCtx.getEnvelope()); + if (synLog.isTraceTraceEnabled()) { + synLog.traceTrace("Message : " + synCtx.getEnvelope()); } } - if (traceOrDebugOn) { - traceOrDebug(traceOn, "Scripting language : " + language + " source " + + if (synLog.isTraceOrDebugEnabled()) { + synLog.traceOrDebug("Scripting language : " + language + " source " + (key == null ? ": specified inline " : " loaded with key : " + key) + (function != null ? " function : " + function : "")); } @@ -173,12 +173,12 @@ } } - if (traceOn && trace.isTraceEnabled()) { - trace.trace("Result message after execution of script : " + synCtx.getEnvelope()); + if (synLog.isTraceTraceEnabled()) { + synLog.traceTrace("Result message after execution of script : " + synCtx.getEnvelope()); } - if (traceOrDebugOn) { - traceOrDebug(traceOn, "End : Script mediator return value : " + returnValue); + if (synLog.isTraceOrDebugEnabled()) { + synLog.traceOrDebug("End : Script mediator return value : " + returnValue); } return returnValue; Modified: synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/spring/SpringMediator.java URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/spring/SpringMediator.java?rev=720091&r1=720090&r2=720091&view=diff ============================================================================== --- synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/spring/SpringMediator.java (original) +++ synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/spring/SpringMediator.java Sun Nov 23 17:30:09 2008 @@ -23,6 +23,7 @@ import org.apache.synapse.Mediator; import org.apache.synapse.ManagedLifecycle; import org.apache.synapse.SynapseException; +import org.apache.synapse.SynapseLog; import org.apache.synapse.core.SynapseEnvironment; import org.apache.synapse.mediators.AbstractMediator; import org.apache.synapse.config.SynapseConfigUtils; @@ -57,14 +58,13 @@ public boolean mediate(MessageContext synCtx) { - boolean traceOn = isTraceOn(synCtx); - boolean traceOrDebugOn = isTraceOrDebugOn(traceOn); + SynapseLog synLog = getLog(synCtx); - if (traceOrDebugOn) { - traceOrDebug(traceOn, "Start : Spring mediator"); + if (synLog.isTraceOrDebugEnabled()) { + synLog.traceOrDebug("Start : Spring mediator"); - if (traceOn && trace.isTraceEnabled()) { - trace.trace("Message : " + synCtx.getEnvelope()); + if (synLog.isTraceTraceEnabled()) { + synLog.traceTrace("Message : " + synCtx.getEnvelope()); } } @@ -73,12 +73,12 @@ // if the configKey refers to a dynamic property if (entry != null && entry.isDynamic()) { if (!entry.isCached() || entry.isExpired()) { - buildAppContext(synCtx, traceOrDebugOn, traceOn); + buildAppContext(synCtx, synLog); } // if the property is not a DynamicProperty, we will create an ApplicationContext only once } else { if (appContext == null) { - buildAppContext(synCtx, traceOrDebugOn, traceOn); + buildAppContext(synCtx, synLog); } } @@ -87,14 +87,14 @@ Object o = appContext.getBean(beanName); if (o != null && Mediator.class.isAssignableFrom(o.getClass())) { Mediator m = (Mediator) o; - if (traceOrDebugOn) { - traceOrDebug(traceOn, "Loaded mediator from bean : " + beanName + " executing..."); + if (synLog.isTraceOrDebugEnabled()) { + synLog.traceOrDebug("Loaded mediator from bean : " + beanName + " executing..."); } return m.mediate(synCtx); } else { - if (traceOrDebugOn) { - traceOrDebug(traceOn, "Unable to load mediator from bean : " + beanName); + if (synLog.isTraceOrDebugEnabled()) { + synLog.traceOrDebug("Unable to load mediator from bean : " + beanName); } handleException("Could not load bean named : " + beanName + " from the Spring configuration with key : " + configKey, synCtx); @@ -103,17 +103,15 @@ handleException("Cannot reference application context with key : " + configKey, synCtx); } - if (traceOrDebugOn) { - traceOrDebug(traceOn, "End : Spring mediator"); - } + synLog.traceOrDebug("End : Spring mediator"); return true; } private synchronized void buildAppContext(MessageContext synCtx, - boolean traceOrDebugOn, boolean traceOn) { + SynapseLog synLog) { - if (traceOrDebugOn) { - traceOrDebug(traceOn, "Creating Spring ApplicationContext from key : " + configKey); + if (synLog.isTraceOrDebugEnabled()) { + synLog.traceOrDebug("Creating Spring ApplicationContext from key : " + configKey); } GenericApplicationContext appContext = new GenericApplicationContext(); XmlBeanDefinitionReader xbdr = new XmlBeanDefinitionReader(appContext); @@ -130,8 +128,8 @@ new InputStreamResource( SynapseConfigUtils.getStreamSource(springConfig).getInputStream())); appContext.refresh(); - if (traceOrDebugOn) { - traceOrDebug(traceOn, "Spring ApplicationContext from key : " + configKey + " created"); + if (synLog.isTraceOrDebugEnabled()) { + synLog.traceOrDebug("Spring ApplicationContext from key : " + configKey + " created"); } this.appContext = appContext; } @@ -167,7 +165,7 @@ public void init(SynapseEnvironment se) { MessageContext synCtx = se.createMessageContext(); - buildAppContext(synCtx, log.isDebugEnabled(), false); + buildAppContext(synCtx, getLog(synCtx)); } public void destroy() { Modified: synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/throttle/ThrottleMediator.java URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/throttle/ThrottleMediator.java?rev=720091&r1=720090&r2=720091&view=diff ============================================================================== --- synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/throttle/ThrottleMediator.java (original) +++ synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/throttle/ThrottleMediator.java Sun Nov 23 17:30:09 2008 @@ -23,6 +23,7 @@ import org.apache.synapse.ManagedLifecycle; import org.apache.synapse.Mediator; import org.apache.synapse.MessageContext; +import org.apache.synapse.SynapseLog; import org.apache.synapse.transport.nhttp.NhttpConstants; import org.apache.synapse.config.Entry; import org.apache.synapse.core.SynapseEnvironment; @@ -95,17 +96,16 @@ public boolean mediate(MessageContext synCtx) { - boolean traceOn = isTraceOn(synCtx); - boolean traceOrDebugOn = isTraceOrDebugOn(traceOn); + SynapseLog synLog = getLog(synCtx); boolean isResponse = synCtx.isResponse(); ConfigurationContext cc; org.apache.axis2.context.MessageContext axisMC; - if (traceOrDebugOn) { - traceOrDebug(traceOn, "Start : Throttle mediator"); + if (synLog.isTraceOrDebugEnabled()) { + synLog.traceOrDebug("Start : Throttle mediator"); - if (traceOn && trace.isTraceEnabled()) { - trace.trace("Message : " + synCtx.getEnvelope()); + if (synLog.isTraceTraceEnabled()) { + synLog.traceTrace("Message : " + synCtx.getEnvelope()); } } // To ensure the creation of throttle is thread safe â It is possible create same throttle @@ -140,8 +140,8 @@ // this uses a static policy if (throttle == null) { // only one time creation - if (traceOn && trace.isTraceEnabled()) { - trace.trace("Initializing using static throttling policy : " + if (synLog.isTraceTraceEnabled()) { + synLog.traceTrace("Initializing using static throttling policy : " + inLinePolicy); } try { @@ -242,20 +242,20 @@ } } //perform concurrency throttling - boolean canAccess = doThrottleByConcurrency(isResponse, traceOrDebugOn, traceOn); + boolean canAccess = doThrottleByConcurrency(isResponse, synLog); //if the access is success through concurrency throttle and if this is a request message //then do access rate based throttling if (throttle != null && !isResponse && canAccess) { - canAccess = throttleByAccessRate(synCtx, axisMC, cc, traceOrDebugOn, traceOn); + canAccess = throttleByAccessRate(synCtx, axisMC, cc, synLog); } // all the replication functionality of the access rate based throttling handles by itself // Just replicate the current state of ConcurrentAccessController if (isClusteringEnable && concurrentAccessController != null) { if (cc != null) { try { - if (traceOrDebugOn) { - traceOrDebug(traceOn, "Going to replicates the " + + if (synLog.isTraceOrDebugEnabled()) { + synLog.traceOrDebug("Going to replicates the " + "states of the ConcurrentAccessController with key : " + key); } Replicator.replicate(cc); @@ -296,9 +296,7 @@ } } - if (traceOrDebugOn) { - traceOrDebug(traceOn, "End : Throttle mediator"); - } + synLog.traceOrDebug("End : Throttle mediator"); return canAccess; } @@ -306,32 +304,31 @@ * Helper method that handles the concurrent access through throttle * * @param isResponse Current Message is response or not - * @param traceOrDebugOn is trace or debug on? - * @param traceOn is trace on? + * @param synLog the Synapse log to use * @return true if the caller can access ,o.w. false */ - private boolean doThrottleByConcurrency(boolean isResponse, boolean traceOrDebugOn, boolean traceOn) { + private boolean doThrottleByConcurrency(boolean isResponse, SynapseLog synLog) { boolean canAcess = true; if (concurrentAccessController != null) { // do the concurrecy throttling int concurrentLimit = concurrentAccessController.getLimit(); - if (traceOrDebugOn) { - traceOrDebug(traceOn, "Concurrent access controller for ID : " + id + + if (synLog.isTraceOrDebugEnabled()) { + synLog.traceOrDebug("Concurrent access controller for ID : " + id + " allows : " + concurrentLimit + " concurrent accesses"); } int available; if (!isResponse) { available = concurrentAccessController.getAndDecrement(); canAcess = available > 0; - if (traceOrDebugOn) { - traceOrDebug(traceOn, "Concurrency Throttle : Access " + + if (synLog.isTraceOrDebugEnabled()) { + synLog.traceOrDebug("Concurrency Throttle : Access " + (canAcess ? "allowed" : "denied") + " :: " + available + " of available of " + concurrentLimit + " connections"); } } else { available = concurrentAccessController.incrementAndGet(); - if (traceOrDebugOn) { - traceOrDebug(traceOn, "Concurrency Throttle : Connection returned" + " :: " + + if (synLog.isTraceOrDebugEnabled()) { + synLog.traceOrDebug("Concurrency Throttle : Connection returned" + " :: " + available + " of available of " + concurrentLimit + " connections"); } } @@ -345,11 +342,10 @@ * @param synCtx MessageContext(Synapse) * @param axisMC MessageContext(Axis2) * @param cc ConfigurationContext - * @param traceOrDebugOn is trace or debug on? - * @param traceOn is trace on? + * @param synLog the Synapse log to use * @return ue if the caller can access ,o.w. false */ - private boolean throttleByAccessRate(MessageContext synCtx, org.apache.axis2.context.MessageContext axisMC, ConfigurationContext cc, boolean traceOrDebugOn, boolean traceOn) { + private boolean throttleByAccessRate(MessageContext synCtx, org.apache.axis2.context.MessageContext axisMC, ConfigurationContext cc, SynapseLog synLog) { String callerId = null; boolean canAccess = true; @@ -363,8 +359,8 @@ // this domain name ,then throttling will occur according to that configuration if (domainName != null) { // do the domain based throttling - if (traceOrDebugOn) { - traceOrDebug(traceOn, "The Domain Name of the caller is :" + domainName); + if (synLog.isTraceOrDebugEnabled()) { + synLog.traceOrDebug("The Domain Name of the caller is :" + domainName); } // loads the DomainBasedThrottleContext ThrottleContext context @@ -388,8 +384,8 @@ canAccess = accessControler.canAccess(context, callerId, ThrottleConstants.DOMAIN_BASE); - if (traceOrDebugOn) { - traceOrDebug(traceOn, "Access " + (canAccess ? "allowed" : "denied") + if (synLog.isTraceOrDebugEnabled()) { + synLog.traceOrDebug("Access " + (canAccess ? "allowed" : "denied") + " for Domain Name : " + domainName); } @@ -411,9 +407,7 @@ } } } else { - if (traceOrDebugOn) { - traceOrDebug(traceOn, "The Domain name of the caller cannot be found"); - } + synLog.traceOrDebug("The Domain name of the caller cannot be found"); } //At this point , any configuration for the remote caller hasn't found , @@ -421,14 +415,12 @@ if (callerId == null) { //do the IP-based throttling if (remoteIP == null) { - if (traceOrDebugOn) { - traceOrDebug(traceOn, "The IP address of the caller cannot be found"); - } + synLog.traceOrDebug("The IP address of the caller cannot be found"); canAccess = true; } else { - if (traceOrDebugOn) { - traceOrDebug(traceOn, "The IP Address of the caller is :" + remoteIP); + if (synLog.isTraceOrDebugEnabled()) { + synLog.traceOrDebug("The IP Address of the caller is :" + remoteIP); } try { // Loads the IPBasedThrottleContext @@ -451,8 +443,8 @@ canAccess = accessControler.canAccess(context, callerId, ThrottleConstants.IP_BASE); - if (traceOrDebugOn) { - traceOrDebug(traceOn, "Access " + + if (synLog.isTraceOrDebugEnabled()) { + synLog.traceOrDebug("Access " + (canAccess ? "allowed" : "denied") + " for IP : " + remoteIP); } Modified: synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/xquery/XQueryMediator.java URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/xquery/XQueryMediator.java?rev=720091&r1=720090&r2=720091&view=diff ============================================================================== --- synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/xquery/XQueryMediator.java (original) +++ synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/xquery/XQueryMediator.java Sun Nov 23 17:30:09 2008 @@ -31,6 +31,7 @@ import org.apache.axiom.soap.SOAP12Constants; import org.apache.synapse.MessageContext; import org.apache.synapse.SynapseException; +import org.apache.synapse.SynapseLog; import org.apache.synapse.config.Entry; import org.apache.synapse.config.SynapseConfigUtils; import org.apache.synapse.mediators.AbstractMediator; @@ -144,24 +145,21 @@ try { - boolean traceOn = isTraceOn(synCtx); - boolean traceOrDebugOn = isTraceOrDebugOn(traceOn); + SynapseLog synLog = getLog(synCtx); - if (traceOrDebugOn) { - traceOrDebug(traceOn, "Start : XQuery mediator"); + if (synLog.isTraceOrDebugEnabled()) { + synLog.traceOrDebug("Start : XQuery mediator"); - if (traceOn && trace.isTraceEnabled()) { - trace.trace("Message : " + synCtx.getEnvelope()); + if (synLog.isTraceTraceEnabled()) { + synLog.traceTrace("Message : " + synCtx.getEnvelope()); } - traceOrDebug(traceOn, "Performing XQuery using query resource with key : " + queryKey); + synLog.traceOrDebug("Performing XQuery using query resource with key : " + queryKey); } // perform the xquery - performQuery(synCtx, traceOrDebugOn, traceOn); + performQuery(synCtx, synLog); - if (traceOrDebugOn) { - traceOrDebug(traceOn, "End : XQuery mediator"); - } + synLog.traceOrDebug("End : XQuery mediator"); return true; @@ -175,10 +173,9 @@ * Perform the quering and get the result and attached to the target node * * @param synCtx The current MessageContext - * @param traceOrDebugOn is tracing or debbug on - * @param traceOn indicate whether trace is ON or OFF + * @param synLog the Synapse log to use */ - private void performQuery(MessageContext synCtx, boolean traceOrDebugOn, boolean traceOn) { + private void performQuery(MessageContext synCtx, SynapseLog synLog) { boolean reLoad = false; boolean needBind = false; @@ -201,9 +198,7 @@ cachedXQDataSource = new SaxonXQDataSource(); //setting up the properties to the XQDataSource if (dataSourceProperties != null && !dataSourceProperties.isEmpty()) { - if (traceOrDebugOn) { - traceOrDebug(traceOn, "Setting up properties to the XQDataSource"); - } + synLog.traceOrDebug("Setting up properties to the XQDataSource"); for (int i = 0; i < dataSourceProperties.size(); i++) { MediatorProperty prop = (MediatorProperty) dataSourceProperties.get(i); if (prop != null) { @@ -217,9 +212,7 @@ if (cachedConnection == null || (cachedConnection != null && cachedConnection.isClosed())) { //get the Connection to XML DataBase - if (traceOrDebugOn) { - traceOrDebug(traceOn, "Creating a connection from the XQDataSource "); - } + synLog.traceOrDebug("Creating a connection from the XQDataSource "); cachedConnection = cachedXQDataSource.getConnection(); } @@ -232,9 +225,9 @@ if (cachedPreparedExpression == null) { - if (traceOrDebugOn) { - traceOrDebug(traceOn, "Using in-lined query source - " + querySource); - traceOrDebug(traceOn, "Prepare an expression for the query "); + if (synLog.isTraceOrDebugEnabled()) { + synLog.traceOrDebug("Using in-lined query source - " + querySource); + synLog.traceOrDebug("Prepare an expression for the query "); } //create an XQPreparedExpression using the query source @@ -247,8 +240,8 @@ Object o = synCtx.getEntry(queryKey); if (o == null) { - if (traceOrDebugOn) { - traceOrDebug(traceOn, "Couldn't find the xquery source with a key " + if (synLog.isTraceOrDebugEnabled()) { + synLog.traceOrDebug("Couldn't find the xquery source with a key " + queryKey); } return; @@ -266,8 +259,8 @@ try { inputStream = dataHandler.getInputStream(); if (inputStream == null) { - if (traceOrDebugOn) { - traceOrDebug(traceOn, "Couldn't get" + + if (synLog.isTraceOrDebugEnabled()) { + synLog.traceOrDebug("Couldn't get" + " the stream from the xquery source with a key " + queryKey); } @@ -281,17 +274,17 @@ } if ((sourceCode == null || "".equals(sourceCode)) && inputStream == null) { - if (traceOrDebugOn) { - traceOrDebug(traceOn, "Couldn't find the xquery source with a key " + if (synLog.isTraceOrDebugEnabled()) { + synLog.traceOrDebug("Couldn't find the xquery source with a key " + queryKey); } return; } - if (traceOrDebugOn) { - traceOrDebug(traceOn, "Picked up the xquery source from the " + + if (synLog.isTraceOrDebugEnabled()) { + synLog.traceOrDebug("Picked up the xquery source from the " + "key " + queryKey); - traceOrDebug(traceOn, "Prepare an expression for the query "); + synLog.traceOrDebug("Prepare an expression for the query "); } if (sourceCode != null) { @@ -310,16 +303,14 @@ //Bind the external variables to the DynamicContext if (variables != null & !variables.isEmpty()) { - if (traceOrDebugOn) { - traceOrDebug(traceOn, "Binding external variables to the DynamicContext"); - } + synLog.traceOrDebug("Binding external variables to the DynamicContext"); for (int i = 0; i < variables.size(); i++) { MediatorVariable variable = (MediatorVariable) variables.get(i); boolean hasValueChanged = variable.evaluateValue(synCtx); //if the value has changed or need binding because the expression has recreated if (hasValueChanged || needBind) { //Binds the external variable to the DynamicContext - bindVariable(cachedPreparedExpression, variable, traceOrDebugOn, traceOn); + bindVariable(cachedPreparedExpression, variable, synLog); } } } @@ -330,9 +321,7 @@ } if (resultSequence == null) { - if (traceOrDebugOn) { - traceOrDebug(traceOn, "Result Sequence is null"); - } + synLog.traceOrDebug("Result Sequence is null"); return; } @@ -349,15 +338,15 @@ } int itemKind = itemType.getItemKind(); int baseType = itemType.getBaseType(); - if (traceOrDebugOn) { - traceOrDebug(traceOn, "The XQuery Result " + xqItem.getItemAsString()); + if (synLog.isTraceOrDebugEnabled()) { + synLog.traceOrDebug("The XQuery Result " + xqItem.getItemAsString()); } //The target node that is going to modify OMNode destination = getTargetNode(synCtx); if (destination != null) { - if (traceOrDebugOn) { - traceOrDebug(traceOn, "The target node " + destination); + if (synLog.isTraceOrDebugEnabled()) { + synLog.traceOrDebug("The target node " + destination); } //If the result is XML @@ -410,12 +399,11 @@ * * @param xqDynamicContext The Dynamic Context to which the variable will be binded * @param variable The variable which contains the name and vaule for binding - * @param traceOrDebugOn is tracing or debbug on - * @param traceOn indicate whether trace is ON or OF + * @param synLog the Synapse log to use * @throws XQException throws if any error occurs when binding the variable */ private void bindVariable(XQDynamicContext xqDynamicContext, MediatorVariable variable, - boolean traceOrDebugOn, boolean traceOn) throws XQException { + SynapseLog synLog) throws XQException { if (variable != null) { @@ -425,8 +413,8 @@ if (value != null && type != -1) { - if (traceOrDebugOn) { - traceOrDebug(traceOn, "Binding a variable to the DynamicContext with a name : " + if (synLog.isTraceOrDebugEnabled()) { + synLog.traceOrDebug("Binding a variable to the DynamicContext with a name : " + name + " and a value : " + value); }
