You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@synapse.apache.org by su...@apache.org on 2011/03/15 12:09:50 UTC
svn commit: r1081724 - in
/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse:
config/SynapseConfiguration.java config/xml/endpoints/TemplateFactory.java
endpoints/Template.java
Author: supun
Date: Tue Mar 15 11:09:50 2011
New Revision: 1081724
URL: http://svn.apache.org/viewvc?rev=1081724&view=rev
Log:
improving the endpoint templates to be fetched from the registry
Modified:
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/xml/endpoints/TemplateFactory.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/Template.java
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=1081724&r1=1081723&r2=1081724&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 Tue Mar 15 11:09:50 2011
@@ -1412,7 +1412,7 @@ public class SynapseConfiguration implem
public Template getEndpointTemplate(String key) {
Object o = getEntry(key);
- if (o instanceof Mediator) {
+ if (o instanceof Template) {
return (Template) o;
}
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/TemplateFactory.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/TemplateFactory.java?rev=1081724&r1=1081723&r2=1081724&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/TemplateFactory.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/TemplateFactory.java Tue Mar 15 11:09:50 2011
@@ -41,6 +41,9 @@ public class TemplateFactory {
OMAttribute nameAttribute = element.getAttribute(
new QName(XMLConfigConstants.NULL_NAMESPACE, "name"));
+ template.addParameter("name");
+ template.addParameter("uri");
+
if (nameAttribute != null) {
template.setName(nameAttribute.getAttributeValue());
} else {
@@ -54,20 +57,14 @@ public class TemplateFactory {
OMElement paramElement = (OMElement) paramItr.next();
OMAttribute paramName = paramElement.getAttribute(new QName("name"));
- OMAttribute paramValue = paramElement.getAttribute(new QName("value"));
if (paramName == null) {
handleException("parameter name should be present");
}
- if (paramValue == null) {
- handleException("parameter value should be present");
- }
-
assert paramName != null;
- assert paramValue != null;
- template.addParameter(paramName.getAttributeValue(), paramValue.getAttributeValue());
+ template.addParameter(paramName.getAttributeValue());
}
OMElement endpointElement = element.getFirstChildWithName(
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/Template.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/Template.java?rev=1081724&r1=1081723&r2=1081724&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/Template.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/Template.java Tue Mar 15 11:09:50 2011
@@ -24,10 +24,7 @@ import org.apache.axiom.om.OMElement;
import org.apache.synapse.SynapseArtifact;
import org.apache.synapse.config.xml.endpoints.EndpointFactory;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Properties;
+import java.util.*;
/**
* A template with the endpoint information.
@@ -37,7 +34,7 @@ public class Template implements Synapse
private String name = null;
- private Map<String, String> parameters = new HashMap<String, String>();
+ private List<String> parameters = new ArrayList<String>();
private String fileName = null;
@@ -59,12 +56,12 @@ public class Template implements Synapse
this.name = name;
}
- public Map<String, String> getParameters() {
+ public List<String> getParameters() {
return parameters;
}
- public void addParameter(String name, String value) {
- parameters.put(name, value);
+ public void addParameter(String name) {
+ parameters.add(name);
}
public void setElement(OMElement element) {
@@ -108,7 +105,7 @@ public class Template implements Synapse
String param = value.substring(1);
if (templateEndpoint.getParameters().containsKey(param) &&
- parameters.containsKey(param)) {
+ parameters.contains(param)) {
return templateEndpoint.getParameterValue(param);
}
}