You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@synapse.apache.org by ve...@apache.org on 2008/06/23 23:55:48 UTC
svn commit: r670781 - in
/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml:
StartupFinder.java SynapseXMLConfigurationFactory.java
XMLConfigConstants.java
Author: veithen
Date: Mon Jun 23 14:55:47 2008
New Revision: 670781
URL: http://svn.apache.org/viewvc?rev=670781&view=rev
Log:
Corrected an issue that caused Startup extensions (actually any Startup other than task) to be misidentified as mediators.
Modified:
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/SynapseXMLConfigurationFactory.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/XMLConfigConstants.java
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=670781&r1=670780&r2=670781&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 Mon Jun 23 14:55:47 2008
@@ -118,6 +118,16 @@
}
/**
+ * Check whether an element with the given qualified name defines a startup.
+ *
+ * @param name
+ * @return
+ */
+ public boolean isStartup(QName name) {
+ return factoryMap.containsKey(name);
+ }
+
+ /**
* This method returns a Processor given an OMElement. This will be used
* recursively by the elements which contain processor elements themselves
* (e.g. rules)
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=670781&r1=670780&r2=670781&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 Mon Jun 23 14:55:47 2008
@@ -85,7 +85,7 @@
defineProxy(config, elt);
} else if (XMLConfigConstants.REGISTRY_ELT.equals(elt.getQName())) {
defineRegistry(config, elt);
- } else if (XMLConfigConstants.TASK_ELT.equals(elt.getQName())) {
+ } else if (StartupFinder.getInstance().isStartup(elt.getQName())) {
defineStartup(config, elt);
} else {
Mediator m = MediatorFactoryFinder.getInstance().getMediator(elt);
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/XMLConfigConstants.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/XMLConfigConstants.java?rev=670781&r1=670780&r2=670781&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/XMLConfigConstants.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/XMLConfigConstants.java Mon Jun 23 14:55:47 2008
@@ -56,7 +56,6 @@
public static final QName ENDPOINT_ELT = new QName(SYNAPSE_NAMESPACE, "endpoint");
public static final QName ENTRY_ELT = new QName(SYNAPSE_NAMESPACE, "localEntry");
public static final QName REGISTRY_ELT = new QName(SYNAPSE_NAMESPACE, "registry");
- public static final QName TASK_ELT = new QName(SYNAPSE_NAMESPACE, "task");
public static final QName PROXY_ELT = new QName(SYNAPSE_NAMESPACE, "proxy");
public static final String NULL_NAMESPACE = "";
public static final Object QUARTZ_QNAME =