[jboss-svn-commits] JBL Code SVN: r15171 - in labs/jbossesb/trunk/product: rosetta/src/org/jboss/soa/esb/actions/converters and 14 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Sep 17 07:32:02 EDT 2007
Author: mark.little at jboss.com
Date: 2007-09-17 07:32:02 -0400 (Mon, 17 Sep 2007)
New Revision: 15171
Modified:
labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/actions/ActionUtils.java
labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/actions/SystemPrintln.java
labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/actions/converters/ByteArrayToString.java
labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/actions/converters/ObjectInvoke.java
labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/actions/converters/ObjectToCSVString.java
labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/actions/converters/ObjectToXStream.java
labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/actions/converters/XStreamToObject.java
labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/actions/routing/AbstractRouter.java
labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/actions/routing/EchoRouter.java
labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/actions/routing/HttpRouter.java
labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/actions/routing/JMSRouter.java
labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/actions/scripting/GroovyActionProcessor.java
labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/JBossRemotingGatewayListener.java
labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/SqlTableGatewayListener.java
labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/message/AbstractMessageComposer.java
labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/message/BasicMessageComposer.java
labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/actions/ActionUtilsUnitTest.java
labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/actions/converters/ByteArrayToStringUnitTest.java
labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/actions/converters/LongToDateConverter.java
labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/actions/converters/ObjectInvokeTest.java
labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/actions/converters/ObjectToCSVStringUnitTest.java
labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/actions/converters/ObjectToXStreamUnitTest.java
labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/actions/converters/StringToLongConverter.java
labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/actions/converters/XStreamToObjectUnitTest.java
labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/actions/routing/JmsRouterIntegrationTest.java
labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/gateway/GroovyGatewayUnitTest.java
labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/gateway/JBossRemotingGatewayListenerUnitTest.java
labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/message/MessageDeliveryAdapterUnitTest.java
labs/jbossesb/trunk/product/samples/quickstarts/groovy_gateway/src/org/jboss/soa/esb/samples/quickstart/groovygateway/AnotherAction.java
labs/jbossesb/trunk/product/samples/quickstarts/groovy_gateway/src/org/jboss/soa/esb/samples/quickstart/groovygateway/GreeterAction.java
labs/jbossesb/trunk/product/samples/quickstarts/webservice_producer/src/org/jboss/soa/esb/samples/quickstart/webserviceproducer/webservice/GoodbyeWorldWS.java
labs/jbossesb/trunk/product/services/smooks/src/main/java/org/jboss/soa/esb/actions/converters/SmooksTransformer.java
labs/jbossesb/trunk/product/services/smooks/src/test/java/org/jboss/soa/esb/actions/converters/SmooksTransformerUnitTest.java
labs/jbossesb/trunk/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/SOAPClient.java
labs/jbossesb/trunk/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/SOAPProcessor.java
Log:
http://jira.jboss.com/jira/browse/JBESB-769 and http://jira.jboss.com/jira/browse/JBESB-856.
Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/actions/ActionUtils.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/actions/ActionUtils.java 2007-09-17 11:29:53 UTC (rev 15170)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/actions/ActionUtils.java 2007-09-17 11:32:02 UTC (rev 15171)
@@ -35,19 +35,21 @@
*/
public class ActionUtils
{
- public static final String BEFORE_ACTION="org.jboss.soa.esb.actions.current.before";
- private static final String CURRENT_OBJECT="org.jboss.soa.esb.actions.current.after";
+ public static final String PRE_ACTION_DATA = "org.jboss.soa.esb.actions.pre";
+ public static final String POST_ACTION_DATA = "org.jboss.soa.esb.actions.post";
/**
* Obtain the current object from standard spot within message
* @param message - from where to obtain the 'current object'
- * @return Object stored in Body with key ActionProcessor.CURRENT_OBJECT
+ * @return Object stored in Body with key ActionProcessor.POST_ACTION_DATA
+ * @deprecated use get(POST_ACTION_DATA) on Body instead.
*/
+
public static Object getTaskObject(Message message)
{
Object payload = null ;
if (message != null) {
- payload = message.getBody().get(CURRENT_OBJECT);
+ payload = message.getBody().get(POST_ACTION_DATA);
if(payload == null) {
payload = (byte[]) message.getBody().get(BytesBody.BYTES_LOCATION);
@@ -60,22 +62,26 @@
* Obtain previous 'current object' from standard spot within message
* @param message - from where to obtain the value
* @return Object stored in Body with key ActionProcessor.BEFORE_ACTION
+ * @deprecated use get(BEFORE_ACTION) on Body instead.
*/
+
public static Object getTaskBeforeObject(Message message)
{
- return (null==message)? null : message.getBody().get(BEFORE_ACTION);
+ return (null==message)? null : message.getBody().get(PRE_ACTION_DATA);
}
/**
* Copy 'current object' to a temporary holder within message
* @param message
+ * @deprecated use BEFORE_ACTION and CURRENT_ACTION instead.
*/
+
public static void copyCurrentToPrevious(Message message)
{
Body body = message.getBody();
- body.remove(BEFORE_ACTION);
- Object obj = body.get(CURRENT_OBJECT);
+ body.remove(PRE_ACTION_DATA);
+ Object obj = body.get(POST_ACTION_DATA);
if (null != obj)
- body.add(BEFORE_ACTION,obj);
+ body.add(PRE_ACTION_DATA,obj);
}
/**
* Put current object in standard spot within message
@@ -83,13 +89,15 @@
* @param message - to operate on
* @param obj - Object to store - Won't be stored if <null>
* @return Object previous 'current object'
+ * @deprecated use set(POST_ACTION_DATA) instead.
*/
+
public static Object setTaskObject(Message message, Object obj)
{
- Object oRet = message.getBody().remove(CURRENT_OBJECT);
+ Object oRet = message.getBody().remove(POST_ACTION_DATA);
if (null!=obj) {
- message.getBody().add(CURRENT_OBJECT,obj);
+ message.getBody().add(POST_ACTION_DATA,obj);
}
if(obj instanceof byte[]) {
message.getBody().add(BytesBody.BYTES_LOCATION, (byte[])obj);
@@ -100,7 +108,7 @@
public static NotificationList getNotifyList(ConfigTree tree, String type)
{
- ConfigTree[] array = tree.getChildren("NotificationList");
+ ConfigTree[] array = tree.getChildren(NotificationList.ELEMENT);
for (ConfigTree curr : array)
{
String sType = curr.getAttribute(NotificationList.TYPE);
Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/actions/SystemPrintln.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/actions/SystemPrintln.java 2007-09-17 11:29:53 UTC (rev 15170)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/actions/SystemPrintln.java 2007-09-17 11:32:02 UTC (rev 15171)
@@ -69,7 +69,11 @@
*/
public Message process(Message message) throws ActionProcessingException
{
- Object messageObject = ActionUtils.getTaskObject(message);
+ Object messageObject = message.getBody().get(BytesBody.BYTES_LOCATION);
+
+ if (messageObject == null)
+ messageObject = message.getBody().get(ActionUtils.POST_ACTION_DATA);
+
PrintStream stream = (useOutputStream ? System.out : System.err);
stream.println(printlnMessage + ": ");
Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/actions/converters/ByteArrayToString.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/actions/converters/ByteArrayToString.java 2007-09-17 11:29:53 UTC (rev 15170)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/actions/converters/ByteArrayToString.java 2007-09-17 11:32:02 UTC (rev 15171)
@@ -31,6 +31,7 @@
import org.jboss.soa.esb.helpers.ConfigTree;
import org.jboss.soa.esb.helpers.KeyValuePair;
import org.jboss.soa.esb.message.Message;
+import org.jboss.soa.esb.message.body.content.BytesBody;
/**
* Byte Array to String processor.
@@ -72,13 +73,25 @@
byte[] bytes;
try {
- bytes = (byte[])ActionUtils.getTaskObject(message);
+ /*
+ * First check normal payload location.
+ */
+
+ bytes = (byte[]) message.getBody().get(BytesBody.BYTES_LOCATION);
+
+ /*
+ * Now check action-chaining location. Some Actions may want to maintain
+ * the original data as well as the new.
+ */
+
+ if (bytes == null)
+ bytes = (byte[]) message.getBody().get(ActionUtils.POST_ACTION_DATA);
} catch(ClassCastException e) {
throw new ActionProcessingException("Message must be an array of bytes. Is " + message.getClass().getName());
}
try {
- ActionUtils.setTaskObject(message,new String(bytes, encoding));
+ message.getBody().add(ActionUtils.POST_ACTION_DATA, new String(bytes, encoding));
return message;
} catch (UnsupportedEncodingException e) {
throw new ActionProcessingException("Unable to decode byte[] to String. Unsupported character encoding configuration: " + encoding, e);
Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/actions/converters/ObjectInvoke.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/actions/converters/ObjectInvoke.java 2007-09-17 11:29:53 UTC (rev 15170)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/actions/converters/ObjectInvoke.java 2007-09-17 11:32:02 UTC (rev 15171)
@@ -34,6 +34,7 @@
import org.jboss.soa.esb.helpers.ConfigTree;
import org.jboss.soa.esb.helpers.KeyValuePair;
import org.jboss.soa.esb.message.Message;
+import org.jboss.soa.esb.message.body.content.BytesBody;
import org.jboss.soa.esb.util.ClassUtil;
@@ -119,8 +120,11 @@
*
*/
public Message process(Message message) throws ActionProcessingException {
- Object object = ActionUtils.getTaskObject(message);
-
+ Object object = message.getBody().get(BytesBody.BYTES_LOCATION);
+
+ if (object == null)
+ object = message.getBody().get(ActionUtils.POST_ACTION_DATA);
+
Object processor = getObjectToInvoke();
Method m = this.setUpMethod(processor);
@@ -138,7 +142,7 @@
}
- ActionUtils.setTaskObject(message,result);
+ message.getBody().add(ActionUtils.POST_ACTION_DATA, result);
return message;
}
Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/actions/converters/ObjectToCSVString.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/actions/converters/ObjectToCSVString.java 2007-09-17 11:29:53 UTC (rev 15170)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/actions/converters/ObjectToCSVString.java 2007-09-17 11:32:02 UTC (rev 15171)
@@ -34,6 +34,7 @@
import org.jboss.soa.esb.helpers.ConfigTree;
import org.jboss.soa.esb.helpers.KeyValuePair;
import org.jboss.soa.esb.message.Message;
+import org.jboss.soa.esb.message.body.content.BytesBody;
/**
* Object to CSV String processor.
@@ -112,7 +113,11 @@
*/
public Message process(Message message) throws ActionProcessingException {
- Object oCurr = ActionUtils.getTaskObject(message);
+ Object oCurr = message.getBody().get(BytesBody.BYTES_LOCATION);
+
+ if (oCurr == null)
+ oCurr = message.getBody().get(ActionUtils.POST_ACTION_DATA);
+
Class oCurrClass = (null==oCurr) ? null : oCurr.getClass();
StringBuffer csv = new StringBuffer();
boolean hasAppendStarted = false; // Have we appended a value yet?
@@ -147,7 +152,9 @@
logger.error("Exception calling bean method: " + methodName, e);
}
}
- ActionUtils.setTaskObject(message,csv.toString());
+
+ message.getBody().add(ActionUtils.POST_ACTION_DATA, csv.toString());
+
return message;
}
}
Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/actions/converters/ObjectToXStream.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/actions/converters/ObjectToXStream.java 2007-09-17 11:29:53 UTC (rev 15170)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/actions/converters/ObjectToXStream.java 2007-09-17 11:32:02 UTC (rev 15171)
@@ -31,6 +31,7 @@
import org.jboss.soa.esb.helpers.ConfigTree;
import org.jboss.soa.esb.helpers.KeyValuePair;
import org.jboss.soa.esb.message.Message;
+import org.jboss.soa.esb.message.body.content.BytesBody;
import com.thoughtworks.xstream.XStream;
@@ -83,7 +84,11 @@
*/
public Message process(Message message) throws ActionProcessingException {
- Object object = ActionUtils.getTaskObject(message);
+ Object object = message.getBody().get(BytesBody.BYTES_LOCATION);
+
+ if (object == null)
+ object = message.getBody().get(ActionUtils.POST_ACTION_DATA);
+
XStream xstream = new XStream();
if(classAlias == null) {
@@ -96,7 +101,8 @@
xstream.alias(classAlias, object.getClass());
}
- ActionUtils.setTaskObject(message,xstream.toXML(object));
+ message.getBody().add(ActionUtils.POST_ACTION_DATA, xstream.toXML(object));
+
return message;
}
}
Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/actions/converters/XStreamToObject.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/actions/converters/XStreamToObject.java 2007-09-17 11:29:53 UTC (rev 15170)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/actions/converters/XStreamToObject.java 2007-09-17 11:32:02 UTC (rev 15171)
@@ -16,6 +16,7 @@
import org.jboss.soa.esb.helpers.ConfigTree;
import org.jboss.soa.esb.helpers.KeyValuePair;
import org.jboss.soa.esb.message.Message;
+import org.jboss.soa.esb.message.body.content.BytesBody;
import org.jboss.soa.esb.util.ClassUtil;
import org.jboss.soa.esb.util.XPathUtil;
import org.w3c.dom.Element;
@@ -99,12 +100,16 @@
*
*/
public Message process(Message message) throws ActionProcessingException {
- Object object = ActionUtils.getTaskObject(message);
+ Object object = message.getBody().get(BytesBody.BYTES_LOCATION);
+
+ if (object == null)
+ object = message.getBody().get(ActionUtils.POST_ACTION_DATA);
try {
Object toObject = incomingType.newInstance();
fromXmlToObject( object.toString(), toObject );
- ActionUtils.setTaskObject(message,toObject);
+
+ message.getBody().add(ActionUtils.POST_ACTION_DATA, toObject);
} catch (InstantiationException e) {
logger.error( e );
throw new ActionProcessingException("Could not invoke for Arg: " + getName(),e );
Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/actions/routing/AbstractRouter.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/actions/routing/AbstractRouter.java 2007-09-17 11:29:53 UTC (rev 15170)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/actions/routing/AbstractRouter.java 2007-09-17 11:32:02 UTC (rev 15171)
@@ -32,6 +32,7 @@
import org.jboss.soa.esb.actions.ActionUtils;
import org.jboss.soa.esb.helpers.KeyValuePair;
import org.jboss.soa.esb.message.Message;
+import org.jboss.soa.esb.message.body.content.BytesBody;
/**
* Abstract router.
@@ -65,7 +66,12 @@
*/
public Message process(Message message) throws ActionProcessingException {
if(unwrap) {
- route(ActionUtils.getTaskObject(message));
+ Object content = message.getBody().get(BytesBody.BYTES_LOCATION);
+
+ if (content == null)
+ content = message.getBody().get(ActionUtils.POST_ACTION_DATA);
+
+ route(content);
} else {
route(message);
}
Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/actions/routing/EchoRouter.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/actions/routing/EchoRouter.java 2007-09-17 11:29:53 UTC (rev 15170)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/actions/routing/EchoRouter.java 2007-09-17 11:32:02 UTC (rev 15171)
@@ -27,6 +27,7 @@
import org.jboss.soa.esb.actions.ActionProcessingException;
import org.jboss.soa.esb.actions.ActionUtils;
import org.jboss.soa.esb.helpers.ConfigTree;
+import org.jboss.soa.esb.message.body.content.BytesBody;
/**
* Echo Action Processor.
@@ -55,9 +56,14 @@
public org.jboss.soa.esb.message.Message process(
org.jboss.soa.esb.message.Message message)
throws ActionProcessingException {
-
+
if (logger.isInfoEnabled()) {
- logger.info("EchoRouter currently routing message " + message + " with payload <<" + ActionUtils.getTaskObject(message) + ">>");
+ Object content = message.getBody().get(BytesBody.BYTES_LOCATION);
+
+ if (content == null)
+ content = message.getBody().get(ActionUtils.POST_ACTION_DATA);
+
+ logger.info("EchoRouter currently routing message " + message + " with payload <<" + content + ">>");
}
return message;
Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/actions/routing/HttpRouter.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/actions/routing/HttpRouter.java 2007-09-17 11:29:53 UTC (rev 15170)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/actions/routing/HttpRouter.java 2007-09-17 11:32:02 UTC (rev 15171)
@@ -30,6 +30,7 @@
import org.jboss.soa.esb.actions.ActionUtils;
import org.jboss.soa.esb.helpers.ConfigTree;
import org.jboss.soa.esb.listeners.ListenerTagNames;
+import org.jboss.soa.esb.message.body.content.BytesBody;
/**
* HttpRouter Action Processor. This ActionProcessor will forward the message to an url for further processing.
@@ -80,8 +81,11 @@
org.jboss.soa.esb.message.Message message)
throws ActionProcessingException {
- Object oCurr = ActionUtils.getTaskObject(message);
-
+ Object oCurr = message.getBody().get(BytesBody.BYTES_LOCATION);
+
+ if (oCurr == null)
+ oCurr = message.getBody().get(ActionUtils.POST_ACTION_DATA);
+
if (logger.isInfoEnabled()) {
logger
.info("HttpRouter currently routing message " + message
Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/actions/routing/JMSRouter.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/actions/routing/JMSRouter.java 2007-09-17 11:29:53 UTC (rev 15170)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/actions/routing/JMSRouter.java 2007-09-17 11:32:02 UTC (rev 15171)
@@ -52,6 +52,7 @@
import org.jboss.soa.esb.helpers.ConfigTree;
import org.jboss.soa.esb.helpers.KeyValuePair;
import org.jboss.soa.esb.helpers.NamingContext;
+import org.jboss.soa.esb.message.body.content.BytesBody;
import org.jboss.soa.esb.notification.jms.DefaultJMSPropertiesSetter;
import org.jboss.soa.esb.notification.jms.JMSPropertiesSetter;
import org.jboss.soa.esb.util.Util;
@@ -160,7 +161,11 @@
Message jmsMessage = null;
if ( unwrap ) {
- Object objectFromBody = ActionUtils.getTaskObject(esbMessage);
+ Object objectFromBody = esbMessage.getBody().get(BytesBody.BYTES_LOCATION);
+
+ if (objectFromBody == null)
+ objectFromBody = esbMessage.getBody().get(ActionUtils.POST_ACTION_DATA);
+
jmsMessage = createJMSMessageWithObjectType( objectFromBody );
}
else {
Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/actions/scripting/GroovyActionProcessor.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/actions/scripting/GroovyActionProcessor.java 2007-09-17 11:29:53 UTC (rev 15170)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/actions/scripting/GroovyActionProcessor.java 2007-09-17 11:32:02 UTC (rev 15171)
@@ -35,6 +35,7 @@
import org.jboss.soa.esb.actions.ActionUtils;
import org.jboss.soa.esb.helpers.ConfigTree;
import org.jboss.soa.esb.message.Message;
+import org.jboss.soa.esb.message.body.content.BytesBody;
import org.jboss.soa.esb.util.ClassUtil;
/**
@@ -148,8 +149,12 @@
if(script != null) {
return script;
} else {
- // So, the script is being passed in in the message...
- Object messageScript = ActionUtils.getTaskObject(message);
+ // So, the script is being passed in in the message...
+ Object messageScript = message.getBody().get(BytesBody.BYTES_LOCATION);
+
+ if (messageScript == null)
+ messageScript = message.getBody().get(ActionUtils.POST_ACTION_DATA);
+
if(messageScript instanceof String) {
return (String)messageScript;
} else if(messageScript instanceof byte[]) {
Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/JBossRemotingGatewayListener.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/JBossRemotingGatewayListener.java 2007-09-17 11:29:53 UTC (rev 15170)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/JBossRemotingGatewayListener.java 2007-09-17 11:32:02 UTC (rev 15171)
@@ -425,19 +425,7 @@
@SuppressWarnings("unchecked")
protected void populateMessage(Message message, T invocationRequest) throws MessageDeliverException {
- //
- // There really needs to be an optoin on the body to set it's contents
- // as an unnamed Object, in the same way you can set it's contents as a byte[].
- // I think this is a major'ish usability issue.
- //
- // My suggestion would be...
- // public void setContents(Object object);
- // public Object getContents();
- // public byte[] toByteArray(); // (was "byte[] getContents()")
- //
- // Not totally sure of the real value of toByteArray??
- // Continue to allow setting of named attachments.
- ActionUtils.setTaskObject(message, invocationRequest.getParameter());
+ message.getBody().add(ActionUtils.POST_ACTION_DATA, invocationRequest.getParameter());
// Copy the request properties onto the message...
Map properties = invocationRequest.getRequestPayload();
Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/SqlTableGatewayListener.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/SqlTableGatewayListener.java 2007-09-17 11:29:53 UTC (rev 15170)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/SqlTableGatewayListener.java 2007-09-17 11:32:02 UTC (rev 15171)
@@ -95,7 +95,7 @@
throws ConfigurationException {
super(config);
_config = config;
- _sleepBetweenPolls = 10000; // milliseconds TODO magic number
+ _sleepBetweenPolls = 10000;
checkMyParms();
} // __________________________________
@@ -265,8 +265,6 @@
* classpath
*/
private void checkMyParms() throws ConfigurationException {
- // Third arg is null - Exception will be thrown if attribute is not
- // found
_targetServiceCategory = ListenerUtil.getValue(_config,
ListenerTagNames.TARGET_SERVICE_CATEGORY_TAG, null);
_targetServiceName = ListenerUtil.getValue(_config,
Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/message/AbstractMessageComposer.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/message/AbstractMessageComposer.java 2007-09-17 11:29:53 UTC (rev 15170)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/message/AbstractMessageComposer.java 2007-09-17 11:32:02 UTC (rev 15171)
@@ -21,6 +21,7 @@
import org.jboss.soa.esb.actions.ActionUtils;
import org.jboss.soa.esb.message.Message;
+import org.jboss.soa.esb.message.body.content.BytesBody;
import org.jboss.soa.esb.message.format.MessageFactory;
/**
@@ -55,7 +56,7 @@
/**
* Decompose the message.
* <p/>
- * This implementation simple calls {@link ActionUtils#getTaskObject(org.jboss.soa.esb.message.Message)}.
+ * This implementation simple calls Body.get(ActionUtils.POST_ACTION_DATA)}.
* Override to implement an alternative {@link Message} decomposition strategy.
*
* @param message The message to be decomposed.
@@ -75,7 +76,12 @@
if(response != null) {
return response;
} else {
- return ActionUtils.getTaskObject(message);
+ Object content = message.getBody().get(BytesBody.BYTES_LOCATION);
+
+ if (content == null)
+ content = message.getBody().get(ActionUtils.POST_ACTION_DATA);
+
+ return content;
}
}
Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/message/BasicMessageComposer.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/message/BasicMessageComposer.java 2007-09-17 11:29:53 UTC (rev 15170)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/message/BasicMessageComposer.java 2007-09-17 11:32:02 UTC (rev 15171)
@@ -35,6 +35,6 @@
}
protected void populateMessage(Message message, T messagePayload) throws MessageDeliverException {
- ActionUtils.setTaskObject(message, messagePayload);
+ message.getBody().add(ActionUtils.POST_ACTION_DATA, messagePayload);
}
}
Modified: labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/actions/ActionUtilsUnitTest.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/actions/ActionUtilsUnitTest.java 2007-09-17 11:29:53 UTC (rev 15170)
+++ labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/actions/ActionUtilsUnitTest.java 2007-09-17 11:32:02 UTC (rev 15171)
@@ -47,7 +47,6 @@
public class ActionUtilsUnitTest extends BaseTest
{
- private static final String CURRENT_OBJECT = "org.jboss.soa.esb.actions.current.after";
private Logger logger = Logger.getLogger(this.getClass());
@@ -59,7 +58,7 @@
{
Message msg1 = MessageFactory.getInstance().getMessage(MessageType.DEFAULT_TYPE);
String anyText = "A bunch of text";
- msg1.getBody().add(ActionUtils.BEFORE_ACTION, anyText.getBytes());
+ msg1.getBody().add(ActionUtils.PRE_ACTION_DATA, anyText.getBytes());
Object obj = ActionUtils.getTaskBeforeObject(msg1);
String anyTextAfter = new String((byte[]) obj);
@@ -77,13 +76,13 @@
String currentObject = "current action";
Message msg1 = MessageFactory.getInstance().getMessage(MessageType.DEFAULT_TYPE);
- msg1.getBody().add(ActionUtils.BEFORE_ACTION, beforeAction.getBytes());
- msg1.getBody().add(CURRENT_OBJECT, currentObject.getBytes());
+ msg1.getBody().add(ActionUtils.PRE_ACTION_DATA, beforeAction.getBytes());
+ msg1.getBody().add(ActionUtils.POST_ACTION_DATA, currentObject.getBytes());
ActionUtils.copyCurrentToPrevious(msg1);
- // Both BEFORE_ACTION and CURRENT_OBJECT should be equal
- Object objBeforeAction = msg1.getBody().get(ActionUtils.BEFORE_ACTION);
- Object objCurrentObject = msg1.getBody().get(CURRENT_OBJECT);
+ // Both PRE_ACTION_DATA and POST_ACTION_DATA should be equal
+ Object objBeforeAction = msg1.getBody().get(ActionUtils.PRE_ACTION_DATA);
+ Object objCurrentObject = msg1.getBody().get(ActionUtils.POST_ACTION_DATA);
assertEquals(objBeforeAction, objCurrentObject);
}
Modified: labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/actions/converters/ByteArrayToStringUnitTest.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/actions/converters/ByteArrayToStringUnitTest.java 2007-09-17 11:29:53 UTC (rev 15170)
+++ labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/actions/converters/ByteArrayToStringUnitTest.java 2007-09-17 11:32:02 UTC (rev 15171)
@@ -52,9 +52,9 @@
String sTest = "TestString";
Message msg = MessageFactory.getInstance().getMessage();
- ActionUtils.setTaskObject(msg,sTest.getBytes());
+ msg.getBody().add(ActionUtils.POST_ACTION_DATA, sTest.getBytes());
byteArrayToString.process(msg);
- String decodedBytes = (String)ActionUtils.getTaskObject(msg);
+ String decodedBytes = (String)msg.getBody().get(ActionUtils.POST_ACTION_DATA);
assertEquals(sTest, decodedBytes);
}
}
Modified: labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/actions/converters/LongToDateConverter.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/actions/converters/LongToDateConverter.java 2007-09-17 11:29:53 UTC (rev 15170)
+++ labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/actions/converters/LongToDateConverter.java 2007-09-17 11:32:02 UTC (rev 15171)
@@ -47,7 +47,8 @@
*/
public Message process(Message message) throws ActionProcessingException
{
- Object oCurr = ActionUtils.getTaskObject(message);
+ Object oCurr = message.getBody().get(ActionUtils.POST_ACTION_DATA);
+
if (!(oCurr instanceof Long))
{
throw new ActionProcessingException(
@@ -55,7 +56,9 @@
}
log.debug("LongToDateConverter");
- try { ActionUtils.setTaskObject(message,new Date((Long)oCurr)); }
+ try {
+ message.getBody().add(ActionUtils.POST_ACTION_DATA, new Date((Long)oCurr));
+ }
catch (Exception e)
{ throw new ActionProcessingException(e); }
return message;
Modified: labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/actions/converters/ObjectInvokeTest.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/actions/converters/ObjectInvokeTest.java 2007-09-17 11:29:53 UTC (rev 15170)
+++ labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/actions/converters/ObjectInvokeTest.java 2007-09-17 11:32:02 UTC (rev 15171)
@@ -83,11 +83,12 @@
properties.add(new KeyValuePair("class-method", methodName));
Message oMsg = MessageFactory.getInstance().getMessage();
- ActionUtils.setTaskObject(oMsg, param);
+
+ oMsg.getBody().add(ActionUtils.POST_ACTION_DATA, param);
ObjectInvoke objectInvoke = new ObjectInvoke("ObjectInvoke",properties);
objectInvoke.process(oMsg);
- return ActionUtils.getTaskObject(oMsg);
+ return oMsg.getBody().get(ActionUtils.POST_ACTION_DATA);
}
}
Modified: labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/actions/converters/ObjectToCSVStringUnitTest.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/actions/converters/ObjectToCSVStringUnitTest.java 2007-09-17 11:29:53 UTC (rev 15170)
+++ labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/actions/converters/ObjectToCSVStringUnitTest.java 2007-09-17 11:32:02 UTC (rev 15171)
@@ -52,42 +52,43 @@
properties.add(new KeyValuePair(ObjectToCSVString.BEAN_PROPERTIES_PROP, "name"));
ObjectToCSVString processor = new ObjectToCSVString("ObjectToCSVString", properties);
- ActionUtils.setTaskObject(oMsg,new TestBean());
+ oMsg.getBody().add(ActionUtils.POST_ACTION_DATA, new TestBean());
oMsg = processor.process(oMsg);
- assertEquals("Tom Fennelly", ActionUtils.getTaskObject(oMsg));
+ assertEquals("Tom Fennelly", oMsg.getBody().get(ActionUtils.POST_ACTION_DATA));
// Multi value - properties all exist on bean...
properties.clear();
properties.add(new KeyValuePair(ObjectToCSVString.BEAN_PROPERTIES_PROP, "name,age"));
processor = new ObjectToCSVString("ObjectToCSVString", properties);
- ActionUtils.setTaskObject(oMsg,new TestBean());
+ oMsg.getBody().add(ActionUtils.POST_ACTION_DATA, new TestBean());
processor.process(oMsg);
- assertEquals("Tom Fennelly,21", ActionUtils.getTaskObject(oMsg));
+ assertEquals("Tom Fennelly,21", oMsg.getBody().get(ActionUtils.POST_ACTION_DATA));
// Multi value - some properties exist on bean and some don't...
properties.clear();
properties.add(new KeyValuePair(ObjectToCSVString.BEAN_PROPERTIES_PROP, "id,name,phone,age"));
processor = new ObjectToCSVString("ObjectToCSVString", properties);
- ActionUtils.setTaskObject(oMsg,new TestBean());
+ oMsg.getBody().add(ActionUtils.POST_ACTION_DATA, new TestBean());
log.warn( "The following two error messages are intentional" );
processor.process(oMsg);
- assertEquals("<no-such-property>,Tom Fennelly,<no-such-property>,21", ActionUtils.getTaskObject(oMsg));
+ assertEquals("<no-such-property>,Tom Fennelly,<no-such-property>,21", oMsg.getBody().get(ActionUtils.POST_ACTION_DATA));
// Single value - property doesn't exist on bean...
properties.clear();
properties.add(new KeyValuePair(ObjectToCSVString.BEAN_PROPERTIES_PROP, "id"));
processor = new ObjectToCSVString("ObjectToCSVString", properties);
- ActionUtils.setTaskObject(oMsg,new TestBean());
+ oMsg.getBody().add(ActionUtils.POST_ACTION_DATA, new TestBean());
log.warn( "The following error message is intentional" );
processor.process(oMsg);
- assertEquals("<no-such-property>", ActionUtils.getTaskObject(oMsg));
+ assertEquals("<no-such-property>", oMsg.getBody().get(ActionUtils.POST_ACTION_DATA));
// Single value - property doesn't exist on bean and "fail-on-missing-property" action config is set on...
properties.clear();
properties.add(new KeyValuePair(ObjectToCSVString.BEAN_PROPERTIES_PROP, "id"));
properties.add(new KeyValuePair(ObjectToCSVString.FAIL_ON_MISSING_PROPERTY, "true"));
processor = new ObjectToCSVString("ObjectToCSVString", properties);
- ActionUtils.setTaskObject(oMsg,new TestBean());
+ oMsg.getBody().add(ActionUtils.POST_ACTION_DATA, new TestBean());
+
try {
log.warn( "The following error message is intentional" );
processor.process(oMsg);
Modified: labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/actions/converters/ObjectToXStreamUnitTest.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/actions/converters/ObjectToXStreamUnitTest.java 2007-09-17 11:29:53 UTC (rev 15170)
+++ labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/actions/converters/ObjectToXStreamUnitTest.java 2007-09-17 11:32:02 UTC (rev 15171)
@@ -50,9 +50,9 @@
ObjectToXStream objectToXStream = new ObjectToXStream("TestBean-Serialiser", properties);
Message oMsg = MessageFactory.getInstance().getMessage();
- ActionUtils.setTaskObject(oMsg,new TestBean("Tom", "1234"));
+ oMsg.getBody().add(ActionUtils.POST_ACTION_DATA, new TestBean("Tom", "1234"));
oMsg = objectToXStream.process(oMsg);
- String xml = (String)ActionUtils.getTaskObject(oMsg);
+ String xml = (String)oMsg.getBody().get(ActionUtils.POST_ACTION_DATA);
XStream xstream = new XStream(new DomDriver());
TestBean bean = new TestBean();
@@ -71,9 +71,9 @@
ObjectToXStream objectToXStream = new ObjectToXStream("TestBean-Serialiser", properties);
Message oMsg = MessageFactory.getInstance().getMessage();
- ActionUtils.setTaskObject(oMsg,new TestBean("Tom", "1234"));
+ oMsg.getBody().add(ActionUtils.POST_ACTION_DATA, new TestBean("Tom", "1234"));
objectToXStream.process(oMsg);
- String xml = (String)ActionUtils.getTaskObject(oMsg);
+ String xml = (String)oMsg.getBody().get(ActionUtils.POST_ACTION_DATA);
XStream xstream = new XStream(new DomDriver());
TestBean bean = new TestBean();
@@ -92,9 +92,9 @@
ObjectToXStream objectToXStream = new ObjectToXStream("TestBean-Serialiser", properties);
Message oMsg = MessageFactory.getInstance().getMessage();
- ActionUtils.setTaskObject(oMsg,new TestBean("Tom", "1234"));
+ oMsg.getBody().add(ActionUtils.POST_ACTION_DATA, new TestBean("Tom", "1234"));
objectToXStream.process(oMsg);
- String xml = (String)ActionUtils.getTaskObject(oMsg);
+ String xml = (String)oMsg.getBody().get(ActionUtils.POST_ACTION_DATA);
XStream xstream = new XStream(new DomDriver());
xstream.alias("TomsClass", TestBean.class);
Modified: labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/actions/converters/StringToLongConverter.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/actions/converters/StringToLongConverter.java 2007-09-17 11:29:53 UTC (rev 15170)
+++ labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/actions/converters/StringToLongConverter.java 2007-09-17 11:32:02 UTC (rev 15171)
@@ -38,13 +38,15 @@
* @see org.jboss.soa.esb.actions.ActionProcessor#processAction(java.lang.Object)
*/
public Message process(Message message) throws ActionProcessingException {
- Object oCurr = ActionUtils.getTaskObject(message);
+ Object oCurr = message.getBody().get(ActionUtils.POST_ACTION_DATA);
if(!(oCurr instanceof String)) {
throw new ActionProcessingException("This action handler only accepts String object instances.");
}
System.out.println("StringToLongConverter");
- try { ActionUtils.setTaskObject(message,new Long((String)oCurr)); }
+ try {
+ message.getBody().add(ActionUtils.POST_ACTION_DATA, new Long((String)oCurr));
+ }
catch (Exception e)
{ throw new ActionProcessingException(e); }
return message;
Modified: labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/actions/converters/XStreamToObjectUnitTest.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/actions/converters/XStreamToObjectUnitTest.java 2007-09-17 11:29:53 UTC (rev 15170)
+++ labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/actions/converters/XStreamToObjectUnitTest.java 2007-09-17 11:32:02 UTC (rev 15171)
@@ -62,10 +62,10 @@
String msg = "<" + TestBean.class.getSimpleName() + "> <name>Tom</name><phone>1234</phone></" + TestBean.class.getSimpleName() + ">";
- ActionUtils.setTaskObject(oMsg,msg);
+ oMsg.getBody().add(ActionUtils.POST_ACTION_DATA, msg);
oMsg = xstreamToObject.process(oMsg);
- TestBean bean = (TestBean)ActionUtils.getTaskObject(oMsg);
+ TestBean bean = (TestBean)oMsg.getBody().get(ActionUtils.POST_ACTION_DATA);
assertEquals("Tom", bean.getName());
assertEquals("1234", bean.getPhone());
@@ -84,10 +84,10 @@
String msg = "<" + TestBean.class.getName() + "> <name>Tom</name><phone>1234</phone></"+ TestBean.class.getName() +">";
- ActionUtils.setTaskObject(oMsg,msg);
+ oMsg.getBody().add(ActionUtils.POST_ACTION_DATA, msg);
oMsg = xstreamToObject.process(oMsg);
- TestBean bean = (TestBean)ActionUtils.getTaskObject(oMsg);
+ TestBean bean = (TestBean)oMsg.getBody().get(ActionUtils.POST_ACTION_DATA);
assertEquals("Tom", bean.getName());
assertEquals("1234", bean.getPhone());
@@ -108,10 +108,10 @@
String msg = "<TomsClass><name>Tom</name><phone>1234</phone></TomsClass>";
- ActionUtils.setTaskObject(oMsg,msg);
+ oMsg.getBody().add(ActionUtils.POST_ACTION_DATA, msg);
oMsg = xstreamToObject.process(oMsg);
- TestBean bean = (TestBean)ActionUtils.getTaskObject(oMsg);
+ TestBean bean = (TestBean)oMsg.getBody().get(ActionUtils.POST_ACTION_DATA);
assertEquals("Tom", bean.getName());
assertEquals("1234", bean.getPhone());
@@ -150,7 +150,6 @@
xstreamToObject.addAliases( aliases, new XStream() );
assertEquals( "Aliases map should have been empty!", 0, aliases.size() );
-
}
@Test
@@ -162,10 +161,10 @@
String msg = "<TomsClass><name>Tom</name><phone>1234</phone></TomsClass>";
- ActionUtils.setTaskObject(oMsg,msg);
+ oMsg.getBody().add(ActionUtils.POST_ACTION_DATA, msg);
oMsg = xstreamToObject.process(oMsg);
- TestBean bean = (TestBean)ActionUtils.getTaskObject(oMsg);
+ TestBean bean = (TestBean)oMsg.getBody().get(ActionUtils.POST_ACTION_DATA);
assertEquals("Tom", bean.getName());
assertEquals("1234", bean.getPhone());
Modified: labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/actions/routing/JmsRouterIntegrationTest.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/actions/routing/JmsRouterIntegrationTest.java 2007-09-17 11:29:53 UTC (rev 15170)
+++ labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/actions/routing/JmsRouterIntegrationTest.java 2007-09-17 11:32:02 UTC (rev 15171)
@@ -45,6 +45,7 @@
import org.jboss.internal.soa.esb.rosetta.pooling.ConnectionException;
import org.jboss.soa.esb.ConfigurationException;
import org.jboss.soa.esb.actions.ActionProcessingException;
+import org.jboss.soa.esb.actions.ActionUtils;
import org.jboss.soa.esb.addressing.eprs.JMSEpr;
import org.jboss.soa.esb.helpers.ConfigTree;
import org.jboss.soa.esb.helpers.KeyValuePair;
@@ -183,7 +184,7 @@
try
{
- msg.getBody().add("org.jboss.soa.esb.actions.current.after", "hello world");
+ msg.getBody().add(ActionUtils.POST_ACTION_DATA, "hello world");
router.process(msg);
}
catch (ActionProcessingException ex)
Modified: labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/gateway/GroovyGatewayUnitTest.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/gateway/GroovyGatewayUnitTest.java 2007-09-17 11:29:53 UTC (rev 15170)
+++ labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/gateway/GroovyGatewayUnitTest.java 2007-09-17 11:32:02 UTC (rev 15171)
@@ -76,7 +76,7 @@
groovyGateway.stopped = true;
Thread.sleep(2000);
assertTrue("Is not stopped", (courier1.message != null));
- assertEquals("Hi there!", ActionUtils.getTaskObject(courier1.message));
+ assertEquals("Hi there!", (String) courier1.message.getBody().get(ActionUtils.POST_ACTION_DATA));
}
// TODO: Fix build such that it can pick up the scripts from the src folder.
Modified: labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/gateway/JBossRemotingGatewayListenerUnitTest.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/gateway/JBossRemotingGatewayListenerUnitTest.java 2007-09-17 11:29:53 UTC (rev 15170)
+++ labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/gateway/JBossRemotingGatewayListenerUnitTest.java 2007-09-17 11:32:02 UTC (rev 15171)
@@ -218,7 +218,7 @@
assertEquals("<ack/>", response);
// Make sure the courier payload after matches the input...
- Object courierPayloadAfter = ActionUtils.getTaskObject(courier2.message);
+ Object courierPayloadAfter = courier2.message.getBody().get(ActionUtils.POST_ACTION_DATA);
assertEquals(messagePayload, courierPayloadAfter);
} finally {
if(remotingClient != null) {
Modified: labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/message/MessageDeliveryAdapterUnitTest.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/message/MessageDeliveryAdapterUnitTest.java 2007-09-17 11:29:53 UTC (rev 15170)
+++ labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/message/MessageDeliveryAdapterUnitTest.java 2007-09-17 11:32:02 UTC (rev 15171)
@@ -139,11 +139,11 @@
assertEquals(null, courier1.message);
assertEquals(null, courier2.message);
assertEquals(null, courier3.message);
- assertEquals(payload, ActionUtils.getTaskObject(courier4.message));
+ assertEquals(payload, courier4.message.getBody().get(ActionUtils.POST_ACTION_DATA));
String payload2 = "*YYY*";
deliveryAdapter.deliverAsync(payload2);
- assertEquals(payload2, ActionUtils.getTaskObject(courier4.message));
+ assertEquals(payload2, courier4.message.getBody().get(ActionUtils.POST_ACTION_DATA));
} catch(RegistryException re) {
fail("RegistryException");
}
Modified: labs/jbossesb/trunk/product/samples/quickstarts/groovy_gateway/src/org/jboss/soa/esb/samples/quickstart/groovygateway/AnotherAction.java
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/groovy_gateway/src/org/jboss/soa/esb/samples/quickstart/groovygateway/AnotherAction.java 2007-09-17 11:29:53 UTC (rev 15170)
+++ labs/jbossesb/trunk/product/samples/quickstarts/groovy_gateway/src/org/jboss/soa/esb/samples/quickstart/groovygateway/AnotherAction.java 2007-09-17 11:32:02 UTC (rev 15171)
@@ -23,6 +23,7 @@
import org.jboss.soa.esb.actions.AbstractActionLifecycle;
import org.jboss.soa.esb.helpers.ConfigTree;
import org.jboss.soa.esb.message.Message;
+import org.jboss.soa.esb.message.body.content.BytesBody;
import org.jboss.soa.esb.actions.ActionProcessingException;
import org.jboss.soa.esb.actions.ActionUtils;
@@ -30,10 +31,14 @@
{
public Message process(Message message) throws ActionProcessingException {
- String content = (String) ActionUtils.getTaskObject(message);
+ Object content = message.getBody().get(BytesBody.BYTES_LOCATION);
+
+ if (content == null)
+ content = message.getBody().get(ActionUtils.POST_ACTION_DATA);
+
content = content + ", How are you TODAY?";
- System.out.println("Msg Content: " + content);
- ActionUtils.setTaskObject(message,content);
+ System.out.println("Msg Content: " + content);
+ message.getBody().add(ActionUtils.POST_ACTION_DATA, content);
return message;
}
Modified: labs/jbossesb/trunk/product/samples/quickstarts/groovy_gateway/src/org/jboss/soa/esb/samples/quickstart/groovygateway/GreeterAction.java
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/groovy_gateway/src/org/jboss/soa/esb/samples/quickstart/groovygateway/GreeterAction.java 2007-09-17 11:29:53 UTC (rev 15170)
+++ labs/jbossesb/trunk/product/samples/quickstarts/groovy_gateway/src/org/jboss/soa/esb/samples/quickstart/groovygateway/GreeterAction.java 2007-09-17 11:32:02 UTC (rev 15171)
@@ -23,6 +23,7 @@
import org.jboss.soa.esb.actions.AbstractActionLifecycle;
import org.jboss.soa.esb.helpers.ConfigTree;
import org.jboss.soa.esb.message.Message;
+import org.jboss.soa.esb.message.body.content.BytesBody;
import org.jboss.soa.esb.actions.ActionProcessingException;
import org.jboss.soa.esb.actions.ActionUtils;
@@ -30,10 +31,14 @@
{
public Message process(Message message) throws ActionProcessingException {
- String content = (String) ActionUtils.getTaskObject(message);
+ Object content = message.getBody().get(BytesBody.BYTES_LOCATION);
+
+ if (content == null)
+ content = message.getBody().get(ActionUtils.POST_ACTION_DATA);
+
content = "Hello " + content;
System.out.println("Msg Content: " + content);
- ActionUtils.setTaskObject(message,content);
+ message.getBody().add(ActionUtils.POST_ACTION_DATA, content);;
return message;
}
Modified: labs/jbossesb/trunk/product/samples/quickstarts/webservice_producer/src/org/jboss/soa/esb/samples/quickstart/webserviceproducer/webservice/GoodbyeWorldWS.java
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/webservice_producer/src/org/jboss/soa/esb/samples/quickstart/webserviceproducer/webservice/GoodbyeWorldWS.java 2007-09-17 11:29:53 UTC (rev 15170)
+++ labs/jbossesb/trunk/product/samples/quickstarts/webservice_producer/src/org/jboss/soa/esb/samples/quickstart/webserviceproducer/webservice/GoodbyeWorldWS.java 2007-09-17 11:32:02 UTC (rev 15171)
@@ -8,6 +8,7 @@
import org.jboss.soa.esb.message.Message;
import org.jboss.soa.esb.message.Body;
+import org.jboss.soa.esb.actions.ActionUtils;
import org.jboss.soa.esb.actions.soap.SOAPProcessor;
/**
@@ -22,7 +23,7 @@
Message esbMessage = SOAPProcessor.getMessage();
if(esbMessage != null) {
- System.out.println("**** SOAPRequest perhaps mediated by ESB:\n" + esbMessage.getBody().get("org.jboss.soa.esb.actions.current.after"));
+ System.out.println("**** SOAPRequest perhaps mediated by ESB:\n" + esbMessage.getBody().get(ActionUtils.POST_ACTION_DATA));
// System.out.println("\n" + esbMessage.toString() + "\n");
}
System.out.println("Web Service Parameter - message=" + message);
@@ -33,7 +34,7 @@
public String sayAdios(String message) {
Message esbMessage = SOAPProcessor.getMessage();
if(esbMessage != null) {
- System.out.println("**** SOAPRequest perhaps mediated by ESB:\n" + esbMessage.getBody().get("org.jboss.soa.esb.actions.current.after"));
+ System.out.println("**** SOAPRequest perhaps mediated by ESB:\n" + esbMessage.getBody().get(ActionUtils.POST_ACTION_DATA));
// System.out.println("\n" + esbMessage.toString() + "\n");
}
System.out.println("Web Service Parameter - message=" + message);
@@ -46,7 +47,7 @@
Message esbMessage = SOAPProcessor.getMessage();
if(esbMessage != null) {
- System.out.println("**** SOAPRequest perhaps mediated by ESB:\n" + esbMessage.getBody().get("org.jboss.soa.esb.actions.current.after"));
+ System.out.println("**** SOAPRequest perhaps mediated by ESB:\n" + esbMessage.getBody().get(ActionUtils.POST_ACTION_DATA));
}
System.out.println("Web Service Parameter - message=" + message);
}
Modified: labs/jbossesb/trunk/product/services/smooks/src/main/java/org/jboss/soa/esb/actions/converters/SmooksTransformer.java
===================================================================
--- labs/jbossesb/trunk/product/services/smooks/src/main/java/org/jboss/soa/esb/actions/converters/SmooksTransformer.java 2007-09-17 11:29:53 UTC (rev 15170)
+++ labs/jbossesb/trunk/product/services/smooks/src/main/java/org/jboss/soa/esb/actions/converters/SmooksTransformer.java 2007-09-17 11:32:02 UTC (rev 15171)
@@ -33,6 +33,7 @@
import org.jboss.soa.esb.helpers.KeyValuePair;
import org.jboss.soa.esb.message.Body;
import org.jboss.soa.esb.message.Message;
+import org.jboss.soa.esb.message.body.content.BytesBody;
import org.jboss.soa.esb.services.transform.TransformationException;
import org.jboss.soa.esb.services.transform.TransformationService;
import org.milyn.Smooks;
@@ -286,7 +287,10 @@
Object payload = message.getBody().get(inputLocation);
if(payload == null) {
- payload = ActionUtils.getTaskObject(message);
+ payload = message.getBody().get(ActionUtils.POST_ACTION_DATA);
+
+ if (payload == null)
+ payload = message.getBody().get(BytesBody.BYTES_LOCATION);
}
try {
@@ -335,7 +339,7 @@
if(beanHash != null && setPayloadToBeanHash) {
outputPayload = beanHash;
} else {
- ActionUtils.setTaskObject(message, transformedMessage);
+ message.getBody().add(ActionUtils.POST_ACTION_DATA, transformedMessage);
outputPayload = transformedMessage;
}
Modified: labs/jbossesb/trunk/product/services/smooks/src/test/java/org/jboss/soa/esb/actions/converters/SmooksTransformerUnitTest.java
===================================================================
--- labs/jbossesb/trunk/product/services/smooks/src/test/java/org/jboss/soa/esb/actions/converters/SmooksTransformerUnitTest.java 2007-09-17 11:29:53 UTC (rev 15170)
+++ labs/jbossesb/trunk/product/services/smooks/src/test/java/org/jboss/soa/esb/actions/converters/SmooksTransformerUnitTest.java 2007-09-17 11:32:02 UTC (rev 15171)
@@ -85,9 +85,9 @@
// Perform the transformation by setting the payload on the task object...
message = MessageFactory.getInstance().getMessage();
message = MessageFactory.getInstance().getMessage();
- ActionUtils.setTaskObject(message, stringMessage);
+ message.getBody().add(ActionUtils.POST_ACTION_DATA, stringMessage);
message = transformer.process(message);
- String resultThroughTaskObj = (String) ActionUtils.getTaskObject(message);
+ String resultThroughTaskObj = (String) message.getBody().get(ActionUtils.POST_ACTION_DATA);
assertEquals(resultThroughTaskObj, message.getBody().get());
// Perform the transformation by setting the payload on the body as bytes...
Modified: labs/jbossesb/trunk/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/SOAPClient.java
===================================================================
--- labs/jbossesb/trunk/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/SOAPClient.java 2007-09-17 11:29:53 UTC (rev 15170)
+++ labs/jbossesb/trunk/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/SOAPClient.java 2007-09-17 11:32:02 UTC (rev 15171)
@@ -301,7 +301,7 @@
params = (Map) message.getBody().get();
} catch(ClassCastException e) {/* ignore */}
if(params == null) {
- params = (Map) ActionUtils.getTaskObject(message);
+ params = (Map) message.getBody().get(ActionUtils.POST_ACTION_DATA);
}
}
if(params == null) {
@@ -390,7 +390,7 @@
message.getBody().add(responseLocation, responseObject);
} else {
message.getBody().add(responseObject);
- ActionUtils.setTaskObject(message, responseObject);
+ message.getBody().add(ActionUtils.POST_ACTION_DATA, responseObject); // TODO why both?!
}
}
Modified: labs/jbossesb/trunk/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/SOAPProcessor.java
===================================================================
--- labs/jbossesb/trunk/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/SOAPProcessor.java 2007-09-17 11:29:53 UTC (rev 15170)
+++ labs/jbossesb/trunk/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/SOAPProcessor.java 2007-09-17 11:32:02 UTC (rev 15171)
@@ -33,6 +33,7 @@
import org.jboss.soa.esb.actions.ActionUtils;
import org.jboss.soa.esb.helpers.ConfigTree;
import org.jboss.soa.esb.message.Message;
+import org.jboss.soa.esb.message.body.content.BytesBody;
import org.jboss.wsf.spi.deployment.Endpoint;
import org.jboss.wsf.spi.invocation.BasicInvocationContext;
import org.jboss.wsf.spi.invocation.RequestHandler;
@@ -135,7 +136,8 @@
if(message.getProperties().getProperty("Content-Type") == null) {
message.getProperties().setProperty("Content-Type", "text/xml");
}
- ActionUtils.setTaskObject(message, new String(os.toByteArray()).trim());
+
+ message.getBody().add(ActionUtils.POST_ACTION_DATA, new String(os.toByteArray()).trim());
}
catch (Exception ex) {
throw new ActionProcessingException("Cannot process SOAP request", ex);
@@ -151,7 +153,11 @@
private byte[] getSOAPMessagePayload(Message message) throws ActionProcessingException {
byte[] soapMessage;
- Object messagePayload = ActionUtils.getTaskObject(message);
+ Object messagePayload = message.getBody().get(BytesBody.BYTES_LOCATION);
+
+ if (messagePayload == null)
+ messagePayload = message.getBody().get(ActionUtils.POST_ACTION_DATA);
+
if(messagePayload instanceof byte[]) {
soapMessage = (byte[])messagePayload;
} else if(messagePayload instanceof String) {
More information about the jboss-svn-commits
mailing list