Author: ruwan
Date: Wed Sep 22 09:49:16 2010
New Revision: 999846
URL: http://svn.apache.org/viewvc?rev=999846&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/ServerConfigurationInformationFactory.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SendMediatorFactory.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SequenceMediatorFactory.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/StartupFinder.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/deployers/SequenceDeployer.java
synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/SendMediatorSerializationTest.java
synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/StartupSerializationTest.java
synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/registry/url/SimpleURLRegistryTest.java
synapse/trunk/java/modules/experimental/src/main/java/org/apache/synapse/experimental/mediators/seda/SEDAMediatorFactory.java
synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/spring/SpringMediatorFactory.java
synapse/trunk/java/modules/extensions/src/test/java/org/apache/synapse/mediators/spring/SpringMediatorTest.java
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/ServerConfigurationInformationFactory.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/ServerConfigurationInformationFactory.java?rev=999846&r1=999845&r2=999846&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/ServerConfigurationInformationFactory.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/ServerConfigurationInformationFactory.java
Wed Sep 22 09:49:16 2010
@@ -146,11 +146,11 @@ public class ServerConfigurationInformat
if (synapseHome == null) {
log.info("synapse.home not set; using web application root as
default value");
- String webinfPath =
servletConfig.getServletContext().getRealPath("WEB-INF");
- if (webinfPath == null || !webinfPath.endsWith("WEB-INF")) {
+ String webInfPath =
servletConfig.getServletContext().getRealPath("WEB-INF");
+ if (webInfPath == null || !webInfPath.endsWith("WEB-INF")) {
handleFatal("Unable to currentState web application root
directory");
} else {
- synapseHome = webinfPath.substring(0, webinfPath.length() - 7);
+ synapseHome = webInfPath.substring(0, webInfPath.length() - 7);
log.info("Setting synapse.home to : " + synapseHome);
}
}
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SendMediatorFactory.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SendMediatorFactory.java?rev=999846&r1=999845&r2=999846&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SendMediatorFactory.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SendMediatorFactory.java
Wed Sep 22 09:49:16 2010
@@ -26,6 +26,7 @@ import org.apache.synapse.endpoints.Endp
import org.apache.synapse.mediators.builtin.SendMediator;
import javax.xml.namespace.QName;
+import java.util.Properties;
/**
* Factory for {...@link SendMediator} instances.
@@ -76,7 +77,7 @@ public class SendMediatorFactory extends
private static final QName SEND_Q = new
QName(XMLConfigConstants.SYNAPSE_NAMESPACE, "send");
private static final QName ENDPOINT_Q = new
QName(XMLConfigConstants.SYNAPSE_NAMESPACE, "endpoint");
- public Mediator createSpecificMediator(OMElement elem) {
+ public Mediator createSpecificMediator(OMElement elem, Properties
properties) {
SendMediator sm = new SendMediator();
@@ -86,8 +87,8 @@ public class SendMediatorFactory extends
OMElement epElement = elem.getFirstChildWithName(ENDPOINT_Q);
if (epElement != null) {
- // create the endpoint and set it in the send medaitor
- Endpoint endpoint =
EndpointFactory.getEndpointFromElement(epElement, true);
+ // create the endpoint and set it in the send mediator
+ Endpoint endpoint =
EndpointFactory.getEndpointFromElement(epElement, true, properties);
if (endpoint != null) {
sm.setEndpoint(endpoint);
}
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SequenceMediatorFactory.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SequenceMediatorFactory.java?rev=999846&r1=999845&r2=999846&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SequenceMediatorFactory.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SequenceMediatorFactory.java
Wed Sep 22 09:49:16 2010
@@ -26,6 +26,7 @@ import org.apache.synapse.SynapseExcepti
import org.apache.synapse.mediators.base.SequenceMediator;
import javax.xml.namespace.QName;
+import java.util.Properties;
/**
* Factory for {...@link SequenceMediator} instances.
@@ -53,7 +54,7 @@ public class SequenceMediatorFactory ext
return SEQUENCE_Q;
}
- public SequenceMediator createAnonymousSequence(OMElement elem) {
+ public SequenceMediator createAnonymousSequence(OMElement elem, Properties
properties) {
SequenceMediator seqMediator = new SequenceMediator();
OMAttribute e = elem.getAttribute(ATT_ONERROR);
if (e != null) {
@@ -64,11 +65,11 @@ public class SequenceMediatorFactory ext
if (descElem != null) {
seqMediator.setDescription(descElem.getText());
}
- addChildren(elem, seqMediator);
+ addChildren(elem, seqMediator, properties);
return seqMediator;
}
- public Mediator createSpecificMediator(OMElement elem) {
+ public Mediator createSpecificMediator(OMElement elem, Properties
properties) {
SequenceMediator seqMediator = new SequenceMediator();
@@ -80,7 +81,7 @@ public class SequenceMediatorFactory ext
seqMediator.setErrorHandler(e.getAttributeValue());
}
processAuditStatus(seqMediator, elem);
- addChildren(elem, seqMediator);
+ addChildren(elem, seqMediator, properties);
} else {
n = elem.getAttribute(ATT_KEY);
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/StartupFinder.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/StartupFinder.java?rev=999846&r1=999845&r2=999846&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/StartupFinder.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/StartupFinder.java
Wed Sep 22 09:49:16 2010
@@ -22,6 +22,7 @@ package org.apache.synapse.config.xml;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
+import java.util.Properties;
import javax.xml.namespace.QName;
@@ -30,11 +31,12 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.synapse.SynapseException;
import org.apache.synapse.Startup;
+import org.apache.synapse.config.XMLToObjectMapper;
import org.apache.synapse.startup.quartz.SimpleQuartzFactory;
import sun.misc.Service;
-public class StartupFinder {
+public class StartupFinder implements XMLToObjectMapper {
private static final Log log = LogFactory
.getLog(ConfigurationFactoryAndSerializerFinder.class);
@@ -126,8 +128,8 @@ public class StartupFinder {
/**
* Check whether an element with the given qualified name defines a
startup.
*
- * @param name
- * @return
+ * @param name to be identified whether it is a startup or not
+ * @return true if there is a startup registered with the factory map in
the name, false if not
*/
public boolean isStartup(QName name) {
return factoryMap.containsKey(name);
@@ -138,10 +140,12 @@ public class StartupFinder {
* recursively by the elements which contain processor elements themselves
* (e.g. rules)
*
- * @param element
+ * @param element configuration for creating the startup
+ * @param properties bag of properties with additional information
* @return Processor
*/
- public Startup getStartup(OMElement element) {
+ @SuppressWarnings({"UnusedDeclaration"})
+ public Startup getStartup(OMElement element, Properties properties) {
QName qName = element.getQName();
if (log.isDebugEnabled()) {
@@ -226,12 +230,13 @@ public class StartupFinder {
* Allow the startup finder to act as an XMLToObjectMapper for
* Startup (i.e. Startup) loaded dynamically from a Registry
*
- * @param om
- * @return
+ * @param om to build the startup object
+ * @param properties bag of properties with additional information
+ * @return startup created
*/
- public Startup getObjectFromOMNode(OMNode om) {
+ public Startup getObjectFromOMNode(OMNode om, Properties properties) {
if (om instanceof OMElement) {
- return getStartup((OMElement) om);
+ return getStartup((OMElement) om, properties);
} else {
handleException("Invalid configuration XML : " + om);
}
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=999846&r1=999845&r2=999846&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
Wed Sep 22 09:49:16 2010
@@ -28,6 +28,7 @@ import org.jaxen.JaxenException;
import javax.xml.namespace.QName;
import java.util.Iterator;
+import java.util.Properties;
import java.util.regex.Pattern;
import java.util.regex.PatternSyntaxException;
@@ -48,11 +49,14 @@ import java.util.regex.PatternSyntaxExce
*/
public class SwitchMediatorFactory extends AbstractMediatorFactory {
- private static final QName SWITCH_Q = new
QName(XMLConfigConstants.SYNAPSE_NAMESPACE, "switch");
- private static final QName CASE_Q = new
QName(XMLConfigConstants.SYNAPSE_NAMESPACE, "case");
- private static final QName DEFAULT_Q = new
QName(XMLConfigConstants.SYNAPSE_NAMESPACE, "default");
+ private static final QName SWITCH_Q
+ = new QName(XMLConfigConstants.SYNAPSE_NAMESPACE, "switch");
+ private static final QName CASE_Q
+ = new QName(XMLConfigConstants.SYNAPSE_NAMESPACE, "case");
+ private static final QName DEFAULT_Q
+ = new QName(XMLConfigConstants.SYNAPSE_NAMESPACE, "default");
- public Mediator createSpecificMediator(OMElement elem) {
+ public Mediator createSpecificMediator(OMElement elem, Properties
properties) {
SwitchMediator switchMediator = new SwitchMediator();
OMAttribute source = elem.getAttribute(ATT_SOURCE);
@@ -87,17 +91,20 @@ public class SwitchMediatorFactory exten
try {
aCase.setRegex(Pattern.compile(regex.getAttributeValue()));
} catch (PatternSyntaxException pse) {
- String msg = "Invalid Regular Expression for attribute 'regex'
: " + regex.getAttributeValue();
+ String msg = "Invalid Regular Expression for attribute 'regex'
: "
+ + regex.getAttributeValue();
log.error(msg);
throw new SynapseException(msg);
}
-
aCase.setCaseMediator(AnonymousListMediatorFactory.createAnonymousListMediator(caseElem));
+
aCase.setCaseMediator(AnonymousListMediatorFactory.createAnonymousListMediator(
+ caseElem, properties));
switchMediator.addCase(aCase);
}
iter = elem.getChildrenWithName(DEFAULT_Q);
while (iter.hasNext()) {
SwitchCase aCase = new SwitchCase();
-
aCase.setCaseMediator(AnonymousListMediatorFactory.createAnonymousListMediator((OMElement)
iter.next()));
+
aCase.setCaseMediator(AnonymousListMediatorFactory.createAnonymousListMediator(
+ (OMElement) iter.next(), properties));
switchMediator.setDefaultCase(aCase);
break; // add only the *first* default if multiple are specified,
ignore rest if any
}
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/SequenceDeployer.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/SequenceDeployer.java?rev=999846&r1=999845&r2=999846&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/SequenceDeployer.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/SequenceDeployer.java
Wed Sep 22 09:49:16 2010
@@ -30,6 +30,7 @@ import org.apache.synapse.config.xml.Mul
import org.apache.synapse.mediators.base.SequenceMediator;
import java.io.File;
+import java.util.Properties;
/**
* Handles the <code>Sequence</code> deployment and undeployment tasks
@@ -41,14 +42,16 @@ public class SequenceDeployer extends Ab
private static Log log = LogFactory.getLog(SequenceDeployer.class);
@Override
- public String deploySynapseArtifact(OMElement artifactConfig, String
fileName) {
+ public String deploySynapseArtifact(OMElement artifactConfig, String
fileName,
+ Properties properties) {
if (log.isDebugEnabled()) {
log.debug("Sequence Deployment from file : " + fileName + " :
Started");
}
try {
- Mediator m =
MediatorFactoryFinder.getInstance().getMediator(artifactConfig);
+ Mediator m = MediatorFactoryFinder.getInstance().getMediator(
+ artifactConfig, properties);
if (m instanceof SequenceMediator) {
SequenceMediator seq = (SequenceMediator) m;
seq.setFileName((new File(fileName)).getName());
@@ -81,14 +84,15 @@ public class SequenceDeployer extends Ab
@Override
public String updateSynapseArtifact(OMElement artifactConfig, String
fileName,
- String existingArtifactName) {
+ String existingArtifactName,
Properties properties) {
if (log.isDebugEnabled()) {
log.debug("Sequence Update from file : " + fileName + " :
Started");
}
try {
- Mediator m =
MediatorFactoryFinder.getInstance().getMediator(artifactConfig);
+ Mediator m = MediatorFactoryFinder.getInstance().getMediator(
+ artifactConfig, properties);
if (m instanceof SequenceMediator) {
SequenceMediator seq = (SequenceMediator) m;
if
((SynapseConstants.MAIN_SEQUENCE_KEY.equals(existingArtifactName)
Modified:
synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/SendMediatorSerializationTest.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/SendMediatorSerializationTest.java?rev=999846&r1=999845&r2=999846&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/SendMediatorSerializationTest.java
(original)
+++
synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/SendMediatorSerializationTest.java
Wed Sep 22 09:49:16 2010
@@ -32,6 +32,7 @@ import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLStreamException;
import java.util.List;
import java.io.StringReader;
+import java.util.Properties;
public class SendMediatorSerializationTest extends AbstractTestCase {
@@ -58,10 +59,10 @@ public class SendMediatorSerializationTe
"</send>";
OMElement config1 = createOMElement(sendConfig);
- SendMediator send1 = (SendMediator) factory.createMediator(config1);
+ SendMediator send1 = (SendMediator) factory.createMediator(config1,
new Properties());
OMElement config2 = serializer.serializeMediator(null, send1);
- SendMediator send2 = (SendMediator) factory.createMediator(config2);
+ SendMediator send2 = (SendMediator) factory.createMediator(config2,
new Properties());
assertTrue("Top level endpoint should be a address endpoint.",
send1.getEndpoint() instanceof AddressEndpoint);
@@ -91,10 +92,10 @@ public class SendMediatorSerializationTe
"</send>";
OMElement config1 = createOMElement(sendConfig);
- SendMediator send1 = (SendMediator) factory.createMediator(config1);
+ SendMediator send1 = (SendMediator) factory.createMediator(config1,
new Properties());
OMElement config2 = serializer.serializeMediator(null, send1);
- SendMediator send2 = (SendMediator) factory.createMediator(config2);
+ SendMediator send2 = (SendMediator) factory.createMediator(config2,
new Properties());
assertTrue("Top level endpoint should be a WSDL endpoint.",
send1.getEndpoint() instanceof WSDLEndpoint);
@@ -142,10 +143,10 @@ public class SendMediatorSerializationTe
"</send>";
OMElement config1 = createOMElement(sendConfig);
- SendMediator send1 = (SendMediator) factory.createMediator(config1);
+ SendMediator send1 = (SendMediator) factory.createMediator(config1,
new Properties());
OMElement config2 = serializer.serializeMediator(null, send1);
- SendMediator send2 = (SendMediator) factory.createMediator(config2);
+ SendMediator send2 = (SendMediator) factory.createMediator(config2,
new Properties());
assertTrue("Top level endpoint should be a load balance endpoint.",
send2.getEndpoint() instanceof LoadbalanceEndpoint);
@@ -191,10 +192,10 @@ public class SendMediatorSerializationTe
"</send>";
OMElement config1 = createOMElement(sendConfig);
- SendMediator send1 = (SendMediator) factory.createMediator(config1);
+ SendMediator send1 = (SendMediator) factory.createMediator(config1,
new Properties());
OMElement config2 = serializer.serializeMediator(null, send1);
- SendMediator send2 = (SendMediator) factory.createMediator(config2);
+ SendMediator send2 = (SendMediator) factory.createMediator(config2,
new Properties());
assertTrue("Top level endpoint should be a failover endpoint.",
send2.getEndpoint() instanceof FailoverEndpoint);
@@ -244,10 +245,10 @@ public class SendMediatorSerializationTe
"</send>";
OMElement config1 = createOMElement(sendConfig);
- SendMediator send1 = (SendMediator) factory.createMediator(config1);
+ SendMediator send1 = (SendMediator) factory.createMediator(config1,
new Properties());
OMElement config2 = serializer.serializeMediator(null, send1);
- SendMediator send2 = (SendMediator) factory.createMediator(config2);
+ SendMediator send2 = (SendMediator) factory.createMediator(config2,
new Properties());
assertTrue("Top level endpoint should be a load balance endpoint.",
send2.getEndpoint() instanceof LoadbalanceEndpoint);
Modified:
synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/StartupSerializationTest.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/StartupSerializationTest.java?rev=999846&r1=999845&r2=999846&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/StartupSerializationTest.java
(original)
+++
synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/StartupSerializationTest.java
Wed Sep 22 09:49:16 2010
@@ -22,6 +22,8 @@ package org.apache.synapse.config.xml;
import org.apache.axiom.om.OMElement;
import org.apache.synapse.Startup;
+import java.util.Properties;
+
/**
*
*/
@@ -33,7 +35,7 @@ public class StartupSerializationTest ex
"<property name=\"name\" value=\"foo\"/>" +
"<trigger interval=\"5\"/></task>";
OMElement inputOM = createOMElement(inputXml);
- Startup startup = StartupFinder.getInstance().getStartup(inputOM);
+ Startup startup = StartupFinder.getInstance().getStartup(inputOM, new
Properties());
OMElement resultOM =
StartupFinder.getInstance().serializeStartup(null, startup);
assertTrue(compare(resultOM, inputOM));
}
@@ -45,7 +47,7 @@ public class StartupSerializationTest ex
"<property name=\"name\" value=\"foo\"/>" +
"<trigger interval=\"5\"/></task>";
OMElement inputOM = createOMElement(inputXml);
- Startup startup = StartupFinder.getInstance().getStartup(inputOM);
+ Startup startup = StartupFinder.getInstance().getStartup(inputOM, new
Properties());
OMElement resultOM =
StartupFinder.getInstance().serializeStartup(null, startup);
assertTrue(compare(resultOM, inputOM));
}
Modified:
synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/registry/url/SimpleURLRegistryTest.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/registry/url/SimpleURLRegistryTest.java?rev=999846&r1=999845&r2=999846&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/registry/url/SimpleURLRegistryTest.java
(original)
+++
synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/registry/url/SimpleURLRegistryTest.java
Wed Sep 22 09:49:16 2010
@@ -66,15 +66,15 @@ public class SimpleURLRegistryTest exten
prop.setKey(FILE);
// initial load of file from registry
- assertEquals(TEXT_1, reg.getResource(prop).toString());
+ assertEquals(TEXT_1, reg.getResource(prop, new
Properties()).toString());
// sleep 1 sec
Thread.sleep(1000);
- assertEquals(TEXT_1, reg.getResource(prop).toString());
+ assertEquals(TEXT_1, reg.getResource(prop, new
Properties()).toString());
// sleep another 1 sec, has expired in cache, but content hasnt changed
Thread.sleep(1000);
- assertEquals(TEXT_1, reg.getResource(prop).toString());
+ assertEquals(TEXT_1, reg.getResource(prop, new
Properties()).toString());
// the renewed cache should be valid for another 1.5 secs
// change the file now and change next cache duration
@@ -82,15 +82,15 @@ public class SimpleURLRegistryTest exten
props.put("cachableDuration", "100");
reg.init(props);
// still cached content should be available and valid
- assertEquals(TEXT_1, reg.getResource(prop).toString());
+ assertEquals(TEXT_1, reg.getResource(prop, new
Properties()).toString());
// now sleep ~1 sec, still cache should be valid
Thread.sleep(800);
- assertEquals(TEXT_1, reg.getResource(prop).toString());
+ assertEquals(TEXT_1, reg.getResource(prop, new
Properties()).toString());
// sleep another 1 sec.. cache should expire and new content should be
loaded
Thread.sleep(1000);
- assertEquals(TEXT_2, reg.getResource(prop).toString());
+ assertEquals(TEXT_2, reg.getResource(prop, new
Properties()).toString());
// change content back to original
writeToFile(TEXT_1);
@@ -98,7 +98,7 @@ public class SimpleURLRegistryTest exten
// sleep for .5 sec, now the new content should be loaded as new
expiry time
// is .1 sec
Thread.sleep(500);
- assertEquals(TEXT_1, reg.getResource(prop).toString());
+ assertEquals(TEXT_1, reg.getResource(prop, new
Properties()).toString());
}
public void testLargeFile() throws Exception {
Modified:
synapse/trunk/java/modules/experimental/src/main/java/org/apache/synapse/experimental/mediators/seda/SEDAMediatorFactory.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/experimental/src/main/java/org/apache/synapse/experimental/mediators/seda/SEDAMediatorFactory.java?rev=999846&r1=999845&r2=999846&view=diff
==============================================================================
---
synapse/trunk/java/modules/experimental/src/main/java/org/apache/synapse/experimental/mediators/seda/SEDAMediatorFactory.java
(original)
+++
synapse/trunk/java/modules/experimental/src/main/java/org/apache/synapse/experimental/mediators/seda/SEDAMediatorFactory.java
Wed Sep 22 09:49:16 2010
@@ -24,6 +24,7 @@ import org.apache.synapse.SynapseConstan
import org.apache.synapse.config.xml.AbstractMediatorFactory;
import javax.xml.namespace.QName;
+import java.util.Properties;
/**
*
@@ -33,7 +34,7 @@ public class SEDAMediatorFactory extends
private static final QName SEDA_Q =
new QName(SynapseConstants.SYNAPSE_NAMESPACE, "seda");
- public Mediator createSpecificMediator(OMElement elem) {
+ public Mediator createSpecificMediator(OMElement elem, Properties
properties) {
final SEDAMediator mediator = new SEDAMediator();
String mediatorKey = elem.getAttributeValue(ATT_KEY);
Modified:
synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/spring/SpringMediatorFactory.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/spring/SpringMediatorFactory.java?rev=999846&r1=999845&r2=999846&view=diff
==============================================================================
---
synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/spring/SpringMediatorFactory.java
(original)
+++
synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/spring/SpringMediatorFactory.java
Wed Sep 22 09:49:16 2010
@@ -26,6 +26,7 @@ import org.apache.synapse.config.xml.XML
import org.apache.synapse.config.xml.AbstractMediatorFactory;
import javax.xml.namespace.QName;
+import java.util.Properties;
/**
* Creates an instance of a Spring mediator that refers to the given Spring
@@ -44,9 +45,10 @@ public class SpringMediatorFactory exten
* by the OMElement declaration
*
* @param elem the OMElement that specifies the Spring mediator
configuration
+ * @param properties
* @return the Spring mediator instance created
*/
- public Mediator createSpecificMediator(OMElement elem) {
+ public Mediator createSpecificMediator(OMElement elem, Properties
properties) {
SpringMediator sm = new SpringMediator();
OMAttribute bean = elem.getAttribute(new
QName(XMLConfigConstants.NULL_NAMESPACE, "bean"));
Modified:
synapse/trunk/java/modules/extensions/src/test/java/org/apache/synapse/mediators/spring/SpringMediatorTest.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/extensions/src/test/java/org/apache/synapse/mediators/spring/SpringMediatorTest.java?rev=999846&r1=999845&r2=999846&view=diff
==============================================================================
---
synapse/trunk/java/modules/extensions/src/test/java/org/apache/synapse/mediators/spring/SpringMediatorTest.java
(original)
+++
synapse/trunk/java/modules/extensions/src/test/java/org/apache/synapse/mediators/spring/SpringMediatorTest.java
Wed Sep 22 09:49:16 2010
@@ -24,6 +24,8 @@ import org.apache.synapse.MessageContext
import org.apache.synapse.config.SynapseConfigurationBuilder;
import org.apache.synapse.mediators.TestUtils;
+import java.util.Properties;
+
/**
* This unit test is a different 'type' of a unit test, such that it tests
end-to-end
* like scenario of using Spring extensions! First it tests that the
configuration
@@ -38,7 +40,7 @@ public class SpringMediatorTest extends
MessageContext msgCtx = TestUtils.getTestContext("<dummy/>");
msgCtx.setConfiguration(
-
SynapseConfigurationBuilder.getConfiguration("./../../repository/conf/sample/resources/spring/synapse_spring_unittest.xml"));
+
SynapseConfigurationBuilder.getConfiguration("./../../repository/conf/sample/resources/spring/synapse_spring_unittest.xml",
new Properties()));
msgCtx.getMainSequence().mediate(msgCtx);
assertEquals(TestMediateHandlerImpl.invokeCount, 202);
