You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@synapse.apache.org by ru...@apache.org on 2008/03/11 20:33:02 UTC
svn commit: r636073 [1/2] - in /synapse/trunk/java/modules:
core/src/main/java/org/apache/synapse/config/xml/
core/src/main/java/org/apache/synapse/mediators/
core/src/main/java/org/apache/synapse/mediators/builtin/
core/src/main/java/org/apache/synaps...
Author: ruwan
Date: Tue Mar 11 12:32:51 2008
New Revision: 636073
URL: http://svn.apache.org/viewvc?rev=636073&view=rev
Log:
Incoperated the SynapseXPath - need to fix some factories and Serializers (part 3 of SYNAPSE-235)
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/AbstractDBMediatorFactory.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/AggregateMediatorFactory.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/AnnotatedCommandMediatorFactory.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/FaultMediatorFactory.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/FilterMediatorFactory.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/HeaderMediatorFactory.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/IterateMediatorFactory.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/MediatorPropertyFactory.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/POJOCommandMediatorFactory.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/POJOCommandMediatorSerializer.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/PropertyHelper.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/PropertyMediatorFactory.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/RMSequenceMediatorFactory.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SwitchMediatorFactory.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SynapseXMLConfigurationFactory.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SynapseXPathFactory.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SynapseXPathSerializer.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/ValidateMediatorFactory.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/XSLTMediatorFactory.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/MediatorProperty.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/CalloutMediator.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/PropertyMediator.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/RMSequenceMediator.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/ValidateMediator.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/db/Statement.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/eip/EIPUtils.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/eip/aggregator/AggregateMediator.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/eip/splitter/IterateMediator.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/ext/AnnotatedCommandMediator.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/ext/POJOCommandMediator.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/filters/FilterMediator.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/filters/SwitchMediator.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/transform/FaultMediator.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/transform/HeaderMediator.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/transform/XSLTMediator.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/SynapseXPath.java
synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/core/axis2/Axis2MessageContextTest.java
synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/builtin/PropertyMediatorTest.java
synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/builtin/ValidateMediatorTest.java
synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/ext/AnnotatedCommandMediatorTest.java
synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/ext/ClassMediatorTest.java
synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/filters/FilterMediatorTest.java
synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/filters/SwitchMediatorTest.java
synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/transform/HeaderMediatorTest.java
synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/transform/XSLTMediatorTest.java
synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/n2n/SynapseCommodityServiceTest.java
synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/xquery/MediatorCustomVariable.java
synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/xquery/XQueryMediator.java
synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/xquery/XQueryMediatorFactory.java
synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/xquery/XQueryMediatorSerializer.java
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/AbstractDBMediatorFactory.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/AbstractDBMediatorFactory.java?rev=636073&r1=636072&r2=636073&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/AbstractDBMediatorFactory.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/AbstractDBMediatorFactory.java Tue Mar 11 12:32:51 2008
@@ -21,10 +21,10 @@
import org.apache.axiom.om.OMAttribute;
import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.xpath.AXIOMXPath;
import org.apache.commons.dbcp.BasicDataSource;
import org.apache.synapse.mediators.db.AbstractDBMediator;
import org.apache.synapse.mediators.db.Statement;
+import org.apache.synapse.util.SynapseXPath;
import org.jaxen.JaxenException;
import javax.naming.Context;
@@ -105,7 +105,7 @@
// get the 'pool' element and determine if we need to create a DataSource or
// look up using JNDI
try {
- AXIOMXPath xpath = new AXIOMXPath("self::node()/syn:connection/syn:pool");
+ SynapseXPath xpath = new SynapseXPath("self::node()/syn:connection/syn:pool");
xpath.addNamespace("syn", XMLConfigConstants.SYNAPSE_NAMESPACE);
pool = (OMElement) xpath.selectSingleNode(elem);
@@ -292,10 +292,10 @@
if (xpath != null || value != null) {
- AXIOMXPath xp = null;
+ SynapseXPath xp = null;
if (xpath != null) {
try {
- xp = new AXIOMXPath(xpath);
+ xp = new SynapseXPath(xpath);
OMElementUtils.addNameSpaces(xp, paramElt, log);
} catch (JaxenException e) {
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=636073&r1=636072&r2=636073&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 Tue Mar 11 12:32:51 2008
@@ -23,12 +23,12 @@
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMNamespace;
-import org.apache.axiom.om.xpath.AXIOMXPath;
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.MediatorProperty;
+import org.apache.synapse.util.SynapseXPath;
import javax.xml.namespace.QName;
import java.util.Collection;
@@ -106,7 +106,7 @@
serializeMediatorProperties(parent, props);
}
- protected void serializeNamespaces(OMElement elem, AXIOMXPath xpath) {
+ protected void serializeNamespaces(OMElement elem, SynapseXPath xpath) {
Iterator iter = xpath.getNamespaces().keySet().iterator();
while (iter.hasNext()) {
String prefix = (String) iter.next();
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/AggregateMediatorFactory.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/AggregateMediatorFactory.java?rev=636073&r1=636072&r2=636073&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/AggregateMediatorFactory.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/AggregateMediatorFactory.java Tue Mar 11 12:32:51 2008
@@ -19,15 +19,15 @@
package org.apache.synapse.config.xml;
-import org.apache.synapse.Mediator;
-import org.apache.synapse.mediators.eip.aggregator.AggregateMediator;
-import org.apache.synapse.mediators.builtin.DropMediator;
-import org.apache.synapse.mediators.base.SequenceMediator;
-import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMAttribute;
-import org.apache.axiom.om.xpath.AXIOMXPath;
+import org.apache.axiom.om.OMElement;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.synapse.Mediator;
+import org.apache.synapse.mediators.base.SequenceMediator;
+import org.apache.synapse.mediators.builtin.DropMediator;
+import org.apache.synapse.mediators.eip.aggregator.AggregateMediator;
+import org.apache.synapse.util.SynapseXPath;
import org.jaxen.JaxenException;
import javax.xml.namespace.QName;
@@ -72,7 +72,7 @@
OMAttribute corelateExpr = corelateOn.getAttribute(EXPRESSION_Q);
if (corelateExpr != null) {
try {
- AXIOMXPath xp = new AXIOMXPath(corelateExpr.getAttributeValue());
+ SynapseXPath xp = new SynapseXPath(corelateExpr.getAttributeValue());
OMElementUtils.addNameSpaces(xp, corelateOn, log);
mediator.setCorrelateExpression(xp);
} catch (JaxenException e) {
@@ -109,7 +109,7 @@
OMAttribute aggregateExpr = onComplete.getAttribute(EXPRESSION_Q);
if (aggregateExpr != null) {
try {
- AXIOMXPath xp = new AXIOMXPath(aggregateExpr.getAttributeValue());
+ SynapseXPath xp = new SynapseXPath(aggregateExpr.getAttributeValue());
OMElementUtils.addNameSpaces(xp, onComplete, log);
mediator.setAggregationExpression(xp);
} catch (JaxenException e) {
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/AnnotatedCommandMediatorFactory.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/AnnotatedCommandMediatorFactory.java?rev=636073&r1=636072&r2=636073&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/AnnotatedCommandMediatorFactory.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/AnnotatedCommandMediatorFactory.java Tue Mar 11 12:32:51 2008
@@ -21,10 +21,10 @@
import org.apache.axiom.om.OMAttribute;
import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.xpath.AXIOMXPath;
import org.apache.synapse.Mediator;
import org.apache.synapse.SynapseException;
import org.apache.synapse.mediators.ext.AnnotatedCommandMediator;
+import org.apache.synapse.util.SynapseXPath;
import org.jaxen.JaxenException;
import javax.xml.namespace.QName;
@@ -81,9 +81,9 @@
"A POJO command mediator property must specify the name attribute");
} else {
if (child.getAttribute(ATT_EXPRN) != null) {
- AXIOMXPath xpath = null;
+ SynapseXPath xpath = null;
try {
- xpath = new AXIOMXPath(
+ xpath = new SynapseXPath(
child.getAttribute(ATT_EXPRN).getAttributeValue());
OMElementUtils.addNameSpaces(xpath, child, log);
pojoMediator.addMessageSetterProperty(propName, xpath);
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/FaultMediatorFactory.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/FaultMediatorFactory.java?rev=636073&r1=636072&r2=636073&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/FaultMediatorFactory.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/FaultMediatorFactory.java Tue Mar 11 12:32:51 2008
@@ -21,12 +21,10 @@
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.SynapseException;
import org.apache.synapse.mediators.transform.FaultMediator;
+import org.apache.synapse.util.SynapseXPath;
import org.jaxen.JaxenException;
import javax.xml.namespace.QName;
@@ -102,7 +100,7 @@
faultMediator.setFaultCodeValue(new QName(namespaceURI, name, prefix));
} else if (expression != null) {
try {
- AXIOMXPath xp = new AXIOMXPath(expression.getAttributeValue());
+ SynapseXPath xp = new SynapseXPath(expression.getAttributeValue());
OMElementUtils.addNameSpaces(xp, code, log);
faultMediator.setFaultCodeExpr(xp);
} catch (JaxenException je) {
@@ -131,7 +129,7 @@
faultMediator.setFaultReasonValue(value.getAttributeValue());
} else if (expression != null) {
try {
- AXIOMXPath xp = new AXIOMXPath(expression.getAttributeValue());
+ SynapseXPath xp = new SynapseXPath(expression.getAttributeValue());
OMElementUtils.addNameSpaces(xp, reason, log);
faultMediator.setFaultReasonExpr(xp);
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/FilterMediatorFactory.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/FilterMediatorFactory.java?rev=636073&r1=636072&r2=636073&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/FilterMediatorFactory.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/FilterMediatorFactory.java Tue Mar 11 12:32:51 2008
@@ -21,10 +21,10 @@
import org.apache.axiom.om.OMAttribute;
import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.xpath.AXIOMXPath;
import org.apache.synapse.Mediator;
import org.apache.synapse.SynapseConstants;
import org.apache.synapse.mediators.filters.FilterMediator;
+import org.apache.synapse.util.SynapseXPath;
import org.jaxen.JaxenException;
import javax.xml.namespace.QName;
@@ -77,7 +77,7 @@
} else {
try {
- filter.setXpath(new AXIOMXPath(attXpath.getAttributeValue()));
+ filter.setXpath(new SynapseXPath(attXpath.getAttributeValue()));
OMElementUtils.addNameSpaces(filter.getXpath(), elem, log);
} catch (JaxenException e) {
handleException("Invalid XPath expression for attribute xpath : "
@@ -97,7 +97,7 @@
} else {
try {
- filter.setSource(new AXIOMXPath(attSource.getAttributeValue()));
+ filter.setSource(new SynapseXPath(attSource.getAttributeValue()));
OMElementUtils.addNameSpaces(filter.getSource(), elem, log);
} catch (JaxenException e) {
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/HeaderMediatorFactory.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/HeaderMediatorFactory.java?rev=636073&r1=636072&r2=636073&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/HeaderMediatorFactory.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/HeaderMediatorFactory.java Tue Mar 11 12:32:51 2008
@@ -21,12 +21,10 @@
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.SynapseException;
import org.apache.synapse.mediators.transform.HeaderMediator;
+import org.apache.synapse.util.SynapseXPath;
import org.jaxen.JaxenException;
import javax.xml.namespace.QName;
@@ -103,7 +101,7 @@
} else if (exprn != null && exprn.getAttributeValue() != null) {
try {
- AXIOMXPath xp = new AXIOMXPath(exprn.getAttributeValue());
+ SynapseXPath xp = new SynapseXPath(exprn.getAttributeValue());
OMElementUtils.addNameSpaces(xp, elem, log);
headerMediator.setExpression(xp);
} catch (JaxenException je) {
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/IterateMediatorFactory.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/IterateMediatorFactory.java?rev=636073&r1=636072&r2=636073&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/IterateMediatorFactory.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/IterateMediatorFactory.java Tue Mar 11 12:32:51 2008
@@ -19,14 +19,14 @@
package org.apache.synapse.config.xml;
-import org.apache.synapse.Mediator;
-import org.apache.synapse.SynapseConstants;
-import org.apache.synapse.mediators.eip.splitter.IterateMediator;
-import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMAttribute;
-import org.apache.axiom.om.xpath.AXIOMXPath;
+import org.apache.axiom.om.OMElement;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.synapse.Mediator;
+import org.apache.synapse.SynapseConstants;
+import org.apache.synapse.mediators.eip.splitter.IterateMediator;
+import org.apache.synapse.util.SynapseXPath;
import org.jaxen.JaxenException;
import javax.xml.namespace.QName;
@@ -88,7 +88,7 @@
OMAttribute expression = elem.getAttribute(ATT_EXPRN);
if (expression != null) {
try {
- AXIOMXPath xp = new AXIOMXPath(expression.getAttributeValue());
+ SynapseXPath xp = new SynapseXPath(expression.getAttributeValue());
OMElementUtils.addNameSpaces(xp, elem, log);
mediator.setExpression(xp);
} catch (JaxenException e) {
@@ -110,7 +110,7 @@
}
try {
- AXIOMXPath xp = new AXIOMXPath(attachPathValue);
+ SynapseXPath xp = new SynapseXPath(attachPathValue);
OMElementUtils.addNameSpaces(xp, elem, log);
mediator.setAttachPath(xp);
} catch (JaxenException e) {
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/MediatorPropertyFactory.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/MediatorPropertyFactory.java?rev=636073&r1=636072&r2=636073&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/MediatorPropertyFactory.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/MediatorPropertyFactory.java Tue Mar 11 12:32:51 2008
@@ -21,11 +21,11 @@
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.mediators.MediatorProperty;
+import org.apache.synapse.util.SynapseXPath;
import org.jaxen.JaxenException;
import javax.xml.namespace.QName;
@@ -89,7 +89,7 @@
} else {
try {
- AXIOMXPath xp = new AXIOMXPath(attExpr.getAttributeValue());
+ SynapseXPath xp = new SynapseXPath(attExpr.getAttributeValue());
OMElementUtils.addNameSpaces(xp, propEle, log);
prop.setExpression(xp);
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/POJOCommandMediatorFactory.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/POJOCommandMediatorFactory.java?rev=636073&r1=636072&r2=636073&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/POJOCommandMediatorFactory.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/POJOCommandMediatorFactory.java Tue Mar 11 12:32:51 2008
@@ -21,10 +21,10 @@
import org.apache.axiom.om.OMAttribute;
import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.xpath.AXIOMXPath;
import org.apache.synapse.Mediator;
import org.apache.synapse.SynapseException;
import org.apache.synapse.mediators.ext.POJOCommandMediator;
+import org.apache.synapse.util.SynapseXPath;
import org.jaxen.JaxenException;
import javax.xml.namespace.QName;
@@ -112,14 +112,14 @@
OMAttribute ctxNameAttr = propElem.getAttribute(ATT_CTXNAME);
OMAttribute actionAttr = propElem.getAttribute(ATT_ACTION);
- AXIOMXPath xpath = null;
+ SynapseXPath xpath = null;
try {
if (exprAttr != null) {
- xpath = new AXIOMXPath(exprAttr.getAttributeValue());
+ xpath = new SynapseXPath(exprAttr.getAttributeValue());
OMElementUtils.addNameSpaces(xpath, propElem, log);
}
} catch (JaxenException e) {
- handleException("Error in building the expression as an AXIOMXPath" + e);
+ handleException("Error in building the expression as an SynapseXPath" + e);
}
// if there is a value attribute there is no action (action is implied as read value)
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/POJOCommandMediatorSerializer.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/POJOCommandMediatorSerializer.java?rev=636073&r1=636072&r2=636073&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/POJOCommandMediatorSerializer.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/POJOCommandMediatorSerializer.java Tue Mar 11 12:32:51 2008
@@ -20,9 +20,9 @@
package org.apache.synapse.config.xml;
import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.xpath.AXIOMXPath;
import org.apache.synapse.Mediator;
import org.apache.synapse.mediators.ext.POJOCommandMediator;
+import org.apache.synapse.util.SynapseXPath;
import java.util.Iterator;
@@ -85,7 +85,7 @@
prop.addAttribute(fac.createOMAttribute("context-name", nullNS,
mediator.getContextGetterProperties().get(propName)));
} else if (mediator.getMessageGetterProperties().containsKey(propName)) {
- AXIOMXPath xpath = mediator.getMessageGetterProperties().get(propName);
+ SynapseXPath xpath = mediator.getMessageGetterProperties().get(propName);
prop.addAttribute(fac.createOMAttribute("expression", nullNS, xpath.toString()));
serializeNamespaces(prop, xpath);
}
@@ -96,7 +96,7 @@
getMessageSetterProperties().keySet().iterator(); itr.hasNext(); ) {
String propName = (String) itr.next();
- AXIOMXPath exprn = mediator.getMessageSetterProperties().get(propName);
+ SynapseXPath exprn = mediator.getMessageSetterProperties().get(propName);
OMElement prop = fac.createOMElement(PROP_Q);
prop.addAttribute(fac.createOMAttribute("name", nullNS, propName));
prop.addAttribute(fac.createOMAttribute("expression", nullNS, exprn.toString()));
@@ -126,7 +126,7 @@
if (mediator.getContextGetterProperties().containsKey(propName)) {
prop.addAttribute(fac.createOMAttribute("action", nullNS, "ReadAndUpdateContext"));
} else if (mediator.getMessageGetterProperties().containsKey(propName)) {
- AXIOMXPath exprn = mediator.getMessageGetterProperties().get(propName);
+ SynapseXPath exprn = mediator.getMessageGetterProperties().get(propName);
prop.addAttribute(fac.createOMAttribute("expression", nullNS, exprn.toString()));
serializeNamespaces(prop, exprn);
prop.addAttribute(fac.createOMAttribute("action", nullNS, "ReadContext"));
@@ -155,7 +155,7 @@
String propName = (String) itr.next();
if (!isSerialized(propName, mediator)) {
- AXIOMXPath exprn = mediator.getMessageGetterProperties().get(propName);
+ SynapseXPath exprn = mediator.getMessageGetterProperties().get(propName);
OMElement prop = fac.createOMElement(PROP_Q);
prop.addAttribute(fac.createOMAttribute("name", nullNS, propName));
prop.addAttribute(fac.createOMAttribute("expression", nullNS,
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/PropertyHelper.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/PropertyHelper.java?rev=636073&r1=636072&r2=636073&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/PropertyHelper.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/PropertyHelper.java Tue Mar 11 12:32:51 2008
@@ -20,17 +20,12 @@
package org.apache.synapse.config.xml;
import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.xpath.AXIOMXPath;
-import org.apache.synapse.SynapseException;
-import org.apache.synapse.MessageContext;
-import org.apache.synapse.core.axis2.Axis2MessageContext;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.jaxen.JaxenException;
+import org.apache.synapse.SynapseException;
import javax.xml.namespace.QName;
import java.lang.reflect.Method;
-import java.lang.reflect.InvocationTargetException;
/**
* This class will be used as a Helper class to get the properties loaded while building the
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/PropertyMediatorFactory.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/PropertyMediatorFactory.java?rev=636073&r1=636072&r2=636073&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/PropertyMediatorFactory.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/PropertyMediatorFactory.java Tue Mar 11 12:32:51 2008
@@ -19,18 +19,16 @@
package org.apache.synapse.config.xml;
-import javax.xml.namespace.QName;
-
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.Mediator;
import org.apache.synapse.SynapseException;
import org.apache.synapse.mediators.builtin.PropertyMediator;
+import org.apache.synapse.util.SynapseXPath;
import org.jaxen.JaxenException;
+import javax.xml.namespace.QName;
+
/**
* Creates a property mediator through the supplied XML configuration
* <p/>
@@ -65,7 +63,7 @@
propMediator.setValue(value.getAttributeValue());
} else if (expression != null) {
try {
- AXIOMXPath xp = new AXIOMXPath(expression.getAttributeValue());
+ SynapseXPath xp = new SynapseXPath(expression.getAttributeValue());
OMElementUtils.addNameSpaces(xp, elem, log);
propMediator.setExpression(xp);
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/RMSequenceMediatorFactory.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/RMSequenceMediatorFactory.java?rev=636073&r1=636072&r2=636073&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/RMSequenceMediatorFactory.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/RMSequenceMediatorFactory.java Tue Mar 11 12:32:51 2008
@@ -19,18 +19,16 @@
package org.apache.synapse.config.xml;
-import javax.xml.namespace.QName;
-
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.Mediator;
import org.apache.synapse.SynapseException;
import org.apache.synapse.mediators.builtin.RMSequenceMediator;
+import org.apache.synapse.util.SynapseXPath;
import org.jaxen.JaxenException;
+import javax.xml.namespace.QName;
+
/**
* Creates a RMSequence mediator through the supplied XML configuration
* <p/>
@@ -70,7 +68,7 @@
} else {
try {
- sequenceMediator.setCorrelation(new AXIOMXPath(correlation.getAttributeValue()));
+ sequenceMediator.setCorrelation(new SynapseXPath(correlation.getAttributeValue()));
} catch (JaxenException e) {
String msg = "Invalid XPath expression for attribute correlation : "
+ correlation.getAttributeValue();
@@ -107,7 +105,7 @@
} else {
try {
- sequenceMediator.setLastMessage(new AXIOMXPath(lastMessage.getAttributeValue()));
+ sequenceMediator.setLastMessage(new SynapseXPath(lastMessage.getAttributeValue()));
} catch (JaxenException e) {
String msg = "Invalid XPath expression for attribute last-message : "
+ lastMessage.getAttributeValue();
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SwitchMediatorFactory.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SwitchMediatorFactory.java?rev=636073&r1=636072&r2=636073&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SwitchMediatorFactory.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SwitchMediatorFactory.java Tue Mar 11 12:32:51 2008
@@ -21,12 +21,10 @@
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.SynapseException;
import org.apache.synapse.mediators.filters.SwitchMediator;
+import org.apache.synapse.util.SynapseXPath;
import org.jaxen.JaxenException;
import javax.xml.namespace.QName;
@@ -64,7 +62,7 @@
throw new SynapseException(msg);
} else {
try {
- AXIOMXPath sourceXPath = new AXIOMXPath(source.getAttributeValue());
+ SynapseXPath sourceXPath = new SynapseXPath(source.getAttributeValue());
org.apache.synapse.config.xml.OMElementUtils.addNameSpaces(sourceXPath, elem, log);
switchMediator.setSource(sourceXPath);
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SynapseXMLConfigurationFactory.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SynapseXMLConfigurationFactory.java?rev=636073&r1=636072&r2=636073&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SynapseXMLConfigurationFactory.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SynapseXMLConfigurationFactory.java Tue Mar 11 12:32:51 2008
@@ -21,7 +21,6 @@
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMNode;
-import org.apache.axiom.om.xpath.AXIOMXPath;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.synapse.Mediator;
@@ -34,10 +33,11 @@
import org.apache.synapse.config.xml.endpoints.EndpointAbstractFactory;
import org.apache.synapse.core.axis2.ProxyService;
import org.apache.synapse.endpoints.Endpoint;
+import org.apache.synapse.mediators.MediatorProperty;
import org.apache.synapse.mediators.base.SequenceMediator;
import org.apache.synapse.mediators.builtin.DropMediator;
import org.apache.synapse.mediators.builtin.LogMediator;
-import org.apache.synapse.mediators.MediatorProperty;
+import org.apache.synapse.util.SynapseXPath;
import org.jaxen.JaxenException;
import javax.xml.namespace.QName;
@@ -229,14 +229,14 @@
mp = new MediatorProperty();
mp.setName("ERROR_CODE");
try {
- mp.setExpression(new AXIOMXPath("get-property('ERROR_CODE')"));
+ mp.setExpression(new SynapseXPath("get-property('ERROR_CODE')"));
} catch (JaxenException ignore) {}
log.addProperty(mp);
mp = new MediatorProperty();
mp.setName("ERROR_MESSAGE");
try {
- mp.setExpression(new AXIOMXPath("get-property('ERROR_MESSAGE')"));
+ mp.setExpression(new SynapseXPath("get-property('ERROR_MESSAGE')"));
} catch (JaxenException ignore) {}
log.addProperty(mp);
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SynapseXPathFactory.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SynapseXPathFactory.java?rev=636073&r1=636072&r2=636073&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SynapseXPathFactory.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SynapseXPathFactory.java Tue Mar 11 12:32:51 2008
@@ -65,7 +65,7 @@
}
} catch (JaxenException e) {
- handleException("Error in creating the AXIOMXPath from : " + xpathAttrib, e);
+ handleException("Error in creating the XPath from : " + xpathAttrib, e);
}
return xpath;
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SynapseXPathSerializer.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SynapseXPathSerializer.java?rev=636073&r1=636072&r2=636073&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SynapseXPathSerializer.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SynapseXPathSerializer.java Tue Mar 11 12:32:51 2008
@@ -21,7 +21,6 @@
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMNamespace;
-import org.apache.axiom.om.xpath.AXIOMXPath;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.synapse.SynapseException;
@@ -60,7 +59,7 @@
return elem;
}
- private static void serializeNamespaces(OMElement elem, AXIOMXPath xpath) {
+ private static void serializeNamespaces(OMElement elem, SynapseXPath xpath) {
for (Object o : xpath.getNamespaces().keySet()) {
String prefix = (String) o;
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/ValidateMediatorFactory.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/ValidateMediatorFactory.java?rev=636073&r1=636072&r2=636073&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/ValidateMediatorFactory.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/ValidateMediatorFactory.java Tue Mar 11 12:32:51 2008
@@ -21,9 +21,9 @@
import org.apache.axiom.om.OMAttribute;
import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.xpath.AXIOMXPath;
import org.apache.synapse.Mediator;
import org.apache.synapse.mediators.builtin.ValidateMediator;
+import org.apache.synapse.util.SynapseXPath;
import org.jaxen.JaxenException;
import org.xml.sax.SAXException;
@@ -83,7 +83,7 @@
if (attSource != null) {
try {
- AXIOMXPath xp = new AXIOMXPath(attSource.getAttributeValue());
+ SynapseXPath xp = new SynapseXPath(attSource.getAttributeValue());
validateMediator.setSource(xp);
OMElementUtils.addNameSpaces(xp, elem, log);
} catch (JaxenException e) {
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/XSLTMediatorFactory.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/XSLTMediatorFactory.java?rev=636073&r1=636072&r2=636073&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/XSLTMediatorFactory.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/XSLTMediatorFactory.java Tue Mar 11 12:32:51 2008
@@ -21,13 +21,9 @@
import org.apache.axiom.om.OMAttribute;
import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.xpath.AXIOMXPath;
-import org.apache.synapse.config.xml.OMElementUtils;
import org.apache.synapse.Mediator;
import org.apache.synapse.mediators.transform.XSLTMediator;
-import org.apache.synapse.config.xml.XMLConfigConstants;
-import org.apache.synapse.config.xml.AbstractMediatorFactory;
-import org.apache.synapse.config.xml.MediatorPropertyFactory;
+import org.apache.synapse.util.SynapseXPath;
import org.jaxen.JaxenException;
import javax.xml.namespace.QName;
@@ -68,7 +64,7 @@
if (attSource != null) {
try {
transformMediator.setSourceXPathString(attSource.getAttributeValue());
- AXIOMXPath xp = new AXIOMXPath(attSource.getAttributeValue());
+ SynapseXPath xp = new SynapseXPath(attSource.getAttributeValue());
OMElementUtils.addNameSpaces(xp, elem, log);
transformMediator.setSource(xp);
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/MediatorProperty.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/MediatorProperty.java?rev=636073&r1=636072&r2=636073&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/MediatorProperty.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/MediatorProperty.java Tue Mar 11 12:32:51 2008
@@ -19,10 +19,10 @@
package org.apache.synapse.mediators;
-import org.apache.axiom.om.xpath.AXIOMXPath;
import org.apache.synapse.MessageContext;
-import org.apache.synapse.core.axis2.Axis2MessageContext;
import org.apache.synapse.config.xml.XMLConfigConstants;
+import org.apache.synapse.core.axis2.Axis2MessageContext;
+import org.apache.synapse.util.SynapseXPath;
import javax.xml.namespace.QName;
@@ -40,7 +40,7 @@
private String name;
private String value;
- private AXIOMXPath expression;
+ private SynapseXPath expression;
public MediatorProperty() {}
@@ -60,11 +60,11 @@
this.value = value;
}
- public AXIOMXPath getExpression() {
+ public SynapseXPath getExpression() {
return expression;
}
- public void setExpression(AXIOMXPath expression) {
+ public void setExpression(SynapseXPath expression) {
this.expression = expression;
}
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/CalloutMediator.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/CalloutMediator.java?rev=636073&r1=636072&r2=636073&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/CalloutMediator.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/CalloutMediator.java Tue Mar 11 12:32:51 2008
@@ -21,7 +21,6 @@
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMNode;
-import org.apache.axiom.om.xpath.AXIOMXPath;
import org.apache.axis2.AxisFault;
import org.apache.axis2.addressing.AddressingConstants;
import org.apache.axis2.addressing.EndpointReference;
@@ -241,7 +240,7 @@
return requestXPath;
}
- public AXIOMXPath getTargetXPath() {
+ public SynapseXPath getTargetXPath() {
return targetXPath;
}
}
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/PropertyMediator.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/PropertyMediator.java?rev=636073&r1=636072&r2=636073&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/PropertyMediator.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/PropertyMediator.java Tue Mar 11 12:32:51 2008
@@ -19,15 +19,11 @@
package org.apache.synapse.mediators.builtin;
-import org.apache.axiom.om.xpath.AXIOMXPath;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.synapse.SynapseConstants;
import org.apache.synapse.MessageContext;
-import org.apache.synapse.SynapseException;
import org.apache.synapse.config.xml.XMLConfigConstants;
import org.apache.synapse.core.axis2.Axis2MessageContext;
import org.apache.synapse.mediators.AbstractMediator;
+import org.apache.synapse.util.SynapseXPath;
import java.util.HashMap;
import java.util.Map;
@@ -48,7 +44,7 @@
/** The Value to be set*/
private String value = null;
/** The XPath expr. to get value */
- private AXIOMXPath expression = null;
+ private SynapseXPath expression = null;
/** The scope for which decide properties where to go*/
private String scope = null;
/** The Action - set or remove */
@@ -194,11 +190,11 @@
this.value = value;
}
- public AXIOMXPath getExpression() {
+ public SynapseXPath getExpression() {
return expression;
}
- public void setExpression(AXIOMXPath expression) {
+ public void setExpression(SynapseXPath expression) {
this.expression = expression;
}
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/RMSequenceMediator.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/RMSequenceMediator.java?rev=636073&r1=636072&r2=636073&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/RMSequenceMediator.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/RMSequenceMediator.java Tue Mar 11 12:32:51 2008
@@ -19,30 +19,27 @@
package org.apache.synapse.mediators.builtin;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Collections;
-
import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.xpath.AXIOMXPath;
-import org.apache.synapse.util.UUIDGenerator;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.synapse.SynapseConstants;
+import org.apache.sandesha2.client.SandeshaClientConstants;
import org.apache.synapse.MessageContext;
-import org.apache.synapse.SynapseException;
+import org.apache.synapse.SynapseConstants;
import org.apache.synapse.config.Entry;
import org.apache.synapse.config.xml.XMLConfigConstants;
import org.apache.synapse.core.axis2.Axis2MessageContext;
import org.apache.synapse.mediators.AbstractMediator;
-import org.apache.sandesha2.client.SandeshaClientConstants;
+import org.apache.synapse.util.SynapseXPath;
+import org.apache.synapse.util.UUIDGenerator;
import org.jaxen.JaxenException;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
public class RMSequenceMediator extends AbstractMediator {
- private AXIOMXPath correlation = null;
- private AXIOMXPath lastMessage = null;
+ private SynapseXPath correlation = null;
+ private SynapseXPath lastMessage = null;
private Boolean single = null;
private String version = null;
@@ -215,19 +212,19 @@
}
}
- public AXIOMXPath getCorrelation() {
+ public SynapseXPath getCorrelation() {
return correlation;
}
- public void setCorrelation(AXIOMXPath correlation) {
+ public void setCorrelation(SynapseXPath correlation) {
this.correlation = correlation;
}
- public AXIOMXPath getLastMessage() {
+ public SynapseXPath getLastMessage() {
return lastMessage;
}
- public void setLastMessage(AXIOMXPath lastMessage) {
+ public void setLastMessage(SynapseXPath lastMessage) {
this.lastMessage = lastMessage;
}
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/ValidateMediator.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/ValidateMediator.java?rev=636073&r1=636072&r2=636073&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/ValidateMediator.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/ValidateMediator.java Tue Mar 11 12:32:51 2008
@@ -20,35 +20,40 @@
package org.apache.synapse.mediators.builtin;
import org.apache.axiom.om.OMNode;
-import org.apache.axiom.om.xpath.AXIOMXPath;
import org.apache.axiom.soap.SOAP11Constants;
import org.apache.axiom.soap.SOAP12Constants;
+import org.apache.synapse.FaultHandler;
import org.apache.synapse.MessageContext;
-import org.apache.synapse.SynapseException;
import org.apache.synapse.SynapseConstants;
-import org.apache.synapse.FaultHandler;
-import org.apache.synapse.config.SynapseConfigUtils;
+import org.apache.synapse.SynapseException;
import org.apache.synapse.config.Entry;
+import org.apache.synapse.config.SynapseConfigUtils;
import org.apache.synapse.mediators.AbstractListMediator;
import org.apache.synapse.mediators.MediatorProperty;
+import org.apache.synapse.util.SynapseXPath;
import org.jaxen.JaxenException;
-import org.xml.sax.*;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+import org.xml.sax.SAXParseException;
+import org.xml.sax.XMLReader;
import org.xml.sax.helpers.DefaultHandler;
import org.xml.sax.helpers.XMLReaderFactory;
+import javax.xml.XMLConstants;
import javax.xml.stream.XMLOutputFactory;
import javax.xml.stream.XMLStreamWriter;
+import javax.xml.transform.Source;
import javax.xml.transform.sax.SAXSource;
import javax.xml.transform.stream.StreamSource;
-import javax.xml.transform.Source;
import javax.xml.validation.Schema;
import javax.xml.validation.SchemaFactory;
import javax.xml.validation.Validator;
-import javax.xml.XMLConstants;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
/**
* Validate a message or an element against a schema
@@ -70,7 +75,7 @@
* If this is not specified, the validation will occur against the first child element of the
* SOAP body
*/
- private AXIOMXPath source = null;
+ private SynapseXPath source = null;
/**
* A Map containing features to be passed to the actual validator (Xerces)
@@ -102,7 +107,7 @@
public ValidateMediator() {
// create the default XPath
try {
- this.source = new AXIOMXPath(DEFAULT_XPATH);
+ this.source = new SynapseXPath(DEFAULT_XPATH);
this.source.addNamespace("s11", SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI);
this.source.addNamespace("s12", SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI);
} catch (JaxenException e) {
@@ -380,7 +385,7 @@
* Set the given XPath as the source XPath
* @param source an XPath to be set as the source
*/
- public void setSource(AXIOMXPath source) {
+ public void setSource(SynapseXPath source) {
this.source = source;
}
@@ -388,7 +393,7 @@
* Get the source XPath which yields the source element for validation
* @return the XPath which yields the source element for validation
*/
- public AXIOMXPath getSource() {
+ public SynapseXPath getSource() {
return source;
}
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/db/Statement.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/db/Statement.java?rev=636073&r1=636072&r2=636073&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/db/Statement.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/db/Statement.java Tue Mar 11 12:32:51 2008
@@ -19,8 +19,8 @@
package org.apache.synapse.mediators.db;
-import org.apache.axiom.om.xpath.AXIOMXPath;
import org.apache.synapse.SynapseException;
+import org.apache.synapse.util.SynapseXPath;
import java.sql.Types;
import java.util.ArrayList;
@@ -46,7 +46,7 @@
return rawStatement;
}
- public void addParameter(String propertyName, AXIOMXPath xpath, String type){
+ public void addParameter(String propertyName, SynapseXPath xpath, String type){
parameters.add(new Parameter(propertyName, xpath, type));
}
@@ -64,10 +64,10 @@
public class Parameter {
String propertyName = null;
- AXIOMXPath xpath = null;
+ SynapseXPath xpath = null;
int type = 0;
- Parameter(String value, AXIOMXPath xpath, String type) {
+ Parameter(String value, SynapseXPath xpath, String type) {
this.propertyName = value;
this.xpath = xpath;
@@ -112,7 +112,7 @@
return propertyName;
}
- public AXIOMXPath getXpath() {
+ public SynapseXPath getXpath() {
return xpath;
}
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/eip/EIPUtils.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/eip/EIPUtils.java?rev=636073&r1=636072&r2=636073&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/eip/EIPUtils.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/eip/EIPUtils.java Tue Mar 11 12:32:51 2008
@@ -21,10 +21,10 @@
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMNode;
-import org.apache.axiom.om.xpath.AXIOMXPath;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.synapse.util.SynapseXPath;
import org.jaxen.JaxenException;
import java.util.ArrayList;
@@ -42,11 +42,11 @@
* Return the set of elements specified by the XPath over the given envelope
*
* @param envelope SOAPEnvelope from which the elements will be extracted
- * @param expression AXIOMXPath expression describing the elements to be extracted
+ * @param expression SynapseXPath expression describing the elements to be extracted
* @return List OMElements in the envelope matching the expression
* @throws JaxenException if the XPath expression evaluation fails
*/
- public static List getMatchingElements(SOAPEnvelope envelope, AXIOMXPath expression)
+ public static List getMatchingElements(SOAPEnvelope envelope, SynapseXPath expression)
throws JaxenException {
Object o = expression.evaluate(envelope);
@@ -65,11 +65,11 @@
* Return the set of detached elements specified by the XPath over the given envelope
*
* @param envelope SOAPEnvelope from which the elements will be extracted
- * @param expression AXIOMXPath expression describing the elements to be extracted
+ * @param expression SynapseXPath expression describing the elements to be extracted
* @return List detached OMElements in the envelope matching the expression
* @throws JaxenException if the XPath expression evaluation fails
*/
- public static List getDetachedMatchingElements(SOAPEnvelope envelope, AXIOMXPath expression)
+ public static List getDetachedMatchingElements(SOAPEnvelope envelope, SynapseXPath expression)
throws JaxenException {
List elementList = new ArrayList();
@@ -93,10 +93,10 @@
*
* @param envelope SOAPEnvelope to be enriched with the content
* @param enricher SOAPEnvelope from which the enriching element will be extracted
- * @param expression AXIOMXPath describing the enriching element
+ * @param expression SynapseXPath describing the enriching element
*/
public static void enrichEnvelope(SOAPEnvelope envelope, SOAPEnvelope enricher,
- AXIOMXPath expression) throws JaxenException {
+ SynapseXPath expression) throws JaxenException {
OMElement enrichingElement;
List elementList = getMatchingElements(envelope, expression);
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/eip/aggregator/AggregateMediator.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/eip/aggregator/AggregateMediator.java?rev=636073&r1=636072&r2=636073&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/eip/aggregator/AggregateMediator.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/eip/aggregator/AggregateMediator.java Tue Mar 11 12:32:51 2008
@@ -19,7 +19,6 @@
package org.apache.synapse.mediators.eip.aggregator;
-import org.apache.axiom.om.xpath.AXIOMXPath;
import org.apache.axiom.soap.SOAP11Constants;
import org.apache.axiom.soap.SOAP12Constants;
import org.apache.commons.logging.Log;
@@ -27,15 +26,16 @@
import org.apache.synapse.MessageContext;
import org.apache.synapse.SynapseConstants;
import org.apache.synapse.mediators.AbstractMediator;
-import org.apache.synapse.mediators.eip.EIPUtils;
-import org.apache.synapse.mediators.eip.EIPConstants;
import org.apache.synapse.mediators.base.SequenceMediator;
+import org.apache.synapse.mediators.eip.EIPConstants;
+import org.apache.synapse.mediators.eip.EIPUtils;
+import org.apache.synapse.util.SynapseXPath;
import org.jaxen.JaxenException;
+import java.util.Collections;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
-import java.util.Collections;
/**
* Aggregate a number of messages that are determined to be for a particular group, and combine
@@ -63,14 +63,14 @@
* XPath that specifies a correlation expression that can be used to combine messages. An
* example maybe //department@id="11"
*/
- private AXIOMXPath correlateExpression = null;
+ private SynapseXPath correlateExpression = null;
/**
* An XPath expression that may specify a selected element to be aggregated from a group of
* messages to create the aggregated message
* e.g. //getQuote/return would pick up and aggregate the //getQuote/return elements from a
* bunch of matching messages into one aggregated message
*/
- private AXIOMXPath aggregationExpression = null;
+ private SynapseXPath aggregationExpression = null;
/** This holds the reference sequence name of the */
private String onCompleteSequenceRef = null;
@@ -83,7 +83,7 @@
public AggregateMediator() {
try {
- aggregationExpression = new AXIOMXPath("s11:Body/child::*[position()=1] | " +
+ aggregationExpression = new SynapseXPath("s11:Body/child::*[position()=1] | " +
"s12:Body/child::*[position()=1]");
aggregationExpression.addNamespace("s11", SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI);
aggregationExpression.addNamespace("s12", SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI);
@@ -318,11 +318,11 @@
return newCtx;
}
- public AXIOMXPath getCorrelateExpression() {
+ public SynapseXPath getCorrelateExpression() {
return correlateExpression;
}
- public void setCorrelateExpression(AXIOMXPath correlateExpression) {
+ public void setCorrelateExpression(SynapseXPath correlateExpression) {
this.correlateExpression = correlateExpression;
}
@@ -350,11 +350,11 @@
this.maxMessagesToComplete = maxMessagesToComplete;
}
- public AXIOMXPath getAggregationExpression() {
+ public SynapseXPath getAggregationExpression() {
return aggregationExpression;
}
- public void setAggregationExpression(AXIOMXPath aggregationExpression) {
+ public void setAggregationExpression(SynapseXPath aggregationExpression) {
this.aggregationExpression = aggregationExpression;
}
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/eip/splitter/IterateMediator.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/eip/splitter/IterateMediator.java?rev=636073&r1=636072&r2=636073&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/eip/splitter/IterateMediator.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/eip/splitter/IterateMediator.java Tue Mar 11 12:32:51 2008
@@ -19,26 +19,26 @@
package org.apache.synapse.mediators.eip.splitter;
-import org.apache.synapse.mediators.AbstractMediator;
-import org.apache.synapse.mediators.eip.EIPUtils;
-import org.apache.synapse.mediators.eip.Target;
-import org.apache.synapse.mediators.eip.EIPConstants;
-import org.apache.synapse.MessageContext;
-import org.apache.synapse.ManagedLifecycle;
-import org.apache.synapse.core.axis2.Axis2MessageContext;
-import org.apache.synapse.core.SynapseEnvironment;
-import org.apache.synapse.util.MessageHelper;
-import org.apache.axiom.soap.SOAPEnvelope;
-import org.apache.axiom.om.xpath.AXIOMXPath;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMNode;
+import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axis2.AxisFault;
import org.apache.axis2.Constants;
import org.apache.axis2.context.OperationContext;
+import org.apache.synapse.ManagedLifecycle;
+import org.apache.synapse.MessageContext;
+import org.apache.synapse.core.SynapseEnvironment;
+import org.apache.synapse.core.axis2.Axis2MessageContext;
+import org.apache.synapse.mediators.AbstractMediator;
+import org.apache.synapse.mediators.eip.EIPConstants;
+import org.apache.synapse.mediators.eip.EIPUtils;
+import org.apache.synapse.mediators.eip.Target;
+import org.apache.synapse.util.MessageHelper;
+import org.apache.synapse.util.SynapseXPath;
import org.jaxen.JaxenException;
-import java.util.List;
import java.util.Iterator;
+import java.util.List;
/**
* Splits a message using an XPath expression and creates a new message to hold
@@ -58,13 +58,13 @@
private boolean preservePayload = false;
/** The XPath that will list the elements to be splitted */
- private AXIOMXPath expression = null;
+ private SynapseXPath expression = null;
/**
* An XPath expression that specifies where the splitted elements should be attached when
* the payload is being preserved
*/
- private AXIOMXPath attachPath = null;
+ private SynapseXPath attachPath = null;
/** The target for the newly splitted messages */
private Target target = null;
@@ -230,19 +230,19 @@
this.preservePayload = preservePayload;
}
- public AXIOMXPath getExpression() {
+ public SynapseXPath getExpression() {
return expression;
}
- public void setExpression(AXIOMXPath expression) {
+ public void setExpression(SynapseXPath expression) {
this.expression = expression;
}
- public AXIOMXPath getAttachPath() {
+ public SynapseXPath getAttachPath() {
return attachPath;
}
- public void setAttachPath(AXIOMXPath attachPath) {
+ public void setAttachPath(SynapseXPath attachPath) {
this.attachPath = attachPath;
}
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/ext/AnnotatedCommandMediator.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/ext/AnnotatedCommandMediator.java?rev=636073&r1=636072&r2=636073&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/ext/AnnotatedCommandMediator.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/ext/AnnotatedCommandMediator.java Tue Mar 11 12:32:51 2008
@@ -19,13 +19,6 @@
package org.apache.synapse.mediators.ext;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
-import org.apache.axiom.om.xpath.AXIOMXPath;
import org.apache.synapse.Command;
import org.apache.synapse.MessageContext;
import org.apache.synapse.core.axis2.Axis2MessageContext;
@@ -33,16 +26,23 @@
import org.apache.synapse.mediators.annotations.ReadAndUpdate;
import org.apache.synapse.mediators.annotations.ReadFromMessage;
import org.apache.synapse.mediators.annotations.UpdateMessage;
+import org.apache.synapse.util.SynapseXPath;
import org.jaxen.JaxenException;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
/**
*/
public class AnnotatedCommandMediator extends POJOCommandMediator {
- protected Map<Field, AXIOMXPath> beforeFields;
- protected Map<Method, AXIOMXPath> beforeMethods;
- protected Map<Field, AXIOMXPath> afterFields;
- protected Map<Method, AXIOMXPath> afterMethods;
+ protected Map<Field, SynapseXPath> beforeFields;
+ protected Map<Method, SynapseXPath> beforeMethods;
+ protected Map<Field, SynapseXPath> afterFields;
+ protected Map<Method, SynapseXPath> afterMethods;
@Override
public boolean mediate(MessageContext synCtx) {
@@ -82,7 +82,7 @@
for (Field f : beforeFields.keySet()) {
- AXIOMXPath xpath = beforeFields.get(f);
+ SynapseXPath xpath = beforeFields.get(f);
Object v;
if (f.getType().equals(String.class)) {
v = Axis2MessageContext.getStringValue(xpath, synCtx);
@@ -97,7 +97,7 @@
}
for (Method m : beforeMethods.keySet()) {
- AXIOMXPath xpath = beforeMethods.get(m);
+ SynapseXPath xpath = beforeMethods.get(m);
Object v;
if (m.getParameterTypes().length == 1 && m.getParameterTypes()[0].equals(String.class)) {
v = Axis2MessageContext.getStringValue(xpath, synCtx);
@@ -158,28 +158,28 @@
*/
protected void introspectClass(Class<?> commandClass) {
- beforeFields = new HashMap<Field, AXIOMXPath>();
- afterFields = new HashMap<Field, AXIOMXPath>();
- beforeMethods = new HashMap<Method, AXIOMXPath>();
- afterMethods = new HashMap<Method, AXIOMXPath>();
+ beforeFields = new HashMap<Field, SynapseXPath>();
+ afterFields = new HashMap<Field, SynapseXPath>();
+ beforeMethods = new HashMap<Method, SynapseXPath>();
+ afterMethods = new HashMap<Method, SynapseXPath>();
for (Field f : commandClass.getDeclaredFields()) {
ReadFromMessage readFromMessage = f.getAnnotation(ReadFromMessage.class);
if (readFromMessage != null) {
- AXIOMXPath axiomXpath = createAxiomXPATH(readFromMessage.value(), f.getAnnotation(Namespaces.class));
+ SynapseXPath axiomXpath = createSynapseXPATH(readFromMessage.value(), f.getAnnotation(Namespaces.class));
beforeFields.put(f, axiomXpath);
}
UpdateMessage updateMessage = f.getAnnotation(UpdateMessage.class);
if (updateMessage != null) {
- AXIOMXPath axiomXpath = createAxiomXPATH(updateMessage.value(), f.getAnnotation(Namespaces.class));
+ SynapseXPath axiomXpath = createSynapseXPATH(updateMessage.value(), f.getAnnotation(Namespaces.class));
afterFields.put(f, axiomXpath);
}
ReadAndUpdate readAndUpdate = f.getAnnotation(ReadAndUpdate.class);
if (readAndUpdate != null) {
- AXIOMXPath axiomXpath = createAxiomXPATH(readAndUpdate.value(), f.getAnnotation(Namespaces.class));
+ SynapseXPath axiomXpath = createSynapseXPATH(readAndUpdate.value(), f.getAnnotation(Namespaces.class));
beforeFields.put(f, axiomXpath);
afterFields.put(f, axiomXpath);
}
@@ -189,13 +189,13 @@
ReadFromMessage readFromMessage = m.getAnnotation(ReadFromMessage.class);
if (readFromMessage != null) {
- AXIOMXPath axiomXpath = createAxiomXPATH(readFromMessage.value(), m.getAnnotation(Namespaces.class));
+ SynapseXPath axiomXpath = createSynapseXPATH(readFromMessage.value(), m.getAnnotation(Namespaces.class));
beforeMethods.put(m, axiomXpath);
}
UpdateMessage updateMessage = m.getAnnotation(UpdateMessage.class);
if (updateMessage != null) {
- AXIOMXPath axiomXpath = createAxiomXPATH(updateMessage.value(), m.getAnnotation(Namespaces.class));
+ SynapseXPath axiomXpath = createSynapseXPATH(updateMessage.value(), m.getAnnotation(Namespaces.class));
afterMethods.put(m, axiomXpath);
}
@@ -203,14 +203,14 @@
}
/**
- * Create an AXIOMXPath from an xpath string
+ * Create an SynapseXPath from an xpath string
*/
- protected AXIOMXPath createAxiomXPATH(String xpath, Namespaces nsAnnotation) {
+ protected SynapseXPath createSynapseXPATH(String xpath, Namespaces nsAnnotation) {
Map<String, String> namespaces = getNamespaces(nsAnnotation);
try {
- AXIOMXPath axiomXPath = new AXIOMXPath(xpath);
+ SynapseXPath axiomXPath = new SynapseXPath(xpath);
for (String prefix : namespaces.keySet()) {
axiomXPath.addNamespace(prefix, namespaces.get(prefix));
@@ -219,7 +219,7 @@
return axiomXPath;
} catch (JaxenException e) {
- throw new RuntimeException("Error creating AXIOMXPath: " + xpath, e);
+ throw new RuntimeException("Error creating SynapseXPath: " + xpath, e);
}
}
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/ext/POJOCommandMediator.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/ext/POJOCommandMediator.java?rev=636073&r1=636072&r2=636073&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/ext/POJOCommandMediator.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/ext/POJOCommandMediator.java Tue Mar 11 12:32:51 2008
@@ -22,12 +22,12 @@
import org.apache.axiom.om.OMAbstractFactory;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMNode;
-import org.apache.axiom.om.xpath.AXIOMXPath;
import org.apache.synapse.Command;
import org.apache.synapse.MessageContext;
import org.apache.synapse.core.axis2.Axis2MessageContext;
import org.apache.synapse.mediators.AbstractMediator;
import org.apache.synapse.mediators.eip.EIPUtils;
+import org.apache.synapse.util.SynapseXPath;
import org.jaxen.JaxenException;
import java.lang.reflect.InvocationTargetException;
@@ -62,7 +62,7 @@
* 'dynamic' properties whose values are dynamically evaluated before each
* invocation of the command, by evaluating an XPath against the current message
*/
- private Map<String, AXIOMXPath> messageSetterProperties = new HashMap<String, AXIOMXPath>();
+ private Map<String, SynapseXPath> messageSetterProperties = new HashMap<String, SynapseXPath>();
/**
* 'dynamic' properties whose values are dynamically evaluated before each
@@ -80,7 +80,7 @@
* 'messsage' properties whose values are set back to the current message, from the command
* and as specified by the XPATH
*/
- private Map<String, AXIOMXPath> messageGetterProperties = new HashMap<String, AXIOMXPath>();
+ private Map<String, SynapseXPath> messageGetterProperties = new HashMap<String, SynapseXPath>();
/**
* Implements the mediate method of the Mediator interface. This method will instantiate
@@ -137,7 +137,7 @@
for (Iterator iter = messageSetterProperties.keySet().iterator(); iter.hasNext(); ) {
String name = (String) iter.next();
- AXIOMXPath xpath = messageSetterProperties.get(name);
+ SynapseXPath xpath = messageSetterProperties.get(name);
String value = Axis2MessageContext.getStringValue(xpath, synCtx);
setInstanceProperty(name, value, commandObject, synCtx);
@@ -183,7 +183,7 @@
for (Iterator iter = messageGetterProperties.keySet().iterator(); iter.hasNext(); ) {
String name = (String) iter.next();
- AXIOMXPath xpath = messageGetterProperties.get(name);
+ SynapseXPath xpath = messageGetterProperties.get(name);
Object resultValue = getInstanceProperty(name, commandObject, synCtx);
@@ -341,7 +341,7 @@
this.staticSetterProperties.put(name, value);
}
- public void addMessageSetterProperty(String name, AXIOMXPath xpath) {
+ public void addMessageSetterProperty(String name, SynapseXPath xpath) {
this.messageSetterProperties.put(name, xpath);
}
@@ -353,7 +353,7 @@
this.contextGetterProperties.put(name, value);
}
- public void addMessageGetterProperty(String name, AXIOMXPath xpath) {
+ public void addMessageGetterProperty(String name, SynapseXPath xpath) {
this.messageGetterProperties.put(name, xpath);
}
@@ -361,7 +361,7 @@
return this.staticSetterProperties;
}
- public Map<String, AXIOMXPath> getMessageSetterProperties() {
+ public Map<String, SynapseXPath> getMessageSetterProperties() {
return this.messageSetterProperties;
}
@@ -373,7 +373,7 @@
return this.contextGetterProperties;
}
- public Map<String, AXIOMXPath> getMessageGetterProperties() {
+ public Map<String, SynapseXPath> getMessageGetterProperties() {
return this.messageGetterProperties;
}
}
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/filters/FilterMediator.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/filters/FilterMediator.java?rev=636073&r1=636072&r2=636073&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/filters/FilterMediator.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/filters/FilterMediator.java Tue Mar 11 12:32:51 2008
@@ -19,12 +19,12 @@
package org.apache.synapse.mediators.filters;
-import org.apache.axiom.om.xpath.AXIOMXPath;
import org.apache.synapse.Mediator;
import org.apache.synapse.MessageContext;
import org.apache.synapse.core.axis2.Axis2MessageContext;
import org.apache.synapse.mediators.AbstractListMediator;
import org.apache.synapse.mediators.ListMediator;
+import org.apache.synapse.util.SynapseXPath;
import org.jaxen.JaxenException;
import java.util.regex.Matcher;
@@ -37,9 +37,9 @@
public class FilterMediator extends AbstractListMediator implements
org.apache.synapse.mediators.FilterMediator {
- private AXIOMXPath source = null;
+ private SynapseXPath source = null;
private Pattern regex = null;
- private AXIOMXPath xpath = null;
+ private SynapseXPath xpath = null;
private ListMediator elseMediator = null;
private boolean thenElementPresent = false;
private String thenKey = null;
@@ -188,11 +188,11 @@
}
- public AXIOMXPath getSource() {
+ public SynapseXPath getSource() {
return source;
}
- public void setSource(AXIOMXPath source) {
+ public void setSource(SynapseXPath source) {
this.source = source;
}
@@ -204,11 +204,11 @@
this.regex = regex;
}
- public AXIOMXPath getXpath() {
+ public SynapseXPath getXpath() {
return xpath;
}
- public void setXpath(AXIOMXPath xpath) {
+ public void setXpath(SynapseXPath xpath) {
this.xpath = xpath;
}
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=636073&r1=636072&r2=636073&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 Tue Mar 11 12:32:51 2008
@@ -19,11 +19,11 @@
package org.apache.synapse.mediators.filters;
-import org.apache.axiom.om.xpath.AXIOMXPath;
import org.apache.synapse.MessageContext;
import org.apache.synapse.config.xml.SwitchCase;
import org.apache.synapse.core.axis2.Axis2MessageContext;
import org.apache.synapse.mediators.AbstractMediator;
+import org.apache.synapse.util.SynapseXPath;
import java.util.ArrayList;
import java.util.Iterator;
@@ -38,7 +38,7 @@
public class SwitchMediator extends AbstractMediator {
/** The XPath expression specifying the source element to apply the switch case expressions against */
- private AXIOMXPath source = null;
+ private SynapseXPath source = null;
/** The list of switch cases */
private List cases = new ArrayList();
/** The default switch case, if any */
@@ -144,7 +144,7 @@
*
* @return thje source XPath expression
*/
- public AXIOMXPath getSource() {
+ public SynapseXPath getSource() {
return source;
}
@@ -153,7 +153,7 @@
*
* @param source the XPath expression to be used as the source
*/
- public void setSource(AXIOMXPath source) {
+ public void setSource(SynapseXPath source) {
this.source = source;
}
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=636073&r1=636072&r2=636073&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 Tue Mar 11 12:32:51 2008
@@ -22,17 +22,14 @@
import org.apache.axiom.om.OMAbstractFactory;
import org.apache.axiom.om.OMDocument;
import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.xpath.AXIOMXPath;
import org.apache.axiom.soap.*;
import org.apache.axis2.AxisFault;
import org.apache.axis2.addressing.RelatesTo;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.synapse.SynapseConstants;
import org.apache.synapse.MessageContext;
import org.apache.synapse.SynapseException;
import org.apache.synapse.core.axis2.Axis2MessageContext;
import org.apache.synapse.mediators.AbstractMediator;
+import org.apache.synapse.util.SynapseXPath;
import javax.xml.namespace.QName;
import java.net.URI;
@@ -63,11 +60,11 @@
/** The fault code QName to be used */
private QName faultCodeValue = null;
/** An XPath expression that will give the fault code QName at runtime */
- private AXIOMXPath faultCodeExpr = null;
+ private SynapseXPath faultCodeExpr = null;
/** The fault reason to be used */
private String faultReasonValue = null;
/** An XPath expression that will give the fault reason string at runtime */
- private AXIOMXPath faultReasonExpr = null;
+ private SynapseXPath faultReasonExpr = null;
/** The fault node URI to be used */
private URI faultNode = null;
/** The fault role URI to be used - if applicable */
@@ -322,11 +319,11 @@
}
}
- public AXIOMXPath getFaultCodeExpr() {
+ public SynapseXPath getFaultCodeExpr() {
return faultCodeExpr;
}
- public void setFaultCodeExpr(AXIOMXPath faultCodeExpr) {
+ public void setFaultCodeExpr(SynapseXPath faultCodeExpr) {
this.faultCodeExpr = faultCodeExpr;
}
@@ -338,11 +335,11 @@
this.faultReasonValue = faultReasonValue;
}
- public AXIOMXPath getFaultReasonExpr() {
+ public SynapseXPath getFaultReasonExpr() {
return faultReasonExpr;
}
- public void setFaultReasonExpr(AXIOMXPath faultReasonExpr) {
+ public void setFaultReasonExpr(SynapseXPath faultReasonExpr) {
this.faultReasonExpr = faultReasonExpr;
}
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=636073&r1=636072&r2=636073&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 Tue Mar 11 12:32:51 2008
@@ -20,19 +20,17 @@
package org.apache.synapse.mediators.transform;
import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.xpath.AXIOMXPath;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.soap.SOAPFactory;
import org.apache.axiom.soap.SOAPHeader;
import org.apache.axiom.soap.SOAPHeaderBlock;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.addressing.RelatesTo;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.synapse.SynapseConstants;
import org.apache.synapse.MessageContext;
+import org.apache.synapse.SynapseConstants;
import org.apache.synapse.core.axis2.Axis2MessageContext;
import org.apache.synapse.mediators.AbstractMediator;
+import org.apache.synapse.util.SynapseXPath;
import javax.xml.namespace.QName;
import java.util.Iterator;
@@ -57,7 +55,7 @@
/** Set the header (ACTION_SET) or remove it (ACTION_REMOVE). Defaults to ACTION_SET */
private int action = ACTION_SET;
/** An expression which should be evaluated, and the result set as the header value */
- private AXIOMXPath expression = null;
+ private SynapseXPath expression = null;
/**
* Sets/Removes a SOAP header on the current message
@@ -218,11 +216,11 @@
this.value = value;
}
- public AXIOMXPath getExpression() {
+ public SynapseXPath getExpression() {
return expression;
}
- public void setExpression(AXIOMXPath expression) {
+ public void setExpression(SynapseXPath expression) {
this.expression = expression;
}
}
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/transform/XSLTMediator.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/transform/XSLTMediator.java?rev=636073&r1=636072&r2=636073&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/transform/XSLTMediator.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/transform/XSLTMediator.java Tue Mar 11 12:32:51 2008
@@ -30,11 +30,11 @@
import org.apache.axiom.om.impl.llom.OMTextImpl;
import org.apache.axiom.om.util.ElementHelper;
import org.apache.axiom.om.util.StAXUtils;
-import org.apache.axiom.om.xpath.AXIOMXPath;
import org.apache.axiom.soap.SOAP11Constants;
import org.apache.axiom.soap.SOAP12Constants;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.soap.impl.builder.StAXSOAPModelBuilder;
+import org.apache.axis2.AxisFault;
import org.apache.synapse.MessageContext;
import org.apache.synapse.SynapseException;
import org.apache.synapse.config.Entry;
@@ -44,8 +44,8 @@
import org.apache.synapse.mediators.MediatorProperty;
import org.apache.synapse.transport.base.BaseConstants;
import org.apache.synapse.util.FixedByteArrayOutputStream;
+import org.apache.synapse.util.SynapseXPath;
import org.apache.synapse.util.TextFileDataSource;
-import org.apache.axis2.AxisFault;
import org.jaxen.JaxenException;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
@@ -54,8 +54,8 @@
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.stream.XMLOutputFactory;
import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamWriter;
import javax.xml.stream.XMLStreamReader;
+import javax.xml.stream.XMLStreamWriter;
import javax.xml.transform.*;
import javax.xml.transform.dom.DOMResult;
import javax.xml.transform.dom.DOMSource;
@@ -63,8 +63,8 @@
import javax.xml.transform.stream.StreamSource;
import java.io.*;
import java.util.ArrayList;
-import java.util.List;
import java.util.Iterator;
+import java.util.List;
/**
* The XSLT mediator performs an XSLT transformation requested, using
@@ -103,7 +103,7 @@
/**
* The (optional) XPath expression which yields the source element for a transformation
*/
- private AXIOMXPath source = null;
+ private SynapseXPath source = null;
/**
* The name of the message context property to store the transformation result
@@ -157,7 +157,7 @@
public XSLTMediator() {
// create the default XPath
try {
- this.source = new AXIOMXPath(DEFAULT_XPATH);
+ this.source = new SynapseXPath(DEFAULT_XPATH);
this.source.addNamespace("s11", SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI);
this.source.addNamespace("s12", SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI);
} catch (JaxenException e) {
@@ -553,11 +553,11 @@
return null;
}
- public AXIOMXPath getSource() {
+ public SynapseXPath getSource() {
return source;
}
- public void setSource(AXIOMXPath source) {
+ public void setSource(SynapseXPath source) {
this.source = source;
}
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/SynapseXPath.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/SynapseXPath.java?rev=636073&r1=636072&r2=636073&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/SynapseXPath.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/SynapseXPath.java Tue Mar 11 12:32:51 2008
@@ -20,16 +20,7 @@
package org.apache.synapse.util;
import org.apache.axiom.om.xpath.AXIOMXPath;
-import org.apache.axiom.om.impl.llom.OMTextImpl;
-import org.apache.axiom.om.impl.llom.OMElementImpl;
-import org.apache.axiom.om.impl.llom.OMDocumentImpl;
-import org.apache.synapse.mediators.GetPropertyFunction;
-import org.apache.synapse.SynapseConstants;
import org.jaxen.JaxenException;
-import org.jaxen.SimpleFunctionContext;
-import org.jaxen.XPathFunctionContext;
-
-import java.util.List;
/**
*