Author: ruwan
Date: Wed Sep 22 09:42:56 2010
New Revision: 999840
URL: http://svn.apache.org/viewvc?rev=999840&view=rev
Log:
Fixing the Configuration building API to pass in properties with additional
information
This helps to get rid of the static references to the resolve root and so forth
via the ServerManager
Committing in parts as my commit as a bunch failed
Modified:
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/InMediatorFactory.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/LogMediatorFactory.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/IndirectEndpointFactory.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/LoadbalanceEndpointFactory.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/LocalEntryDeployer.java
synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/HeaderMediatorConfigurationTest.java
synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/LocalEntryConfigurationTest.java
synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/eip/IterateMediatorTest.java
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/HttpCoreNIOListener.java
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=999840&r1=999839&r2=999840&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
Wed Sep 22 09:42:56 2010
@@ -27,6 +27,7 @@ import org.apache.synapse.mediators.filt
import org.jaxen.JaxenException;
import javax.xml.namespace.QName;
+import java.util.Properties;
import java.util.regex.Pattern;
import java.util.regex.PatternSyntaxException;
@@ -59,7 +60,7 @@ public class FilterMediatorFactory exten
private static final QName THEN_Q = new
QName(SynapseConstants.SYNAPSE_NAMESPACE, "then");
private static final QName ELSE_Q = new
QName(SynapseConstants.SYNAPSE_NAMESPACE, "else");
- public Mediator createSpecificMediator(OMElement elem) {
+ public Mediator createSpecificMediator(OMElement elem, Properties
properties) {
FilterMediator filter = new FilterMediator();
@@ -132,7 +133,7 @@ public class FilterMediatorFactory exten
filter.setThenKey(sequenceAttr.getAttributeValue());
} else {
- addChildren(thenElem, filter);
+ addChildren(thenElem, filter, properties);
}
OMElement elseElem = elem.getFirstChildWithName(ELSE_Q);
@@ -147,8 +148,8 @@ public class FilterMediatorFactory exten
} else {
- AnonymousListMediator listMediator =
-
AnonymousListMediatorFactory.createAnonymousListMediator(elseElem);
+ AnonymousListMediator listMediator =
AnonymousListMediatorFactory
+ .createAnonymousListMediator(elseElem, properties);
filter.setElseMediator(listMediator);
}
}
@@ -156,7 +157,7 @@ public class FilterMediatorFactory exten
} else {
filter.setThenElementPresent(false);
- addChildren(elem, filter);
+ addChildren(elem, filter, properties);
}
return filter;
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=999840&r1=999839&r2=999840&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
Wed Sep 22 09:42:56 2010
@@ -28,6 +28,7 @@ import org.apache.synapse.mediators.tran
import org.jaxen.JaxenException;
import javax.xml.namespace.QName;
+import java.util.Properties;
/**
* Factory for {...@link HeaderMediator} instances.
@@ -47,7 +48,7 @@ public class HeaderMediatorFactory exten
private static final QName HEADER_Q = new
QName(XMLConfigConstants.SYNAPSE_NAMESPACE, "header");
private static final QName ATT_ACTION = new QName("action");
- public Mediator createSpecificMediator(OMElement elem) {
+ public Mediator createSpecificMediator(OMElement elem, Properties
properties) {
HeaderMediator headerMediator = new HeaderMediator();
OMAttribute name = elem.getAttribute(ATT_NAME);
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/InMediatorFactory.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/InMediatorFactory.java?rev=999840&r1=999839&r2=999840&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/InMediatorFactory.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/InMediatorFactory.java
Wed Sep 22 09:42:56 2010
@@ -24,6 +24,7 @@ import org.apache.synapse.Mediator;
import org.apache.synapse.mediators.filters.InMediator;
import javax.xml.namespace.QName;
+import java.util.Properties;
/**
* Factory for {...@link InMediator} instances.
@@ -39,12 +40,12 @@ public class InMediatorFactory extends A
private static final QName IN_Q = new
QName(XMLConfigConstants.SYNAPSE_NAMESPACE, "in");
- public Mediator createSpecificMediator(OMElement elem) {
+ public Mediator createSpecificMediator(OMElement elem, Properties
properties) {
InMediator filter = new InMediator();
// after successfully creating the mediator
// set its common attributes such as tracing etc
processAuditStatus(filter,elem);
- addChildren(elem, filter);
+ addChildren(elem, filter, properties);
return filter;
}
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=999840&r1=999839&r2=999840&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
Wed Sep 22 09:42:56 2010
@@ -31,6 +31,7 @@ import org.apache.synapse.util.xpath.Syn
import org.jaxen.JaxenException;
import javax.xml.namespace.QName;
+import java.util.Properties;
/**
* The <iterate> element is used to split messages in Synapse to smaller
messages with only
@@ -68,9 +69,10 @@ public class IterateMediatorFactory exte
* This method will create the IterateMediator by parsing the given xml
configuration
*
* @param elem OMElement describing the configuration of the
IterateMediaotr
+ * @param properties
* @return IterateMediator created from the given configuration
*/
- public Mediator createSpecificMediator(OMElement elem) {
+ public Mediator createSpecificMediator(OMElement elem, Properties
properties) {
IterateMediator mediator = new IterateMediator();
processAuditStatus(mediator, elem);
@@ -126,7 +128,7 @@ public class IterateMediatorFactory exte
OMElement targetElement = elem.getFirstChildWithName(TARGET_Q);
if (targetElement != null) {
- Target target = TargetFactory.createTarget(targetElement);
+ Target target = TargetFactory.createTarget(targetElement,
properties);
if (target != null) {
target.setAsynchronous(asynchronous);
mediator.setTarget(target);
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/LogMediatorFactory.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/LogMediatorFactory.java?rev=999840&r1=999839&r2=999840&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/LogMediatorFactory.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/LogMediatorFactory.java
Wed Sep 22 09:42:56 2010
@@ -25,6 +25,7 @@ import org.apache.synapse.Mediator;
import org.apache.synapse.mediators.builtin.LogMediator;
import javax.xml.namespace.QName;
+import java.util.Properties;
/**
* Created a Log mediator that logs messages using commons-logging.
@@ -56,7 +57,7 @@ public class LogMediatorFactory extends
return LOG_Q;
}
- public Mediator createSpecificMediator(OMElement elem) {
+ public Mediator createSpecificMediator(OMElement elem, Properties
properties) {
LogMediator logMediator = new LogMediator();
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/IndirectEndpointFactory.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/IndirectEndpointFactory.java?rev=999840&r1=999839&r2=999840&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/IndirectEndpointFactory.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/IndirectEndpointFactory.java
Wed Sep 22 09:42:56 2010
@@ -24,6 +24,7 @@ import org.apache.synapse.endpoints.Endp
import org.apache.synapse.endpoints.IndirectEndpoint;
import javax.xml.namespace.QName;
+import java.util.Properties;
/**
* Creates an {...@link IndirectEndpoint} using a XML configuration. Key can
be a name of an endpoint defined
@@ -42,7 +43,8 @@ public class IndirectEndpointFactory ext
return instance;
}
- protected Endpoint createEndpoint(OMElement epConfig, boolean
anonymousEndpoint) {
+ protected Endpoint createEndpoint(OMElement epConfig, boolean
anonymousEndpoint,
+ Properties properties) {
IndirectEndpoint indirectEndpoint = new IndirectEndpoint();
String ref = epConfig.getAttributeValue(new QName("key"));
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/LoadbalanceEndpointFactory.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/LoadbalanceEndpointFactory.java?rev=999840&r1=999839&r2=999840&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/LoadbalanceEndpointFactory.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/LoadbalanceEndpointFactory.java
Wed Sep 22 09:42:56 2010
@@ -34,6 +34,7 @@ import javax.xml.namespace.QName;
import java.util.ArrayList;
import java.util.List;
import java.util.Iterator;
+import java.util.Properties;
/**
* Creates {...@link LoadbalanceEndpoint} using an XML configuration.
@@ -57,7 +58,8 @@ public final class LoadbalanceEndpointFa
return instance;
}
- protected Endpoint createEndpoint(OMElement epConfig, boolean
anonymousEndpoint) {
+ protected Endpoint createEndpoint(OMElement epConfig, boolean
anonymousEndpoint,
+ Properties properties) {
// create the endpoint, manager and the algorithms
@@ -89,7 +91,7 @@ public final class LoadbalanceEndpointFa
throw new SynapseException(msg);
}
List<Endpoint> endpoints
- = getEndpoints(loadbalanceElement,
loadbalanceEndpoint);
+ = getEndpoints(loadbalanceElement,
loadbalanceEndpoint, properties);
loadbalanceEndpoint.setChildren(endpoints);
algorithm =
LoadbalanceAlgorithmFactory.
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/LocalEntryDeployer.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/LocalEntryDeployer.java?rev=999840&r1=999839&r2=999840&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/LocalEntryDeployer.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/LocalEntryDeployer.java
Wed Sep 22 09:42:56 2010
@@ -28,6 +28,7 @@ import org.apache.synapse.config.xml.Ent
import org.apache.synapse.config.xml.MultiXMLConfigurationBuilder;
import java.io.File;
+import java.util.Properties;
/**
* Handles the <code>LocalEntry</code> deployment and undeployment tasks
@@ -39,14 +40,15 @@ public class LocalEntryDeployer extends
private static Log log = LogFactory.getLog(LocalEntryDeployer.class);
@Override
- public String deploySynapseArtifact(OMElement artifactConfig, String
fileName) {
+ public String deploySynapseArtifact(OMElement artifactConfig, String
fileName,
+ Properties properties) {
if (log.isDebugEnabled()) {
log.debug("LocalEntry Deployment from file : " + fileName + " :
Started");
}
try {
- Entry e = EntryFactory.createEntry(artifactConfig);
+ Entry e = EntryFactory.createEntry(artifactConfig, properties);
if (e != null) {
e.setFileName((new File(fileName)).getName());
if (log.isDebugEnabled()) {
@@ -74,14 +76,14 @@ public class LocalEntryDeployer extends
@Override
public String updateSynapseArtifact(OMElement artifactConfig, String
fileName,
- String existingArtifactName) {
+ String existingArtifactName,
Properties properties) {
if (log.isDebugEnabled()) {
log.debug("LocalEntry Update from file : " + fileName + " :
Started");
}
try {
- Entry e = EntryFactory.createEntry(artifactConfig);
+ Entry e = EntryFactory.createEntry(artifactConfig, properties);
if (e != null) {
e.setFileName((new File(fileName)).getName());
if (log.isDebugEnabled()) {
Modified:
synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/HeaderMediatorConfigurationTest.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/HeaderMediatorConfigurationTest.java?rev=999840&r1=999839&r2=999840&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/HeaderMediatorConfigurationTest.java
(original)
+++
synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/HeaderMediatorConfigurationTest.java
Wed Sep 22 09:42:56 2010
@@ -25,6 +25,7 @@ import org.apache.synapse.SynapseExcepti
import org.apache.synapse.SynapseConstants;
import javax.xml.stream.XMLStreamException;
+import java.util.Properties;
public class HeaderMediatorConfigurationTest extends TestCase {
@@ -32,7 +33,7 @@ public class HeaderMediatorConfiguration
try {
String inputXml = "<header
xmlns=\"http://synapse.apache.org/ns/2010/04/configuration\"; name=\"MyHeader\"
value=\"MyValue\"/>";
HeaderMediatorFactory fac = new HeaderMediatorFactory();
- fac.createMediator(AXIOMUtil.stringToOM(inputXml));
+ fac.createMediator(AXIOMUtil.stringToOM(inputXml), new
Properties());
fail("HeaderMediator created with namespace unqualified SOAP
header");
} catch (XMLStreamException e) {
fail("Error while parsing header mediator configuration");
@@ -43,7 +44,7 @@ public class HeaderMediatorConfiguration
try {
String inputXml = "<header
xmlns=\"http://synapse.apache.org/ns/2010/04/configuration\"; name=\"MyHeader\"
action=\"remove\"/>";
HeaderMediatorFactory fac = new HeaderMediatorFactory();
- fac.createMediator(AXIOMUtil.stringToOM(inputXml));
+ fac.createMediator(AXIOMUtil.stringToOM(inputXml), new
Properties());
fail("HeaderMediator created with namespace unqualified SOAP
header");
} catch (XMLStreamException e) {
fail("Error while parsing header mediator configuration");
@@ -56,7 +57,7 @@ public class HeaderMediatorConfiguration
try {
String inputXml = "<header
xmlns=\"http://synapse.apache.org/ns/2010/04/configuration\";
name=\"m:MyHeader\" value=\"MyValue\"/>";
HeaderMediatorFactory fac = new HeaderMediatorFactory();
- fac.createMediator(AXIOMUtil.stringToOM(inputXml));
+ fac.createMediator(AXIOMUtil.stringToOM(inputXml), new
Properties());
fail("HeaderMediator created with namespace unqualified SOAP
header");
} catch (XMLStreamException e) {
fail("Error while parsing header mediator configuration");
@@ -67,7 +68,7 @@ public class HeaderMediatorConfiguration
try {
String inputXml = "<header
xmlns=\"http://synapse.apache.org/ns/2010/04/configuration\";
name=\"m:MyHeader\" action=\"remove\"/>";
HeaderMediatorFactory fac = new HeaderMediatorFactory();
- fac.createMediator(AXIOMUtil.stringToOM(inputXml));
+ fac.createMediator(AXIOMUtil.stringToOM(inputXml), new
Properties());
fail("HeaderMediator created with namespace unqualified SOAP
header");
} catch (XMLStreamException e) {
fail("Error while parsing header mediator configuration");
@@ -89,7 +90,7 @@ public class HeaderMediatorConfiguration
try {
String inputXml = "<header
xmlns=\"http://synapse.apache.org/ns/2010/04/configuration\"; name=\"" + header
+ "\" value=\"MyValue\"/>";
HeaderMediatorFactory fac = new HeaderMediatorFactory();
- fac.createMediator(AXIOMUtil.stringToOM(inputXml));
+ fac.createMediator(AXIOMUtil.stringToOM(inputXml), new
Properties());
} catch (XMLStreamException e) {
fail("Error while parsing header mediator configuration");
}
@@ -97,7 +98,7 @@ public class HeaderMediatorConfiguration
try {
String inputXml = "<header
xmlns=\"http://synapse.apache.org/ns/2010/04/configuration\"; name=\"" + header
+ "\" action=\"remove\"/>";
HeaderMediatorFactory fac = new HeaderMediatorFactory();
- fac.createMediator(AXIOMUtil.stringToOM(inputXml));
+ fac.createMediator(AXIOMUtil.stringToOM(inputXml), new
Properties());
} catch (XMLStreamException e) {
fail("Error while parsing header mediator configuration");
}
@@ -107,7 +108,7 @@ public class HeaderMediatorConfiguration
try {
String inputXml = "<header
xmlns=\"http://synapse.apache.org/ns/2010/04/configuration\";
xmlns:m=\"http://synapse.apache.org\"; name=\"m:MyHeader\" value=\"MyValue\"/>";
HeaderMediatorFactory fac = new HeaderMediatorFactory();
- fac.createMediator(AXIOMUtil.stringToOM(inputXml));
+ fac.createMediator(AXIOMUtil.stringToOM(inputXml), new
Properties());
} catch (XMLStreamException e) {
fail("Error while parsing header mediator configuration");
}
@@ -115,7 +116,7 @@ public class HeaderMediatorConfiguration
try {
String inputXml = "<header
xmlns=\"http://synapse.apache.org/ns/2010/04/configuration\";
xmlns:m=\"http://synapse.apache.org\"; name=\"m:MyHeader\" action=\"remove\"/>";
HeaderMediatorFactory fac = new HeaderMediatorFactory();
- fac.createMediator(AXIOMUtil.stringToOM(inputXml));
+ fac.createMediator(AXIOMUtil.stringToOM(inputXml), new
Properties());
} catch (XMLStreamException e) {
fail("Error while parsing header mediator configuration");
}
Modified:
synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/LocalEntryConfigurationTest.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/LocalEntryConfigurationTest.java?rev=999840&r1=999839&r2=999840&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/LocalEntryConfigurationTest.java
(original)
+++
synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/LocalEntryConfigurationTest.java
Wed Sep 22 09:42:56 2010
@@ -28,6 +28,7 @@ import javax.xml.stream.XMLStreamExcepti
import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLStreamReader;
import java.io.StringReader;
+import java.util.Properties;
public class LocalEntryConfigurationTest extends AbstractTestCase {
@@ -42,7 +43,7 @@ public class LocalEntryConfigurationTest
try {
OMElement elem = parseXMLString(entrySrc, true);
- Entry entry = EntryFactory.createEntry(elem);
+ Entry entry = EntryFactory.createEntry(elem, new Properties());
assertEquals(key, entry.getKey());
assertEquals(Entry.INLINE_TEXT, entry.getType());
assertEquals(text, (String) entry.getValue());
@@ -69,7 +70,7 @@ public class LocalEntryConfigurationTest
try {
OMElement elem = parseXMLString(entrySrc, coalesced);
- Entry entry = EntryFactory.createEntry(elem);
+ Entry entry = EntryFactory.createEntry(elem, new Properties());
assertEquals(key, entry.getKey());
assertEquals(Entry.INLINE_TEXT, entry.getType());
assertEquals(text, (String) entry.getValue());
@@ -98,7 +99,7 @@ public class LocalEntryConfigurationTest
try {
OMElement elem = parseXMLString(entrySrc, coalesced);
- Entry entry = EntryFactory.createEntry(elem);
+ Entry entry = EntryFactory.createEntry(elem, new Properties());
assertEquals(key, entry.getKey());
assertEquals(Entry.INLINE_TEXT, entry.getType());
assertEquals(actualText, (String) entry.getValue());
@@ -129,7 +130,7 @@ public class LocalEntryConfigurationTest
try {
OMElement elem = parseXMLString(entrySrc, true);
- Entry entry = EntryFactory.createEntry(elem);
+ Entry entry = EntryFactory.createEntry(elem, new Properties());
assertEquals(key, entry.getKey());
assertEquals(Entry.INLINE_TEXT, entry.getType());
assertEquals(text, (String) entry.getValue());
@@ -167,7 +168,7 @@ public class LocalEntryConfigurationTest
try {
OMElement elem = parseXMLString(entrySrc, coalesced);
- Entry entry = EntryFactory.createEntry(elem);
+ Entry entry = EntryFactory.createEntry(elem, new Properties());
assertEquals(key, entry.getKey());
assertEquals(Entry.INLINE_TEXT, entry.getType());
assertEquals(text, (String) entry.getValue());
@@ -192,7 +193,7 @@ public class LocalEntryConfigurationTest
try {
OMElement elem = parseXMLString(entrySrc, true);
OMElement expectedSerialization = elem.cloneOMElement();
- Entry entry = EntryFactory.createEntry(elem);
+ Entry entry = EntryFactory.createEntry(elem, new Properties());
assertEquals(key, entry.getKey());
assertEquals(Entry.INLINE_XML, entry.getType());
@@ -223,7 +224,7 @@ public class LocalEntryConfigurationTest
try {
OMElement elem = parseXMLString(entrySrc, coalesced);
OMElement expectedSerialization = elem.cloneOMElement();
- Entry entry = EntryFactory.createEntry(elem);
+ Entry entry = EntryFactory.createEntry(elem, new Properties());
assertEquals(key, entry.getKey());
assertEquals(Entry.INLINE_XML, entry.getType());
@@ -328,7 +329,7 @@ public class LocalEntryConfigurationTest
try {
OMElement elem = parseXMLString(entrySrc, true);
OMElement expectedSerialization = elem.cloneOMElement();
- Entry entry = EntryFactory.createEntry(elem);
+ Entry entry = EntryFactory.createEntry(elem, new Properties());
assertEquals(key, entry.getKey());
assertEquals(Entry.INLINE_XML, entry.getType());
Modified:
synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/eip/IterateMediatorTest.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/eip/IterateMediatorTest.java?rev=999840&r1=999839&r2=999840&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/eip/IterateMediatorTest.java
(original)
+++
synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/eip/IterateMediatorTest.java
Wed Sep 22 09:42:56 2010
@@ -26,6 +26,8 @@ import org.apache.axiom.soap.SOAPEnvelop
import org.apache.axiom.om.OMAbstractFactory;
import org.apache.axiom.om.OMElement;
+import java.util.Properties;
+
/**
*
*/
@@ -49,7 +51,7 @@ public class IterateMediatorTest extends
public void testIterationScenarioOne() throws Exception {
Mediator iterate = fac.createMediator(createOMElement("<iterate " +
"expression=\"//original/itr\"
xmlns=\"http://synapse.apache.org/ns/2010/04/configuration\";>" +
- "<target soapAction=\"urn:iterate\"
sequence=\"seqRef\"/></iterate>"));
+ "<target soapAction=\"urn:iterate\"
sequence=\"seqRef\"/></iterate>"), new Properties());
helperMediator.clearMediatedContexts();
iterate.mediate(testCtx);
while(helperMediator.getMediatedContext(1) == null) {
@@ -70,7 +72,7 @@ public class IterateMediatorTest extends
Mediator iterate = fac.createMediator(createOMElement("<iterate " +
"expression=\"//original/itr\" preservePayload=\"true\"
attachPath=\"//original\" " +
"xmlns=\"http://synapse.apache.org/ns/2010/04/configuration\";><target
soapAction=\"urn:iterate\" " +
- "sequence=\"seqRef\"/></iterate>"));
+ "sequence=\"seqRef\"/></iterate>"), new Properties());
iterate.mediate(testCtx);
while(helperMediator.getMediatedContext(1) == null) {
Thread.sleep(100);
Modified:
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/HttpCoreNIOListener.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/HttpCoreNIOListener.java?rev=999840&r1=999839&r2=999840&view=diff
==============================================================================
---
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/HttpCoreNIOListener.java
(original)
+++
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/HttpCoreNIOListener.java
Wed Sep 22 09:42:56 2010
@@ -68,6 +68,7 @@ import java.net.UnknownHostException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Map;
+import java.util.Properties;
/**
* NIO transport listener for Axis2 based on HttpCore and NIO extensions
@@ -234,7 +235,8 @@ public class HttpCoreNIOListener impleme
" configuration is mandatory for priority based routing");
}
- executor = PriorityExecutorFactory.createExecutor(null, executorElem,
false);
+ executor = PriorityExecutorFactory.createExecutor(
+ null, executorElem, false, new Properties());
OMElement conditionsElem = definitions.getFirstChildWithName(
new QName(EvaluatorConstants.CONDITIONS));
if (conditionsElem == null) {
