Author: ruwan
Date: Wed Sep 22 09:45:09 2010
New Revision: 999843
URL: http://svn.apache.org/viewvc?rev=999843&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/experimental/src/main/java/org/apache/synapse/experimental/ProxyDeployer.java
Modified:
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/executors/config/PriorityExecutorFactory.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/MediatorFactory.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/MediatorFactoryFinder.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/MessageStoreFactory.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/MultiXMLConfigurationBuilder.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/OutMediatorFactory.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/POJOCommandMediatorFactory.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/PropertyMediatorFactory.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/ProxyServiceDeployer.java
synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/MultiXMLConfigurationBuilderTest.java
synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/ext/POJOCommandMediatorTest.java
Modified:
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/executors/config/PriorityExecutorFactory.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/executors/config/PriorityExecutorFactory.java?rev=999843&r1=999842&r2=999843&view=diff
==============================================================================
---
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/executors/config/PriorityExecutorFactory.java
(original)
+++
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/executors/config/PriorityExecutorFactory.java
Wed Sep 22 09:45:09 2010
@@ -32,15 +32,13 @@ import javax.xml.namespace.QName;
import java.util.Iterator;
import java.util.List;
import java.util.ArrayList;
+import java.util.Properties;
public class PriorityExecutorFactory {
private static Log log = LogFactory.getLog(PriorityExecutorFactory.class);
public static final QName NAME_ATT = new QName(ExecutorConstants.NAME);
- public static final QName CLASS_ATT = new QName("class");
- public static final QName ATT_NAME = new QName(ExecutorConstants.NAME);
- public static final QName ATT_VALUE = new QName(ExecutorConstants.VALUE);
public static final QName SIZE_ATT = new QName(ExecutorConstants.SIZE);
public static final QName PRIORITY_ATT = new
QName(ExecutorConstants.PRIORITY);
@@ -55,8 +53,11 @@ public class PriorityExecutorFactory {
public static final QName CORE_ATT = new QName(ExecutorConstants.CORE);
public static final QName KEEP_ALIVE_ATT = new
QName(ExecutorConstants.KEEP_ALIVE);
+ @SuppressWarnings({"UnusedDeclaration"})
public static PriorityExecutor createExecutor(String namespace, OMElement
e,
- boolean requireName) throws
AxisFault {
+ boolean requireName,
+ Properties properties)
throws AxisFault {
+
QName queuesQName = createQname(namespace, ExecutorConstants.QUEUES);
QName queueQName = createQname(namespace, ExecutorConstants.QUEUE);
QName threadsQName = createQname(namespace, ExecutorConstants.THREADS);
@@ -97,10 +98,11 @@ public class PriorityExecutorFactory {
}
// create the queue configuration
- List<InternalQueue<Runnable>> intQueues = createQueues(queueQName,
queuesEle, isFixedSize);
+ List<InternalQueue<Runnable>> intQueues
+ = createQueues(queueQName, queuesEle, isFixedSize);
- MultiPriorityBlockingQueue queue =
- new MultiPriorityBlockingQueue(intQueues, isFixedSize,
nqa);
+ MultiPriorityBlockingQueue<Runnable> queue =
+ new MultiPriorityBlockingQueue<Runnable>(intQueues,
isFixedSize, nqa);
executor.setQueue(queue);
} else {
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/MediatorFactory.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/MediatorFactory.java?rev=999843&r1=999842&r2=999843&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/MediatorFactory.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/MediatorFactory.java
Wed Sep 22 09:45:09 2010
@@ -23,6 +23,7 @@ import org.apache.axiom.om.OMElement;
import org.apache.synapse.Mediator;
import javax.xml.namespace.QName;
+import java.util.Properties;
/**
* A mediator factory capable of creating an instance of a {...@link
org.apache.synapse.Mediator}
@@ -40,9 +41,10 @@ public interface MediatorFactory {
/**
* Creates an instance of the mediator using the OMElement
* @param elem configuration element describing the mediator properties
+ * @param properties bag of properties to pass in any information to the
factory
* @return the created mediator
*/
- public Mediator createMediator(OMElement elem);
+ public Mediator createMediator(OMElement elem, Properties properties);
/**
* The QName of this mediator element in the XML config
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/MediatorFactoryFinder.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/MediatorFactoryFinder.java?rev=999843&r1=999842&r2=999843&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/MediatorFactoryFinder.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/MediatorFactoryFinder.java
Wed Sep 22 09:45:09 2010
@@ -34,6 +34,7 @@ import javax.xml.namespace.QName;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
+import java.util.Properties;
/**
*
@@ -147,9 +148,10 @@ public class MediatorFactoryFinder imple
* (e.g. rules)
*
* @param element XML representation of a mediator
+ * @param properties bag of properties to pass in any information to the
factory
* @return Processor
*/
- public Mediator getMediator(OMElement element) {
+ public Mediator getMediator(OMElement element, Properties properties) {
String localName = element.getLocalName();
QName qName;
@@ -180,7 +182,7 @@ public class MediatorFactoryFinder imple
try {
MediatorFactory mf = (MediatorFactory)
cls.newInstance();
- return mf.createMediator(element);
+ return mf.createMediator(element, properties);
} catch (InstantiationException e) {
String msg = "Error initializing mediator factory : " + cls;
@@ -208,9 +210,9 @@ public class MediatorFactoryFinder imple
* @param om node from which the object is expected
* @return Object buit from the om node
*/
- public Object getObjectFromOMNode(OMNode om) {
+ public Object getObjectFromOMNode(OMNode om, Properties properties) {
if (om instanceof OMElement) {
- return getMediator((OMElement) om);
+ return getMediator((OMElement) om, properties);
} else {
handleException("Invalid mediator configuration XML : " + om);
}
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/MessageStoreFactory.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/MessageStoreFactory.java?rev=999843&r1=999842&r2=999843&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/MessageStoreFactory.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/MessageStoreFactory.java
Wed Sep 22 09:45:09 2010
@@ -34,6 +34,7 @@ import javax.xml.namespace.QName;
import java.util.Iterator;
import java.util.Map;
import java.util.HashMap;
+import java.util.Properties;
/**
* Create an instance of the given Message Store, and sets properties on it.
@@ -65,7 +66,8 @@ public class MessageStoreFactory {
public static final QName PARAMETER_Q = new
QName(XMLConfigConstants.SYNAPSE_NAMESPACE,
"parameter");
- public static MessageStore createMessageStore(OMElement elem) {
+ @SuppressWarnings({"UnusedDeclaration"})
+ public static MessageStore createMessageStore(OMElement elem, Properties
properties) {
OMAttribute clss = elem.getAttribute(CLASS_Q);
MessageStore messageStore;
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/MultiXMLConfigurationBuilder.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/MultiXMLConfigurationBuilder.java?rev=999843&r1=999842&r2=999843&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/MultiXMLConfigurationBuilder.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/MultiXMLConfigurationBuilder.java
Wed Sep 22 09:45:09 2010
@@ -37,6 +37,7 @@ import org.apache.synapse.mediators.base
import javax.xml.stream.XMLStreamException;
import java.io.*;
+import java.util.Properties;
/**
* <p>
@@ -87,13 +88,14 @@ public class MultiXMLConfigurationBuilde
}
};
- public static SynapseConfiguration getConfiguration(String root) throws
XMLStreamException {
+ public static SynapseConfiguration getConfiguration(String root,
Properties properties)
+ throws XMLStreamException {
log.info("Building synapse configuration from the " +
"synapse artifact repository at : " + root);
// First try to load the configuration from synapse.xml
- SynapseConfiguration synapseConfig =
createConfigurationFromSynapseXML(root);
+ SynapseConfiguration synapseConfig =
createConfigurationFromSynapseXML(root, properties);
if (synapseConfig == null) {
synapseConfig = SynapseConfigUtils.newConfiguration();
synapseConfig.setDefaultQName(XMLConfigConstants.DEFINITIONS_ELT);
@@ -105,38 +107,39 @@ public class MultiXMLConfigurationBuilde
if (synapseConfig.getRegistry() == null) {
// If the synapse.xml does not define a registry look for a
registry.xml
- createRegistry(synapseConfig, root);
+ createRegistry(synapseConfig, root, properties);
} else if (log.isDebugEnabled()) {
log.debug("Using the registry defined in the " +
SynapseConstants.SYNAPSE_XML
+ " as the registry, any definitions in the "
+ REGISTRY_FILE + " will be neglected");
}
- createLocalEntries(synapseConfig, root);
- createEndpoints(synapseConfig, root);
- createSequences(synapseConfig, root);
- createProxyServices(synapseConfig, root);
- createTasks(synapseConfig, root);
- createEventSources(synapseConfig, root);
- createExecutors(synapseConfig, root);
+ createLocalEntries(synapseConfig, root, properties);
+ createEndpoints(synapseConfig, root, properties);
+ createSequences(synapseConfig, root, properties);
+ createProxyServices(synapseConfig, root, properties);
+ createTasks(synapseConfig, root, properties);
+ createEventSources(synapseConfig, root, properties);
+ createExecutors(synapseConfig, root, properties);
return synapseConfig;
}
- private static SynapseConfiguration
createConfigurationFromSynapseXML(String rootDirPath)
- throws XMLStreamException {
+ private static SynapseConfiguration createConfigurationFromSynapseXML(
+ String rootDirPath, Properties properties) throws
XMLStreamException {
File synapseXML = new File(rootDirPath, SynapseConstants.SYNAPSE_XML);
if (synapseXML.exists() && synapseXML.isFile()) {
try {
- return XMLConfigurationBuilder.getConfiguration(new
FileInputStream(synapseXML));
+ return XMLConfigurationBuilder.getConfiguration(
+ new FileInputStream(synapseXML), properties);
} catch (FileNotFoundException ignored) {}
}
return null;
}
- private static void createRegistry(SynapseConfiguration synapseConfig,
String rootDirPath)
- throws XMLStreamException {
+ private static void createRegistry(SynapseConfiguration synapseConfig,
String rootDirPath,
+ Properties properties) throws
XMLStreamException {
File registryDef = new File(rootDirPath, REGISTRY_FILE);
if (registryDef.exists() && registryDef.isFile()) {
@@ -146,15 +149,15 @@ public class MultiXMLConfigurationBuilde
}
try {
OMElement document = parseFile(registryDef);
- SynapseXMLConfigurationFactory.defineRegistry(synapseConfig,
document);
+ SynapseXMLConfigurationFactory.defineRegistry(synapseConfig,
document, properties);
synapseConfig.setProperty(SEPARATE_REGISTRY_DEFINITION,
String.valueOf(Boolean.TRUE));
} catch (FileNotFoundException ignored) {}
}
}
- private static void createLocalEntries(SynapseConfiguration synapseConfig,
String rootDirPath)
- throws XMLStreamException {
+ private static void createLocalEntries(SynapseConfiguration synapseConfig,
String rootDirPath,
+ Properties properties) throws
XMLStreamException {
File localEntriesDir = new File(rootDirPath, LOCAL_ENTRY_DIR);
if (localEntriesDir.exists()) {
@@ -166,7 +169,7 @@ public class MultiXMLConfigurationBuilde
try {
OMElement document = parseFile(file);
Entry entry = SynapseXMLConfigurationFactory.defineEntry(
- synapseConfig, document);
+ synapseConfig, document, properties);
entry.setFileName(file.getName());
synapseConfig.getArtifactDeploymentStore().addArtifact(
file.getAbsolutePath(), entry.getKey());
@@ -175,8 +178,8 @@ public class MultiXMLConfigurationBuilde
}
}
- private static void createProxyServices(SynapseConfiguration
synapseConfig, String rootDirPath)
- throws XMLStreamException {
+ private static void createProxyServices(SynapseConfiguration
synapseConfig, String rootDirPath,
+ Properties properties) throws
XMLStreamException {
File proxyServicesDir = new File(rootDirPath, PROXY_SERVICES_DIR);
if (proxyServicesDir.exists()) {
@@ -188,7 +191,7 @@ public class MultiXMLConfigurationBuilde
try {
OMElement document = parseFile(file);
ProxyService proxy =
SynapseXMLConfigurationFactory.defineProxy(
- synapseConfig, document);
+ synapseConfig, document, properties);
proxy.setFileName(file.getName());
synapseConfig.getArtifactDeploymentStore().addArtifact(
file.getAbsolutePath(), proxy.getName());
@@ -197,8 +200,8 @@ public class MultiXMLConfigurationBuilde
}
}
- private static void createTasks(SynapseConfiguration synapseConfig, String
rootDirPath)
- throws XMLStreamException {
+ private static void createTasks(SynapseConfiguration synapseConfig, String
rootDirPath,
+ Properties properties) throws
XMLStreamException {
File tasksDir = new File(rootDirPath, TASKS_DIR);
if (tasksDir.exists()) {
@@ -210,7 +213,7 @@ public class MultiXMLConfigurationBuilde
try {
OMElement document = parseFile(file);
Startup startup =
SynapseXMLConfigurationFactory.defineStartup(
- synapseConfig, document);
+ synapseConfig, document, properties);
startup.setFileName(file.getName());
synapseConfig.getArtifactDeploymentStore().addArtifact(
file.getAbsolutePath(), startup.getName());
@@ -219,8 +222,8 @@ public class MultiXMLConfigurationBuilde
}
}
- private static void createSequences(SynapseConfiguration synapseConfig,
String rootDirPath)
- throws XMLStreamException {
+ private static void createSequences(SynapseConfiguration synapseConfig,
String rootDirPath,
+ Properties properties) throws
XMLStreamException {
File sequencesDir = new File(rootDirPath, SEQUENCES_DIR);
if (sequencesDir.exists()) {
@@ -232,7 +235,7 @@ public class MultiXMLConfigurationBuilde
try {
OMElement document = parseFile(file);
Mediator seq =
SynapseXMLConfigurationFactory.defineSequence(
- synapseConfig, document);
+ synapseConfig, document, properties);
if (seq instanceof SequenceMediator) {
SequenceMediator sequence = (SequenceMediator) seq;
sequence.setFileName(file.getName());
@@ -244,8 +247,8 @@ public class MultiXMLConfigurationBuilde
}
}
- private static void createEndpoints(SynapseConfiguration synapseConfig,
String rootDirPath)
- throws XMLStreamException {
+ private static void createEndpoints(SynapseConfiguration synapseConfig,
String rootDirPath,
+ Properties properties) throws
XMLStreamException {
File endpointsDir = new File(rootDirPath, ENDPOINTS_DIR);
if (endpointsDir.exists()) {
@@ -257,7 +260,7 @@ public class MultiXMLConfigurationBuilde
try {
OMElement document = parseFile(file);
Endpoint endpoint =
SynapseXMLConfigurationFactory.defineEndpoint(
- synapseConfig, document);
+ synapseConfig, document, properties);
endpoint.setFileName(file.getName());
synapseConfig.getArtifactDeploymentStore().addArtifact(
file.getAbsolutePath(), endpoint.getName());
@@ -266,8 +269,8 @@ public class MultiXMLConfigurationBuilde
}
}
- private static void createEventSources(SynapseConfiguration synapseConfig,
String rootDirPath)
- throws XMLStreamException {
+ private static void createEventSources(SynapseConfiguration synapseConfig,
String rootDirPath,
+ Properties properties) throws
XMLStreamException {
File eventsDir = new File(rootDirPath, EVENTS_DIR);
if (eventsDir.exists()) {
@@ -279,7 +282,7 @@ public class MultiXMLConfigurationBuilde
try {
OMElement document = parseFile(file);
SynapseEventSource eventSource =
SynapseXMLConfigurationFactory.
- defineEventSource(synapseConfig, document);
+ defineEventSource(synapseConfig, document,
properties);
eventSource.setFileName(file.getName());
synapseConfig.getArtifactDeploymentStore().addArtifact(
file.getAbsolutePath(), eventSource.getName());
@@ -288,8 +291,8 @@ public class MultiXMLConfigurationBuilde
}
}
- private static void createExecutors(SynapseConfiguration synapseConfig,
String rootDirPath)
- throws XMLStreamException {
+ private static void createExecutors(SynapseConfiguration synapseConfig,
String rootDirPath,
+ Properties properties) throws
XMLStreamException {
File eventsDir = new File(rootDirPath, EXECUTORS_DIR);
if (eventsDir.exists()) {
@@ -301,7 +304,7 @@ public class MultiXMLConfigurationBuilde
try {
OMElement document = parseFile(file);
PriorityExecutor executor = SynapseXMLConfigurationFactory.
- defineExecutor(synapseConfig, document);
+ defineExecutor(synapseConfig, document,
properties);
executor.setFileName(file.getName());
synapseConfig.getArtifactDeploymentStore().addArtifact(
file.getAbsolutePath(), executor.getName());
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/OutMediatorFactory.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/OutMediatorFactory.java?rev=999843&r1=999842&r2=999843&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/OutMediatorFactory.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/OutMediatorFactory.java
Wed Sep 22 09:45:09 2010
@@ -24,6 +24,7 @@ import org.apache.synapse.Mediator;
import org.apache.synapse.mediators.filters.OutMediator;
import javax.xml.namespace.QName;
+import java.util.Properties;
/**
* Creates an Out mediator instance
@@ -38,14 +39,14 @@ public class OutMediatorFactory extends
private static final QName OUT_Q = new
QName(XMLConfigConstants.SYNAPSE_NAMESPACE, "out");
- public Mediator createSpecificMediator(OMElement elem) {
+ public Mediator createSpecificMediator(OMElement elem, Properties
properties) {
OutMediator filter = new OutMediator();
// 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/POJOCommandMediatorFactory.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/POJOCommandMediatorFactory.java?rev=999843&r1=999842&r2=999843&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/POJOCommandMediatorFactory.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/POJOCommandMediatorFactory.java
Wed Sep 22 09:45:09 2010
@@ -29,6 +29,7 @@ import org.jaxen.JaxenException;
import javax.xml.namespace.QName;
import java.util.Iterator;
+import java.util.Properties;
/**
* Factory for {...@link POJOCommandMediator} instances.
@@ -63,7 +64,7 @@ public class POJOCommandMediatorFactory
protected static final String RAUM_ACTION = "ReadAndUpdateMessage";
protected static final String RAUC_ACTION = "ReadAndUpdateContext";
- public Mediator createSpecificMediator(OMElement elem) {
+ public Mediator createSpecificMediator(OMElement elem, Properties
properties) {
POJOCommandMediator pojoMediator = new POJOCommandMediator();
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/PropertyMediatorFactory.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/PropertyMediatorFactory.java?rev=999843&r1=999842&r2=999843&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/PropertyMediatorFactory.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/PropertyMediatorFactory.java
Wed Sep 22 09:45:09 2010
@@ -27,6 +27,7 @@ import org.apache.synapse.mediators.buil
import org.jaxen.JaxenException;
import javax.xml.namespace.QName;
+import java.util.Properties;
import java.util.regex.Pattern;
/**
@@ -45,7 +46,7 @@ public class PropertyMediatorFactory ext
private static final QName ATT_PATTERN = new QName("pattern");
private static final QName ATT_GROUP = new QName("group");
- public Mediator createSpecificMediator(OMElement elem) {
+ public Mediator createSpecificMediator(OMElement elem, Properties
properties) {
PropertyMediator propMediator = new PropertyMediator();
OMAttribute name = elem.getAttribute(ATT_NAME);
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/ProxyServiceDeployer.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/ProxyServiceDeployer.java?rev=999843&r1=999842&r2=999843&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/ProxyServiceDeployer.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/ProxyServiceDeployer.java
Wed Sep 22 09:45:09 2010
@@ -29,6 +29,7 @@ import org.apache.synapse.config.xml.Pro
import org.apache.synapse.core.axis2.ProxyService;
import java.io.File;
+import java.util.Properties;
/**
* Handles the <code>ProxyService</code> deployment and undeployment tasks
@@ -40,14 +41,15 @@ public class ProxyServiceDeployer extend
private static Log log = LogFactory.getLog(ProxyServiceDeployer.class);
@Override
- public String deploySynapseArtifact(OMElement artifactConfig, String
fileName) {
+ public String deploySynapseArtifact(OMElement artifactConfig, String
fileName,
+ Properties properties) {
if (log.isDebugEnabled()) {
log.debug("ProxyService Deployment from file : " + fileName + " :
Started");
}
try {
- ProxyService proxy =
ProxyServiceFactory.createProxy(artifactConfig);
+ ProxyService proxy =
ProxyServiceFactory.createProxy(artifactConfig, properties);
if (proxy != null) {
proxy.setFileName((new File(fileName)).getName());
if (log.isDebugEnabled()) {
@@ -85,14 +87,14 @@ public class ProxyServiceDeployer extend
@Override
public String updateSynapseArtifact(OMElement artifactConfig, String
fileName,
- String existingArtifactName) {
+ String existingArtifactName,
Properties properties) {
if (log.isDebugEnabled()) {
log.debug("ProxyService Update from file : " + fileName + " :
Started");
}
try {
- ProxyService proxy =
ProxyServiceFactory.createProxy(artifactConfig);
+ ProxyService proxy =
ProxyServiceFactory.createProxy(artifactConfig, properties);
if (proxy != null) {
proxy.setFileName((new File(fileName)).getName());
if (log.isDebugEnabled()) {
Modified:
synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/MultiXMLConfigurationBuilderTest.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/MultiXMLConfigurationBuilderTest.java?rev=999843&r1=999842&r2=999843&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/MultiXMLConfigurationBuilderTest.java
(original)
+++
synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/MultiXMLConfigurationBuilderTest.java
Wed Sep 22 09:45:09 2010
@@ -23,6 +23,7 @@ import junit.framework.TestCase;
import java.io.File;
import java.net.URL;
+import java.util.Properties;
import org.apache.synapse.config.SynapseConfiguration;
import org.apache.synapse.mediators.base.SequenceMediator;
@@ -39,7 +40,7 @@ public class MultiXMLConfigurationBuilde
System.out.println("Using SYNAPSE_CONFIG_HOME=" + root);
try {
SynapseConfiguration synapseConfig =
- MultiXMLConfigurationBuilder.getConfiguration(root);
+ MultiXMLConfigurationBuilder.getConfiguration(root, new
Properties());
assertNotNull(synapseConfig.getDefinedSequences().get("main"));
assertNotNull(synapseConfig.getDefinedSequences().get("fault"));
Modified:
synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/ext/POJOCommandMediatorTest.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/ext/POJOCommandMediatorTest.java?rev=999843&r1=999842&r2=999843&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/ext/POJOCommandMediatorTest.java
(original)
+++
synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/ext/POJOCommandMediatorTest.java
Wed Sep 22 09:45:09 2010
@@ -27,6 +27,8 @@ import org.apache.synapse.mediators.Abst
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.om.OMAbstractFactory;
+import java.util.Properties;
+
/**
* Tests the pojo command mediator instantiation and setting of literal and
* XPath parameters at runtime.
@@ -36,7 +38,7 @@ public class POJOCommandMediatorTest ext
public void testPojoWithoutPropertiesNotCommandImpl() throws Exception {
Mediator pcm =
MediatorFactoryFinder.getInstance().getMediator(createOMElement(
"<pojoCommand
name='org.apache.synapse.mediators.ext.POJOCommandTestMediator' " +
-
"xmlns='http://synapse.apache.org/ns/2010/04/configuration'/>"));
+
"xmlns='http://synapse.apache.org/ns/2010/04/configuration'/>"), new
Properties());
POJOCommandTestHelper.reset();
pcm.mediate(new TestMessageContext());
assertTrue(POJOCommandTestHelper.getInstance().isExecuted());
@@ -46,7 +48,7 @@ public class POJOCommandMediatorTest ext
Mediator pcm =
MediatorFactoryFinder.getInstance().getMediator(createOMElement(
"<pojoCommand
name='org.apache.synapse.mediators.ext.POJOCommandTestMediator' " +
"xmlns='http://synapse.apache.org/ns/2010/04/configuration'><property
name=\"testProp\" " +
- "expression=\"fn:concat('XPATH ', 'FUNC')\"
action=\"ReadMessage\"/></pojoCommand>"));
+ "expression=\"fn:concat('XPATH ', 'FUNC')\"
action=\"ReadMessage\"/></pojoCommand>"), new Properties());
POJOCommandTestHelper.reset();
pcm.mediate(new TestMessageContext());
assertEquals("XPATH FUNC",
POJOCommandTestHelper.getInstance().getChangedProperty());
@@ -56,7 +58,7 @@ public class POJOCommandMediatorTest ext
public void testPojoWithoutPropertiesCommandImpl() throws Exception {
Mediator pcm =
MediatorFactoryFinder.getInstance().getMediator(createOMElement(
"<pojoCommand
name='org.apache.synapse.mediators.ext.POJOCommandTestImplementedMediator' " +
-
"xmlns='http://synapse.apache.org/ns/2010/04/configuration'/>"));
+
"xmlns='http://synapse.apache.org/ns/2010/04/configuration'/>"), new
Properties());
POJOCommandTestHelper.reset();
pcm.mediate(new TestMessageContext());
assertTrue(POJOCommandTestHelper.getInstance().isExecuted());
@@ -66,7 +68,7 @@ public class POJOCommandMediatorTest ext
Mediator pcm =
MediatorFactoryFinder.getInstance().getMediator(createOMElement(
"<pojoCommand
name='org.apache.synapse.mediators.ext.POJOCommandTestImplementedMediator' " +
"xmlns='http://synapse.apache.org/ns/2010/04/configuration'><property
name=\"testProp\" " +
- "expression=\"fn:concat('XPATH ', 'FUNC')\"
action=\"ReadMessage\"/></pojoCommand>"));
+ "expression=\"fn:concat('XPATH ', 'FUNC')\"
action=\"ReadMessage\"/></pojoCommand>"), new Properties());
POJOCommandTestHelper.reset();
pcm.mediate(new TestMessageContext());
assertEquals("XPATH FUNC",
POJOCommandTestHelper.getInstance().getChangedProperty());
@@ -77,7 +79,7 @@ public class POJOCommandMediatorTest ext
Mediator pcm =
MediatorFactoryFinder.getInstance().getMediator(createOMElement(
"<pojoCommand
name='org.apache.synapse.mediators.ext.POJOCommandTestImplementedMediator' " +
"xmlns='http://synapse.apache.org/ns/2010/04/configuration'><property
name=\"testProp\" " +
- "value=\"Test Property\"/></pojoCommand>"));
+ "value=\"Test Property\"/></pojoCommand>"), new
Properties());
POJOCommandTestHelper.reset();
pcm.mediate(new TestMessageContext());
assertEquals("Test Property",
POJOCommandTestHelper.getInstance().getChangedProperty());
@@ -88,7 +90,7 @@ public class POJOCommandMediatorTest ext
Mediator pcm =
MediatorFactoryFinder.getInstance().getMediator(createOMElement(
"<pojoCommand
name='org.apache.synapse.mediators.ext.POJOCommandTestImplementedMediator' " +
"xmlns='http://synapse.apache.org/ns/2010/04/configuration'><property
name=\"testProp\" " +
- "value=\"Test Property\"
context-name=\"testPropInMC\"/></pojoCommand>"));
+ "value=\"Test Property\"
context-name=\"testPropInMC\"/></pojoCommand>"), new Properties());
POJOCommandTestHelper.reset();
MessageContext ctx = new TestMessageContext();
pcm.mediate(ctx);
@@ -101,7 +103,7 @@ public class POJOCommandMediatorTest ext
Mediator pcm =
MediatorFactoryFinder.getInstance().getMediator(createOMElement(
"<pojoCommand
name='org.apache.synapse.mediators.ext.POJOCommandTestImplementedMediator' " +
"xmlns='http://synapse.apache.org/ns/2010/04/configuration'><property
name=\"testProp\" " +
- "value=\"TestProperty\"
expression=\"//testNode\"/></pojoCommand>"));
+ "value=\"TestProperty\"
expression=\"//testNode\"/></pojoCommand>"), new Properties());
POJOCommandTestHelper.reset();
MessageContext ctx = new TestMessageContext();
SOAPEnvelope envelope =
OMAbstractFactory.getSOAP11Factory().getDefaultEnvelope();
@@ -117,7 +119,7 @@ public class POJOCommandMediatorTest ext
Mediator pcm =
MediatorFactoryFinder.getInstance().getMediator(createOMElement(
"<pojoCommand
name='org.apache.synapse.mediators.ext.POJOCommandTestImplementedMediator' " +
"xmlns='http://synapse.apache.org/ns/2010/04/configuration'><property
name=\"ctxTest\" " +
- "context-name=\"testCtxProp\"
action=\"ReadAndUpdateContext\"/></pojoCommand>"));
+ "context-name=\"testCtxProp\"
action=\"ReadAndUpdateContext\"/></pojoCommand>"), new Properties());
POJOCommandTestHelper.reset();
MessageContext ctx = new TestMessageContext();
ctx.setProperty("testCtxProp", "test");
