Author: supun
Date: Wed Feb 9 06:43:20 2011
New Revision: 1068764
URL: http://svn.apache.org/viewvc?rev=1068764&view=rev
Log:
changing the Key class to value as this can be used to represent any dynamic key
Added:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/ValueFactory.java
- copied, changed from r1067872,
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/KeyFactory.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/ValueSerializer.java
- copied, changed from r1066425,
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/KeySerializer.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/Value.java
- copied, changed from r1067872,
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/Key.java
Removed:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/KeyFactory.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/KeySerializer.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/Key.java
Modified:
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/SequenceMediatorSerializer.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/ValidateMediatorFactory.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/ValidateMediatorSerializer.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/XSLTMediatorFactory.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/XSLTMediatorSerializer.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/IndirectEndpointFactory.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/base/SequenceMediator.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/ValidateMediator.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/transform/XSLTMediator.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/registry/RegistryEntryImpl.java
synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/builtin/ValidateMediatorTest.java
synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/transform/XSLTMediatorTest.java
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=1068764&r1=1068763&r2=1068764&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 Feb 9 06:43:20 2011
@@ -23,7 +23,7 @@ import org.apache.axiom.om.OMAttribute;
import org.apache.axiom.om.OMElement;
import org.apache.synapse.Mediator;
import org.apache.synapse.SynapseException;
-import org.apache.synapse.mediators.Key;
+import org.apache.synapse.mediators.Value;
import org.apache.synapse.mediators.base.SequenceMediator;
import javax.xml.namespace.QName;
@@ -87,10 +87,10 @@ public class SequenceMediatorFactory ext
} else {
n = elem.getAttribute(ATT_KEY);
if (n != null) {
- // KeyFactory for creating dynamic or static Key
- KeyFactory keyFac = new KeyFactory();
+ // ValueFactory for creating dynamic or static Value
+ ValueFactory keyFac = new ValueFactory();
// create dynamic or static key based on OMElement
- Key generatedKey = keyFac.createKey(elem);
+ Value generatedKey = keyFac.createValue(elem);
// setKey
seqMediator.setKey(generatedKey);
if (e != null) {
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SequenceMediatorSerializer.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SequenceMediatorSerializer.java?rev=1068764&r1=1068763&r2=1068764&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SequenceMediatorSerializer.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SequenceMediatorSerializer.java
Wed Feb 9 06:43:20 2011
@@ -70,9 +70,9 @@ public class SequenceMediatorSerializer
} else {
if (mediator.getKey() != null) {
- // Serialize Key using KeySerializer
- KeySerializer keySerializer = new KeySerializer();
- keySerializer.serializeKey(mediator.getKey(), sequence);
+ // Serialize Value using ValueSerializer
+ ValueSerializer keySerializer = new ValueSerializer();
+ keySerializer.serializeValue(mediator.getKey(), sequence);
} else if (mediator.getName() != null) {
sequence.addAttribute(fac.createOMAttribute(
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/ValidateMediatorFactory.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/ValidateMediatorFactory.java?rev=1068764&r1=1068763&r2=1068764&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/ValidateMediatorFactory.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/ValidateMediatorFactory.java
Wed Feb 9 06:43:20 2011
@@ -22,7 +22,7 @@ package org.apache.synapse.config.xml;
import org.apache.axiom.om.OMAttribute;
import org.apache.axiom.om.OMElement;
import org.apache.synapse.Mediator;
-import org.apache.synapse.mediators.Key;
+import org.apache.synapse.mediators.Value;
import org.apache.synapse.mediators.builtin.ValidateMediator;
import org.jaxen.JaxenException;
import org.xml.sax.SAXException;
@@ -56,7 +56,7 @@ public class ValidateMediatorFactory ext
ValidateMediator validateMediator = new ValidateMediator();
// process schema element definitions and create DynamicProperties
- List<Key> schemaKeys = new ArrayList<Key>();
+ List<Value> schemaKeys = new ArrayList<Value>();
Iterator schemas = elem.getChildrenWithName(SCHEMA_Q);
while (schemas.hasNext()) {
@@ -65,10 +65,10 @@ public class ValidateMediatorFactory ext
OMElement omElem = (OMElement) o;
OMAttribute keyAtt = omElem.getAttribute(ATT_KEY);
if (keyAtt != null) {
- // KeyFactory for creating dynamic or static Key
- KeyFactory keyFac = new KeyFactory();
+ // ValueFactory for creating dynamic or static Value
+ ValueFactory keyFac = new ValueFactory();
// create dynamic or static key based on OMElement
- Key generatedKey = keyFac.createKey(omElem);
+ Value generatedKey = keyFac.createValue(omElem);
schemaKeys.add(generatedKey);
} else {
handleException("A 'schema' definition must contain a
local property 'key'");
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/ValidateMediatorSerializer.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/ValidateMediatorSerializer.java?rev=1068764&r1=1068763&r2=1068764&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/ValidateMediatorSerializer.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/ValidateMediatorSerializer.java
Wed Feb 9 06:43:20 2011
@@ -21,7 +21,7 @@ package org.apache.synapse.config.xml;
import org.apache.axiom.om.OMElement;
import org.apache.synapse.Mediator;
-import org.apache.synapse.mediators.Key;
+import org.apache.synapse.mediators.Value;
import org.apache.synapse.mediators.MediatorProperty;
import org.apache.synapse.mediators.builtin.ValidateMediator;
@@ -48,11 +48,11 @@ public class ValidateMediatorSerializer
SynapseXPathSerializer.serializeXPath(mediator.getSource(),
validate, "source");
}
- for (Key key : mediator.getSchemaKeys()) {
+ for (Value key : mediator.getSchemaKeys()) {
OMElement schema = fac.createOMElement("schema", synNS, validate);
- // Serialize Key using KeySerializer
- KeySerializer keySerializer = new KeySerializer();
- keySerializer.serializeKey(key, schema);
+ // Serialize Value using ValueSerializer
+ ValueSerializer keySerializer = new ValueSerializer();
+ keySerializer.serializeValue(key, schema);
}
ResourceMapSerializer.serializeResourceMap(validate,
mediator.getResourceMap());
Copied:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/ValueFactory.java
(from r1067872,
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/KeyFactory.java)
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/ValueFactory.java?p2=synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/ValueFactory.java&p1=synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/KeyFactory.java&r1=1067872&r2=1068764&rev=1068764&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/KeyFactory.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/ValueFactory.java
Wed Feb 9 06:43:20 2011
@@ -24,18 +24,18 @@ import org.apache.axiom.om.OMElement;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.synapse.SynapseException;
-import org.apache.synapse.mediators.Key;
+import org.apache.synapse.mediators.Value;
import org.apache.synapse.util.xpath.SynapseXPath;
import org.jaxen.JaxenException;
import javax.xml.namespace.QName;
/**
- * Factory for {@link org.apache.synapse.mediators.Key} instances.
+ * Factory for {@link org.apache.synapse.mediators.Value} instances.
*/
-public class KeyFactory {
+public class ValueFactory {
- private static final Log log = LogFactory.getLog(KeyFactory.class);
+ private static final Log log = LogFactory.getLog(ValueFactory.class);
private static final QName ATT_KEY = new QName("key");
@@ -45,9 +45,9 @@ public class KeyFactory {
* @param elem OMElement
* @return Key
*/
- public Key createKey(OMElement elem) {
+ public Value createValue(OMElement elem) {
- Key key = null;
+ Value key = null;
OMAttribute attKey = elem.getAttribute(ATT_KEY);
@@ -56,10 +56,10 @@ public class KeyFactory {
if (isDynamicKey(attributeValue)) {
/** dynamic key */
SynapseXPath synXpath = createSynXpath(elem, attributeValue);
- key = new Key(synXpath);
+ key = new Value(synXpath);
} else {
/** static key */
- key = new Key(attributeValue);
+ key = new Value(attributeValue);
}
} else {
handleException("The 'key' attribute is required for the XSLT
mediator");
Copied:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/ValueSerializer.java
(from r1066425,
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/KeySerializer.java)
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/ValueSerializer.java?p2=synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/ValueSerializer.java&p1=synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/KeySerializer.java&r1=1066425&r2=1068764&rev=1068764&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/KeySerializer.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/ValueSerializer.java
Wed Feb 9 06:43:20 2011
@@ -23,24 +23,24 @@ import org.apache.axiom.om.OMAbstractFac
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMNamespace;
-import org.apache.synapse.mediators.Key;
+import org.apache.synapse.mediators.Value;
/**
- * Serializer for {@link org.apache.synapse.mediators.Key} instances.
+ * Serializer for {@link org.apache.synapse.mediators.Value} instances.
*/
-public class KeySerializer {
+public class ValueSerializer {
protected static final OMFactory fac = OMAbstractFactory.getOMFactory();
protected static final OMNamespace nullNS
= fac.createOMNamespace(XMLConfigConstants.NULL_NAMESPACE, "");
/**
- * Serialize the Key object to an OMElement representing the entry
+ * Serialize the Value object to an OMElement representing the entry
*
- * @param key Key to serialize
+ * @param key Value to serialize
* @param elem OMElement
* @return OMElement
*/
- public OMElement serializeKey(Key key, OMElement elem) {
+ public OMElement serializeValue(Value key, OMElement elem) {
if (key != null) {
if (key.getExpression() == null) {
//static key
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/XSLTMediatorFactory.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/XSLTMediatorFactory.java?rev=1068764&r1=1068763&r2=1068764&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/XSLTMediatorFactory.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/XSLTMediatorFactory.java
Wed Feb 9 06:43:20 2011
@@ -23,7 +23,7 @@ import org.apache.axiom.om.OMAttribute;
import org.apache.axiom.om.OMElement;
import org.apache.synapse.Mediator;
import org.apache.synapse.mediators.transform.XSLTMediator;
-import org.apache.synapse.mediators.Key;
+import org.apache.synapse.mediators.Value;
import org.jaxen.JaxenException;
import javax.xml.namespace.QName;
@@ -63,12 +63,12 @@ public class XSLTMediatorFactory extends
OMAttribute attTarget = elem.getAttribute(ATT_TARGET);
if (attXslt != null) {
- // KeyFactory for creating dynamic or static Key
- KeyFactory keyFac = new KeyFactory();
+ // ValueFactory for creating dynamic or static Value
+ ValueFactory keyFac = new ValueFactory();
// create dynamic or static key based on OMElement
- Key generatedKey = keyFac.createKey(elem);
+ Value generatedKey = keyFac.createValue(elem);
- // set generated key as the Key
+ // set generated key as the Value
transformMediator.setXsltKey(generatedKey);
} else {
handleException("The 'key' attribute is required for the XSLT
mediator");
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/XSLTMediatorSerializer.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/XSLTMediatorSerializer.java?rev=1068764&r1=1068763&r2=1068764&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/XSLTMediatorSerializer.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/XSLTMediatorSerializer.java
Wed Feb 9 06:43:20 2011
@@ -47,9 +47,9 @@ public class XSLTMediatorSerializer exte
OMElement xslt = fac.createOMElement("xslt", synNS);
if (mediator.getXsltKey() != null) {
- // Serialize Key using KeySerializer
- KeySerializer keySerializer = new KeySerializer();
- keySerializer.serializeKey(mediator.getXsltKey(), xslt);
+ // Serialize Value using ValueSerializer
+ ValueSerializer keySerializer = new ValueSerializer();
+ keySerializer.serializeValue(mediator.getXsltKey(), xslt);
} else {
handleException("Invalid XSLT mediator. XSLT registry key is
required");
}
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/IndirectEndpointFactory.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/IndirectEndpointFactory.java?rev=1068764&r1=1068763&r2=1068764&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/IndirectEndpointFactory.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/IndirectEndpointFactory.java
Wed Feb 9 06:43:20 2011
@@ -27,7 +27,7 @@ import javax.xml.namespace.QName;
import java.util.Properties;
/**
- * Creates an {@link IndirectEndpoint} using a XML configuration. Key can be a
name of an endpoint defined
+ * Creates an {@link IndirectEndpoint} using a XML configuration. Value can be
a name of an endpoint defined
* in the same Synapse configuration or a registry key pointing to an endpoint
configuration in the
* registry (e.g. <endpoint key="registry/endpoint1.xml"/>).
*
Copied:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/Value.java
(from r1067872,
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/Key.java)
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/Value.java?p2=synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/Value.java&p1=synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/Key.java&r1=1067872&r2=1068764&rev=1068764&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/Key.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/Value.java
Wed Feb 9 06:43:20 2011
@@ -26,13 +26,19 @@ import org.apache.synapse.SynapseExcepti
import org.apache.synapse.util.xpath.SynapseXPath;
/**
- * Represents a Key
+ * Represents a Value
* Handling both static and dynamic(Xpath) keys.
* User can give Xpath expression as a key and derive
* real key based on message context
*/
-public class Key {
- private static final Log log = LogFactory.getLog(Key.class);
+public class Value {
+ private static final Log log = LogFactory.getLog(Value.class);
+
+ /**
+ * Name of the value attribute
+ */
+ private String name = null;
+
/**
* The static key value
*/
@@ -47,7 +53,7 @@ public class Key {
*
* @param staticKey static key
*/
- public Key(String staticKey) {
+ public Value(String staticKey) {
this.keyValue = staticKey;
}
@@ -56,7 +62,7 @@ public class Key {
*
* @param expression SynapseXpath for dynamic key
*/
- public Key(SynapseXPath expression) {
+ public Value(SynapseXPath expression) {
this.expression = expression;
}
@@ -101,6 +107,15 @@ public class Key {
}
/**
+ * Get the name of the value attribute
+ *
+ * @return name of the value attribute
+ */
+ public String getName() {
+ return name;
+ }
+
+ /**
* Handle exceptions
*
* @param msg error message
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/base/SequenceMediator.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/base/SequenceMediator.java?rev=1068764&r1=1068763&r2=1068764&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/base/SequenceMediator.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/base/SequenceMediator.java
Wed Feb 9 06:43:20 2011
@@ -24,7 +24,7 @@ import org.apache.synapse.aspects.Compon
import org.apache.synapse.aspects.statistics.StatisticsReporter;
import org.apache.synapse.core.SynapseEnvironment;
import org.apache.synapse.mediators.AbstractListMediator;
-import org.apache.synapse.mediators.Key;
+import org.apache.synapse.mediators.Value;
import org.apache.synapse.mediators.MediatorFaultHandler;
import java.util.Stack;
@@ -43,7 +43,7 @@ public class SequenceMediator extends Ab
/** The name of the this sequence */
private String name = null;
/** The local registry key which is used to pick a sequence definition*/
- private Key key = null;
+ private Value key = null;
/** The name of the error handler which is used to handle error during the
mediation */
private String errorHandler = null;
/** is this definition dynamic */
@@ -219,7 +219,7 @@ public class SequenceMediator extends Ab
* To get the key which is used to pick the sequence definition from the
local registry
* @return return the key which is used to pick the sequence definition
from the local registry
*/
- public Key getKey() {
+ public Value getKey() {
return key;
}
@@ -227,7 +227,7 @@ public class SequenceMediator extends Ab
* To set the local registry key in order to pick the sequence definition
* @param key the local registry key
*/
- public void setKey(Key key) {
+ public void setKey(Value key) {
this.key = key;
}
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/ValidateMediator.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/ValidateMediator.java?rev=1068764&r1=1068763&r2=1068764&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/ValidateMediator.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/ValidateMediator.java
Wed Feb 9 06:43:20 2011
@@ -27,7 +27,7 @@ import org.apache.synapse.SynapseLog;
import org.apache.synapse.config.Entry;
import org.apache.synapse.config.SynapseConfigUtils;
import org.apache.synapse.mediators.AbstractListMediator;
-import org.apache.synapse.mediators.Key;
+import org.apache.synapse.mediators.Value;
import org.apache.synapse.mediators.MediatorProperty;
import org.apache.synapse.util.AXIOMUtils;
import org.apache.synapse.util.jaxp.SchemaResourceResolver;
@@ -62,7 +62,7 @@ public class ValidateMediator extends Ab
* A list of property keys, referring to the schemas to be used for the
validation
* key can be static or dynamic(xpath) key
*/
- private List<Key> schemaKeys = new ArrayList<Key>();
+ private List<Value> schemaKeys = new ArrayList<Value>();
/**
* A list of property keys, referring to the external schema resources to
be used for the validation
@@ -114,7 +114,7 @@ public class ValidateMediator extends Ab
// flag to check if we need to initialize/re-initialize the schema
boolean reCreate = false;
// if any of the schemas are not loaded, or have expired, load or
re-load them
- for (Key schemaKey : schemaKeys) {
+ for (Value schemaKey : schemaKeys) {
// Derive actual key from message context
String propKey = schemaKey.evaluateKey(synCtx);
Entry dp = synCtx.getConfiguration().getEntryDefinition(propKey);
@@ -135,7 +135,7 @@ public class ValidateMediator extends Ab
factory.setErrorHandler(errorHandler);
StreamSource[] sources = new StreamSource[schemaKeys.size()];
int i = 0;
- for (Key schemaKey : schemaKeys) {
+ for (Value schemaKey : schemaKeys) {
// Derive actual key from message context
String propName = schemaKey.evaluateKey(synCtx);
sources[i++] =
SynapseConfigUtils.getStreamSource(synCtx.getEntry(propName));
@@ -319,7 +319,7 @@ public class ValidateMediator extends Ab
*
* @param schemaKeys list of local property names
*/
- public void setSchemaKeys(List<Key> schemaKeys) {
+ public void setSchemaKeys(List<Value> schemaKeys) {
this.schemaKeys = schemaKeys;
}
@@ -351,7 +351,7 @@ public class ValidateMediator extends Ab
* The keys for the schema resources used for validation
* @return schema registry keys
*/
- public List<Key> getSchemaKeys() {
+ public List<Value> getSchemaKeys() {
return schemaKeys;
}
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/transform/XSLTMediator.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/transform/XSLTMediator.java?rev=1068764&r1=1068763&r2=1068764&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/transform/XSLTMediator.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/transform/XSLTMediator.java
Wed Feb 9 06:43:20 2011
@@ -30,7 +30,7 @@ import org.apache.synapse.config.Entry;
import org.apache.synapse.config.SynapseConfigUtils;
import org.apache.synapse.core.SynapseEnvironment;
import org.apache.synapse.mediators.AbstractMediator;
-import org.apache.synapse.mediators.Key;
+import org.apache.synapse.mediators.Value;
import org.apache.synapse.mediators.MediatorProperty;
import org.apache.synapse.util.jaxp.*;
import org.apache.synapse.util.resolver.CustomJAXPURIResolver;
@@ -110,7 +110,7 @@ public class XSLTMediator extends Abstra
* The resource key which refers to the XSLT to be used for the
transformation
* supports both static and dynamic(xpath) keys
*/
- private Key xsltKey = null;
+ private Value xsltKey = null;
/**
* The (optional) XPath expression which yields the source element for a
transformation
@@ -410,11 +410,11 @@ public class XSLTMediator extends Abstra
this.source.setXPath(source);
}
- public Key getXsltKey() {
+ public Value getXsltKey() {
return xsltKey;
}
- public void setXsltKey(Key xsltKey) {
+ public void setXsltKey(Value xsltKey) {
this.xsltKey = xsltKey;
}
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/registry/RegistryEntryImpl.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/registry/RegistryEntryImpl.java?rev=1068764&r1=1068763&r2=1068764&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/registry/RegistryEntryImpl.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/registry/RegistryEntryImpl.java
Wed Feb 9 06:43:20 2011
@@ -116,7 +116,7 @@ public class RegistryEntryImpl implement
public String toString() {
StringBuffer sb = new StringBuffer();
sb.append("RegistryEntry {")
- .append(" Key : ").append(key)
+ .append(" Value : ").append(key)
.append(" Name : ").append(name)
.append(" Version : ").append(version)
.append(" Type : ").append(type)
Modified:
synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/builtin/ValidateMediatorTest.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/builtin/ValidateMediatorTest.java?rev=1068764&r1=1068763&r2=1068764&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/builtin/ValidateMediatorTest.java
(original)
+++
synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/builtin/ValidateMediatorTest.java
Wed Feb 9 06:43:20 2011
@@ -25,7 +25,7 @@ import org.apache.synapse.MessageContext
import org.apache.synapse.TestMessageContextBuilder;
import org.apache.synapse.config.SynapseConfigUtils;
import org.apache.synapse.config.xml.ValidateMediatorFactory;
-import org.apache.synapse.mediators.Key;
+import org.apache.synapse.mediators.Value;
import org.apache.synapse.mediators.TestMediateHandler;
import org.apache.synapse.mediators.TestMediator;
import org.apache.synapse.util.xpath.SynapseXPath;
@@ -359,41 +359,41 @@ public class ValidateMediatorTest extend
}
/**
- * Create a Key list which consists with one static element
+ * Create a Value list which consists with one static element
*
- * @param keyName String key value (static key) to create Key object
- * @return immutable Key list with one Key element
+ * @param keyName String key value (static key) to create Value object
+ * @return immutable Value list with one Value element
*/
- private List<Key> createKeyListFromStaticKey(String keyName) {
+ private List<Value> createKeyListFromStaticKey(String keyName) {
// create static key using given string key name
- Key xsdKey = new Key(keyName);
+ Value xsdKey = new Value(keyName);
return Collections.singletonList(xsdKey);
}
/**
- * Create a Key list which consists with one dynamic element
+ * Create a Value list which consists with one dynamic element
*
- * @param xpath String key value (static key) to create Key object
- * @return immutable Key list with one Key element
+ * @param xpath String key value (static key) to create Value object
+ * @return immutable Value list with one Value element
*/
- private List<Key> createKeyListFromDynamicKey(SynapseXPath xpath) {
+ private List<Value> createKeyListFromDynamicKey(SynapseXPath xpath) {
// create static key using given string key name
- Key xsdKey = new Key(xpath);
+ Value xsdKey = new Value(xpath);
return Collections.singletonList(xsdKey);
}
/**
- * Create a Key list with given set of static keys
+ * Create a Value list with given set of static keys
*
* @param keyNames Set of static keys to create list
* @return Key list
*/
- private List<Key> createKeyListFromMoreKeys(String... keyNames) {
- List<Key> keyList = new ArrayList<Key>();
+ private List<Value> createKeyListFromMoreKeys(String... keyNames) {
+ List<Value> keyList = new ArrayList<Value>();
for (String keyName : keyNames) {
// create static key using given string key name
- Key xsdKey = new Key(keyName);
+ Value xsdKey = new Value(keyName);
keyList.add(xsdKey);
}
Modified:
synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/transform/XSLTMediatorTest.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/transform/XSLTMediatorTest.java?rev=1068764&r1=1068763&r2=1068764&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/transform/XSLTMediatorTest.java
(original)
+++
synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/transform/XSLTMediatorTest.java
Wed Feb 9 06:43:20 2011
@@ -26,7 +26,7 @@ import org.apache.axis2.transport.base.B
import org.apache.synapse.MessageContext;
import org.apache.synapse.SynapseException;
import org.apache.synapse.TestMessageContextBuilder;
-import org.apache.synapse.mediators.Key;
+import org.apache.synapse.mediators.Value;
import org.apache.synapse.util.jaxp.*;
import org.apache.synapse.util.xpath.SynapseXPath;
@@ -376,7 +376,7 @@ public class XSLTMediatorTest extends Te
String path;
SynapseXPath xpath;
- Key xsltKey;
+ Value xsltKey;
XSLTMediator transformMediator = new XSLTMediator();
//default source, xsltFile, and state of key (dynamic or static)
@@ -409,7 +409,7 @@ public class XSLTMediatorTest extends Te
xpath.addNamespace("m0", "http://services.samples/xsd";);
// Create key from dynamic key (xpath)
- xsltKey = new Key(xpath);
+ xsltKey = new Value(xpath);
// set XSLT transformation URL (Xpath)
transformMediator.setXsltKey(xsltKey);
} else {
@@ -433,7 +433,7 @@ public class XSLTMediatorTest extends Te
protected static void test(Class sbf, Class rbf) throws Exception {
XSLTMediator transformMediator = new XSLTMediator();
- Key xsltKey = new Key("xslt-key");
+ Value xsltKey = new Value("xslt-key");
transformMediator.setXsltKey(xsltKey);
MessageContext mc = new TestMessageContextBuilder()
@@ -470,7 +470,7 @@ public class XSLTMediatorTest extends Te
* @param xsltKeyValue String key value (static key) to set as a key
*/
private void setXsltTransformationURL(XSLTMediator transformMediator,
String xsltKeyValue) {
- Key xsltKey = new Key(xsltKeyValue);
+ Value xsltKey = new Value(xsltKeyValue);
transformMediator.setXsltKey(xsltKey);
}
}
