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 2010/09/22 11:50:56 UTC
svn commit: r999848 - in /synapse/trunk/java/modules:
core/src/main/java/org/apache/synapse/config/
core/src/main/java/org/apache/synapse/config/xml/
core/src/main/java/org/apache/synapse/deployers/
core/src/test/java/org/apache/synapse/mediators/trans...
Author: ruwan
Date: Wed Sep 22 09:50:55 2010
New Revision: 999848
URL: http://svn.apache.org/viewvc?rev=999848&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
Removed:
synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/utils/
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapseConfigUtils.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapseConfiguration.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapseConfigurationBuilder.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SynapseMediatorFactory.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/TargetFactory.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/TransactionMediatorFactory.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/URLRewriteMediatorFactory.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/TaskDeployer.java
synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/transform/url/URLRewriteMediatorTest.java
synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/throttle/ThrottleMediatorFactory.java
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapseConfigUtils.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapseConfigUtils.java?rev=999848&r1=999847&r2=999848&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapseConfigUtils.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapseConfigUtils.java Wed Sep 22 09:50:55 2010
@@ -144,9 +144,10 @@ public class SynapseConfigUtils {
* treated as XML and an OMNode would be returned
*
* @param url the URL to the resource
+ * @param properties bag of properties to pass in any information to the factory
* @return an Object created from the given URL
*/
- public static Object getObject(URL url) {
+ public static Object getObject(URL url, Properties properties) {
try {
if (url != null && "file".equals(url.getProtocol())) {
try {
@@ -203,7 +204,7 @@ public class SynapseConfigUtils {
omElem.build();
if (xmlToObject != null) {
- return xmlToObject.getObjectFromOMNode(omElem);
+ return xmlToObject.getObjectFromOMNode(omElem, properties);
} else {
return omElem;
}
@@ -727,19 +728,6 @@ public class SynapseConfigUtils {
return "";
}
- public static String getResolveRoot() {
- //TODO SUPUN
- /*ServerManager serverManager = ServerManager.getInstance();
- if (serverManager.isInitialized()) {
- ServerConfigurationInformation information =
- serverManager.getServerConfigurationInformation();
- if (information != null) {
- return information.getResolveRoot();
- }
- }*/
- return "";
- }
-
/**
* Get the StatisticsCollector from synapse env.
*
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapseConfiguration.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapseConfiguration.java?rev=999848&r1=999847&r2=999848&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapseConfiguration.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapseConfiguration.java Wed Sep 22 09:50:55 2010
@@ -250,7 +250,7 @@ public class SynapseConfiguration implem
if (entry.getType() == Entry.REMOTE_ENTRY) {
if (registry != null) {
- o = registry.getResource(entry);
+ o = registry.getResource(entry, getProperties());
if (o != null && o instanceof Mediator) {
localRegistry.put(key, entry);
return (Mediator) o;
@@ -259,7 +259,8 @@ public class SynapseConfiguration implem
} else {
Object value = entry.getValue();
if (value instanceof OMNode) {
- Object object = entry.getMapper().getObjectFromOMNode((OMNode) value);
+ Object object = entry.getMapper().getObjectFromOMNode(
+ (OMNode) value, getProperties());
if (object instanceof Mediator) {
entry.setValue(object);
return (Mediator) object;
@@ -411,7 +412,7 @@ public class SynapseConfiguration implem
if (registry != null) {
if (entry.isCached()) {
try {
- o = registry.getResource(entry);
+ o = registry.getResource(entry, getProperties());
} catch (Exception e) {
// Error occured while loading the resource from the registry
// Fall back to the cached value - Do not increase the expiry time
@@ -423,7 +424,7 @@ public class SynapseConfiguration implem
} else {
// Resource not available in the cache - Must load from the registry
// No fall backs possible here!!
- o = registry.getResource(entry);
+ o = registry.getResource(entry, getProperties());
}
} else {
if (entry.isCached()) {
@@ -604,7 +605,7 @@ public class SynapseConfiguration implem
if (entry.getType() == Entry.REMOTE_ENTRY) {
if (registry != null) {
- o = registry.getResource(entry);
+ o = registry.getResource(entry, getProperties());
if (o != null && o instanceof Endpoint) {
localRegistry.put(key, entry);
return (Endpoint) o;
@@ -613,7 +614,8 @@ public class SynapseConfiguration implem
} else {
Object value = entry.getValue();
if (value instanceof OMNode) {
- Object object = entry.getMapper().getObjectFromOMNode((OMNode) value);
+ Object object = entry.getMapper().getObjectFromOMNode(
+ (OMNode) value, getProperties());
if (object instanceof Endpoint) {
entry.setValue(object);
return (Endpoint) object;
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapseConfigurationBuilder.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapseConfigurationBuilder.java?rev=999848&r1=999847&r2=999848&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapseConfigurationBuilder.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapseConfigurationBuilder.java Wed Sep 22 09:50:55 2010
@@ -34,6 +34,7 @@ import org.apache.synapse.registry.Regis
import javax.xml.stream.XMLStreamException;
import java.io.File;
import java.io.FileInputStream;
+import java.util.Properties;
/**
* Builds a Synapse Configuration model with a given input
@@ -70,9 +71,10 @@ public class SynapseConfigurationBuilder
* Build a Synapse configuration from a given XML configuration file
*
* @param configFile Path to the Synapse configuration file or directory
+ * @param properties bag of properties to be passed into the builder
* @return the Synapse configuration model
*/
- public static SynapseConfiguration getConfiguration(String configFile) {
+ public static SynapseConfiguration getConfiguration(String configFile, Properties properties) {
File synapseConfigLocation = new File(configFile);
if (!synapseConfigLocation.exists()) {
@@ -86,7 +88,8 @@ public class SynapseConfigurationBuilder
if (synapseConfigLocation.isFile()) {
// build the Synapse configuration parsing the XML config file
try {
- synCfg = XMLConfigurationBuilder.getConfiguration(new FileInputStream(configFile));
+ synCfg = XMLConfigurationBuilder.getConfiguration(
+ new FileInputStream(configFile), properties);
log.info("Loaded Synapse configuration from : " + configFile);
} catch (Exception e) {
handleException("Could not initialize Synapse : " + e.getMessage(), e);
@@ -95,7 +98,7 @@ public class SynapseConfigurationBuilder
} else if (synapseConfigLocation.isDirectory()) {
// build the Synapse configuration by processing given directory hierarchy
try {
- synCfg = MultiXMLConfigurationBuilder.getConfiguration(configFile);
+ synCfg = MultiXMLConfigurationBuilder.getConfiguration(configFile, properties);
log.info("Loaded Synapse configuration from the artifact " +
"repository at : " + configFile);
} catch (XMLStreamException e) {
@@ -117,7 +120,7 @@ public class SynapseConfigurationBuilder
if (remoteConfigNode != null) {
try {
synCfg = XMLConfigurationBuilder.getConfiguration(SynapseConfigUtils
- .getStreamSource(remoteConfigNode).getInputStream());
+ .getStreamSource(remoteConfigNode).getInputStream(), properties);
// TODO: when you fetch the configuration and serialize the config in any case
// TODO: the remote config is serialized to the synapse.xml we should prevent
// TODO: that, and should serialize the config to the registry
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SynapseMediatorFactory.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SynapseMediatorFactory.java?rev=999848&r1=999847&r2=999848&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SynapseMediatorFactory.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SynapseMediatorFactory.java Wed Sep 22 09:50:55 2010
@@ -25,6 +25,7 @@ import org.apache.synapse.SynapseConstan
import org.apache.synapse.mediators.base.SynapseMediator;
import javax.xml.namespace.QName;
+import java.util.Properties;
/**
* Builds the main mediator (@see SynapseConfiguration) of the Synapse instance
@@ -43,14 +44,14 @@ public class SynapseMediatorFactory exte
return RULES_Q;
}
- public Mediator createSpecificMediator(OMElement elem) {
+ public Mediator createSpecificMediator(OMElement elem, Properties properties) {
SynapseMediator sm = new SynapseMediator();
// after successfully creating the mediator
// set its common attributes such as tracing etc
processAuditStatus(sm,elem);
- addChildren(elem, sm);
+ addChildren(elem, sm, properties);
return sm;
}
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=999848&r1=999847&r2=999848&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 Wed Sep 22 09:50:55 2010
@@ -42,12 +42,13 @@ import org.apache.axis2.AxisFault;
import javax.xml.namespace.QName;
import java.util.Iterator;
+import java.util.Properties;
public class SynapseXMLConfigurationFactory implements ConfigurationFactory {
private static Log log = LogFactory.getLog(SynapseXMLConfigurationFactory.class);
- public SynapseConfiguration getConfiguration(OMElement definitions) {
+ public SynapseConfiguration getConfiguration(OMElement definitions, Properties properties) {
if (!definitions.getQName().equals(XMLConfigConstants.DEFINITIONS_ELT)) {
throw new SynapseException(
@@ -68,24 +69,24 @@ public class SynapseXMLConfigurationFact
if (key != null) {
handleException("Referred sequences are not allowed at the top level");
} else {
- defineSequence(config, elt);
+ defineSequence(config, elt, properties);
}
} else if (XMLConfigConstants.ENDPOINT_ELT.equals(elt.getQName())) {
- defineEndpoint(config, elt);
+ defineEndpoint(config, elt, properties);
} else if (XMLConfigConstants.ENTRY_ELT.equals(elt.getQName())) {
- defineEntry(config, elt);
+ defineEntry(config, elt, properties);
} else if (XMLConfigConstants.PROXY_ELT.equals(elt.getQName())) {
- defineProxy(config, elt);
+ defineProxy(config, elt, properties);
} else if (XMLConfigConstants.REGISTRY_ELT.equals(elt.getQName())) {
- defineRegistry(config, elt);
+ defineRegistry(config, elt, properties);
} else if (XMLConfigConstants.EVENT_SOURCE_ELT.equals(elt.getQName())) {
- defineEventSource(config, elt);
+ defineEventSource(config, elt, properties);
} else if (XMLConfigConstants.EXECUTOR_ELT.equals(elt.getQName())) {
- defineExecutor(config, elt);
+ defineExecutor(config, elt, properties);
} else if(XMLConfigConstants.MESSAGE_STORE_ELT.equals(elt.getQName())) {
- defineMessageStore(config, elt);
+ defineMessageStore(config, elt, properties);
} else if (StartupFinder.getInstance().isStartup(elt.getQName())) {
- defineStartup(config, elt);
+ defineStartup(config, elt, properties);
} else if (XMLConfigConstants.DESCRIPTION_ELT.equals(elt.getQName())) {
config.setDescription(elt.getText());
} else {
@@ -99,38 +100,43 @@ public class SynapseXMLConfigurationFact
return config;
}
- public static Registry defineRegistry(SynapseConfiguration config, OMElement elem) {
+ public static Registry defineRegistry(SynapseConfiguration config, OMElement elem,
+ Properties properties) {
if (config.getRegistry() != null) {
handleException("Only one remote registry can be defined within a configuration");
}
- Registry registry = RegistryFactory.createRegistry(elem);
+ Registry registry = RegistryFactory.createRegistry(elem, properties);
config.setRegistry(registry);
return registry;
}
- public static Startup defineStartup(SynapseConfiguration config, OMElement elem) {
- Startup startup = StartupFinder.getInstance().getStartup(elem);
+ public static Startup defineStartup(SynapseConfiguration config, OMElement elem,
+ Properties properties) {
+ Startup startup = StartupFinder.getInstance().getStartup(elem, properties);
config.addStartup(startup);
return startup;
}
- public static ProxyService defineProxy(SynapseConfiguration config, OMElement elem) {
- ProxyService proxy = ProxyServiceFactory.createProxy(elem);
+ public static ProxyService defineProxy(SynapseConfiguration config, OMElement elem,
+ Properties properties) {
+ ProxyService proxy = ProxyServiceFactory.createProxy(elem, properties);
config.addProxyService(proxy.getName(), proxy);
return proxy;
}
- public static Entry defineEntry(SynapseConfiguration config, OMElement elem) {
- Entry entry = EntryFactory.createEntry(elem);
+ public static Entry defineEntry(SynapseConfiguration config, OMElement elem,
+ Properties properties) {
+ Entry entry = EntryFactory.createEntry(elem, properties);
config.addEntry(entry.getKey(), entry);
return entry;
}
- public static Mediator defineSequence(SynapseConfiguration config, OMElement ele) {
+ public static Mediator defineSequence(SynapseConfiguration config, OMElement ele,
+ Properties properties) {
String name = ele.getAttributeValue(new QName(XMLConfigConstants.NULL_NAMESPACE, "name"));
if (name != null) {
- Mediator mediator = MediatorFactoryFinder.getInstance().getMediator(ele);
+ Mediator mediator = MediatorFactoryFinder.getInstance().getMediator(ele, properties);
config.addSequence(name, mediator);
// mandatory sequence is treated as a speciall sequence because it will be fetched for
// each and every message and keeps a direct reference to that from the configuration
@@ -145,11 +151,12 @@ public class SynapseXMLConfigurationFact
return null;
}
- public static Endpoint defineEndpoint(SynapseConfiguration config, OMElement ele) {
+ public static Endpoint defineEndpoint(SynapseConfiguration config, OMElement ele,
+ Properties properties) {
String name = ele.getAttributeValue(new QName(XMLConfigConstants.NULL_NAMESPACE, "name"));
if (name != null) {
- Endpoint endpoint = EndpointFactory.getEndpointFromElement(ele, false);
+ Endpoint endpoint = EndpointFactory.getEndpointFromElement(ele, false, properties);
config.addEndpoint(name.trim(), endpoint);
return endpoint;
} else {
@@ -159,28 +166,30 @@ public class SynapseXMLConfigurationFact
}
public static SynapseEventSource defineEventSource(SynapseConfiguration config,
- OMElement elem) {
- SynapseEventSource eventSource = EventSourceFactory.createEventSource(elem);
+ OMElement elem, Properties properties) {
+ SynapseEventSource eventSource = EventSourceFactory.createEventSource(elem, properties);
config.addEventSource(eventSource.getName(), eventSource);
return eventSource;
}
public static PriorityExecutor defineExecutor(SynapseConfiguration config,
- OMElement elem) {
+ OMElement elem, Properties properties) {
PriorityExecutor executor = null;
try {
executor = PriorityExecutorFactory.createExecutor(
- XMLConfigConstants.SYNAPSE_NAMESPACE, elem, true);
+ XMLConfigConstants.SYNAPSE_NAMESPACE, elem, true, properties);
} catch (AxisFault axisFault) {
handleException("Failed to create the priorityExecutor configuration");
}
+ assert executor != null;
config.addPriorityExecutor(executor.getName(), executor);
return executor;
}
- public static MessageStore defineMessageStore(SynapseConfiguration config , OMElement elem) {
- MessageStore messageStore = MessageStoreFactory.createMessageStore(elem);
- config.addMessageStore(messageStore.getName(),messageStore);
+ public static MessageStore defineMessageStore(SynapseConfiguration config ,
+ OMElement elem, Properties properties) {
+ MessageStore messageStore = MessageStoreFactory.createMessageStore(elem, properties);
+ config.addMessageStore(messageStore.getName(), messageStore);
return messageStore;
}
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/TargetFactory.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/TargetFactory.java?rev=999848&r1=999847&r2=999848&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/TargetFactory.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/TargetFactory.java Wed Sep 22 09:50:55 2010
@@ -28,6 +28,7 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import javax.xml.namespace.QName;
+import java.util.Properties;
/**
* Factory for {@link Target} instances.
@@ -55,9 +56,10 @@ public class TargetFactory {
* This static method will be used to build the Target from the specified element
*
* @param elem - OMElement describing the xml configuration of the target
+ * @param properties bag of properties with information
* @return Target built by parsing the given element
*/
- public static Target createTarget(OMElement elem) {
+ public static Target createTarget(OMElement elem, Properties properties) {
if (!TARGET_Q.equals(elem.getQName())) {
handleException("Element does not match with the target QName");
@@ -91,13 +93,13 @@ public class TargetFactory {
new QName(XMLConfigConstants.SYNAPSE_NAMESPACE, "sequence"));
if (sequence != null) {
SequenceMediatorFactory fac = new SequenceMediatorFactory();
- target.setSequence(fac.createAnonymousSequence(sequence));
+ target.setSequence(fac.createAnonymousSequence(sequence, properties));
}
OMElement endpoint = elem.getFirstChildWithName(
new QName(XMLConfigConstants.SYNAPSE_NAMESPACE, "endpoint"));
if (endpoint != null) {
- target.setEndpoint(EndpointFactory.getEndpointFromElement(endpoint, true));
+ target.setEndpoint(EndpointFactory.getEndpointFromElement(endpoint, true, properties));
}
return target;
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/TransactionMediatorFactory.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/TransactionMediatorFactory.java?rev=999848&r1=999847&r2=999848&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/TransactionMediatorFactory.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/TransactionMediatorFactory.java Wed Sep 22 09:50:55 2010
@@ -25,6 +25,7 @@ import org.apache.synapse.Mediator;
import org.apache.synapse.mediators.transaction.TransactionMediator;
import javax.xml.namespace.QName;
+import java.util.Properties;
/**
* The Factory for create transaction mediator- InLine XML need to provide
@@ -44,9 +45,10 @@ public class TransactionMediatorFactory
* by the OMElement declaration
*
* @param elem the OMElement that specifies the Transaction mediator configuration
+ * @param properties
* @return the Transaction mediator instance created
*/
- public Mediator createSpecificMediator(OMElement elem) {
+ public Mediator createSpecificMediator(OMElement elem, Properties properties) {
TransactionMediator tm = new TransactionMediator();
OMAttribute action
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/URLRewriteMediatorFactory.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/URLRewriteMediatorFactory.java?rev=999848&r1=999847&r2=999848&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/URLRewriteMediatorFactory.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/URLRewriteMediatorFactory.java Wed Sep 22 09:50:55 2010
@@ -33,6 +33,7 @@ import org.jaxen.JaxenException;
import javax.xml.namespace.QName;
import java.util.Iterator;
+import java.util.Properties;
/**
* Creates an instance of the URLRewriteMediator given an XML configuration which
@@ -82,7 +83,7 @@ public class URLRewriteMediatorFactory e
public static final String FRAGMENT_REF = "ref";
public static final String FRAGMENT_FULL_URI = "full";
- protected Mediator createSpecificMediator(OMElement element) {
+ protected Mediator createSpecificMediator(OMElement element, Properties properties) {
Iterator rules = element.getChildrenWithName(RULE_Q);
String inputProperty = element.getAttributeValue(ATT_IN_PROPERTY);
String outputProperty = element.getAttributeValue(ATT_OUT_PROPERTY);
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/TaskDeployer.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/TaskDeployer.java?rev=999848&r1=999847&r2=999848&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/TaskDeployer.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/TaskDeployer.java Wed Sep 22 09:50:55 2010
@@ -27,6 +27,7 @@ import org.apache.synapse.config.xml.Mul
import org.apache.synapse.config.xml.StartupFinder;
import java.io.File;
+import java.util.Properties;
/**
* Handles the <code>Startup Task</code> deployment and undeployment
@@ -38,14 +39,14 @@ public class TaskDeployer extends Abstra
private static Log log = LogFactory.getLog(TaskDeployer.class);
@Override
- public String deploySynapseArtifact(OMElement artifactConfig, String fileName) {
+ public String deploySynapseArtifact(OMElement artifactConfig, String fileName, Properties properties) {
if (log.isDebugEnabled()) {
log.debug("StartupTask Deployment from file : " + fileName + " : Started");
}
try {
- Startup st = StartupFinder.getInstance().getStartup(artifactConfig);
+ Startup st = StartupFinder.getInstance().getStartup(artifactConfig, properties);
st.setFileName((new File(fileName)).getName());
if (log.isDebugEnabled()) {
log.debug("StartupTask named '" + st.getName()
@@ -72,14 +73,14 @@ public class TaskDeployer extends Abstra
@Override
public String updateSynapseArtifact(OMElement artifactConfig, String fileName,
- String existingArtifactName) {
+ String existingArtifactName, Properties properties) {
if (log.isDebugEnabled()) {
log.debug("StartupTask Update from file : " + fileName + " : Started");
}
try {
- Startup st = StartupFinder.getInstance().getStartup(artifactConfig);
+ Startup st = StartupFinder.getInstance().getStartup(artifactConfig, properties);
st.setFileName((new File(fileName)).getName());
if (log.isDebugEnabled()) {
log.debug("StartupTask named '" + st.getName()
Modified: synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/transform/url/URLRewriteMediatorTest.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/transform/url/URLRewriteMediatorTest.java?rev=999848&r1=999847&r2=999848&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/transform/url/URLRewriteMediatorTest.java (original)
+++ synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/transform/url/URLRewriteMediatorTest.java Wed Sep 22 09:50:55 2010
@@ -33,6 +33,7 @@ import org.apache.axis2.addressing.Endpo
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.util.AXIOMUtil;
+import java.util.Properties;
import java.util.regex.Pattern;
public class URLRewriteMediatorTest extends TestCase {
@@ -256,7 +257,7 @@ public class URLRewriteMediatorTest exte
OMElement element = AXIOMUtil.stringToOM(xml);
URLRewriteMediator mediator = (URLRewriteMediator) new URLRewriteMediatorFactory().
- createMediator(element);
+ createMediator(element, new Properties());
MessageContext msgCtx = TestUtils.createLightweightSynapseMessageContext("<empty/>");
msgCtx.setTo(new EndpointReference("http://test.org:9763/MyService"));
Modified: synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/throttle/ThrottleMediatorFactory.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/throttle/ThrottleMediatorFactory.java?rev=999848&r1=999847&r2=999848&view=diff
==============================================================================
--- synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/throttle/ThrottleMediatorFactory.java (original)
+++ synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/throttle/ThrottleMediatorFactory.java Wed Sep 22 09:50:55 2010
@@ -26,6 +26,7 @@ import org.apache.synapse.config.xml.Seq
import org.apache.synapse.config.xml.XMLConfigConstants;
import javax.xml.namespace.QName;
+import java.util.Properties;
/**
@@ -48,7 +49,7 @@ public class ThrottleMediatorFactory ext
private static final QName TAG_NAME
= new QName(XMLConfigConstants.SYNAPSE_NAMESPACE, "throttle");
- public Mediator createSpecificMediator(OMElement elem) {
+ public Mediator createSpecificMediator(OMElement elem, Properties properties) {
ThrottleMediator throttleMediator = new ThrottleMediator();
OMElement policy = elem.getFirstChildWithName(
@@ -93,7 +94,7 @@ public class ThrottleMediatorFactory ext
new QName(XMLConfigConstants.SYNAPSE_NAMESPACE, XMLConfigConstants.ONREJECT));
if (onRejectMediatorElement != null) {
throttleMediator.setOnRejectMediator(mediatorFactory.createAnonymousSequence(
- onRejectMediatorElement));
+ onRejectMediatorElement, properties));
}
}
OMAttribute onAccept = elem.getAttribute(
@@ -108,7 +109,7 @@ public class ThrottleMediatorFactory ext
new QName(XMLConfigConstants.SYNAPSE_NAMESPACE, XMLConfigConstants.ONACCEPT));
if (onAcceptMediatorElement != null) {
throttleMediator.setOnAcceptMediator(mediatorFactory.createAnonymousSequence(
- onAcceptMediatorElement));
+ onAcceptMediatorElement, properties));
}
}
return throttleMediator;