Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/ValidateMediatorFactory.java URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/ValidateMediatorFactory.java?rev=579749&r1=579748&r2=579749&view=diff ============================================================================== --- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/ValidateMediatorFactory.java (original) +++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/ValidateMediatorFactory.java Wed Sep 26 11:28:04 2007 @@ -22,9 +22,6 @@ import org.apache.axiom.om.OMAttribute; import org.apache.axiom.om.OMElement; import org.apache.axiom.om.xpath.AXIOMXPath; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.apache.synapse.SynapseException; import org.apache.synapse.Mediator; import org.apache.synapse.mediators.builtin.ValidateMediator; import org.jaxen.JaxenException; @@ -48,15 +45,9 @@ */ public class ValidateMediatorFactory extends AbstractListMediatorFactory { - private static final Log log = LogFactory.getLog(ValidateMediatorFactory.class); - private static final QName VALIDATE_Q = new QName(XMLConfigConstants.SYNAPSE_NAMESPACE, "validate"); private static final QName ON_FAIL_Q = new QName(XMLConfigConstants.SYNAPSE_NAMESPACE, "on-fail"); private static final QName SCHEMA_Q = new QName(XMLConfigConstants.SYNAPSE_NAMESPACE, "schema"); - private static final QName KEY_Q = new QName(XMLConfigConstants.NULL_NAMESPACE, "key"); - private static final QName SOURCE_Q = new QName(XMLConfigConstants.NULL_NAMESPACE, "source"); - public static final QName ATT_NAME_Q = new QName(XMLConfigConstants.NULL_NAMESPACE, "name"); - public static final QName ATT_VALUE_Q = new QName(XMLConfigConstants.NULL_NAMESPACE, "value"); public Mediator createMediator(OMElement elem) { @@ -70,7 +61,7 @@ Object o = schemas.next(); if (o instanceof OMElement) { OMElement omElem = (OMElement) o; - OMAttribute keyAtt = omElem.getAttribute(KEY_Q); + OMAttribute keyAtt = omElem.getAttribute(ATT_KEY); if (keyAtt != null) { schemaKeys.add(keyAtt.getAttributeValue()); } else { @@ -88,7 +79,7 @@ } // process source XPath attribute if present - OMAttribute attSource = elem.getAttribute(SOURCE_Q); + OMAttribute attSource = elem.getAttribute(ATT_SOURCE); if (attSource != null) { try { @@ -116,13 +107,13 @@ // after successfully creating the mediator // set its common attributes such as tracing etc - initMediator(validateMediator,elem); + processTraceState(validateMediator,elem); // set the features - Iterator iter = elem.getChildrenWithName(new QName(XMLConfigConstants.SYNAPSE_NAMESPACE, "feature")); + Iterator iter = elem.getChildrenWithName(FEATURE_Q); while (iter.hasNext()) { OMElement featureElem = (OMElement) iter.next(); - OMAttribute attName = featureElem.getAttribute(ATT_NAME_Q); - OMAttribute attValue = featureElem.getAttribute(ATT_VALUE_Q); + OMAttribute attName = featureElem.getAttribute(ATT_NAME); + OMAttribute attValue = featureElem.getAttribute(ATT_VALUE); if (attName != null && attValue != null) { String name = attName.getAttributeValue(); String value = attValue.getAttributeValue(); @@ -146,16 +137,6 @@ } } return validateMediator; - } - - private void handleException(String msg, Exception e) { - log.error(msg, e); - throw new SynapseException(msg, e); - } - - private void handleException(String msg) { - log.error(msg); - throw new SynapseException(msg); } public QName getTagQName() {
Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/ValidateMediatorSerializer.java URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/ValidateMediatorSerializer.java?rev=579749&r1=579748&r2=579749&view=diff ============================================================================== --- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/ValidateMediatorSerializer.java (original) +++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/ValidateMediatorSerializer.java Wed Sep 26 11:28:04 2007 @@ -22,7 +22,6 @@ import org.apache.axiom.om.OMElement; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.synapse.SynapseException; import org.apache.synapse.Mediator; import org.apache.synapse.mediators.builtin.ValidateMediator; import org.apache.synapse.mediators.MediatorProperty; @@ -42,8 +41,6 @@ public class ValidateMediatorSerializer extends AbstractListMediatorSerializer implements MediatorSerializer { - private static final Log log = LogFactory.getLog(ValidateMediatorSerializer.class); - public OMElement serializeMediator(OMElement parent, Mediator m) { if (!(m instanceof ValidateMediator)) { @@ -52,7 +49,7 @@ ValidateMediator mediator = (ValidateMediator) m; OMElement validate = fac.createOMElement("validate", synNS); - finalizeSerialization(validate, mediator); + saveTracingState(validate, mediator); if (mediator.getSource() != null) { validate.addAttribute(fac.createOMAttribute( @@ -97,8 +94,4 @@ return ValidateMediator.class.getName(); } - private void handleException(String msg) { - log.error(msg); - throw new SynapseException(msg); - } } Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/XSLTMediatorFactory.java URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/XSLTMediatorFactory.java?rev=579749&r1=579748&r2=579749&view=diff ============================================================================== --- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/XSLTMediatorFactory.java (original) +++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/XSLTMediatorFactory.java Wed Sep 26 11:28:04 2007 @@ -22,9 +22,6 @@ import org.apache.axiom.om.OMAttribute; import org.apache.axiom.om.OMElement; import org.apache.axiom.om.xpath.AXIOMXPath; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.apache.synapse.SynapseException; import org.apache.synapse.config.xml.OMElementUtils; import org.apache.synapse.Mediator; import org.apache.synapse.mediators.transform.XSLTMediator; @@ -47,11 +44,7 @@ */ public class XSLTMediatorFactory extends AbstractMediatorFactory { - private static final Log log = LogFactory.getLog(XSLTMediatorFactory.class); private static final QName TAG_NAME = new QName(XMLConfigConstants.SYNAPSE_NAMESPACE, "xslt"); - public static final QName ATT_NAME_Q = new QName(XMLConfigConstants.NULL_NAMESPACE, "name"); - public static final QName ATT_VALUE_Q = new QName(XMLConfigConstants.NULL_NAMESPACE, "value"); - public QName getTagQName() { return TAG_NAME; @@ -61,8 +54,8 @@ XSLTMediator transformMediator = new XSLTMediator(); - OMAttribute attXslt = elem.getAttribute(new QName(XMLConfigConstants.NULL_NAMESPACE, "key")); - OMAttribute attSource = elem.getAttribute(new QName(XMLConfigConstants.NULL_NAMESPACE, "source")); + OMAttribute attXslt = elem.getAttribute(ATT_KEY); + OMAttribute attSource = elem.getAttribute(ATT_SOURCE); if (attXslt != null) { transformMediator.setXsltKey(attXslt.getAttributeValue()); @@ -84,13 +77,13 @@ } // after successfully creating the mediator // set its common attributes such as tracing etc - initMediator(transformMediator, elem); + processTraceState(transformMediator, elem); // set the features - Iterator iter = elem.getChildrenWithName(new QName(XMLConfigConstants.SYNAPSE_NAMESPACE, "feature")); + Iterator iter = elem.getChildrenWithName(FEATURE_Q); while (iter.hasNext()) { OMElement featureElem = (OMElement) iter.next(); - OMAttribute attName = featureElem.getAttribute(ATT_NAME_Q); - OMAttribute attValue = featureElem.getAttribute(ATT_VALUE_Q); + OMAttribute attName = featureElem.getAttribute(ATT_NAME); + OMAttribute attValue = featureElem.getAttribute(ATT_VALUE); if (attName != null && attValue != null) { String name = attName.getAttributeValue(); String value = attValue.getAttributeValue(); @@ -116,15 +109,4 @@ return transformMediator; } - - private void handleException(String msg, Exception e) { - log.error(msg, e); - throw new SynapseException(msg, e); - } - - private void handleException(String msg) { - log.error(msg); - throw new SynapseException(msg); - } - } Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/XSLTMediatorSerializer.java URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/XSLTMediatorSerializer.java?rev=579749&r1=579748&r2=579749&view=diff ============================================================================== --- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/XSLTMediatorSerializer.java (original) +++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/XSLTMediatorSerializer.java Wed Sep 26 11:28:04 2007 @@ -22,14 +22,11 @@ import org.apache.axiom.om.OMElement; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.synapse.SynapseException; import org.apache.synapse.Mediator; import org.apache.synapse.mediators.transform.XSLTMediator; import org.apache.synapse.mediators.MediatorProperty; import org.apache.synapse.config.xml.AbstractMediatorSerializer; -import java.util.Map; -import java.util.Set; import java.util.Iterator; import java.util.List; @@ -42,8 +39,6 @@ */ public class XSLTMediatorSerializer extends AbstractMediatorSerializer { - private static final Log log = LogFactory.getLog(XSLTMediatorSerializer.class); - public OMElement serializeMediator(OMElement parent, Mediator m) { if (!(m instanceof XSLTMediator)) { @@ -59,7 +54,7 @@ } else { handleException("Invalid XSLT mediator. XSLT registry key is required"); } - finalizeSerialization(xslt,mediator); + saveTracingState(xslt,mediator); if (mediator.getSource() != null && !XSLTMediator.DEFAULT_XPATH.toString().equals(mediator.getSource().toString())) { @@ -93,10 +88,5 @@ public String getMediatorClassName() { return XSLTMediator.class.getName(); - } - - private void handleException(String msg) { - log.error(msg); - throw new SynapseException(msg); } } Modified: webservices/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/ScriptMediatorFactory.java URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/ScriptMediatorFactory.java?rev=579749&r1=579748&r2=579749&view=diff ============================================================================== --- webservices/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/ScriptMediatorFactory.java (original) +++ webservices/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/ScriptMediatorFactory.java Wed Sep 26 11:28:04 2007 @@ -86,7 +86,7 @@ mediator = new ScriptMediator(langAtt.getAttributeValue(), elem.getText()); } - initMediator(mediator, elem); + processTraceState(mediator, elem); return mediator; } Modified: webservices/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/ScriptMediatorSerializer.java URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/ScriptMediatorSerializer.java?rev=579749&r1=579748&r2=579749&view=diff ============================================================================== --- webservices/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/ScriptMediatorSerializer.java (original) +++ webservices/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/ScriptMediatorSerializer.java Wed Sep 26 11:28:04 2007 @@ -20,7 +20,6 @@ import org.apache.synapse.config.xml.AbstractMediatorSerializer; import org.apache.synapse.Mediator; -import org.apache.synapse.SynapseException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.axiom.om.OMElement; @@ -61,7 +60,7 @@ script.addChild(textData); } - finalizeSerialization(script, scriptMediator); + saveTracingState(script, scriptMediator); if (parent != null) { parent.addChild(script); } @@ -70,10 +69,5 @@ public String getMediatorClassName() { return ScriptMediator.class.getName(); - } - - private void handleException(String msg) { - log.error(msg); - throw new SynapseException(msg); } } Modified: webservices/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/spring/SpringMediatorFactory.java URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/spring/SpringMediatorFactory.java?rev=579749&r1=579748&r2=579749&view=diff ============================================================================== --- webservices/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/spring/SpringMediatorFactory.java (original) +++ webservices/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/spring/SpringMediatorFactory.java Wed Sep 26 11:28:04 2007 @@ -23,7 +23,6 @@ import org.apache.axiom.om.OMElement; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.synapse.SynapseException; import org.apache.synapse.Mediator; import org.apache.synapse.config.xml.XMLConfigConstants; import org.apache.synapse.config.xml.AbstractMediatorFactory; @@ -64,17 +63,12 @@ // after successfully creating the mediator // set its common attributes such as tracing etc - initMediator(sm,elem); + processTraceState(sm,elem); sm.setBeanName(bean.getAttributeValue()); sm.setConfigKey(key.getAttributeValue()); return sm; } return null; - } - - private void handleException(String msg) { - log.error(msg); - throw new SynapseException(msg); } public QName getTagQName() { Modified: webservices/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/spring/SpringMediatorSerializer.java URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/spring/SpringMediatorSerializer.java?rev=579749&r1=579748&r2=579749&view=diff ============================================================================== --- webservices/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/spring/SpringMediatorSerializer.java (original) +++ webservices/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/spring/SpringMediatorSerializer.java Wed Sep 26 11:28:04 2007 @@ -23,7 +23,6 @@ import org.apache.axiom.om.OMNamespace; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.synapse.SynapseException; import org.apache.synapse.Mediator; import org.apache.synapse.config.xml.XMLConfigConstants; import org.apache.synapse.config.xml.MediatorSerializer; @@ -54,7 +53,7 @@ } else { handleException("Invalid mediator. Bean name required."); } - finalizeSerialization(spring,mediator); + saveTracingState(spring,mediator); if (mediator.getConfigKey() != null) { spring.addAttribute(fac.createOMAttribute( @@ -71,10 +70,5 @@ public String getMediatorClassName() { return SpringMediator.class.getName(); - } - - private void handleException(String msg) { - log.error(msg); - throw new SynapseException(msg); } } Modified: webservices/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/throttle/ThrottleMediatorFactory.java URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/throttle/ThrottleMediatorFactory.java?rev=579749&r1=579748&r2=579749&view=diff ============================================================================== --- webservices/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/throttle/ThrottleMediatorFactory.java (original) +++ webservices/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/throttle/ThrottleMediatorFactory.java Wed Sep 26 11:28:04 2007 @@ -21,7 +21,6 @@ import org.apache.axiom.om.OMAttribute; import org.apache.axiom.om.OMElement; import org.apache.synapse.Mediator; -import org.apache.synapse.SynapseException; import org.apache.synapse.config.xml.AbstractMediatorFactory; import org.apache.synapse.config.xml.XMLConfigConstants; import org.apache.synapse.config.xml.SequenceMediatorFactory; @@ -69,7 +68,7 @@ } // after successfully creating the mediator // set its common attributes such as tracing etc - initMediator(throttleMediator,elem); + processTraceState(throttleMediator,elem); SequenceMediatorFactory mediatorFactory = new SequenceMediatorFactory(); OMAttribute onReject = elem.getAttribute( new QName(XMLConfigConstants.NULL_NAMESPACE, XMLConfigConstants.ONREJECT)); @@ -102,11 +101,6 @@ } } return throttleMediator; - } - - private void handleException(String msg) { - log.error(msg); - throw new SynapseException(msg); } public QName getTagQName() { Modified: webservices/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/throttle/ThrottleMediatorSerializer.java URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/throttle/ThrottleMediatorSerializer.java?rev=579749&r1=579748&r2=579749&view=diff ============================================================================== --- webservices/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/throttle/ThrottleMediatorSerializer.java (original) +++ webservices/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/throttle/ThrottleMediatorSerializer.java Wed Sep 26 11:28:04 2007 @@ -24,7 +24,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.synapse.Mediator; -import org.apache.synapse.SynapseException; import org.apache.synapse.mediators.base.SequenceMediator; import org.apache.synapse.config.xml.AbstractMediatorSerializer; import org.apache.synapse.config.xml.XMLConfigConstants; @@ -60,7 +59,7 @@ throttle.addChild(policy); } } - finalizeSerialization(throttle, throttleMediator); + saveTracingState(throttle, throttleMediator); String onReject = throttleMediator.getOnReject(); if (onReject != null) { throttle.addAttribute(fac.createOMAttribute(XMLConfigConstants.ONREJECT, nullNS, onReject)); @@ -97,10 +96,4 @@ public String getMediatorClassName() { return ThrottleMediator.class.getName(); } - - private void handleException(String msg) { - log.error(msg); - throw new SynapseException(msg); - } - } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
