Author: asankha
Date: Tue Mar 6 02:56:06 2007
New Revision: 515066
URL: http://svn.apache.org/viewvc?view=rev&rev=515066
Log:
fix unit test failures for extensions module
Modified:
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/MessageContext.java
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapseConfiguration.java
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/AsyncCallback.java
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2MessageContext.java
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseMessageReceiver.java
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/GetPropertyFunction.java
webservices/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/TestMessageContext.java
webservices/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/ScriptMessageContext.java
webservices/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/ThreadLocalMessageContext.java
webservices/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/spring/SpringMediator.java
webservices/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/validate/ValidateMediator.java
webservices/synapse/trunk/java/modules/extensions/src/test/java/org/apache/synapse/TestMessageContext.java
webservices/synapse/trunk/java/modules/extensions/src/test/java/org/apache/synapse/mediators/transform/XSLTMediatorTest.java
webservices/synapse/trunk/java/modules/extensions/src/test/java/org/apache/synapse/mediators/validate/ValidateMediatorTest.java
Modified:
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/MessageContext.java
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/MessageContext.java?view=diff&rev=515066&r1=515065&r2=515066
==============================================================================
---
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/MessageContext.java
(original)
+++
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/MessageContext.java
Tue Mar 6 02:56:06 2007
@@ -123,7 +123,7 @@
* @param key key to look up property
* @return value for the given key
*/
- public Object getProperty(String key);
+ public Object getEntry(String key);
/**
* Set a custom (local) property with the given name on the message
instance
@@ -136,7 +136,7 @@
* Returns the Set of keys over the properties on this message context
* @return a Set of keys over message properties
*/
- public Set getPropertyKeySet();
+ public Set getLocalPropertyKeySet();
/**
* Get the SOAP envelope of this message
Modified:
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapseConfiguration.java
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapseConfiguration.java?view=diff&rev=515066&r1=515065&r2=515066
==============================================================================
---
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapseConfiguration.java
(original)
+++
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapseConfiguration.java
Tue Mar 6 02:56:06 2007
@@ -203,14 +203,7 @@
* @return its value
*/
public Entry getEntryDefinition(String key) {
- Object o = localRegistry.get(key);
- Entry entry = null;
- if (o != null && o instanceof Entry) {
- entry = (Entry) o;
- } else {
- handleException("Entry with key : " + key + " is undefined");
- }
- return entry;
+ return (Entry) localRegistry.get(key);
}
/**
Modified:
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/AsyncCallback.java
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/AsyncCallback.java?view=diff&rev=515066&r1=515065&r2=515066
==============================================================================
---
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/AsyncCallback.java
(original)
+++
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/AsyncCallback.java
Tue Mar 6 02:56:06 2007
@@ -81,12 +81,12 @@
synapseInMessageContext.setTo(null);
// set the properties of the original MC to the new MC
- Iterator iter = synapseOutMsgCtx.getPropertyKeySet().iterator();
+ Iterator iter = synapseOutMsgCtx.getLocalPropertyKeySet().iterator();
while (iter.hasNext()) {
Object key = iter.next();
synapseInMessageContext.setProperty(
- (String) key, synapseOutMsgCtx.getProperty((String) key));
+ (String) key, synapseOutMsgCtx.getLocalProperty((String) key));
}
// send the response message through the synapse mediation flow
Modified:
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2MessageContext.java
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2MessageContext.java?view=diff&rev=515066&r1=515065&r2=515066
==============================================================================
---
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2MessageContext.java
(original)
+++
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2MessageContext.java
Tue Mar 6 02:56:06 2007
@@ -124,7 +124,7 @@
return properties.get(key);
}
- public Object getProperty(String key) {
+ public Object getEntry(String key) {
Object ret = properties.get(key);
if (ret != null) {
return ret;
@@ -139,7 +139,7 @@
properties.put(key, value);
}
- public Set getPropertyKeySet() {
+ public Set getLocalPropertyKeySet() {
return properties.keySet();
}
Modified:
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseMessageReceiver.java
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseMessageReceiver.java?view=diff&rev=515066&r1=515065&r2=515066
==============================================================================
---
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseMessageReceiver.java
(original)
+++
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseMessageReceiver.java
Tue Mar 6 02:56:06 2007
@@ -50,7 +50,7 @@
MessageContext synCtx =
MessageContextCreatorForAxis2.getSynapseMessageContext(mc);
try {
- StatisticsStack synapseServiceStack = (StatisticsStack)
synCtx.getProperty(org.apache.synapse.Constants.SYNAPSESERVICE_STATISTICS_STACK);
+ StatisticsStack synapseServiceStack = (StatisticsStack)
synCtx.getLocalProperty(org.apache.synapse.Constants.SYNAPSESERVICE_STATISTICS_STACK);
if (synapseServiceStack == null) {
synapseServiceStack = new ProxyServiceStatisticsStack();
synCtx.setProperty(org.apache.synapse.Constants.SYNAPSESERVICE_STATISTICS_STACK,
synapseServiceStack);
Modified:
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/GetPropertyFunction.java
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/GetPropertyFunction.java?view=diff&rev=515066&r1=515065&r2=515066
==============================================================================
---
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/GetPropertyFunction.java
(original)
+++
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/GetPropertyFunction.java
Tue Mar 6 02:56:06 2007
@@ -85,7 +85,7 @@
return null;
}
if (Constants.SCOPE_DEFAULT.equals(scope)) {
- Object result = synCtx.getProperty(key);
+ Object result = synCtx.getLocalProperty(key);
if (result != null) {
return result;
} else {
Modified:
webservices/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/TestMessageContext.java
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/TestMessageContext.java?view=diff&rev=515066&r1=515065&r2=515066
==============================================================================
---
webservices/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/TestMessageContext.java
(original)
+++
webservices/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/TestMessageContext.java
Tue Mar 6 02:56:06 2007
@@ -65,7 +65,7 @@
return properties.get(key);
}
- public Object getProperty(String key) {
+ public Object getEntry(String key) {
Object ret = properties.get(key);
if (ret != null) {
return ret;
@@ -80,7 +80,7 @@
properties.put(key, value);
}
- public Set getPropertyKeySet() {
+ public Set getLocalPropertyKeySet() {
return properties.keySet();
}
Modified:
webservices/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/ScriptMessageContext.java
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/ScriptMessageContext.java?view=diff&rev=515066&r1=515065&r2=515066
==============================================================================
---
webservices/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/ScriptMessageContext.java
(original)
+++
webservices/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/ScriptMessageContext.java
Tue Mar 6 02:56:06 2007
@@ -111,16 +111,16 @@
return mc.getLocalProperty(key);
}
- public Object getProperty(String key) {
- return mc.getProperty(key);
+ public Object getEntry(String key) {
+ return mc.getEntry(key);
}
public void setProperty(String key, Object value) {
mc.setProperty(key, value);
}
- public Set getPropertyKeySet() {
- return mc.getPropertyKeySet();
+ public Set getLocalPropertyKeySet() {
+ return mc.getLocalPropertyKeySet();
}
public Mediator getMainSequence() {
Modified:
webservices/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/ThreadLocalMessageContext.java
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/ThreadLocalMessageContext.java?view=diff&rev=515066&r1=515065&r2=515066
==============================================================================
---
webservices/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/ThreadLocalMessageContext.java
(original)
+++
webservices/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/ThreadLocalMessageContext.java
Tue Mar 6 02:56:06 2007
@@ -117,12 +117,12 @@
return getMC().getLocalProperty(key);
}
- public Object getProperty(String key) {
- return getMC().getProperty(key);
+ public Object getEntry(String key) {
+ return getMC().getEntry(key);
}
- public Set getPropertyKeySet() {
- return getMC().getPropertyKeySet();
+ public Set getLocalPropertyKeySet() {
+ return getMC().getLocalPropertyKeySet();
}
public Mediator getMainSequence() {
Modified:
webservices/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/spring/SpringMediator.java
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/spring/SpringMediator.java?view=diff&rev=515066&r1=515065&r2=515066
==============================================================================
---
webservices/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/spring/SpringMediator.java
(original)
+++
webservices/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/spring/SpringMediator.java
Tue Mar 6 02:56:06 2007
@@ -65,11 +65,11 @@
if (shouldTrace) {
trace.trace("Start : Spring mediator");
}
- Entry dp = synCtx.getConfiguration().getEntryDefinition(configKey);
+ Entry entry = synCtx.getConfiguration().getEntryDefinition(configKey);
// if the configKey refers to a dynamic property
- if (dp != null && dp.isDynamic()) {
- if (!dp.isCached() || dp.isExpired()) {
+ if (entry != null && entry.isDynamic()) {
+ if (!entry.isCached() || entry.isExpired()) {
buildAppContext(synCtx);
}
// if the property is not a DynamicProperty, we will create an
ApplicationContext only once
Modified:
webservices/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/validate/ValidateMediator.java
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/validate/ValidateMediator.java?view=diff&rev=515066&r1=515065&r2=515066
==============================================================================
---
webservices/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/validate/ValidateMediator.java
(original)
+++
webservices/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/validate/ValidateMediator.java
Tue Mar 6 02:56:06 2007
@@ -258,8 +258,7 @@
int i = 0;
while (iter.hasNext()) {
String propName = (String) iter.next();
- sources[i++] = Util.getStreamSource(
- msgCtx.getConfiguration().getEntry(propName));
+ sources[i++] = Util.getStreamSource(msgCtx.getEntry(propName));
}
schema = factory.newSchema(sources);
Modified:
webservices/synapse/trunk/java/modules/extensions/src/test/java/org/apache/synapse/TestMessageContext.java
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/extensions/src/test/java/org/apache/synapse/TestMessageContext.java?view=diff&rev=515066&r1=515065&r2=515066
==============================================================================
---
webservices/synapse/trunk/java/modules/extensions/src/test/java/org/apache/synapse/TestMessageContext.java
(original)
+++
webservices/synapse/trunk/java/modules/extensions/src/test/java/org/apache/synapse/TestMessageContext.java
Tue Mar 6 02:56:06 2007
@@ -65,7 +65,7 @@
return properties.get(key);
}
- public Object getProperty(String key) {
+ public Object getEntry(String key) {
Object ret = properties.get(key);
if (ret != null) {
return ret;
@@ -80,7 +80,7 @@
properties.put(key, value);
}
- public Set getPropertyKeySet() {
+ public Set getLocalPropertyKeySet() {
return properties.keySet();
}
Modified:
webservices/synapse/trunk/java/modules/extensions/src/test/java/org/apache/synapse/mediators/transform/XSLTMediatorTest.java
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/extensions/src/test/java/org/apache/synapse/mediators/transform/XSLTMediatorTest.java?view=diff&rev=515066&r1=515065&r2=515066
==============================================================================
---
webservices/synapse/trunk/java/modules/extensions/src/test/java/org/apache/synapse/mediators/transform/XSLTMediatorTest.java
(original)
+++
webservices/synapse/trunk/java/modules/extensions/src/test/java/org/apache/synapse/mediators/transform/XSLTMediatorTest.java
Tue Mar 6 02:56:06 2007
@@ -30,6 +30,7 @@
import java.util.HashMap;
import java.util.Map;
+import java.net.URL;
public class XSLTMediatorTest extends TestCase {
@@ -62,8 +63,8 @@
Map props = new HashMap();
Entry prop = new Entry();
- prop.setType(Entry.REMOTE_ENTRY);
-
prop.setKey("file:./../../repository/conf/sample/resources/transform/transform_unittest.xslt");
+ prop.setType(Entry.URL_SRC);
+ prop.setSrc(new
URL("file:./../../repository/conf/sample/resources/transform/transform_unittest.xslt"));
props.put("xslt-key", prop);
// invoke transformation, with static enveope
@@ -102,8 +103,8 @@
Map props = new HashMap();
Entry prop = new Entry();
- prop.setType(Entry.REMOTE_ENTRY);
-
prop.setKey("file:./../../repository/conf/sample/resources/transform/transform_unittest.xslt");
+ prop.setType(Entry.URL_SRC);
+ prop.setSrc(new
URL("file:./../../repository/conf/sample/resources/transform/transform_unittest.xslt"));
props.put("xslt-key", prop);
// invoke transformation, with static enveope
@@ -143,8 +144,8 @@
Map props = new HashMap();
Entry prop = new Entry();
- prop.setType(Entry.REMOTE_ENTRY);
-
prop.setKey("file:./../../repository/conf/sample/resources/transform/transform_unittest.xslt");
+ prop.setType(Entry.URL_SRC);
+ prop.setSrc(new
URL("file:./../../repository/conf/sample/resources/transform/transform_unittest.xslt"));
props.put("xslt-key", prop);
// invoke transformation, with static enveope
Modified:
webservices/synapse/trunk/java/modules/extensions/src/test/java/org/apache/synapse/mediators/validate/ValidateMediatorTest.java
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/extensions/src/test/java/org/apache/synapse/mediators/validate/ValidateMediatorTest.java?view=diff&rev=515066&r1=515065&r2=515066
==============================================================================
---
webservices/synapse/trunk/java/modules/extensions/src/test/java/org/apache/synapse/mediators/validate/ValidateMediatorTest.java
(original)
+++
webservices/synapse/trunk/java/modules/extensions/src/test/java/org/apache/synapse/mediators/validate/ValidateMediatorTest.java
Tue Mar 6 02:56:06 2007
@@ -37,6 +37,7 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.net.URL;
public class ValidateMediatorTest extends TestCase {
@@ -157,8 +158,8 @@
Map props = new HashMap();
Entry prop = new Entry();
- prop.setType(Entry.REMOTE_ENTRY);
-
prop.setKey("file:./../../repository/conf/sample/resources/validate/validate.xsd");
+ prop.setType(Entry.URL_SRC);
+ prop.setSrc(new
URL("file:./../../repository/conf/sample/resources/validate/validate.xsd"));
props.put("xsd-key", prop);
// test validate mediator, with static enveope
@@ -187,12 +188,12 @@
Map props = new HashMap();
Entry prop = new Entry();
- prop.setType(Entry.REMOTE_ENTRY);
-
prop.setKey("file:./../../repository/conf/sample/resources/validate/validate.xsd");
+ prop.setType(Entry.URL_SRC);
+ prop.setSrc(new
URL("file:./../../repository/conf/sample/resources/validate/validate.xsd"));
props.put("xsd-key-1", prop);
Entry prop2 = new Entry();
- prop2.setType(Entry.REMOTE_ENTRY);
-
prop2.setKey("file:./../../repository/conf/sample/resources/validate/validate2.xsd");
+ prop2.setType(Entry.URL_SRC);
+ prop2.setSrc(new
URL("file:./../../repository/conf/sample/resources/validate/validate2.xsd"));
props.put("xsd-key-2", prop2);
// test validate mediator, with static enveope
@@ -221,12 +222,12 @@
Map props = new HashMap();
Entry prop = new Entry();
- prop.setType(Entry.REMOTE_ENTRY);
-
prop.setKey("file:./../../repository/conf/sample/resources/validate/validate.xsd");
+ prop.setType(Entry.URL_SRC);
+ prop.setSrc(new
URL("file:./../../repository/conf/sample/resources/validate/validate.xsd"));
props.put("xsd-key-1", prop);
Entry prop2 = new Entry();
- prop2.setType(Entry.REMOTE_ENTRY);
-
prop2.setKey("file:./../../repository/conf/sample/resources/validate/validate2.xsd");
+ prop2.setType(Entry.URL_SRC);
+ prop2.setSrc(new
URL("file:./../../repository/conf/sample/resources/validate/validate2.xsd"));
props.put("xsd-key-2", prop2);
// test validate mediator, with static enveope
@@ -254,8 +255,8 @@
Map props = new HashMap();
Entry prop = new Entry();
- prop.setType(Entry.REMOTE_ENTRY);
-
prop.setKey("file:./../../repository/conf/sample/resources/validate/validate.xsd");
+ prop.setType(Entry.URL_SRC);
+ prop.setSrc(new
URL("file:./../../repository/conf/sample/resources/validate/validate.xsd"));
props.put("xsd-key-1", prop);
// test validate mediator, with static enveope
@@ -283,8 +284,8 @@
Map props = new HashMap();
Entry prop = new Entry();
- prop.setType(Entry.REMOTE_ENTRY);
-
prop.setKey("file:./../../repository/conf/sample/resources/validate/validate.xsd");
+ prop.setType(Entry.URL_SRC);
+ prop.setSrc(new
URL("file:./../../repository/conf/sample/resources/validate/validate.xsd"));
props.put("xsd-key-1", prop);
// test validate mediator, with static enveope
@@ -312,8 +313,8 @@
Map props = new HashMap();
Entry prop = new Entry();
- prop.setType(Entry.REMOTE_ENTRY);
-
prop.setKey("file:./../../repository/conf/sample/resources/validate/validate.xsd");
+ prop.setType(Entry.URL_SRC);
+ prop.setSrc(new
URL("file:./../../repository/conf/sample/resources/validate/validate.xsd"));
props.put("xsd-key-1", prop);
// test validate mediator, with static enveope
@@ -366,8 +367,8 @@
Map props = new HashMap();
Entry prop = new Entry();
- prop.setType(Entry.REMOTE_ENTRY);
-
prop.setKey("file:./../../repository/conf/sample/resources/validate/validate.xsd");
+ prop.setType(Entry.URL_SRC);
+ prop.setSrc(new
URL("file:./../../repository/conf/sample/resources/validate/validate.xsd"));
props.put("xsd-key-1", prop);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
