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 [2/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...
Modified: synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/core/axis2/Axis2MessageContextTest.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/core/axis2/Axis2MessageContextTest.java?rev=636073&r1=636072&r2=636073&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/core/axis2/Axis2MessageContextTest.java (original)
+++ synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/core/axis2/Axis2MessageContextTest.java Tue Mar 11 12:32:51 2008
@@ -21,9 +21,8 @@
import junit.framework.TestCase;
import org.apache.synapse.MessageContext;
-import org.apache.synapse.core.axis2.Axis2MessageContext;
import org.apache.synapse.mediators.TestUtils;
-import org.apache.axiom.om.xpath.AXIOMXPath;
+import org.apache.synapse.util.SynapseXPath;
public class Axis2MessageContextTest extends TestCase {
String nsSoapEnv = "http://schemas.xmlsoap.org/soap/envelope/";
@@ -35,7 +34,7 @@
public void testMessageContextGetStringValueBody() throws Exception {
- AXIOMXPath axiomXpath = new AXIOMXPath("ns1:a/ns1:c");
+ SynapseXPath axiomXpath = new SynapseXPath("ns1:a/ns1:c");
axiomXpath.addNamespace("ns1", nsNamespace1);
MessageContext synCtx = TestUtils.getTestContext(sampleBody);
@@ -44,7 +43,7 @@
}
public void testMessageContextGetStringValueEnvelope() throws Exception {
- AXIOMXPath axiomXpath = new AXIOMXPath("/s11:Envelope/s11:Body/ns1:a/ns1:c");
+ SynapseXPath axiomXpath = new SynapseXPath("/s11:Envelope/s11:Body/ns1:a/ns1:c");
axiomXpath.addNamespace("s11", nsSoapEnv);
axiomXpath.addNamespace("ns1", nsNamespace1);
Modified: synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/builtin/PropertyMediatorTest.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/builtin/PropertyMediatorTest.java?rev=636073&r1=636072&r2=636073&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/builtin/PropertyMediatorTest.java (original)
+++ synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/builtin/PropertyMediatorTest.java Tue Mar 11 12:32:51 2008
@@ -20,11 +20,11 @@
package org.apache.synapse.mediators.builtin;
import junit.framework.TestCase;
-import org.apache.axiom.om.xpath.AXIOMXPath;
import org.apache.synapse.MessageContext;
import org.apache.synapse.core.axis2.Axis2MessageContext;
import org.apache.synapse.mediators.MediatorProperty;
import org.apache.synapse.mediators.TestUtils;
+import org.apache.synapse.util.SynapseXPath;
public class PropertyMediatorTest extends TestCase {
@@ -44,10 +44,10 @@
propMediatorTwo.mediate(synCtx);
assertTrue(
"value".equals(Axis2MessageContext.getStringValue(
- new AXIOMXPath("synapse:get-property('name')"), synCtx)));
+ new SynapseXPath("synapse:get-property('name')"), synCtx)));
assertTrue(
"valueTwo".equals(Axis2MessageContext.getStringValue(
- new AXIOMXPath("synapse:get-property('nameTwo')"), synCtx)));
+ new SynapseXPath("synapse:get-property('nameTwo')"), synCtx)));
PropertyMediator propMediatorThree = new PropertyMediator();
propMediatorThree.setName("name");
@@ -55,10 +55,10 @@
propMediatorThree.setAction(PropertyMediator.ACTION_REMOVE);
propMediatorThree.mediate(synCtx) ;
assertNull(Axis2MessageContext.getStringValue(
- new AXIOMXPath("synapse:get-property('name')"), synCtx));
+ new SynapseXPath("synapse:get-property('name')"), synCtx));
assertTrue(
"valueTwo".equals(Axis2MessageContext.getStringValue(
- new AXIOMXPath("synapse:get-property('nameTwo')"), synCtx)));
+ new SynapseXPath("synapse:get-property('nameTwo')"), synCtx)));
}
@@ -80,7 +80,7 @@
assertTrue(
"value".equals(Axis2MessageContext.getStringValue(
- new AXIOMXPath("synapse:get-property('name')"), synCtx)));
+ new SynapseXPath("synapse:get-property('name')"), synCtx)));
}*/
public void testMediatorPropertiesLiteral() throws Exception {
@@ -103,7 +103,7 @@
// read property through a mediator property
MediatorProperty medProp = new MediatorProperty();
- medProp.setExpression(new AXIOMXPath("synapse:get-property('name')"));
+ medProp.setExpression(new SynapseXPath("synapse:get-property('name')"));
assertTrue(
"value".equals(medProp.getEvaluatedExpression(synCtx)));
Modified: synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/builtin/ValidateMediatorTest.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/builtin/ValidateMediatorTest.java?rev=636073&r1=636072&r2=636073&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/builtin/ValidateMediatorTest.java (original)
+++ synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/builtin/ValidateMediatorTest.java Tue Mar 11 12:32:51 2008
@@ -22,22 +22,21 @@
import junit.framework.TestCase;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.impl.builder.StAXOMBuilder;
-import org.apache.axiom.om.xpath.AXIOMXPath;
-import org.apache.synapse.mediators.TestUtils;
-import org.apache.synapse.mediators.TestMediator;
-import org.apache.synapse.mediators.TestMediateHandler;
-import org.apache.synapse.mediators.builtin.ValidateMediator;
-import org.apache.synapse.config.xml.ValidateMediatorFactory;
-import org.apache.synapse.config.Entry;
import org.apache.synapse.MessageContext;
+import org.apache.synapse.config.Entry;
+import org.apache.synapse.config.xml.ValidateMediatorFactory;
+import org.apache.synapse.mediators.TestMediateHandler;
+import org.apache.synapse.mediators.TestMediator;
+import org.apache.synapse.mediators.TestUtils;
+import org.apache.synapse.util.SynapseXPath;
import javax.xml.stream.XMLStreamException;
import java.io.ByteArrayInputStream;
+import java.net.URL;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.net.URL;
public class ValidateMediatorTest extends TestCase {
@@ -152,7 +151,7 @@
List keys = new ArrayList();
keys.add("xsd-key");
validate.setSchemaKeys(keys);
- AXIOMXPath source = new AXIOMXPath("//m0:CheckPriceRequest");
+ SynapseXPath source = new SynapseXPath("//m0:CheckPriceRequest");
source.addNamespace("m0", "http://services.samples/xsd");
validate.setSource(source);
@@ -182,7 +181,7 @@
keys.add("xsd-key-1");
keys.add("xsd-key-2");
validate.setSchemaKeys(keys);
- AXIOMXPath source = new AXIOMXPath("//m0:Outer");
+ SynapseXPath source = new SynapseXPath("//m0:Outer");
source.addNamespace("m0", "http://services.samples/xsd2");
validate.setSource(source);
@@ -216,7 +215,7 @@
keys.add("xsd-key-1");
keys.add("xsd-key-2");
validate.setSchemaKeys(keys);
- AXIOMXPath source = new AXIOMXPath("//m0:Outer");
+ SynapseXPath source = new SynapseXPath("//m0:Outer");
source.addNamespace("m0", "http://services.samples/xsd2");
validate.setSource(source);
@@ -249,7 +248,7 @@
List keys = new ArrayList();
keys.add("xsd-key-1");
validate.setSchemaKeys(keys);
- AXIOMXPath source = new AXIOMXPath("//m0:CheckPriceRequest");
+ SynapseXPath source = new SynapseXPath("//m0:CheckPriceRequest");
source.addNamespace("m0", "http://services.samples/xsd");
validate.setSource(source);
@@ -278,7 +277,7 @@
List keys = new ArrayList();
keys.add("xsd-key-1");
validate.setSchemaKeys(keys);
- AXIOMXPath source = new AXIOMXPath("//m0:CheckPriceRequest");
+ SynapseXPath source = new SynapseXPath("//m0:CheckPriceRequest");
source.addNamespace("m0", "http://services.samples/xsd");
validate.setSource(source);
@@ -307,7 +306,7 @@
List keys = new ArrayList();
keys.add("xsd-key-1");
validate.setSchemaKeys(keys);
- AXIOMXPath source = new AXIOMXPath("//m0:CheckPriceRequest");
+ SynapseXPath source = new SynapseXPath("//m0:CheckPriceRequest");
source.addNamespace("m0", "http://services.samples/xsd");
validate.setSource(source);
@@ -360,7 +359,7 @@
List keys = new ArrayList();
keys.add("xsd-key-1");
validate.setSchemaKeys(keys);
- AXIOMXPath source = new AXIOMXPath("//m0:CheckPriceRequest");
+ SynapseXPath source = new SynapseXPath("//m0:CheckPriceRequest");
source.addNamespace("m0", "http://services.samples/xsd");
validate.setSource(source);
Modified: synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/ext/AnnotatedCommandMediatorTest.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/ext/AnnotatedCommandMediatorTest.java?rev=636073&r1=636072&r2=636073&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/ext/AnnotatedCommandMediatorTest.java (original)
+++ synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/ext/AnnotatedCommandMediatorTest.java Tue Mar 11 12:32:51 2008
@@ -19,12 +19,12 @@
package org.apache.synapse.mediators.ext;
-import org.apache.axiom.om.xpath.AXIOMXPath;
import org.apache.synapse.Mediator;
import org.apache.synapse.MessageContext;
import org.apache.synapse.config.xml.MediatorFactoryFinder;
import org.apache.synapse.mediators.AbstractMediatorTestCase;
import org.apache.synapse.mediators.TestUtils;
+import org.apache.synapse.util.SynapseXPath;
/**
*/
@@ -47,7 +47,7 @@
AnnotatedCommandMediator m = new AnnotatedCommandMediator();
m.setCommand(AnnotatedCommand.class);
- AXIOMXPath ax = m.afterFields.get(AnnotatedCommand.class.getDeclaredField("ReadAndUpdateField"));
+ SynapseXPath ax = m.afterFields.get(AnnotatedCommand.class.getDeclaredField("ReadAndUpdateField"));
assertEquals(1, ax.getNamespaces().size());
assertEquals("http://myns", ax.getNamespaces().values().iterator().next());
assertEquals("myns", ax.getNamespaces().keySet().iterator().next());
Modified: synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/ext/ClassMediatorTest.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/ext/ClassMediatorTest.java?rev=636073&r1=636072&r2=636073&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/ext/ClassMediatorTest.java (original)
+++ synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/ext/ClassMediatorTest.java Tue Mar 11 12:32:51 2008
@@ -22,11 +22,10 @@
import org.apache.synapse.ManagedLifecycle;
import org.apache.synapse.Mediator;
import org.apache.synapse.TestMessageContext;
-import org.apache.synapse.mediators.AbstractMediatorTestCase;
-import org.apache.synapse.config.xml.AbstractTestCase;
-import org.apache.synapse.config.xml.MediatorFactoryFinder;
import org.apache.synapse.config.SynapseConfiguration;
+import org.apache.synapse.config.xml.MediatorFactoryFinder;
import org.apache.synapse.core.axis2.Axis2SynapseEnvironment;
+import org.apache.synapse.mediators.AbstractMediatorTestCase;
/**
* Tests the class mediator instantiation and setting of literal and
@@ -75,7 +74,7 @@
// ClassMediator cm = new ClassMediator();
// MediatorProperty mp = new MediatorProperty();
// mp.setName("testProp");
-// mp.setExpression(new AXIOMXPath("concat('XPath ','is ','FUN!')"));
+// mp.setExpression(new SynapseXPath("concat('XPath ','is ','FUN!')"));
// cm.addProperty(mp);
// cm.setClazz(ClassMediatorTestMediator.class);
// cm.mediate(new TestMessageContext());
Modified: synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/filters/FilterMediatorTest.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/filters/FilterMediatorTest.java?rev=636073&r1=636072&r2=636073&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/filters/FilterMediatorTest.java (original)
+++ synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/filters/FilterMediatorTest.java Tue Mar 11 12:32:51 2008
@@ -20,13 +20,13 @@
package org.apache.synapse.mediators.filters;
import junit.framework.TestCase;
-import org.apache.axiom.om.xpath.AXIOMXPath;
import org.apache.synapse.MessageContext;
import org.apache.synapse.config.xml.AnonymousListMediator;
import org.apache.synapse.mediators.TestMediateHandler;
import org.apache.synapse.mediators.TestMediator;
import org.apache.synapse.mediators.TestUtils;
import org.apache.synapse.mediators.base.SequenceMediator;
+import org.apache.synapse.util.SynapseXPath;
import java.util.regex.Pattern;
@@ -57,7 +57,7 @@
FilterMediator filter = new FilterMediator();
// set xpath condition to IBM
- AXIOMXPath xpath = new AXIOMXPath("//*[wsx:symbol='IBM']");
+ SynapseXPath xpath = new SynapseXPath("//*[wsx:symbol='IBM']");
xpath.addNamespace("wsx", "http://www.webserviceX.NET/");
filter.setXpath(xpath);
@@ -77,7 +77,7 @@
FilterMediator filter = new FilterMediator();
// set xpath condition to MSFT
- AXIOMXPath xpath = new AXIOMXPath("//*[wsx:symbol='MSFT']");
+ SynapseXPath xpath = new SynapseXPath("//*[wsx:symbol='MSFT']");
xpath.addNamespace("wsx", "http://www.webserviceX.NET/");
filter.setXpath(xpath);
@@ -97,7 +97,7 @@
FilterMediator filter = new FilterMediator();
// set source xpath condition to //symbol
- AXIOMXPath source = new AXIOMXPath("//wsx:symbol");
+ SynapseXPath source = new SynapseXPath("//wsx:symbol");
source.addNamespace("wsx", "http://www.webserviceX.NET/");
filter.setSource(source);
@@ -121,7 +121,7 @@
FilterMediator filter = new FilterMediator();
// set source xpath condition to //symbol
- AXIOMXPath source = new AXIOMXPath("//wsx:symbol");
+ SynapseXPath source = new SynapseXPath("//wsx:symbol");
source.addNamespace("wsx", "http://www.webserviceX.NET/");
filter.setSource(source);
@@ -145,7 +145,7 @@
FilterMediator filter = new FilterMediator();
// set source xpath condition to //symbol
- AXIOMXPath source = new AXIOMXPath("//wsx:symbol");
+ SynapseXPath source = new SynapseXPath("//wsx:symbol");
source.addNamespace("wsx", "http://www.webserviceX.NET/");
filter.setSource(source);
@@ -175,7 +175,7 @@
FilterMediator filter = new FilterMediator();
// set source xpath condition to //symbol
- AXIOMXPath source = new AXIOMXPath("//wsx:symbol");
+ SynapseXPath source = new SynapseXPath("//wsx:symbol");
source.addNamespace("wsx", "http://www.webserviceX.NET/");
filter.setSource(source);
Modified: synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/filters/SwitchMediatorTest.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/filters/SwitchMediatorTest.java?rev=636073&r1=636072&r2=636073&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/filters/SwitchMediatorTest.java (original)
+++ synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/filters/SwitchMediatorTest.java Tue Mar 11 12:32:51 2008
@@ -20,14 +20,14 @@
package org.apache.synapse.mediators.filters;
import junit.framework.TestCase;
-import org.apache.axiom.om.xpath.AXIOMXPath;
-import org.apache.synapse.MessageContext;
import org.apache.synapse.Mediator;
-import org.apache.synapse.config.xml.SwitchCase;
+import org.apache.synapse.MessageContext;
import org.apache.synapse.config.xml.AnonymousListMediator;
+import org.apache.synapse.config.xml.SwitchCase;
import org.apache.synapse.mediators.TestMediateHandler;
import org.apache.synapse.mediators.TestMediator;
import org.apache.synapse.mediators.TestUtils;
+import org.apache.synapse.util.SynapseXPath;
import java.util.Arrays;
import java.util.regex.Pattern;
@@ -83,7 +83,7 @@
switchMediator = new SwitchMediator();
// set xpath condition to select symbol
- AXIOMXPath xpath = new AXIOMXPath("//wsx:symbol");
+ SynapseXPath xpath = new SynapseXPath("//wsx:symbol");
xpath.addNamespace("wsx", "http://www.webserviceX.NET/");
switchMediator.setSource(xpath);
SwitchCase caseOne = new SwitchCase();
Modified: synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/transform/HeaderMediatorTest.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/transform/HeaderMediatorTest.java?rev=636073&r1=636072&r2=636073&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/transform/HeaderMediatorTest.java (original)
+++ synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/transform/HeaderMediatorTest.java Tue Mar 11 12:32:51 2008
@@ -20,10 +20,10 @@
package org.apache.synapse.mediators.transform;
import junit.framework.TestCase;
-import org.apache.axiom.om.xpath.AXIOMXPath;
import org.apache.synapse.MessageContext;
import org.apache.synapse.SynapseConstants;
import org.apache.synapse.mediators.TestUtils;
+import org.apache.synapse.util.SynapseXPath;
import javax.xml.namespace.QName;
@@ -54,7 +54,7 @@
HeaderMediator headerMediator = new HeaderMediator();
headerMediator.setQName(new QName(SynapseConstants.HEADER_TO));
- headerMediator.setExpression(new AXIOMXPath("concat('http://','server','/path')"));
+ headerMediator.setExpression(new SynapseXPath("concat('http://','server','/path')"));
// invoke transformation, with static enveope
MessageContext synCtx = TestUtils.getTestContext("<empty/>");
Modified: synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/transform/XSLTMediatorTest.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/transform/XSLTMediatorTest.java?rev=636073&r1=636072&r2=636073&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/transform/XSLTMediatorTest.java (original)
+++ synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/transform/XSLTMediatorTest.java Tue Mar 11 12:32:51 2008
@@ -20,22 +20,19 @@
package org.apache.synapse.mediators.transform;
import junit.framework.TestCase;
-import org.apache.axiom.om.*;
-import org.apache.axiom.om.impl.builder.StAXOMBuilder;
-import org.apache.axiom.om.xpath.AXIOMXPath;
-import org.apache.axiom.soap.SOAPEnvelope;
-import org.apache.synapse.mediators.TestUtils;
-import org.apache.synapse.mediators.MediatorProperty;
-import org.apache.synapse.mediators.transform.XSLTMediator;
-import org.apache.synapse.config.Entry;
+import org.apache.axiom.om.OMContainer;
+import org.apache.axiom.om.OMElement;
import org.apache.synapse.MessageContext;
+import org.apache.synapse.config.Entry;
+import org.apache.synapse.mediators.MediatorProperty;
+import org.apache.synapse.mediators.TestUtils;
+import org.apache.synapse.util.SynapseXPath;
+import java.net.URL;
+import java.util.ArrayList;
import java.util.HashMap;
-import java.util.Map;
import java.util.List;
-import java.util.ArrayList;
-import java.net.URL;
-import java.io.FileOutputStream;
+import java.util.Map;
public class XSLTMediatorTest extends TestCase {
@@ -59,7 +56,7 @@
transformMediator = new XSLTMediator();
// set xpath condition to select source
- AXIOMXPath xpath = new AXIOMXPath("//m0:CheckPriceRequest");
+ SynapseXPath xpath = new SynapseXPath("//m0:CheckPriceRequest");
xpath.addNamespace("m0", "http://services.samples/xsd");
transformMediator.setSource(xpath);
@@ -238,7 +235,7 @@
transformMediator = new XSLTMediator();
// set xpath condition to select source
- AXIOMXPath xpath = new AXIOMXPath("//m0:CheckPriceRequest");
+ SynapseXPath xpath = new SynapseXPath("//m0:CheckPriceRequest");
xpath.addNamespace("m0", "http://services.samples/xsd");
transformMediator.setSource(xpath);
Modified: synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/n2n/SynapseCommodityServiceTest.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/n2n/SynapseCommodityServiceTest.java?rev=636073&r1=636072&r2=636073&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/n2n/SynapseCommodityServiceTest.java (original)
+++ synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/n2n/SynapseCommodityServiceTest.java Tue Mar 11 12:32:51 2008
@@ -24,7 +24,7 @@
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.axis2.AxisFault;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.client.Options;
import org.apache.axis2.client.ServiceClient;
@@ -32,15 +32,15 @@
import org.apache.axis2.context.ConfigurationContextFactory;
import org.apache.axis2.description.AxisService;
import org.apache.axis2.description.TransportInDescription;
-import org.apache.axis2.transport.TransportListener;
import org.apache.axis2.engine.ListenerManager;
import org.apache.axis2.engine.MessageReceiver;
-import org.apache.axis2.AxisFault;
+import org.apache.axis2.transport.TransportListener;
import org.apache.synapse.SynapseConstants;
+import org.apache.synapse.util.SynapseXPath;
import org.apache.synapse.utils.Services;
-import java.util.Iterator;
import java.util.HashMap;
+import java.util.Iterator;
public class SynapseCommodityServiceTest extends TestCase {
@@ -149,7 +149,7 @@
assertNotNull(response);
- AXIOMXPath xPath = new AXIOMXPath("//return");
+ SynapseXPath xPath = new SynapseXPath("//return");
xPath.addNamespace("ns","http://services.samples/xsd");
OMElement returnEle = (OMElement) xPath.selectSingleNode(response);
Modified: synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/xquery/MediatorCustomVariable.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/xquery/MediatorCustomVariable.java?rev=636073&r1=636072&r2=636073&view=diff
==============================================================================
--- synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/xquery/MediatorCustomVariable.java (original)
+++ synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/xquery/MediatorCustomVariable.java Tue Mar 11 12:32:51 2008
@@ -22,7 +22,6 @@
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMNode;
import org.apache.axiom.om.OMText;
-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;
@@ -30,6 +29,7 @@
import org.apache.synapse.MessageContext;
import org.apache.synapse.SynapseException;
import org.apache.synapse.config.Entry;
+import org.apache.synapse.util.SynapseXPath;
import org.jaxen.JaxenException;
import javax.xml.namespace.QName;
@@ -48,7 +48,7 @@
/**
* The XPath expression which yeilds the element from given XMLDocument
*/
- private AXIOMXPath expression;
+ private SynapseXPath expression;
/**
* The key to lookup the xml document from registry
@@ -72,7 +72,7 @@
super(name);
// create the default XPath
try {
- this.expression = new AXIOMXPath(DEFAULT_XPATH);
+ this.expression = new SynapseXPath(DEFAULT_XPATH);
this.expression.addNamespace("s11", SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI);
this.expression.addNamespace("s12", SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI);
} catch (JaxenException e) {
@@ -164,7 +164,7 @@
throw new SynapseException(msg);
}
- public void setExpression(AXIOMXPath expression) {
+ public void setExpression(SynapseXPath expression) {
this.expression = expression;
}
@@ -176,7 +176,7 @@
return regKey;
}
- public AXIOMXPath getExpression() {
+ public SynapseXPath getExpression() {
return expression;
}
}
Modified: synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/xquery/XQueryMediator.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/xquery/XQueryMediator.java?rev=636073&r1=636072&r2=636073&view=diff
==============================================================================
--- synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/xquery/XQueryMediator.java (original)
+++ synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/xquery/XQueryMediator.java Tue Mar 11 12:32:51 2008
@@ -25,7 +25,6 @@
import org.apache.axiom.om.impl.builder.StAXOMBuilder;
import org.apache.axiom.om.impl.dom.DOOMAbstractFactory;
import org.apache.axiom.om.util.ElementHelper;
-import org.apache.axiom.om.xpath.AXIOMXPath;
import org.apache.axiom.soap.SOAP11Constants;
import org.apache.axiom.soap.SOAP12Constants;
import org.apache.synapse.MessageContext;
@@ -34,6 +33,7 @@
import org.apache.synapse.config.SynapseConfigUtils;
import org.apache.synapse.mediators.AbstractMediator;
import org.apache.synapse.mediators.MediatorProperty;
+import org.apache.synapse.util.SynapseXPath;
import org.jaxen.JaxenException;
import org.w3c.dom.Element;
import org.xml.sax.InputSource;
@@ -87,7 +87,7 @@
/**
* The (optional) XPath expression which yeilds the target element to attached the result
*/
- private AXIOMXPath target = null;
+ private SynapseXPath target = null;
/**
* The list of variables for binding to the DyanamicContext in order to available for querying
@@ -122,7 +122,7 @@
public XQueryMediator() {
// create the default XPath
try {
- this.target = new AXIOMXPath(DEFAULT_XPATH);
+ this.target = new SynapseXPath(DEFAULT_XPATH);
this.target.addNamespace("s11", SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI);
this.target.addNamespace("s12", SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI);
} catch (JaxenException e) {
@@ -664,11 +664,11 @@
return variables;
}
- public AXIOMXPath getTarget() {
+ public SynapseXPath getTarget() {
return target;
}
- public void setTarget(AXIOMXPath target) {
+ public void setTarget(SynapseXPath target) {
this.target = target;
}
Modified: synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/xquery/XQueryMediatorFactory.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/xquery/XQueryMediatorFactory.java?rev=636073&r1=636072&r2=636073&view=diff
==============================================================================
--- synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/xquery/XQueryMediatorFactory.java (original)
+++ synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/xquery/XQueryMediatorFactory.java Tue Mar 11 12:32:51 2008
@@ -18,27 +18,21 @@
*/
package org.apache.synapse.mediators.xquery;
-import org.apache.synapse.config.xml.AbstractMediatorFactory;
-import org.apache.synapse.config.xml.OMElementUtils;
-import org.apache.synapse.config.xml.MediatorPropertyFactory;
-import org.apache.synapse.config.xml.XMLConfigConstants;
-import org.apache.synapse.Mediator;
-import org.apache.axiom.om.OMElement;
+import net.sf.saxon.javax.xml.xquery.XQItemType;
import org.apache.axiom.om.OMAttribute;
-import org.apache.axiom.om.impl.builder.StAXOMBuilder;
-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.config.xml.AbstractMediatorFactory;
+import org.apache.synapse.config.xml.MediatorPropertyFactory;
+import org.apache.synapse.config.xml.OMElementUtils;
+import org.apache.synapse.config.xml.XMLConfigConstants;
+import org.apache.synapse.util.SynapseXPath;
import org.jaxen.JaxenException;
import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamReader;
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLStreamException;
import java.util.Iterator;
-import java.io.StringReader;
-
-import net.sf.saxon.javax.xml.xquery.XQItemType;
/**
* Creates a XQuery mediator from the given XML
@@ -83,7 +77,7 @@
String targetValue = attrTarget.getAttributeValue();
if (targetValue != null) {
try {
- AXIOMXPath xp = new AXIOMXPath(targetValue.trim());
+ SynapseXPath xp = new SynapseXPath(targetValue.trim());
OMElementUtils.addNameSpaces(xp, elem, log);
xQueryMediator.setTarget(xp);
} catch (JaxenException e) {
@@ -125,7 +119,7 @@
}
if (expr != null && !"".equals(expr)) {
try {
- AXIOMXPath xp = new AXIOMXPath(expr.trim());
+ SynapseXPath xp = new SynapseXPath(expr.trim());
OMElementUtils.addNameSpaces(xp, variableOM, log);
((MediatorCustomVariable) variable).setExpression(xp);
Modified: synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/xquery/XQueryMediatorSerializer.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/xquery/XQueryMediatorSerializer.java?rev=636073&r1=636072&r2=636073&view=diff
==============================================================================
--- synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/xquery/XQueryMediatorSerializer.java (original)
+++ synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/xquery/XQueryMediatorSerializer.java Tue Mar 11 12:32:51 2008
@@ -18,20 +18,18 @@
*/
package org.apache.synapse.mediators.xquery;
-import org.apache.synapse.config.xml.AbstractMediatorSerializer;
-import org.apache.synapse.config.xml.XMLConfigConstants;
-import org.apache.synapse.Mediator;
+import net.sf.saxon.javax.xml.xquery.XQItemType;
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 java.util.List;
-
-import net.sf.saxon.javax.xml.xquery.XQItemType;
+import org.apache.synapse.Mediator;
+import org.apache.synapse.config.xml.AbstractMediatorSerializer;
+import org.apache.synapse.config.xml.XMLConfigConstants;
+import org.apache.synapse.util.SynapseXPath;
import javax.xml.namespace.QName;
+import java.util.List;
/**
* Serialize the given XQuery mediator into a XML
@@ -67,7 +65,7 @@
saveTracingState(xquery, queryMediator);
- AXIOMXPath targetXPath = queryMediator.getTarget();
+ SynapseXPath targetXPath = queryMediator.getTarget();
if (targetXPath != null &&
!XQueryMediator.DEFAULT_XPATH.toString().equals(targetXPath.toString())) {
xquery.addAttribute(fac.createOMAttribute(
@@ -144,7 +142,7 @@
customElement.addAttribute(fac.createOMAttribute(
"key", nullNS, regkey));
}
- AXIOMXPath expression = variable.getExpression();
+ SynapseXPath expression = variable.getExpression();
if (expression != null && !XQueryMediator.DEFAULT_XPATH.toString().
equals(expression.toString())) {
customElement.addAttribute(fac.createOMAttribute(