[jboss-svn-commits] JBL Code SVN: r11836 - in labs/jbossesb/trunk: product/core/listeners/src/org/jboss/soa/esb/actions/converters and 46 other directories.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Sat May 12 02:55:23 EDT 2007


Author: mark.little at jboss.com
Date: 2007-05-12 02:55:23 -0400 (Sat, 12 May 2007)
New Revision: 11836

Modified:
   labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/ActionUtils.java
   labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/Notifier.java
   labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/SystemPrintln.java
   labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/converters/SmooksTransformer.java
   labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/gateway/FileGatewayListener.java
   labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/gateway/JmsGatewayListener.java
   labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/actions/converters/SmooksTransformerUnitTest.java
   labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/actions/routing/EchoRouterUnitTest.java
   labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/actions/routing/HttpRouterUnitTest.java
   labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/actions/routing/JmsRouterUnitTest.java
   labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/actions/scripting/GroovyActionProcessorUnitTest.java
   labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/actions/scripting/test.groovy
   labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/ListenerManagerBaseTest.java
   labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/ListenerManagerFTPIntegrationTest.java
   labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/ListenerManagerFileUnitTest.java
   labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/ListenerManagerJDBCUnitTest.java
   labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/ListenerManagerJMSXntegrationTest.java
   labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/message/format/serialized/BodyImpl.java
   labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/message/format/xml/BodyImpl.java
   labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/message/Body.java
   labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/notification/NotifyConsole.java
   labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/notification/NotifyEmail.java
   labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/notification/NotifyFTP.java
   labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/notification/NotifyFiles.java
   labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/notification/NotifyJMS.java
   labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/notification/NotifySqlTable.java
   labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/internal/soa/esb/couriers/tests/CourierIntegrationTest.java
   labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/internal/soa/esb/couriers/tests/FileCourierUnitTest.java
   labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/addressing/eprs/tests/DefaultFileReplyToEprUnitTest.java
   labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/addressing/eprs/tests/DefaultFtpReplyToEprIntegrationTest.java
   labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/addressing/eprs/tests/DefaultJdbcReplyToEprUnitTest.java
   labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/message/tests/SerializedMessageUnitTest.java
   labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/message/tests/XMLMessageUnitTest.java
   labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/notification/NotificationListUnitTest.java
   labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/notification/NotifyEmailUnitTest.java
   labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/notification/NotifyFilesUnitTest.java
   labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/notification/NotifyQueuesUnitTest.java
   labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/notification/NotifyTopicsUnitTest.java
   labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/notification/TestNotificationTarget1.java
   labs/jbossesb/trunk/product/core/services/src/org/jboss/internal/soa/esb/persistence/format/jcr/JCRMessageStoreImpl.java
   labs/jbossesb/trunk/product/core/services/src/org/jboss/internal/soa/esb/services/routing/cbr/DslHelper.java
   labs/jbossesb/trunk/product/core/services/tests/src/org/jboss/internal/soa/esb/services/routing/cbr/JBossRulesRouterUnitTest.java
   labs/jbossesb/trunk/product/core/services/tests/src/org/jboss/soa/esb/esb/persistence/tests/MessageStoreUnitTest.java
   labs/jbossesb/trunk/product/core/services/tests/src/org/jboss/soa/esb/services/routing/cbr/ContentBasedRoutingUnitTest.java
   labs/jbossesb/trunk/product/docs/ProgrammersGuide.odt
   labs/jbossesb/trunk/product/samples/quickstarts/aggregator/src/org/jboss/soa/esb/dvdstore/DVDStoreAction.java
   labs/jbossesb/trunk/product/samples/quickstarts/aggregator/src/org/jboss/soa/esb/dvdstore/RetrieveCustomerAction.java
   labs/jbossesb/trunk/product/samples/quickstarts/aggregator/src/org/jboss/soa/esb/dvdstore/RetrieveLineItemsAction.java
   labs/jbossesb/trunk/product/samples/quickstarts/aggregator/src/org/jboss/soa/esb/dvdstore/RetrieveOrderAction.java
   labs/jbossesb/trunk/product/samples/quickstarts/aggregator/src/org/jboss/soa/esb/samples/quickstart/aggregator/MyJMSListenerAction.java
   labs/jbossesb/trunk/product/samples/quickstarts/aggregator/src/org/jboss/soa/esb/samples/quickstart/aggregator/ReturnJMSMessage.java
   labs/jbossesb/trunk/product/samples/quickstarts/aggregator/src/org/jboss/soa/esb/samples/quickstart/aggregator/TeamAlert.java
   labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration1/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration1/esb_actions/MessageSpy.java
   labs/jbossesb/trunk/product/samples/quickstarts/business_service/src/org/jboss/soa/esb/samples/quickstart/businessservice/MyAction.java
   labs/jbossesb/trunk/product/samples/quickstarts/fun_cbr/src/org/jboss/soa/esb/dvdstore/DVDStoreAction.java
   labs/jbossesb/trunk/product/samples/quickstarts/fun_cbr/src/org/jboss/soa/esb/samples/quickstart/funcbr/MyJMSListenerAction.java
   labs/jbossesb/trunk/product/samples/quickstarts/fun_cbr/src/org/jboss/soa/esb/samples/quickstart/funcbr/ReturnJMSMessage.java
   labs/jbossesb/trunk/product/samples/quickstarts/fun_cbr/src/org/jboss/soa/esb/samples/quickstart/funcbr/TeamAlert.java
   labs/jbossesb/trunk/product/samples/quickstarts/helloworld/src/org/jboss/soa/esb/samples/quickstart/helloworld/MyJMSListenerAction.java
   labs/jbossesb/trunk/product/samples/quickstarts/helloworld/src/org/jboss/soa/esb/samples/quickstart/helloworld/test/SendEsbMessage.java
   labs/jbossesb/trunk/product/samples/quickstarts/helloworld_action/src/org/jboss/soa/esb/samples/quickstart/helloworldaction/MyJMSListenerAction.java
   labs/jbossesb/trunk/product/samples/quickstarts/helloworld_db_registration/src/org/jboss/soa/esb/samples/quickstart/helloworlddbregistration/MyJMSListenerAction.java
   labs/jbossesb/trunk/product/samples/quickstarts/helloworld_file_action/src/org/jboss/soa/esb/samples/quickstart/helloworldfileaction/MyAction.java
   labs/jbossesb/trunk/product/samples/quickstarts/helloworld_ftp_action/src/org/jboss/soa/esb/samples/quickstart/helloworldftpaction/MyAction.java
   labs/jbossesb/trunk/product/samples/quickstarts/more_action/src/org/jboss/soa/esb/samples/quickstart/moreaction/MyJMSListenerAction.java
   labs/jbossesb/trunk/product/samples/quickstarts/more_action/src/org/jboss/soa/esb/samples/quickstart/moreaction/StatefulAction.java
   labs/jbossesb/trunk/product/samples/quickstarts/simple_cbr/src/org/jboss/soa/esb/samples/quickstart/simplecbr/MyJMSListenerAction.java
   labs/jbossesb/trunk/product/samples/quickstarts/simple_cbr/src/org/jboss/soa/esb/samples/quickstart/simplecbr/ReturnJMSMessage.java
   labs/jbossesb/trunk/product/samples/quickstarts/simple_cbr/src/org/jboss/soa/esb/samples/quickstart/simplecbr/RouteExpressShipping.java
   labs/jbossesb/trunk/product/samples/quickstarts/simple_cbr/src/org/jboss/soa/esb/samples/quickstart/simplecbr/RouteNormalShipping.java
   labs/jbossesb/trunk/product/samples/quickstarts/static_router/src/org/jboss/soa/esb/samples/quickstart/staticrouter/SimpleFileAction.java
   labs/jbossesb/trunk/product/samples/quickstarts/transform_XML2POJO/src/org/jboss/soa/esb/dvdstore/DVDStoreAction.java
   labs/jbossesb/trunk/product/samples/quickstarts/transform_XML2POJO/src/org/jboss/soa/esb/samples/quickstart/transformxml2pojo/MyJMSListenerAction.java
   labs/jbossesb/trunk/product/samples/quickstarts/transform_XML2POJO/src/org/jboss/soa/esb/samples/quickstart/transformxml2pojo/ReturnJMSMessage.java
   labs/jbossesb/trunk/product/samples/quickstarts/webservice_war1/src/org/jboss/soa/esb/samples/quickstart/webservicewar1/MyAction.java
   labs/jbossesb/trunk/product/samples/quickstarts/webservice_war1/war/src/org/jboss/soa/esb/samples/quickstart/webservicewar1/webservice/HelloWorldWS.java
   labs/jbossesb/trunk/product/samples/trailblazer/client/src/org/jboss/soa/esb/samples/trailblazer/loanbroker/LoanBroker.java
   labs/jbossesb/trunk/product/samples/trailblazer/esb/src/org/jboss/soa/esb/samples/trailblazer/actions/BankResponseActions.java
   labs/jbossesb/trunk/product/samples/trailblazer/esb/src/org/jboss/soa/esb/samples/trailblazer/actions/CreditAgencyActions.java
   labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/actionhandlers/EsbAction2.java
   labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/actionhandlers/EsbActionHandler.java
   labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/actions/impl/facades/FacadeUtil.java
   labs/jbossesb/trunk/product/services/jbpm/src/test/java/org/jboss/soa/esb/services/jbpm/actions/BpmProcessorUnitTest.java
   labs/jbossesb/trunk/product/services/jbpm/src/test/java/org/jboss/soa/esb/services/jbpm/actions/JbpmTestUtil.java
   labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/actions/AggregatorTest.java
   labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/actions/ContentBasedRouterTest.java
   labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/actions/MessagePersisterTest.java
   labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/messagestore/MessageStoreClient.java
   labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/messagestore/MessageStoreTest.java
   labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/server/MyAction.java
Log:
http://jira.jboss.com/jira/browse/JBESB-565

Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/ActionUtils.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/ActionUtils.java	2007-05-11 10:52:13 UTC (rev 11835)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/ActionUtils.java	2007-05-12 06:55:23 UTC (rev 11836)
@@ -47,7 +47,7 @@
     	Object payload = (null==message)? null : message.getBody().get(CURRENT_OBJECT);
     	
     	if(payload == null) {
-    		payload = message.getBody().getContents();
+    		payload = message.getBody().getByteArray();
     	}
     	
     	return payload;
@@ -82,27 +82,13 @@
      */
     public static Object setTaskObject(Message message, Object obj)
     {
-
-        //
-        // 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 usability issue.  This utility should not be required.
-        //
-        // My suggestion would be...
-        //      public void setContents(Object object);
-        //      public Object getContents();
-        //      public byte[] toByteArray();
-        //
-        // Not totally sure of the value of toByteArray??
-        // Continue to allow setting of named attachments.
-        
         Object oRet = message.getBody().remove(CURRENT_OBJECT);
     	
     	if (null!=obj) {
     		message.getBody().add(CURRENT_OBJECT,obj);
     	}
     	if(obj instanceof byte[]) {
-    		message.getBody().setContents((byte[])obj);
+    		message.getBody().setByteArray((byte[])obj);
     	}
     	
     	return oRet;

Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/Notifier.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/Notifier.java	2007-05-11 10:52:13 UTC (rev 11835)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/Notifier.java	2007-05-12 06:55:23 UTC (rev 11836)
@@ -99,7 +99,7 @@
 	{ 
 		byte[] ba = null;
 		return (null==message) ? "<null message>"
-			:(null==(ba=message.getBody().getContents())) ? "<null body content>"
+			:(null==(ba=message.getBody().getByteArray())) ? "<null body content>"
 			: new String(ba); 
 	} //________________________________
 	

Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/SystemPrintln.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/SystemPrintln.java	2007-05-11 10:52:13 UTC (rev 11835)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/SystemPrintln.java	2007-05-12 06:55:23 UTC (rev 11836)
@@ -60,7 +60,7 @@
 			if (messageObject!=null) System.out.println("[" + format(messageObject.toString()) + "].");
             for (int i=0; i<message.getAttachment().getUnnamedCount(); i++) {
                 Message attachedMessage = (Message) message.getAttachment().itemAt(i);
-                System.out.println("attachment " + i + ": [" + new String(attachedMessage.getBody().getContents()) + "].");
+                System.out.println("attachment " + i + ": [" + new String(attachedMessage.getBody().getByteArray()) + "].");
             }
 		}
 		

Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/converters/SmooksTransformer.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/converters/SmooksTransformer.java	2007-05-11 10:52:13 UTC (rev 11835)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/converters/SmooksTransformer.java	2007-05-12 06:55:23 UTC (rev 11836)
@@ -239,7 +239,7 @@
 	            	ActionUtils.setTaskObject(message, beanHash);
 	            } else {
 	            	ActionUtils.setTaskObject(message, transformedMessage);
-	            	message.getBody().setContents(transformedMessage.getBytes("UTF-8"));
+	            	message.getBody().setByteArray(transformedMessage.getBytes("UTF-8"));
 	            }
 	        } else {
 	        	String sClass = (null==payload) ? "<null>" : payload.getClass().getName();

Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/gateway/FileGatewayListener.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/gateway/FileGatewayListener.java	2007-05-11 10:52:13 UTC (rev 11835)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/gateway/FileGatewayListener.java	2007-05-12 06:55:23 UTC (rev 11836)
@@ -191,7 +191,7 @@
 				throw new ConfigurationException("Object must be instance of File");
 
 			Message message = MessageFactory.getInstance().getMessage();
-			message.getBody().setContents(getFileContent((File) obj));
+			message.getBody().setByteArray(getFileContent((File) obj));
 			return message;
 		}
 

Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/gateway/JmsGatewayListener.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/gateway/JmsGatewayListener.java	2007-05-11 10:52:13 UTC (rev 11835)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/gateway/JmsGatewayListener.java	2007-05-12 06:55:23 UTC (rev 11836)
@@ -424,7 +424,7 @@
 
 			javax.jms.Message jmsMsg = (javax.jms.Message) obj;
 			Message message = MessageFactory.getInstance().getMessage();
-			message.getBody().setContents(getMessageContent(jmsMsg));
+			message.getBody().setByteArray(getMessageContent(jmsMsg));
 			Enumeration<String> EE = jmsMsg.getPropertyNames();
 			if (null != EE)
 			{

Modified: labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/actions/converters/SmooksTransformerUnitTest.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/actions/converters/SmooksTransformerUnitTest.java	2007-05-11 10:52:13 UTC (rev 11835)
+++ labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/actions/converters/SmooksTransformerUnitTest.java	2007-05-12 06:55:23 UTC (rev 11836)
@@ -93,13 +93,13 @@
         ActionUtils.setTaskObject(message, stringMessage);
         message = transformer.process(message);
         String resultThroughTaskObj = (String) ActionUtils.getTaskObject(message);
-        assertEquals(resultThroughTaskObj, new String(message.getBody().getContents()));
+        assertEquals(resultThroughTaskObj, new String(message.getBody().getByteArray()));
         
         // Perform the transformation by setting the payload on the body "contents".
         message = createNewMessage(fromType, from, to, toType);
-        message.getBody().setContents(stringMessage.getBytes());
+        message.getBody().setByteArray(stringMessage.getBytes());
         message = transformer.process(message);
-        assertEquals(resultThroughTaskObj, new String(message.getBody().getContents()));
+        assertEquals(resultThroughTaskObj, new String(message.getBody().getByteArray()));
         
         return resultThroughTaskObj;
     }

Modified: labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/actions/routing/EchoRouterUnitTest.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/actions/routing/EchoRouterUnitTest.java	2007-05-11 10:52:13 UTC (rev 11835)
+++ labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/actions/routing/EchoRouterUnitTest.java	2007-05-12 06:55:23 UTC (rev 11836)
@@ -38,7 +38,7 @@
 		EchoRouter router = new EchoRouter(null);
 		Message msg = MessageFactory.getInstance().getMessage();
 		
-		msg.getBody().setContents("hello world".getBytes());
+		msg.getBody().setByteArray("hello world".getBytes());
 		
 		router.process(msg);
 	}

Modified: labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/actions/routing/HttpRouterUnitTest.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/actions/routing/HttpRouterUnitTest.java	2007-05-11 10:52:13 UTC (rev 11835)
+++ labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/actions/routing/HttpRouterUnitTest.java	2007-05-12 06:55:23 UTC (rev 11836)
@@ -46,7 +46,7 @@
 		
 		Message msg = MessageFactory.getInstance().getMessage();
 		
-		msg.getBody().setContents("hello world".getBytes());
+		msg.getBody().setByteArray("hello world".getBytes());
 		
 		boolean exception = false;
 		

Modified: labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/actions/routing/JmsRouterUnitTest.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/actions/routing/JmsRouterUnitTest.java	2007-05-11 10:52:13 UTC (rev 11835)
+++ labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/actions/routing/JmsRouterUnitTest.java	2007-05-12 06:55:23 UTC (rev 11836)
@@ -46,7 +46,7 @@
 		
 		Message msg = MessageFactory.getInstance().getMessage();
 		
-		msg.getBody().setContents("hello world".getBytes());
+		msg.getBody().setByteArray("hello world".getBytes());
 		
 		try
 		{

Modified: labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/actions/scripting/GroovyActionProcessorUnitTest.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/actions/scripting/GroovyActionProcessorUnitTest.java	2007-05-11 10:52:13 UTC (rev 11835)
+++ labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/actions/scripting/GroovyActionProcessorUnitTest.java	2007-05-12 06:55:23 UTC (rev 11836)
@@ -58,7 +58,7 @@
 
         // Set the script as the message task object...
         ActionUtils.setTaskObject(message, "import org.jboss.soa.esb.message.*\n" +
-                "message.getBody().setContents(config.getAttribute(\"messageContents\").getBytes());");
+                "message.getBody().setByteArray(config.getAttribute(\"messageContents\").getBytes());");
 
         assertProcessingOK(processor, message, messageContents);
     }
@@ -66,7 +66,7 @@
     private void assertProcessingOK(GroovyActionProcessor processor, Message message, String messageContents) throws ActionLifecycleException, ActionProcessingException {
         processor.initialise();
         processor.process(message);
-        byte[] bodyContents = message.getBody().getContents();
+        byte[] bodyContents = message.getBody().getByteArray();
         assertNotNull("Expected body contents to be set.", bodyContents);
         assertEquals(messageContents, new String(bodyContents));
     }

Modified: labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/actions/scripting/test.groovy
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/actions/scripting/test.groovy	2007-05-11 10:52:13 UTC (rev 11835)
+++ labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/actions/scripting/test.groovy	2007-05-12 06:55:23 UTC (rev 11836)
@@ -1,3 +1,3 @@
 import org.jboss.soa.esb.message.*
 
-message.getBody().setContents(config.getAttribute("messageContents").getBytes());
\ No newline at end of file
+message.getBody().setByteArray(config.getAttribute("messageContents").getBytes());
\ No newline at end of file

Modified: labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/ListenerManagerBaseTest.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/ListenerManagerBaseTest.java	2007-05-11 10:52:13 UTC (rev 11835)
+++ labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/ListenerManagerBaseTest.java	2007-05-12 06:55:23 UTC (rev 11836)
@@ -259,7 +259,7 @@
 
 		public Message notifyTest(Message message) throws Exception
 		{
-			addMessage(message.getBody().getContents());
+			addMessage(message.getBody().getByteArray());
 
 			return message;
 		}

Modified: labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/ListenerManagerFTPIntegrationTest.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/ListenerManagerFTPIntegrationTest.java	2007-05-11 10:52:13 UTC (rev 11835)
+++ labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/ListenerManagerFTPIntegrationTest.java	2007-05-12 06:55:23 UTC (rev 11836)
@@ -87,7 +87,7 @@
 		
 		Message message = MessageFactory.getInstance().getMessage();
 		message.getHeader().setCall(new Call(toEPR));
-		message.getBody().setContents(THE_TEXT.getBytes());
+		message.getBody().setByteArray(THE_TEXT.getBytes());
 		
 		for (int i1 = 0; i1 < howMany; i1++)
 		{

Modified: labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/ListenerManagerFileUnitTest.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/ListenerManagerFileUnitTest.java	2007-05-11 10:52:13 UTC (rev 11835)
+++ labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/ListenerManagerFileUnitTest.java	2007-05-12 06:55:23 UTC (rev 11836)
@@ -119,7 +119,7 @@
 		
 		Message message = MessageFactory.getInstance().getMessage();
 		message.getHeader().setCall(new Call(toEPR));
-		message.getBody().setContents(THE_TEXT.getBytes());
+		message.getBody().setByteArray(THE_TEXT.getBytes());
 		
 		for (int i1 = 0; i1 < howMany; i1++)
 		{

Modified: labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/ListenerManagerJDBCUnitTest.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/ListenerManagerJDBCUnitTest.java	2007-05-11 10:52:13 UTC (rev 11835)
+++ labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/ListenerManagerJDBCUnitTest.java	2007-05-12 06:55:23 UTC (rev 11836)
@@ -110,7 +110,7 @@
 		
 		Message message = MessageFactory.getInstance().getMessage();
 		message.getHeader().setCall(new Call(toEPR));
-		message.getBody().setContents(THE_TEXT.getBytes());
+		message.getBody().setByteArray(THE_TEXT.getBytes());
 		
 		for (int i1 = 0; i1 < howMany; i1++)
 		{

Modified: labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/ListenerManagerJMSXntegrationTest.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/ListenerManagerJMSXntegrationTest.java	2007-05-11 10:52:13 UTC (rev 11835)
+++ labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/ListenerManagerJMSXntegrationTest.java	2007-05-12 06:55:23 UTC (rev 11836)
@@ -99,7 +99,7 @@
 		
 		Message message = MessageFactory.getInstance().getMessage();
 		message.getHeader().setCall(new Call(toEPR));
-		message.getBody().setContents(THE_TEXT.getBytes());
+		message.getBody().setByteArray(THE_TEXT.getBytes());
 		
 		for (int i1 = 0; i1 < howMany; i1++)
 		{

Modified: labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/message/format/serialized/BodyImpl.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/message/format/serialized/BodyImpl.java	2007-05-11 10:52:13 UTC (rev 11835)
+++ labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/message/format/serialized/BodyImpl.java	2007-05-12 06:55:23 UTC (rev 11836)
@@ -41,16 +41,26 @@
 		_objects = new Hashtable<String, Serializable>();
 	}
 	
-	public void setContents (byte[] content)
+	public void setByteArray (byte[] content)
 	{
 		_content = content;
 	}
 
-	public byte[] getContents ()
+	public byte[] getByteArray ()
 	{
 		return _content;
 	}
 	
+	public void setContents (byte[] content)
+	{
+		setByteArray(content);
+	}
+
+	public byte[] getContents ()
+	{
+		return getByteArray();
+	}
+	
 	public void add (Object value)
 	{
 		add(Body.DEFAULT_LOCATION, value);
@@ -112,7 +122,7 @@
 		if (b == null)
 			throw new IllegalArgumentException();
 		
-		setContents(b.getContents());
+		setByteArray(b.getByteArray());
 		
 		_objects = ((BodyImpl) b)._objects;
 	}
@@ -122,7 +132,7 @@
 		if (b == null)
 			throw new IllegalArgumentException();
 		
-		byte[] toAdd = b.getContents();
+		byte[] toAdd = b.getByteArray();
 		
 		if ((toAdd != null) && (toAdd.length > 0))
 		{

Modified: labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/message/format/xml/BodyImpl.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/message/format/xml/BodyImpl.java	2007-05-11 10:52:13 UTC (rev 11835)
+++ labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/message/format/xml/BodyImpl.java	2007-05-12 06:55:23 UTC (rev 11836)
@@ -238,22 +238,32 @@
 		}
 	}
 
-	public void setContents(byte[] content)
+	public void setByteArray(byte[] content)
 	{
 		_content = content;
 	}
 
-	public byte[] getContents()
+	public byte[] getByteArray()
 	{
 		return _content;
 	}
 
+	public void setContents (byte[] content)
+	{
+		setByteArray(content);
+	}
+
+	public byte[] getContents ()
+	{
+		return getByteArray();
+	}
+	
 	public void replace(Body b)
 	{
 		if (b == null)
 			throw new IllegalArgumentException();
 
-		setContents(b.getContents());
+		setByteArray(b.getByteArray());
 
 		_objects = ((BodyImpl) b)._objects;
 	}
@@ -263,7 +273,7 @@
 		if (b == null)
 			throw new IllegalArgumentException();
 
-		byte[] toAdd = b.getContents();
+		byte[] toAdd = b.getByteArray();
 
 		if ((toAdd != null) && (toAdd.length > 0))
 		{

Modified: labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/message/Body.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/message/Body.java	2007-05-11 10:52:13 UTC (rev 11835)
+++ labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/message/Body.java	2007-05-12 06:55:23 UTC (rev 11836)
@@ -91,15 +91,32 @@
 	 * affect any of the named objects or attachments.
 	 * 
 	 * @param content the message bytes
+	 * @deprecated As of 4.2 this has been replaced by setByteArray
 	 */
 	
 	public void setContents (byte[] content);
 	
 	/**
 	 * @return the byte content of the body.
+	 * @deprecated As of 4.2 this has been replaced by getByteArray
 	 */
 	
 	public byte[] getContents ();
+	
+	/**
+	 * Set the byte content of the body. This does not
+	 * affect any of the named objects or attachments.
+	 * 
+	 * @param content the message bytes
+	 */
+	
+	public void setByteArray (byte[] content);
+	
+	/**
+	 * @return the byte content of the body.
+	 */
+	
+	public byte[] getByteArray ();
 
 	/**
 	 * Replace this body instance with the one given.

Modified: labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/notification/NotifyConsole.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/notification/NotifyConsole.java	2007-05-11 10:52:13 UTC (rev 11835)
+++ labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/notification/NotifyConsole.java	2007-05-12 06:55:23 UTC (rev 11836)
@@ -38,8 +38,8 @@
 	public void sendNotification(Message message) throws NotificationException 
 	{
         String content=null;  
-        if (message.getBody().getContents()!=null) {
-            content = new String(message.getBody().getContents());
+        if (message.getBody().getByteArray()!=null) {
+            content = new String(message.getBody().getByteArray());
         }
 		System.out.println
 			("ConsoleNotifier "+Util.getStamp()+"<"+content+">");

Modified: labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/notification/NotifyEmail.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/notification/NotifyEmail.java	2007-05-11 10:52:13 UTC (rev 11835)
+++ labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/notification/NotifyEmail.java	2007-05-12 06:55:23 UTC (rev 11836)
@@ -94,8 +94,8 @@
 		try
 		{
             String content=null;
-            if (message.getBody().getContents()!=null) {
-                content = new String(message.getBody().getContents());
+            if (message.getBody().getByteArray()!=null) {
+                content = new String(message.getBody().getByteArray());
             }
 			ConfigTree oP = m_oParms.cloneObj();
 			String sMsg = oP.getAttribute(Email.MESSAGE);

Modified: labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/notification/NotifyFTP.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/notification/NotifyFTP.java	2007-05-11 10:52:13 UTC (rev 11835)
+++ labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/notification/NotifyFTP.java	2007-05-12 06:55:23 UTC (rev 11836)
@@ -184,7 +184,7 @@
 		try {
 			tmpFile = File.createTempFile(TEMP_FILE_BASE, null);
 			stream = new FileOutputStream(tmpFile);
-			IOUtils.write(message.getBody().getContents(), stream);
+			IOUtils.write(message.getBody().getByteArray(), stream);
 			stream.close();
 			rfs = RemoteFileSystemFactory.getRemoteFileSystem(getFtpEpr(), true);
 			rfs.uploadFile(tmpFile, getFileName(message));

Modified: labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/notification/NotifyFiles.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/notification/NotifyFiles.java	2007-05-11 10:52:13 UTC (rev 11835)
+++ labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/notification/NotifyFiles.java	2007-05-12 06:55:23 UTC (rev 11836)
@@ -154,13 +154,13 @@
 						notificationFile.append);
 				if (MessageType.JAVA_SERIALIZED.equals(message.getType()))
 				{
-                    objectNotification(fileOutStream, message.getBody().getContents());
+                    objectNotification(fileOutStream, message.getBody().getByteArray());
 				}
 				else
 				{
                     String content=null;
-                    if (message.getBody().getContents()!=null) {
-                        content = new String(message.getBody().getContents());
+                    if (message.getBody().getByteArray()!=null) {
+                        content = new String(message.getBody().getByteArray());
                     }
                     stringNotification(fileOutStream, content);
 				}

Modified: labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/notification/NotifyJMS.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/notification/NotifyJMS.java	2007-05-11 10:52:13 UTC (rev 11835)
+++ labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/notification/NotifyJMS.java	2007-05-12 06:55:23 UTC (rev 11836)
@@ -177,13 +177,13 @@
 	
 			if (MessageType.JAVA_SERIALIZED.equals(message.getType()))
 			{
-				oMsg = m_oSess[0].createObjectMessage(message.getBody().getContents());
+				oMsg = m_oSess[0].createObjectMessage(message.getBody().getByteArray());
 			}
 			else
 			{
                 String content=null;
-                if (message.getBody().getContents()!=null) {
-                    content = new String(message.getBody().getContents());
+                if (message.getBody().getByteArray()!=null) {
+                    content = new String(message.getBody().getByteArray());
                 }
 				oMsg = m_oSess[0].createTextMessage(content);
 			}

Modified: labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/notification/NotifySqlTable.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/notification/NotifySqlTable.java	2007-05-11 10:52:13 UTC (rev 11835)
+++ labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/notification/NotifySqlTable.java	2007-05-12 06:55:23 UTC (rev 11836)
@@ -124,8 +124,8 @@
 	public void sendNotification (Message message) throws NotificationException
 	{
         String content=null;
-        if (message.getBody().getContents()!=null) {
-            content = new String(message.getBody().getContents());
+        if (message.getBody().getByteArray()!=null) {
+            content = new String(message.getBody().getByteArray());
         }
 		m_oCols.setProperty(m_sDataCol, content);
 		JdbcCleanConn oConn = null;

Modified: labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/internal/soa/esb/couriers/tests/CourierIntegrationTest.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/internal/soa/esb/couriers/tests/CourierIntegrationTest.java	2007-05-11 10:52:13 UTC (rev 11835)
+++ labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/internal/soa/esb/couriers/tests/CourierIntegrationTest.java	2007-05-12 06:55:23 UTC (rev 11836)
@@ -114,7 +114,7 @@
 
 		Message message = MessageFactory.getInstance().getMessage();
 		message.getHeader().setCall(call);
-		message.getBody().setContents("Hello World".getBytes());
+		message.getBody().setByteArray("Hello World".getBytes());
 		Courier courier = CourierFactory.getCourier(call.getTo());
 
 		courier.deliver(message);

Modified: labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/internal/soa/esb/couriers/tests/FileCourierUnitTest.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/internal/soa/esb/couriers/tests/FileCourierUnitTest.java	2007-05-11 10:52:13 UTC (rev 11835)
+++ labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/internal/soa/esb/couriers/tests/FileCourierUnitTest.java	2007-05-12 06:55:23 UTC (rev 11836)
@@ -115,7 +115,7 @@
 		toEpr.setPostSuffix(TEST_SUFFIX);
 		
 		Message msg = MessageFactory.getInstance().getMessage();
-		msg.getBody().setContents(contents.getBytes());
+		msg.getBody().setByteArray(contents.getBytes());
 
 		Call call = new Call(toEpr);
 		String uid = UUID.randomUUID().toString();
@@ -139,7 +139,7 @@
 		Message retrieved = pickUp.pickup(1000);
 		Assert.assertFalse("Null message retrieved",null==retrieved);
 		
-		String back = new String(retrieved.getBody().getContents());
+		String back = new String(retrieved.getBody().getByteArray());
 		Assert.assertEquals(contents,back);
 		_logger.info("Contents of retrieved msg equal original text <"+back+">");
 		
@@ -165,7 +165,7 @@
 		toEpr.setPostSuffix(TEST_SUFFIX);
 		
 		Message msg = MessageFactory.getInstance().getMessage();
-		msg.getBody().setContents(contents.getBytes());
+		msg.getBody().setByteArray(contents.getBytes());
 
 		Call call = new Call(toEpr);
 		String uid = UUID.randomUUID().toString();
@@ -185,7 +185,7 @@
 		Message retrieved = pickUp.pickup(1000);
 		Assert.assertFalse("Null message retrieved",null==retrieved);
 		
-		String back = new String(retrieved.getBody().getContents());
+		String back = new String(retrieved.getBody().getByteArray());
 		Assert.assertEquals(contents,back);
 		_logger.info("Contents of retrieved msg equal original text <"+back+">");
 		
@@ -207,7 +207,7 @@
 		toEpr.setPostSuffix(TEST_SUFFIX);
 		
 		Message msg = MessageFactory.getInstance().getMessage();
-		msg.getBody().setContents(contents.getBytes());
+		msg.getBody().setByteArray(contents.getBytes());
 
 		Call call = new Call(toEpr);
 		final String uid = UUID.randomUUID().toString();
@@ -228,7 +228,7 @@
 		Message retrieved = pickUp.pickup(1000);
 		Assert.assertFalse("Null message retrieved",null==retrieved);
 		
-		String back = new String(retrieved.getBody().getContents());
+		String back = new String(retrieved.getBody().getByteArray());
 		Assert.assertEquals(contents,back);
 		_logger.info("Contents of retrieved msg equal original text <"+back+">");
 		

Modified: labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/addressing/eprs/tests/DefaultFileReplyToEprUnitTest.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/addressing/eprs/tests/DefaultFileReplyToEprUnitTest.java	2007-05-11 10:52:13 UTC (rev 11835)
+++ labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/addressing/eprs/tests/DefaultFileReplyToEprUnitTest.java	2007-05-12 06:55:23 UTC (rev 11836)
@@ -100,7 +100,7 @@
         	Message outgoingMsg = MessageFactory.getInstance().getMessage();
         	outgoingMsg.getHeader().getCall().setTo(toEpr);
         	outgoingMsg.getHeader().getCall().setReplyTo(replyToEpr);
-        	outgoingMsg.getBody().setContents(text_1.getBytes());
+        	outgoingMsg.getBody().setByteArray(text_1.getBytes());
         	CourierUtil.deliverMessage(outgoingMsg);
 
         	// Mock a service that picks up the original message and replies
@@ -109,7 +109,7 @@
         	serviceEpr.setPostDelete(true);
         	PickUpOnlyCourier listener = CourierFactory.getPickupCourier(serviceEpr);
         	Message received = listener.pickup(100);
-        	String text_2 = new String(received.getBody().getContents());
+        	String text_2 = new String(received.getBody().getByteArray());
         	assertTrue(text_1.equals(text_2));
         	assertTrue(replyToEpr.equals(received.getHeader().getCall().getReplyTo()));
         	
@@ -117,13 +117,13 @@
         	text_2	+= " + processed by listener";
         	Message response = MessageFactory.getInstance().getMessage();
         	response.getHeader().getCall().setTo(received.getHeader().getCall().getReplyTo());
-        	response.getBody().setContents(text_2.getBytes());
+        	response.getBody().setByteArray(text_2.getBytes());
         	CourierUtil.deliverMessage(response);
         	
         	// try to pick up reply
         	PickUpOnlyCourier waiter = CourierFactory.getPickupCourier(replyToEpr);
         	Message finalMsg = waiter.pickup(100);
-        	assertTrue(text_2.equals(new String(finalMsg.getBody().getContents())));
+        	assertTrue(text_2.equals(new String(finalMsg.getBody().getByteArray())));
         	
         	_logger.info(text_2+"... and back from local filesystem");
         	_logger.info("getDefaultReplyToEpr test succeeded for local file transport");

Modified: labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/addressing/eprs/tests/DefaultFtpReplyToEprIntegrationTest.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/addressing/eprs/tests/DefaultFtpReplyToEprIntegrationTest.java	2007-05-11 10:52:13 UTC (rev 11835)
+++ labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/addressing/eprs/tests/DefaultFtpReplyToEprIntegrationTest.java	2007-05-12 06:55:23 UTC (rev 11836)
@@ -101,7 +101,7 @@
         	Message outgoingMsg = MessageFactory.getInstance().getMessage();
         	outgoingMsg.getHeader().getCall().setTo(toEpr);
         	outgoingMsg.getHeader().getCall().setReplyTo(replyToEpr);
-        	outgoingMsg.getBody().setContents(text_1.getBytes());
+        	outgoingMsg.getBody().setByteArray(text_1.getBytes());
         	CourierUtil.deliverMessage(outgoingMsg);
 
         	// Mock a service that picks up the original message and replies
@@ -110,7 +110,7 @@
         	serviceEpr.setPostDelete(true);
         	PickUpOnlyCourier listener = CourierFactory.getPickupCourier(serviceEpr);
         	Message received = listener.pickup(100);
-        	String text_2 = new String(received.getBody().getContents());
+        	String text_2 = new String(received.getBody().getByteArray());
         	assertTrue(text_1.equals(text_2));
         	assertTrue(replyToEpr.equals(received.getHeader().getCall().getReplyTo()));
         	
@@ -118,13 +118,13 @@
         	text_2	+= " + processed by listener";
         	Message response = MessageFactory.getInstance().getMessage();
         	response.getHeader().getCall().setTo(received.getHeader().getCall().getReplyTo());
-        	response.getBody().setContents(text_2.getBytes());
+        	response.getBody().setByteArray(text_2.getBytes());
         	CourierUtil.deliverMessage(response);
         	
         	// try to pick up reply
         	PickUpOnlyCourier waiter = CourierFactory.getPickupCourier(replyToEpr);
         	Message finalMsg = waiter.pickup(100);
-        	assertTrue(text_2.equals(new String(finalMsg.getBody().getContents())));
+        	assertTrue(text_2.equals(new String(finalMsg.getBody().getByteArray())));
         	
         	_logger.info(text_2+"... and back from FTP server");
         	_logger.info("getDefaultReplyToEpr test succeeded for FTP transport");

Modified: labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/addressing/eprs/tests/DefaultJdbcReplyToEprUnitTest.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/addressing/eprs/tests/DefaultJdbcReplyToEprUnitTest.java	2007-05-11 10:52:13 UTC (rev 11835)
+++ labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/addressing/eprs/tests/DefaultJdbcReplyToEprUnitTest.java	2007-05-12 06:55:23 UTC (rev 11836)
@@ -131,14 +131,14 @@
         	Message outgoingMsg = MessageFactory.getInstance().getMessage();
         	outgoingMsg.getHeader().getCall().setTo(toEpr);
         	outgoingMsg.getHeader().getCall().setReplyTo(replyToEpr);
-        	outgoingMsg.getBody().setContents(text_1.getBytes());
+        	outgoingMsg.getBody().setByteArray(text_1.getBytes());
         	CourierUtil.deliverMessage(outgoingMsg);
 
         	// Mock a service that picks up the original message and replies
         	JDBCEpr serviceEpr = getEpr("foo");
         	PickUpOnlyCourier listener = CourierFactory.getPickupCourier(serviceEpr);
         	Message received = listener.pickup(100);
-        	String text_2 = new String(received.getBody().getContents());
+        	String text_2 = new String(received.getBody().getByteArray());
         	assertTrue(text_1.equals(text_2));
 //        	assertTrue(replyToEpr.equals(received.getHeader().getCall().getReplyTo()));
         	
@@ -146,13 +146,13 @@
         	text_2	+= " + processed by listener";
         	Message response = MessageFactory.getInstance().getMessage();
         	response.getHeader().getCall().setTo(received.getHeader().getCall().getReplyTo());
-        	response.getBody().setContents(text_2.getBytes());
+        	response.getBody().setByteArray(text_2.getBytes());
         	CourierUtil.deliverMessage(response);
         	
         	// try to pick up reply
         	PickUpOnlyCourier waiter = CourierFactory.getPickupCourier(replyToEpr);
         	Message finalMsg = waiter.pickup(100);
-        	assertTrue(text_2.equals(new String(finalMsg.getBody().getContents())));
+        	assertTrue(text_2.equals(new String(finalMsg.getBody().getByteArray())));
         	
         	_logger.info(text_2+"... and back from jdbc ReplyTo EPR");
         	_logger.info("getDefaultReplyToEpr test succeeded for JDBC message transport");

Modified: labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/message/tests/SerializedMessageUnitTest.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/message/tests/SerializedMessageUnitTest.java	2007-05-11 10:52:13 UTC (rev 11835)
+++ labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/message/tests/SerializedMessageUnitTest.java	2007-05-12 06:55:23 UTC (rev 11836)
@@ -167,7 +167,7 @@
 		
 		String testString = "test";
 		
-		msg.getBody().setContents(testString.getBytes());
+		msg.getBody().setByteArray(testString.getBytes());
 		
 		try
 		{
@@ -184,7 +184,7 @@
 			
 			o.close();
 			
-			String val = new String(nImpl.getBody().getContents());
+			String val = new String(nImpl.getBody().getByteArray());
 			
 			assertEquals(val, testString);
 		}
@@ -210,12 +210,12 @@
 		
 		String bar = "bar";
 		
-		msg1.getBody().setContents(foo.getBytes());
-		msg2.getBody().setContents(bar.getBytes());
+		msg1.getBody().setByteArray(foo.getBytes());
+		msg2.getBody().setByteArray(bar.getBytes());
 		
 		msg1.getBody().replace(msg2.getBody());
 		
-		String foobar = new String(msg1.getBody().getContents());
+		String foobar = new String(msg1.getBody().getByteArray());
 		
 		assertEquals(foobar.equals("bar"), true);
 	}
@@ -236,12 +236,12 @@
 		
 		String bar = "bar";
 		
-		msg1.getBody().setContents(foo.getBytes());
-		msg2.getBody().setContents(bar.getBytes());
+		msg1.getBody().setByteArray(foo.getBytes());
+		msg2.getBody().setByteArray(bar.getBytes());
 		
 		msg1.getBody().merge(msg2.getBody());
 		
-		String foobar = new String(msg1.getBody().getContents());
+		String foobar = new String(msg1.getBody().getByteArray());
 		
 		assertEquals(foobar, "foobar");
 	}

Modified: labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/message/tests/XMLMessageUnitTest.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/message/tests/XMLMessageUnitTest.java	2007-05-11 10:52:13 UTC (rev 11835)
+++ labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/message/tests/XMLMessageUnitTest.java	2007-05-12 06:55:23 UTC (rev 11836)
@@ -162,7 +162,7 @@
 		
 		String testString = "test";
 		
-		msg.getBody().setContents(testString.getBytes());
+		msg.getBody().setByteArray(testString.getBytes());
 		
 		try
 		{
@@ -171,7 +171,7 @@
 			
 			final MessageImpl nImpl = msgFromXML(xmlRepresentation) ;
 			
-			String val = new String(nImpl.getBody().getContents());
+			String val = new String(nImpl.getBody().getByteArray());
 			
 			assertEquals(val, testString);
 		}
@@ -197,12 +197,12 @@
 		
 		String bar = "bar";
 		
-		msg1.getBody().setContents(foo.getBytes());
-		msg2.getBody().setContents(bar.getBytes());
+		msg1.getBody().setByteArray(foo.getBytes());
+		msg2.getBody().setByteArray(bar.getBytes());
 		
 		msg1.getBody().replace(msg2.getBody());
 		
-		String foobar = new String(msg1.getBody().getContents());
+		String foobar = new String(msg1.getBody().getByteArray());
 		
 		assertEquals(foobar, "bar");
 	}
@@ -223,12 +223,12 @@
 		
 		String bar = "bar";
 		
-		msg1.getBody().setContents(foo.getBytes());
-		msg2.getBody().setContents(bar.getBytes());
+		msg1.getBody().setByteArray(foo.getBytes());
+		msg2.getBody().setByteArray(bar.getBytes());
 		
 		msg1.getBody().merge(msg2.getBody());
 		
-		String foobar = new String(msg1.getBody().getContents());
+		String foobar = new String(msg1.getBody().getByteArray());
 		
 		assertEquals(foobar, "foobar");
 	}

Modified: labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/notification/NotificationListUnitTest.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/notification/NotificationListUnitTest.java	2007-05-11 10:52:13 UTC (rev 11835)
+++ labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/notification/NotificationListUnitTest.java	2007-05-12 06:55:23 UTC (rev 11836)
@@ -46,7 +46,7 @@
 		TestNotificationTarget2.messageList = messageList;
 		
         Message message = MessageFactory.getInstance().getMessage(MessageType.JBOSS_XML);
-        message.getBody().setContents("tom".getBytes());
+        message.getBody().setByteArray("tom".getBytes());
 		nList.sendNotification(message);
 		assertEquals(4, messageList.size());
 		assertEquals("message 1-tom", messageList.get(0));

Modified: labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/notification/NotifyEmailUnitTest.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/notification/NotifyEmailUnitTest.java	2007-05-11 10:52:13 UTC (rev 11835)
+++ labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/notification/NotifyEmailUnitTest.java	2007-05-12 06:55:23 UTC (rev 11836)
@@ -48,7 +48,7 @@
 		
 		NotifyEmail ne = new TestNotifyEmail(emailMessageEl);
         Message message = MessageFactory.getInstance().getMessage(MessageType.JBOSS_XML);
-        message.getBody().setContents("Hello".getBytes());
+        message.getBody().setByteArray("Hello".getBytes());
 		ne.sendNotification(message);
 	}
 	

Modified: labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/notification/NotifyFilesUnitTest.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/notification/NotifyFilesUnitTest.java	2007-05-11 10:52:13 UTC (rev 11835)
+++ labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/notification/NotifyFilesUnitTest.java	2007-05-12 06:55:23 UTC (rev 11836)
@@ -79,7 +79,7 @@
 		// Create the class and call the sendNotification method twice...
 		notifyFiles = new NotifyFiles(rootEl);
         Message message = MessageFactory.getInstance().getMessage(MessageType.JAVA_SERIALIZED);
-        message.getBody().setContents("object".getBytes());
+        message.getBody().setByteArray("object".getBytes());
 		notifyFiles.sendNotification(message);
 		notifyFiles.sendNotification(message);
 

Modified: labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/notification/NotifyQueuesUnitTest.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/notification/NotifyQueuesUnitTest.java	2007-05-11 10:52:13 UTC (rev 11835)
+++ labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/notification/NotifyQueuesUnitTest.java	2007-05-12 06:55:23 UTC (rev 11836)
@@ -83,7 +83,7 @@
 
 	public void test_StringObj() throws Exception {
         org.jboss.soa.esb.message.Message message = MessageFactory.getInstance().getMessage(MessageType.JBOSS_XML);
-        message.getBody().setContents("Hello".getBytes());
+        message.getBody().setByteArray("Hello".getBytes());
 		notifyQueues.sendNotification(message);
 		
 		checkQueueTextMessage(mockQueue1, 0, "Hello");
@@ -92,7 +92,7 @@
 	
 	public void test_NonStringObj() throws Exception {
         org.jboss.soa.esb.message.Message message = MessageFactory.getInstance().getMessage(MessageType.JAVA_SERIALIZED);
-        message.getBody().setContents(((new Integer(123).toString().getBytes())));
+        message.getBody().setByteArray(((new Integer(123).toString().getBytes())));
 		notifyQueues.sendNotification(message);
 		
 		checkQueueObjectMessage(mockQueue1, 0, new Integer(123).toString().getBytes());

Modified: labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/notification/NotifyTopicsUnitTest.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/notification/NotifyTopicsUnitTest.java	2007-05-11 10:52:13 UTC (rev 11835)
+++ labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/notification/NotifyTopicsUnitTest.java	2007-05-12 06:55:23 UTC (rev 11836)
@@ -78,7 +78,7 @@
 
 	public void test_StringObj() throws Exception {
         org.jboss.soa.esb.message.Message message = MessageFactory.getInstance().getMessage(MessageType.JBOSS_XML);
-        message.getBody().setContents("Hello".getBytes());
+        message.getBody().setByteArray("Hello".getBytes());
 		notifyTopics.sendNotification(message);
 		
 		checkTopicTextMessage(mockTopic1, 0, "Hello");
@@ -87,7 +87,7 @@
 	
 	public void test_NonStringObj() throws Exception {
         org.jboss.soa.esb.message.Message message = MessageFactory.getInstance().getMessage(MessageType.JAVA_SERIALIZED);
-        message.getBody().setContents((new Integer(123).toString().getBytes()));
+        message.getBody().setByteArray((new Integer(123).toString().getBytes()));
 		notifyTopics.sendNotification(message);
 		
 		checkTopicObjectMessage(mockTopic1, 0, new Integer(123).toString().getBytes());

Modified: labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/notification/TestNotificationTarget1.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/notification/TestNotificationTarget1.java	2007-05-11 10:52:13 UTC (rev 11835)
+++ labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/notification/TestNotificationTarget1.java	2007-05-12 06:55:23 UTC (rev 11836)
@@ -22,7 +22,7 @@
 	public void sendNotification (Message message)
 			throws NotificationException
 	{
-        String content = new String(message.getBody().getContents());
+        String content = new String(message.getBody().getByteArray());
 		messageList.add(config.getAttribute("message") + "-" + content);
 	}
 }

Modified: labs/jbossesb/trunk/product/core/services/src/org/jboss/internal/soa/esb/persistence/format/jcr/JCRMessageStoreImpl.java
===================================================================
--- labs/jbossesb/trunk/product/core/services/src/org/jboss/internal/soa/esb/persistence/format/jcr/JCRMessageStoreImpl.java	2007-05-11 10:52:13 UTC (rev 11835)
+++ labs/jbossesb/trunk/product/core/services/src/org/jboss/internal/soa/esb/persistence/format/jcr/JCRMessageStoreImpl.java	2007-05-12 06:55:23 UTC (rev 11836)
@@ -112,9 +112,9 @@
 			msgProps.setMessageId(messageURI.toString());
 			Node messageNode = root.addNode(messageURI.toString());
 			Node bodyNode = messageNode.addNode(JCRNodeNames.BODY_NODE_NAME);
-			if (message.getBody().getContents() != null) {
+			if (message.getBody().getByteArray() != null) {
 				ByteArrayInputStream stream = new ByteArrayInputStream(
-						message.getBody().getContents());
+						message.getBody().getByteArray());
 				bodyNode.setProperty(JCRNodeNames.BODY_CONTENT_PROP_NAME, stream);
 			}
 			for (String propName : message.getProperties().getNames()) {
@@ -155,7 +155,7 @@
 			Message message = MessageFactory.getInstance().getMessage();
 			if (bodyContents != null) {
 				byte[] contentBytes = IOUtils.toByteArray(bodyContents.getStream());
-				message.getBody().setContents(contentBytes);
+				message.getBody().setByteArray(contentBytes);
 			}
 			if (LOGGER.isInfoEnabled()) {
 				LOGGER.info("Loaded node from content repository:");

Modified: labs/jbossesb/trunk/product/core/services/src/org/jboss/internal/soa/esb/services/routing/cbr/DslHelper.java
===================================================================
--- labs/jbossesb/trunk/product/core/services/src/org/jboss/internal/soa/esb/services/routing/cbr/DslHelper.java	2007-05-11 10:52:13 UTC (rev 11835)
+++ labs/jbossesb/trunk/product/core/services/src/org/jboss/internal/soa/esb/services/routing/cbr/DslHelper.java	2007-05-12 06:55:23 UTC (rev 11836)
@@ -58,7 +58,7 @@
 			log.debug("Trying to match xpath: '" + xpathExp +  "' in message=" + message);
 		}
 		XPath xpath = xpf.newXPath();
-		InputSource inputSource = new InputSource(new ByteArrayInputStream(message.getBody().getContents()));
+		InputSource inputSource = new InputSource(new ByteArrayInputStream(message.getBody().getByteArray()));
 		Object node = xpath.evaluate(xpathExp, inputSource, XPathConstants.NODE);
 		if (log.isDebugEnabled()) {
 			log.debug("Found node=" + node);
@@ -77,10 +77,10 @@
 	public static boolean xmlContentEquals(Message message, String xpathExp, String value) throws XPathExpressionException 
 	{
 		if (log.isDebugEnabled()) {
-			log.debug("Trying to match xpath: '" + xpathExp +  "' in message=" + message.getBody().getContents());
+			log.debug("Trying to match xpath: '" + xpathExp +  "' in message=" + message.getBody().getByteArray());
 		}
 		XPath xpath = xpf.newXPath();
-		InputSource inputSource = new InputSource(new ByteArrayInputStream(message.getBody().getContents()));
+		InputSource inputSource = new InputSource(new ByteArrayInputStream(message.getBody().getByteArray()));
 		String nodeValue = (String) xpath.evaluate(xpathExp, inputSource, XPathConstants.STRING);
 		if (log.isDebugEnabled()) {
 			log.debug("Found nodeValue=" + nodeValue + " which is matched to given value=" + value);
@@ -104,10 +104,10 @@
 		double doubleNodeValue=0;
 		
 		if (log.isDebugEnabled()) {
-			log.debug("Trying to match xpath: '" + xpathExp +  "' in message=" + message.getBody().getContents());
+			log.debug("Trying to match xpath: '" + xpathExp +  "' in message=" + message.getBody().getByteArray());
 		}
 		XPath xpath = xpf.newXPath();
-		InputSource inputSource = new InputSource(new ByteArrayInputStream(message.getBody().getContents()));	
+		InputSource inputSource = new InputSource(new ByteArrayInputStream(message.getBody().getByteArray()));	
 		nodeValue = (String) xpath.evaluate(xpathExp, inputSource, XPathConstants.STRING);if (log.isDebugEnabled()) {
 			log.debug("Found nodeValue=" + nodeValue + " which is matched to given value=" + value);
 		}
@@ -146,10 +146,10 @@
 		double doubleNodeValue=0;
 		
 		if (log.isDebugEnabled()) {
-			log.debug("Trying to match xpath: '" + xpathExp +  "' in message=" + message.getBody().getContents());
+			log.debug("Trying to match xpath: '" + xpathExp +  "' in message=" + message.getBody().getByteArray());
 		}
 		XPath xpath = xpf.newXPath();
-		InputSource inputSource = new InputSource(new ByteArrayInputStream(message.getBody().getContents()));	
+		InputSource inputSource = new InputSource(new ByteArrayInputStream(message.getBody().getByteArray()));	
 		nodeValue = (String) xpath.evaluate(xpathExp, inputSource, XPathConstants.STRING);if (log.isDebugEnabled()) {
 			log.debug("Found nodeValue=" + nodeValue + " which is matched to given value=" + value);
 		}

Modified: labs/jbossesb/trunk/product/core/services/tests/src/org/jboss/internal/soa/esb/services/routing/cbr/JBossRulesRouterUnitTest.java
===================================================================
--- labs/jbossesb/trunk/product/core/services/tests/src/org/jboss/internal/soa/esb/services/routing/cbr/JBossRulesRouterUnitTest.java	2007-05-11 10:52:13 UTC (rev 11835)
+++ labs/jbossesb/trunk/product/core/services/tests/src/org/jboss/internal/soa/esb/services/routing/cbr/JBossRulesRouterUnitTest.java	2007-05-12 06:55:23 UTC (rev 11836)
@@ -53,7 +53,7 @@
 		message.getProperties().setProperty("prop1", "val1");
 		message.getProperties().setProperty("prop2", "val2");
 		//set the body inside the Message
-		message.getBody().setContents(("TEST BODY").getBytes());
+		message.getBody().setByteArray(("TEST BODY").getBytes());
 		//set some object attachments inside the Message
 		message.getAttachment().addItem(new String("TEST ATTACHMENT1"));
 		message.getAttachment().addItem(new String("TEST ATTACHMENT2"));
@@ -78,7 +78,7 @@
 		message.getProperties().setProperty("prop1", "val1");
 		message.getProperties().setProperty("prop2", "val2");
 		//set the body inside the Message
-		message.getBody().setContents(("TEST BODY").getBytes());
+		message.getBody().setByteArray(("TEST BODY").getBytes());
 		//set some object attachments inside the Message
 		message.getAttachment().addItem(new String("TEST ATTACHMENT1"));
 		message.getAttachment().addItem(new String("TEST ATTACHMENT2"));

Modified: labs/jbossesb/trunk/product/core/services/tests/src/org/jboss/soa/esb/esb/persistence/tests/MessageStoreUnitTest.java
===================================================================
--- labs/jbossesb/trunk/product/core/services/tests/src/org/jboss/soa/esb/esb/persistence/tests/MessageStoreUnitTest.java	2007-05-11 10:52:13 UTC (rev 11835)
+++ labs/jbossesb/trunk/product/core/services/tests/src/org/jboss/soa/esb/esb/persistence/tests/MessageStoreUnitTest.java	2007-05-12 06:55:23 UTC (rev 11836)
@@ -168,8 +168,8 @@
 		msg2.getProperties().setProperty("prop2", "val2");
 
 		// set the body inside the Message
-		msg1.getBody().setContents(("TEST BODY").getBytes());
-		msg2.getBody().setContents(("TEST BODY").getBytes());
+		msg1.getBody().setByteArray(("TEST BODY").getBytes());
+		msg2.getBody().setByteArray(("TEST BODY").getBytes());
 
 		// set some object attachments inside the Message
 		msg1.getAttachment().addItem(new String("TEST ATTACHMENT1"));

Modified: labs/jbossesb/trunk/product/core/services/tests/src/org/jboss/soa/esb/services/routing/cbr/ContentBasedRoutingUnitTest.java
===================================================================
--- labs/jbossesb/trunk/product/core/services/tests/src/org/jboss/soa/esb/services/routing/cbr/ContentBasedRoutingUnitTest.java	2007-05-11 10:52:13 UTC (rev 11835)
+++ labs/jbossesb/trunk/product/core/services/tests/src/org/jboss/soa/esb/services/routing/cbr/ContentBasedRoutingUnitTest.java	2007-05-12 06:55:23 UTC (rev 11836)
@@ -53,7 +53,7 @@
 			message.getProperties().setProperty("prop1", "val1");
 			message.getProperties().setProperty("prop2", "val2");
 			//set the body inside the Message
-			message.getBody().setContents(("TEST BODY").getBytes());
+			message.getBody().setByteArray(("TEST BODY").getBytes());
 			//set some object attachments inside the Message
 			message.getAttachment().addItem(new String("TEST ATTACHMENT1"));
 			message.getAttachment().addItem(new String("TEST ATTACHMENT2"));
@@ -77,7 +77,7 @@
 			message.getProperties().setProperty("prop1", "val1");
 			message.getProperties().setProperty("prop2", "val2");
 			//set the body inside the Message
-			message.getBody().setContents(("TEST BODY").getBytes());
+			message.getBody().setByteArray(("TEST BODY").getBytes());
 			//set some object attachments inside the Message
 			message.getAttachment().addItem(new String("TEST ATTACHMENT1"));
 			message.getAttachment().addItem(new String("TEST ATTACHMENT2"));
@@ -100,7 +100,7 @@
 			message.getProperties().setProperty("prop1", "val1");
 			message.getProperties().setProperty("prop2", "val2");
 			//set the body inside the Message
-			message.getBody().setContents(("<jbossesb>TEST BODY</jbossesb>").getBytes());
+			message.getBody().setByteArray(("<jbossesb>TEST BODY</jbossesb>").getBytes());
 			//set some object attachments inside the Message
 			message.getAttachment().addItem(new String("TEST ATTACHMENT1"));
 			message.getAttachment().addItem(new String("TEST ATTACHMENT2"));
@@ -120,7 +120,7 @@
 			//add new messages
 			Message message = MessageFactory.getInstance().getMessage(MessageType.JBOSS_XML);
 			//set the body inside the Message
-			message.getBody().setContents(("<Dave>rocks</Dave>").getBytes());
+			message.getBody().setByteArray(("<Dave>rocks</Dave>").getBytes());
 		
 			ContentBasedRouter cbr = ContentBasedRouterFactory.getRouter();
 			List<String> destinationServices = cbr.route("JBossESBRules-XPath.drl","XPathLanguage.dsl",false,message);
@@ -137,7 +137,7 @@
 			//add new messages
 			Message message = MessageFactory.getInstance().getMessage(MessageType.JBOSS_XML);
 			//set the body inside the Message
-			message.getBody().setContents(("<price>1.55</price>").getBytes());
+			message.getBody().setByteArray(("<price>1.55</price>").getBytes());
 			
 			ContentBasedRouter cbr = ContentBasedRouterFactory.getRouter();
 			List<String> destinationServices = cbr.route("JBossESBRules-XPath.drl","XPathLanguage.dsl",false,message);
@@ -154,7 +154,7 @@
 			//add new messages
 			Message message = MessageFactory.getInstance().getMessage(MessageType.JBOSS_XML);
 			//set the body inside the Message
-			message.getBody().setContents(("<price>0.55</price>").getBytes());
+			message.getBody().setByteArray(("<price>0.55</price>").getBytes());
 			
 			ContentBasedRouter cbr = ContentBasedRouterFactory.getRouter();
 			List<String> destinationServices = cbr.route("JBossESBRules-XPath.drl","XPathLanguage.dsl",false,message);

Modified: labs/jbossesb/trunk/product/docs/ProgrammersGuide.odt
===================================================================
(Binary files differ)

Modified: labs/jbossesb/trunk/product/samples/quickstarts/aggregator/src/org/jboss/soa/esb/dvdstore/DVDStoreAction.java
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/aggregator/src/org/jboss/soa/esb/dvdstore/DVDStoreAction.java	2007-05-11 10:52:13 UTC (rev 11835)
+++ labs/jbossesb/trunk/product/samples/quickstarts/aggregator/src/org/jboss/soa/esb/dvdstore/DVDStoreAction.java	2007-05-12 06:55:23 UTC (rev 11836)
@@ -65,7 +65,7 @@
 		}
 		
 		// Take this "parsed" output and make it a new message
-		message.getBody().setContents(results.toString().getBytes());
+		message.getBody().setByteArray(results.toString().getBytes());
 		return message;
 	}
 }

Modified: labs/jbossesb/trunk/product/samples/quickstarts/aggregator/src/org/jboss/soa/esb/dvdstore/RetrieveCustomerAction.java
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/aggregator/src/org/jboss/soa/esb/dvdstore/RetrieveCustomerAction.java	2007-05-11 10:52:13 UTC (rev 11835)
+++ labs/jbossesb/trunk/product/samples/quickstarts/aggregator/src/org/jboss/soa/esb/dvdstore/RetrieveCustomerAction.java	2007-05-12 06:55:23 UTC (rev 11836)
@@ -50,7 +50,7 @@
 		} else {			
 			results.append("\n*** No beanhash found, failed to transform");
 		}	
-		message.getBody().setContents(results.toString().getBytes());
+		message.getBody().setByteArray(results.toString().getBytes());
 		return message;
 	}
 }

Modified: labs/jbossesb/trunk/product/samples/quickstarts/aggregator/src/org/jboss/soa/esb/dvdstore/RetrieveLineItemsAction.java
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/aggregator/src/org/jboss/soa/esb/dvdstore/RetrieveLineItemsAction.java	2007-05-11 10:52:13 UTC (rev 11835)
+++ labs/jbossesb/trunk/product/samples/quickstarts/aggregator/src/org/jboss/soa/esb/dvdstore/RetrieveLineItemsAction.java	2007-05-12 06:55:23 UTC (rev 11836)
@@ -58,7 +58,7 @@
 		}
 		
 		// Take this "parsed" output and make it a new message
-		message.getBody().setContents(results.toString().getBytes());
+		message.getBody().setByteArray(results.toString().getBytes());
 		return message;
 	}
 }

Modified: labs/jbossesb/trunk/product/samples/quickstarts/aggregator/src/org/jboss/soa/esb/dvdstore/RetrieveOrderAction.java
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/aggregator/src/org/jboss/soa/esb/dvdstore/RetrieveOrderAction.java	2007-05-11 10:52:13 UTC (rev 11835)
+++ labs/jbossesb/trunk/product/samples/quickstarts/aggregator/src/org/jboss/soa/esb/dvdstore/RetrieveOrderAction.java	2007-05-12 06:55:23 UTC (rev 11836)
@@ -53,7 +53,7 @@
 			results.append("\n*** No beanhash found!");
 		}
 			
-		message.getBody().setContents(results.toString().getBytes());
+		message.getBody().setByteArray(results.toString().getBytes());
 		return message;
 	}
 }

Modified: labs/jbossesb/trunk/product/samples/quickstarts/aggregator/src/org/jboss/soa/esb/samples/quickstart/aggregator/MyJMSListenerAction.java
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/aggregator/src/org/jboss/soa/esb/samples/quickstart/aggregator/MyJMSListenerAction.java	2007-05-11 10:52:13 UTC (rev 11835)
+++ labs/jbossesb/trunk/product/samples/quickstarts/aggregator/src/org/jboss/soa/esb/samples/quickstart/aggregator/MyJMSListenerAction.java	2007-05-12 06:55:23 UTC (rev 11836)
@@ -35,7 +35,7 @@
 
   public Message displayMessage(Message message) throws Exception{		
 		  logHeader();
-		  System.out.println(new String(message.getBody().getContents()));
+		  System.out.println(new String(message.getBody().getByteArray()));
 		  logFooter();
 		  return message;         	
 	}
@@ -45,7 +45,7 @@
 	   System.out.println("!ERROR!");
 	   System.out.println(exception.getMessage());
 	   System.out.println("For Message: ");
-	   System.out.println(message.getBody().getContents());
+	   System.out.println(message.getBody().getByteArray());
 	   logFooter();
    }
 	

Modified: labs/jbossesb/trunk/product/samples/quickstarts/aggregator/src/org/jboss/soa/esb/samples/quickstart/aggregator/ReturnJMSMessage.java
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/aggregator/src/org/jboss/soa/esb/samples/quickstart/aggregator/ReturnJMSMessage.java	2007-05-11 10:52:13 UTC (rev 11835)
+++ labs/jbossesb/trunk/product/samples/quickstarts/aggregator/src/org/jboss/soa/esb/samples/quickstart/aggregator/ReturnJMSMessage.java	2007-05-12 06:55:23 UTC (rev 11836)
@@ -55,7 +55,7 @@
     	conn.start();
 
     	    	   
-    	String newMsg = new String(esbMessage.getBody().getContents());
+    	String newMsg = new String(esbMessage.getBody().getByteArray());
 
     	
     	QueueSender send = session.createSender(que);        

Modified: labs/jbossesb/trunk/product/samples/quickstarts/aggregator/src/org/jboss/soa/esb/samples/quickstart/aggregator/TeamAlert.java
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/aggregator/src/org/jboss/soa/esb/samples/quickstart/aggregator/TeamAlert.java	2007-05-11 10:52:13 UTC (rev 11835)
+++ labs/jbossesb/trunk/product/samples/quickstarts/aggregator/src/org/jboss/soa/esb/samples/quickstart/aggregator/TeamAlert.java	2007-05-12 06:55:23 UTC (rev 11836)
@@ -33,7 +33,7 @@
 	  public Message sendResponseBlue(Message message) {
 		  try {
 			   logHeader();
-			   System.out.println(new String(message.getBody().getContents()));
+			   System.out.println(new String(message.getBody().getByteArray()));
 			   System.out.println("Blue Blue Blue");
 			   logFooter();
 			   ReturnJMSMessage.sendMessage(message,"quickstart_Fun_CBR_Blue_Alert");
@@ -48,7 +48,7 @@
 	  public Message sendResponseRed(Message message) {
 		  try {
 			   logHeader();
-			   System.out.println(new String(message.getBody().getContents()));
+			   System.out.println(new String(message.getBody().getByteArray()));
 			   System.out.println("Red Red Red");
 			   logFooter();
 			   ReturnJMSMessage.sendMessage(message,"quickstart_Fun_CBR_Red_Alert");
@@ -63,7 +63,7 @@
 	  public Message sendResponseGreen(Message message) {
 		  try {
 			   logHeader();
-			   System.out.println(new String(message.getBody().getContents()));
+			   System.out.println(new String(message.getBody().getByteArray()));
 			   System.out.println("Green Green Green");
 			   logFooter();
 			   ReturnJMSMessage.sendMessage(message,"quickstart_Fun_CBR_Green_Alert");

Modified: labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration1/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration1/esb_actions/MessageSpy.java
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration1/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration1/esb_actions/MessageSpy.java	2007-05-11 10:52:13 UTC (rev 11835)
+++ labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration1/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration1/esb_actions/MessageSpy.java	2007-05-12 06:55:23 UTC (rev 11836)
@@ -34,8 +34,8 @@
 	
 	  // modify to use the logger
 	public Message process(Message message) throws Exception {		
-		if (message.getBody() != null && message.getBody().getContents() != null) {
-			logger.info("Body: " + new String(message.getBody().getContents()));
+		if (message.getBody() != null && message.getBody().getByteArray() != null) {
+			logger.info("Body: " + new String(message.getBody().getByteArray()));
 		} else {
 			logger.info("Body Contents are NULL");
 		}

Modified: labs/jbossesb/trunk/product/samples/quickstarts/business_service/src/org/jboss/soa/esb/samples/quickstart/businessservice/MyAction.java
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/business_service/src/org/jboss/soa/esb/samples/quickstart/businessservice/MyAction.java	2007-05-11 10:52:13 UTC (rev 11835)
+++ labs/jbossesb/trunk/product/samples/quickstarts/business_service/src/org/jboss/soa/esb/samples/quickstart/businessservice/MyAction.java	2007-05-12 06:55:23 UTC (rev 11836)
@@ -38,7 +38,7 @@
 
   public Message displayMessage(Message message) throws Exception{		
 		  logHeader();
-		  System.out.println("Body: " + new String(message.getBody().getContents()));
+		  System.out.println("Body: " + new String(message.getBody().getByteArray()));
 		  logFooter();
 		  return message;         	
 	}
@@ -46,7 +46,7 @@
    public Message playWithMessage(Message message) throws Exception {
 	   Body msgBody = message.getBody();
      String results = new String();
-	   String contents = new String(msgBody.getContents());
+	   String contents = new String(msgBody.getByteArray());
      try {
      		InitialContext ctx = new InitialContext();
            		
@@ -57,7 +57,7 @@
 		 e.printStackTrace();
      	  System.out.println(e);
      }
-	   msgBody.setContents(results.getBytes());
+	   msgBody.setByteArray(results.getBytes());
 	   return message;
    }
    
@@ -66,7 +66,7 @@
 	   System.out.println("!ERROR!");
 	   System.out.println(exception.getMessage());
 	   System.out.println("For Message: ");
-	   System.out.println(message.getBody().getContents());
+	   System.out.println(message.getBody().getByteArray());
 	   exception.printStackTrace();
 	   logFooter();
    }

Modified: labs/jbossesb/trunk/product/samples/quickstarts/fun_cbr/src/org/jboss/soa/esb/dvdstore/DVDStoreAction.java
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/fun_cbr/src/org/jboss/soa/esb/dvdstore/DVDStoreAction.java	2007-05-11 10:52:13 UTC (rev 11835)
+++ labs/jbossesb/trunk/product/samples/quickstarts/fun_cbr/src/org/jboss/soa/esb/dvdstore/DVDStoreAction.java	2007-05-12 06:55:23 UTC (rev 11836)
@@ -65,7 +65,7 @@
 		}
 		
 		// Take this "parsed" output and make it a new message
-		message.getBody().setContents(results.toString().getBytes());
+		message.getBody().setByteArray(results.toString().getBytes());
 		return message;
 	}
 }

Modified: labs/jbossesb/trunk/product/samples/quickstarts/fun_cbr/src/org/jboss/soa/esb/samples/quickstart/funcbr/MyJMSListenerAction.java
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/fun_cbr/src/org/jboss/soa/esb/samples/quickstart/funcbr/MyJMSListenerAction.java	2007-05-11 10:52:13 UTC (rev 11835)
+++ labs/jbossesb/trunk/product/samples/quickstarts/fun_cbr/src/org/jboss/soa/esb/samples/quickstart/funcbr/MyJMSListenerAction.java	2007-05-12 06:55:23 UTC (rev 11836)
@@ -35,7 +35,7 @@
 
   public Message displayMessage(Message message) throws Exception{		
 		  logHeader();
-		  System.out.println("Body: " + new String(message.getBody().getContents()));
+		  System.out.println("Body: " + new String(message.getBody().getByteArray()));
 		  logFooter();
 		  return message;         	
 	}
@@ -45,7 +45,7 @@
 	   System.out.println("!ERROR!");
 	   System.out.println(exception.getMessage());
 	   System.out.println("For Message: ");
-	   System.out.println(message.getBody().getContents());
+	   System.out.println(message.getBody().getByteArray());
 	   logFooter();
    }
 	

Modified: labs/jbossesb/trunk/product/samples/quickstarts/fun_cbr/src/org/jboss/soa/esb/samples/quickstart/funcbr/ReturnJMSMessage.java
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/fun_cbr/src/org/jboss/soa/esb/samples/quickstart/funcbr/ReturnJMSMessage.java	2007-05-11 10:52:13 UTC (rev 11835)
+++ labs/jbossesb/trunk/product/samples/quickstarts/fun_cbr/src/org/jboss/soa/esb/samples/quickstart/funcbr/ReturnJMSMessage.java	2007-05-12 06:55:23 UTC (rev 11836)
@@ -55,7 +55,7 @@
     	conn.start();
 
     	    	   
-    	String newMsg = new String(esbMessage.getBody().getContents());
+    	String newMsg = new String(esbMessage.getBody().getByteArray());
 
     	
     	QueueSender send = session.createSender(que);        

Modified: labs/jbossesb/trunk/product/samples/quickstarts/fun_cbr/src/org/jboss/soa/esb/samples/quickstart/funcbr/TeamAlert.java
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/fun_cbr/src/org/jboss/soa/esb/samples/quickstart/funcbr/TeamAlert.java	2007-05-11 10:52:13 UTC (rev 11835)
+++ labs/jbossesb/trunk/product/samples/quickstarts/fun_cbr/src/org/jboss/soa/esb/samples/quickstart/funcbr/TeamAlert.java	2007-05-12 06:55:23 UTC (rev 11836)
@@ -33,7 +33,7 @@
 	  public Message sendResponseBlue(Message message) {
 		  try {
 			   logHeader();
-			   System.out.println(new String(message.getBody().getContents()));
+			   System.out.println(new String(message.getBody().getByteArray()));
 			   System.out.println("Blue Blue Blue");
 			   logFooter();
 			   ReturnJMSMessage.sendMessage(message,"quickstart_Fun_CBR_Blue_Alert");
@@ -48,7 +48,7 @@
 	  public Message sendResponseRed(Message message) {
 		  try {
 			   logHeader();
-			   System.out.println(new String(message.getBody().getContents()));
+			   System.out.println(new String(message.getBody().getByteArray()));
 			   System.out.println("Red Red Red");
 			   logFooter();
 			   ReturnJMSMessage.sendMessage(message,"quickstart_Fun_CBR_Red_Alert");
@@ -63,7 +63,7 @@
 	  public Message sendResponseGreen(Message message) {
 		  try {
 			   logHeader();
-			   System.out.println(new String(message.getBody().getContents()));
+			   System.out.println(new String(message.getBody().getByteArray()));
 			   System.out.println("Green Green Green");
 			   logFooter();
 			   ReturnJMSMessage.sendMessage(message,"quickstart_Fun_CBR_Green_Alert");

Modified: labs/jbossesb/trunk/product/samples/quickstarts/helloworld/src/org/jboss/soa/esb/samples/quickstart/helloworld/MyJMSListenerAction.java
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/helloworld/src/org/jboss/soa/esb/samples/quickstart/helloworld/MyJMSListenerAction.java	2007-05-11 10:52:13 UTC (rev 11835)
+++ labs/jbossesb/trunk/product/samples/quickstarts/helloworld/src/org/jboss/soa/esb/samples/quickstart/helloworld/MyJMSListenerAction.java	2007-05-12 06:55:23 UTC (rev 11836)
@@ -35,7 +35,7 @@
   public Message displayMessage(Message message) throws Exception{
 		
 		  System.out.println("&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&");		  		  
-		  System.out.println("Body: " + new String(message.getBody().getContents()));
+		  System.out.println("Body: " + new String(message.getBody().getByteArray()));
 		  System.out.println("&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&");
 		  return message; 
         		

Modified: labs/jbossesb/trunk/product/samples/quickstarts/helloworld/src/org/jboss/soa/esb/samples/quickstart/helloworld/test/SendEsbMessage.java
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/helloworld/src/org/jboss/soa/esb/samples/quickstart/helloworld/test/SendEsbMessage.java	2007-05-11 10:52:13 UTC (rev 11835)
+++ labs/jbossesb/trunk/product/samples/quickstarts/helloworld/src/org/jboss/soa/esb/samples/quickstart/helloworld/test/SendEsbMessage.java	2007-05-12 06:55:23 UTC (rev 11836)
@@ -55,7 +55,7 @@
     	esbMessage.getHeader().setCall(call);
     	
     	// set body contents with args[2], and send
-    	esbMessage.getBody().setContents(args[2].getBytes());
+    	esbMessage.getBody().setByteArray(args[2].getBytes());
     	
     	ListenerUtil.tryToDeliver(esbMessage, args[0], args[1]);
     	

Modified: labs/jbossesb/trunk/product/samples/quickstarts/helloworld_action/src/org/jboss/soa/esb/samples/quickstart/helloworldaction/MyJMSListenerAction.java
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/helloworld_action/src/org/jboss/soa/esb/samples/quickstart/helloworldaction/MyJMSListenerAction.java	2007-05-11 10:52:13 UTC (rev 11835)
+++ labs/jbossesb/trunk/product/samples/quickstarts/helloworld_action/src/org/jboss/soa/esb/samples/quickstart/helloworldaction/MyJMSListenerAction.java	2007-05-12 06:55:23 UTC (rev 11836)
@@ -36,7 +36,7 @@
 
   public Message displayMessage(Message message) throws Exception{		
 		  logHeader();
-		  System.out.println("Body: " + new String(message.getBody().getContents()));
+		  System.out.println("Body: " + new String(message.getBody().getByteArray()));
 		  logFooter();
 		  return message;         	
 	}
@@ -46,12 +46,12 @@
 	   Body msgBody = message.getBody();
 //	   Call theCall = msgHeader.getCall();
 //	   EPR theEpr = theCall.getFrom();
-	   String contents = new String(msgBody.getContents());
+	   String contents = new String(msgBody.getByteArray());
 	   StringBuffer sb = new StringBuffer();
 	   sb.append("\nBEFORE**\n");
 	   sb.append(contents);
 	   sb.append("\nAFTER**\n");
-	   msgBody.setContents(sb.toString().getBytes());
+	   msgBody.setByteArray(sb.toString().getBytes());
 	   return message;
    }
    
@@ -60,7 +60,7 @@
 	   System.out.println("!ERROR!");
 	   System.out.println(exception.getMessage());
 	   System.out.println("For Message: ");
-	   System.out.println(message.getBody().getContents());
+	   System.out.println(message.getBody().getByteArray());
 	   logFooter();
    }
 	

Modified: labs/jbossesb/trunk/product/samples/quickstarts/helloworld_db_registration/src/org/jboss/soa/esb/samples/quickstart/helloworlddbregistration/MyJMSListenerAction.java
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/helloworld_db_registration/src/org/jboss/soa/esb/samples/quickstart/helloworlddbregistration/MyJMSListenerAction.java	2007-05-11 10:52:13 UTC (rev 11835)
+++ labs/jbossesb/trunk/product/samples/quickstarts/helloworld_db_registration/src/org/jboss/soa/esb/samples/quickstart/helloworlddbregistration/MyJMSListenerAction.java	2007-05-12 06:55:23 UTC (rev 11836)
@@ -35,7 +35,7 @@
   public Message displayMessage(Message message) throws Exception{
 		
 		  System.out.println("&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&");		  		  
-		  System.out.println("\nBody: " + new String(message.getBody().getContents()));
+		  System.out.println("\nBody: " + new String(message.getBody().getByteArray()));
 		  System.out.println("\n&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&");
 		  return message; 
         		

Modified: labs/jbossesb/trunk/product/samples/quickstarts/helloworld_file_action/src/org/jboss/soa/esb/samples/quickstart/helloworldfileaction/MyAction.java
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/helloworld_file_action/src/org/jboss/soa/esb/samples/quickstart/helloworldfileaction/MyAction.java	2007-05-11 10:52:13 UTC (rev 11835)
+++ labs/jbossesb/trunk/product/samples/quickstarts/helloworld_file_action/src/org/jboss/soa/esb/samples/quickstart/helloworldfileaction/MyAction.java	2007-05-12 06:55:23 UTC (rev 11836)
@@ -36,19 +36,19 @@
 
   public Message displayMessage(Message message) throws Exception{		
 		  logHeader();
-		  System.out.println("Body: " + new String(message.getBody().getContents()));
+		  System.out.println("Body: " + new String(message.getBody().getByteArray()));
 		  logFooter();
 		  return message;         	
 	}
   
    public Message playWithMessage(Message message) throws Exception {
 	   Body msgBody = message.getBody();
-	   String contents = new String(msgBody.getContents());
+	   String contents = new String(msgBody.getByteArray());
 	   StringBuffer sb = new StringBuffer();
 	   sb.append("\nBEFORE\n");
 	   sb.append(contents);
 	   sb.append("\nAFTER\n");
-	   msgBody.setContents(sb.toString().getBytes());
+	   msgBody.setByteArray(sb.toString().getBytes());
 	   return message;
    }
 	

Modified: labs/jbossesb/trunk/product/samples/quickstarts/helloworld_ftp_action/src/org/jboss/soa/esb/samples/quickstart/helloworldftpaction/MyAction.java
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/helloworld_ftp_action/src/org/jboss/soa/esb/samples/quickstart/helloworldftpaction/MyAction.java	2007-05-11 10:52:13 UTC (rev 11835)
+++ labs/jbossesb/trunk/product/samples/quickstarts/helloworld_ftp_action/src/org/jboss/soa/esb/samples/quickstart/helloworldftpaction/MyAction.java	2007-05-12 06:55:23 UTC (rev 11836)
@@ -36,7 +36,7 @@
 
   public Message displayMessage(Message message) throws Exception{		
 		  logHeader();
-		  System.out.println("Body: " + new String(message.getBody().getContents()));
+		  System.out.println("Body: " + new String(message.getBody().getByteArray()));
 		  logFooter();
 		  return message;         	
 	}
@@ -46,12 +46,12 @@
 	   Body msgBody = message.getBody();
 //	   Call theCall = msgHeader.getCall();
 //	   EPR theEpr = theCall.getFrom();
-	   String contents = new String(msgBody.getContents());
+	   String contents = new String(msgBody.getByteArray());
 	   StringBuffer sb = new StringBuffer();
 	   sb.append("\nBEFORE\n");
 	   sb.append(contents);
 	   sb.append("\nAFTER\n");
-	   msgBody.setContents(sb.toString().getBytes());
+	   msgBody.setByteArray(sb.toString().getBytes());
 	   return message;
    }
    
@@ -60,7 +60,7 @@
 	   System.out.println("!ERROR!");
 	   System.out.println(exception.getMessage());
 	   System.out.println("For Message: ");
-	   System.out.println(message.getBody().getContents());
+	   System.out.println(message.getBody().getByteArray());
 	   logFooter();
    }
 	

Modified: labs/jbossesb/trunk/product/samples/quickstarts/more_action/src/org/jboss/soa/esb/samples/quickstart/moreaction/MyJMSListenerAction.java
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/more_action/src/org/jboss/soa/esb/samples/quickstart/moreaction/MyJMSListenerAction.java	2007-05-11 10:52:13 UTC (rev 11835)
+++ labs/jbossesb/trunk/product/samples/quickstarts/more_action/src/org/jboss/soa/esb/samples/quickstart/moreaction/MyJMSListenerAction.java	2007-05-12 06:55:23 UTC (rev 11836)
@@ -40,7 +40,7 @@
   
   public Message displayMessage(Message message) throws Exception{		
 		  logHeader();
-		  System.out.println("Body: " + new String(message.getBody().getContents()));
+		  System.out.println("Body: " + new String(message.getBody().getByteArray()));
 		  logFooter();
 		  return message;         	
 	}
@@ -50,7 +50,7 @@
 	   System.out.println("!ERROR!");
 	   System.out.println(exception.getMessage());
 	   System.out.println("For Message: ");
-	   System.out.println(message.getBody().getContents());
+	   System.out.println(message.getBody().getByteArray());
 	   logFooter();
    }
 	

Modified: labs/jbossesb/trunk/product/samples/quickstarts/more_action/src/org/jboss/soa/esb/samples/quickstart/moreaction/StatefulAction.java
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/more_action/src/org/jboss/soa/esb/samples/quickstart/moreaction/StatefulAction.java	2007-05-11 10:52:13 UTC (rev 11835)
+++ labs/jbossesb/trunk/product/samples/quickstarts/more_action/src/org/jboss/soa/esb/samples/quickstart/moreaction/StatefulAction.java	2007-05-12 06:55:23 UTC (rev 11836)
@@ -52,7 +52,7 @@
 	  System.out.println("!ERROR!");
 	  System.out.println(exception.getMessage());
 	  System.out.println("For Message: ");
-	  System.out.println(message.getBody().getContents());
+	  System.out.println(message.getBody().getByteArray());
 	  logFooter();
 	 }
 	   

Modified: labs/jbossesb/trunk/product/samples/quickstarts/simple_cbr/src/org/jboss/soa/esb/samples/quickstart/simplecbr/MyJMSListenerAction.java
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/simple_cbr/src/org/jboss/soa/esb/samples/quickstart/simplecbr/MyJMSListenerAction.java	2007-05-11 10:52:13 UTC (rev 11835)
+++ labs/jbossesb/trunk/product/samples/quickstarts/simple_cbr/src/org/jboss/soa/esb/samples/quickstart/simplecbr/MyJMSListenerAction.java	2007-05-12 06:55:23 UTC (rev 11836)
@@ -35,7 +35,7 @@
 
   public Message displayMessage(Message message) throws Exception{		
 		  logHeader();
-		  System.out.println("Body: " + new String(message.getBody().getContents()));
+		  System.out.println("Body: " + new String(message.getBody().getByteArray()));
 		  logFooter();
 		  return message;         	
 	}
@@ -45,7 +45,7 @@
 	   System.out.println("!ERROR!");
 	   System.out.println(exception.getMessage());
 	   System.out.println("For Message: ");
-	   System.out.println(message.getBody().getContents());
+	   System.out.println(message.getBody().getByteArray());
 	   logFooter();
    }
 	

Modified: labs/jbossesb/trunk/product/samples/quickstarts/simple_cbr/src/org/jboss/soa/esb/samples/quickstart/simplecbr/ReturnJMSMessage.java
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/simple_cbr/src/org/jboss/soa/esb/samples/quickstart/simplecbr/ReturnJMSMessage.java	2007-05-11 10:52:13 UTC (rev 11835)
+++ labs/jbossesb/trunk/product/samples/quickstarts/simple_cbr/src/org/jboss/soa/esb/samples/quickstart/simplecbr/ReturnJMSMessage.java	2007-05-12 06:55:23 UTC (rev 11836)
@@ -55,7 +55,7 @@
     	conn.start();
 
     	    	   
-    	String newMsg = new String(esbMessage.getBody().getContents());
+    	String newMsg = new String(esbMessage.getBody().getByteArray());
 
     	
     	QueueSender send = session.createSender(que);        

Modified: labs/jbossesb/trunk/product/samples/quickstarts/simple_cbr/src/org/jboss/soa/esb/samples/quickstart/simplecbr/RouteExpressShipping.java
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/simple_cbr/src/org/jboss/soa/esb/samples/quickstart/simplecbr/RouteExpressShipping.java	2007-05-11 10:52:13 UTC (rev 11835)
+++ labs/jbossesb/trunk/product/samples/quickstarts/simple_cbr/src/org/jboss/soa/esb/samples/quickstart/simplecbr/RouteExpressShipping.java	2007-05-12 06:55:23 UTC (rev 11836)
@@ -36,7 +36,7 @@
 	  public Message sendResponse(Message message) {
 		  try {
 			   logHeader();
-			   System.out.println(new String(message.getBody().getContents()));
+			   System.out.println(new String(message.getBody().getByteArray()));
 			   System.out.println("EXPRESS EXPRESS EXPRESS");
 			   logFooter();
 			   ReturnJMSMessage.sendMessage(message,"CBRExpressFreeShippingAlert");

Modified: labs/jbossesb/trunk/product/samples/quickstarts/simple_cbr/src/org/jboss/soa/esb/samples/quickstart/simplecbr/RouteNormalShipping.java
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/simple_cbr/src/org/jboss/soa/esb/samples/quickstart/simplecbr/RouteNormalShipping.java	2007-05-11 10:52:13 UTC (rev 11835)
+++ labs/jbossesb/trunk/product/samples/quickstarts/simple_cbr/src/org/jboss/soa/esb/samples/quickstart/simplecbr/RouteNormalShipping.java	2007-05-12 06:55:23 UTC (rev 11836)
@@ -36,7 +36,7 @@
 	  public Message sendResponse(Message message) {
 		  try {
 			   logHeader();
-			   System.out.println(new String(message.getBody().getContents()));
+			   System.out.println(new String(message.getBody().getByteArray()));
 			   System.out.println("NORMAL SHIPPING");
 			   logFooter();
 			   ReturnJMSMessage.sendMessage(message,"CBRNormalShippingAlert");

Modified: labs/jbossesb/trunk/product/samples/quickstarts/static_router/src/org/jboss/soa/esb/samples/quickstart/staticrouter/SimpleFileAction.java
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/static_router/src/org/jboss/soa/esb/samples/quickstart/staticrouter/SimpleFileAction.java	2007-05-11 10:52:13 UTC (rev 11835)
+++ labs/jbossesb/trunk/product/samples/quickstarts/static_router/src/org/jboss/soa/esb/samples/quickstart/staticrouter/SimpleFileAction.java	2007-05-12 06:55:23 UTC (rev 11836)
@@ -33,9 +33,9 @@
 	public Message process(Message message) throws Exception
 	{
 
-		String sMsg = new String(message.getBody().getContents());
+		String sMsg = new String(message.getBody().getByteArray());
 		sMsg = sMsg + " - to file with suffix="+_config.getAttribute("msgSuffix");
-		message.getBody().setContents(sMsg.getBytes());
+		message.getBody().setByteArray(sMsg.getBytes());
 		
 	  System.out.println("&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&");		  		  
 	  System.out.println("\nBody: " + sMsg);

Modified: labs/jbossesb/trunk/product/samples/quickstarts/transform_XML2POJO/src/org/jboss/soa/esb/dvdstore/DVDStoreAction.java
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/transform_XML2POJO/src/org/jboss/soa/esb/dvdstore/DVDStoreAction.java	2007-05-11 10:52:13 UTC (rev 11835)
+++ labs/jbossesb/trunk/product/samples/quickstarts/transform_XML2POJO/src/org/jboss/soa/esb/dvdstore/DVDStoreAction.java	2007-05-12 06:55:23 UTC (rev 11836)
@@ -65,7 +65,7 @@
 		}
 		
 		// Take this "parsed" output and make it a new message
-		message.getBody().setContents(results.toString().getBytes());
+		message.getBody().setByteArray(results.toString().getBytes());
 		return message;
 	}
 }

Modified: labs/jbossesb/trunk/product/samples/quickstarts/transform_XML2POJO/src/org/jboss/soa/esb/samples/quickstart/transformxml2pojo/MyJMSListenerAction.java
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/transform_XML2POJO/src/org/jboss/soa/esb/samples/quickstart/transformxml2pojo/MyJMSListenerAction.java	2007-05-11 10:52:13 UTC (rev 11835)
+++ labs/jbossesb/trunk/product/samples/quickstarts/transform_XML2POJO/src/org/jboss/soa/esb/samples/quickstart/transformxml2pojo/MyJMSListenerAction.java	2007-05-12 06:55:23 UTC (rev 11836)
@@ -39,7 +39,7 @@
 
   public Message displayMessage(Message message) throws Exception{		
 		  logHeader();
-		  System.out.println("Body: " + new String(message.getBody().getContents()));
+		  System.out.println("Body: " + new String(message.getBody().getByteArray()));
 		  logFooter();
 		  return message;         	
 	}
@@ -49,12 +49,12 @@
 	   Body msgBody = message.getBody();
 	   Call theCall = msgHeader.getCall();
 	   EPR theEpr = theCall.getFrom();
-	   String contents = new String(msgBody.getContents());
+	   String contents = new String(msgBody.getByteArray());
 	   StringBuffer sb = new StringBuffer();
 	   sb.append("BEFORE\n");
 	   sb.append(contents);
 	   sb.append("\nAFTER");
-	   msgBody.setContents(sb.toString().getBytes());
+	   msgBody.setByteArray(sb.toString().getBytes());
 	   return message;
    }
    
@@ -63,14 +63,14 @@
 	   System.out.println("!ERROR!");
 	   System.out.println(exception.getMessage());
 	   System.out.println("For Message: ");
-	   System.out.println(message.getBody().getContents());
+	   System.out.println(message.getBody().getByteArray());
 	   logFooter();
    }
 	
    public Message sendResponse(Message message) { 
 	   try {
 		   logHeader();
-		   System.out.println(new String(message.getBody().getContents()));
+		   System.out.println(new String(message.getBody().getByteArray()));
 		   logFooter();
 		   ReturnJMSMessage.sendMessage(message,"quickstart_simple_transformation_Response",_config);
 	   } catch (Exception e) {

Modified: labs/jbossesb/trunk/product/samples/quickstarts/transform_XML2POJO/src/org/jboss/soa/esb/samples/quickstart/transformxml2pojo/ReturnJMSMessage.java
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/transform_XML2POJO/src/org/jboss/soa/esb/samples/quickstart/transformxml2pojo/ReturnJMSMessage.java	2007-05-11 10:52:13 UTC (rev 11835)
+++ labs/jbossesb/trunk/product/samples/quickstarts/transform_XML2POJO/src/org/jboss/soa/esb/samples/quickstart/transformxml2pojo/ReturnJMSMessage.java	2007-05-12 06:55:23 UTC (rev 11836)
@@ -74,7 +74,7 @@
     	conn.start();
 
     	    	   
-    	String newMsg = new String(esbMessage.getBody().getContents());
+    	String newMsg = new String(esbMessage.getBody().getByteArray());
 
     	
     	QueueSender send = session.createSender(que);        

Modified: labs/jbossesb/trunk/product/samples/quickstarts/webservice_war1/src/org/jboss/soa/esb/samples/quickstart/webservicewar1/MyAction.java
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/webservice_war1/src/org/jboss/soa/esb/samples/quickstart/webservicewar1/MyAction.java	2007-05-11 10:52:13 UTC (rev 11835)
+++ labs/jbossesb/trunk/product/samples/quickstarts/webservice_war1/src/org/jboss/soa/esb/samples/quickstart/webservicewar1/MyAction.java	2007-05-12 06:55:23 UTC (rev 11836)
@@ -45,17 +45,17 @@
 
     public Message displayMessage(Message message) throws Exception {
         logHeader();
-        System.out.println("Body: " + new String(message.getBody().getContents()));
+        System.out.println("Body: " + new String(message.getBody().getByteArray()));
         logFooter();
         return message;
     }
 
     public Message playWithMessage(Message message) throws Exception {
         Body msgBody = message.getBody();
-        String contents = new String(msgBody.getContents());
+        String contents = new String(msgBody.getByteArray());
 
         // Reset the message body contents with the response...
-        msgBody.setContents(("Hello From ESB MyAction: " + contents).getBytes());
+        msgBody.setByteArray(("Hello From ESB MyAction: " + contents).getBytes());
 
         return message;
     }
@@ -65,7 +65,7 @@
         System.out.println("!ERROR!");
         System.out.println(exception.getMessage());
         System.out.println("For Message: ");
-        System.out.println(message.getBody().getContents());
+        System.out.println(message.getBody().getByteArray());
         logFooter();
     }
 

Modified: labs/jbossesb/trunk/product/samples/quickstarts/webservice_war1/war/src/org/jboss/soa/esb/samples/quickstart/webservicewar1/webservice/HelloWorldWS.java
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/webservice_war1/war/src/org/jboss/soa/esb/samples/quickstart/webservicewar1/webservice/HelloWorldWS.java	2007-05-11 10:52:13 UTC (rev 11835)
+++ labs/jbossesb/trunk/product/samples/quickstarts/webservice_war1/war/src/org/jboss/soa/esb/samples/quickstart/webservicewar1/webservice/HelloWorldWS.java	2007-05-12 06:55:23 UTC (rev 11836)
@@ -55,7 +55,7 @@
             deliveryAdapter = new MessageDeliveryAdapter("MyServiceCategory", "MyService");
             // Create and populate the request message...
             requestMessage = MessageFactory.getInstance().getMessage(MessageType.JBOSS_XML);
-            requestMessage.getBody().setContents(toWhom.getBytes()); // inject the value from the WS client
+            requestMessage.getBody().setByteArray(toWhom.getBytes()); // inject the value from the WS client
             // Deliver the request message synchronously - timeout after 20 seconds... 
             replyMessage = deliveryAdapter.deliverSync(requestMessage, 20000);
 

Modified: labs/jbossesb/trunk/product/samples/trailblazer/client/src/org/jboss/soa/esb/samples/trailblazer/loanbroker/LoanBroker.java
===================================================================
--- labs/jbossesb/trunk/product/samples/trailblazer/client/src/org/jboss/soa/esb/samples/trailblazer/loanbroker/LoanBroker.java	2007-05-11 10:52:13 UTC (rev 11835)
+++ labs/jbossesb/trunk/product/samples/trailblazer/client/src/org/jboss/soa/esb/samples/trailblazer/loanbroker/LoanBroker.java	2007-05-12 06:55:23 UTC (rev 11836)
@@ -133,7 +133,7 @@
 		int score =0;				
 		
 		//set the customer inside the message - csv format for now to test
-		message.getBody().setContents(customer.getCSV().getBytes());	
+		message.getBody().setByteArray(customer.getCSV().getBytes());	
 		
 		try {
 			logger.debug("sending to credit agency");
@@ -175,8 +175,8 @@
         				replyMessage = courier.pickup(5000);	//wait for 5 seconds then give up
         				if (replyMessage !=null) {
         					logger.info("received reply from creditAgency action");
-        					logger.info("message received: " + replyMessage.getBody().getContents());
-        					String xx = new String(replyMessage.getBody().getContents());
+        					logger.info("message received: " + replyMessage.getBody().getByteArray());
+        					String xx = new String(replyMessage.getBody().getByteArray());
         					System.out.println("Loanbroker credit score received of: " + xx);
         					score = Integer.parseInt(xx.trim());					
         				}else {

Modified: labs/jbossesb/trunk/product/samples/trailblazer/esb/src/org/jboss/soa/esb/samples/trailblazer/actions/BankResponseActions.java
===================================================================
--- labs/jbossesb/trunk/product/samples/trailblazer/esb/src/org/jboss/soa/esb/samples/trailblazer/actions/BankResponseActions.java	2007-05-11 10:52:13 UTC (rev 11835)
+++ labs/jbossesb/trunk/product/samples/trailblazer/esb/src/org/jboss/soa/esb/samples/trailblazer/actions/BankResponseActions.java	2007-05-12 06:55:23 UTC (rev 11836)
@@ -36,12 +36,12 @@
 	public BankResponseActions(ConfigTree config) { _config = config; }
 	
 	public Message processResponseFromJMSBank(Message message) throws Exception {
-		System.out.println("Got the message from the JMS bank: " + message.getBody().getContents());
+		System.out.println("Got the message from the JMS bank: " + message.getBody().getByteArray());
 		
-		_logger.debug("message received: \n" + new String(message.getBody().getContents()));
+		_logger.debug("message received: \n" + new String(message.getBody().getByteArray()));
 		
 		//get the response from the bank and set it in the customer
-		ConfigTree tree = ConfigTree.fromXml(new String(message.getBody().getContents()));		
+		ConfigTree tree = ConfigTree.fromXml(new String(message.getBody().getByteArray()));		
 		String quoteID = tree.getFirstTextChild("quoteId");
 		String rate = tree.getFirstTextChild("interestRate");
 		String errorCode = tree.getFirstTextChild("errorCode");

Modified: labs/jbossesb/trunk/product/samples/trailblazer/esb/src/org/jboss/soa/esb/samples/trailblazer/actions/CreditAgencyActions.java
===================================================================
--- labs/jbossesb/trunk/product/samples/trailblazer/esb/src/org/jboss/soa/esb/samples/trailblazer/actions/CreditAgencyActions.java	2007-05-11 10:52:13 UTC (rev 11835)
+++ labs/jbossesb/trunk/product/samples/trailblazer/esb/src/org/jboss/soa/esb/samples/trailblazer/actions/CreditAgencyActions.java	2007-05-12 06:55:23 UTC (rev 11836)
@@ -48,7 +48,7 @@
 		
 		_logger.debug("message received: " + Util.serialize(message) );		
 		
-		String csvData = new String(message.getBody().getContents());
+		String csvData = new String(message.getBody().getByteArray());
 		_logger.debug("csv data received: " + csvData);
 		
 		
@@ -60,7 +60,7 @@
 		//send back the reply
                 Message replyMessage = MessageFactory.getInstance().getMessage(MessageType.JBOSS_XML);		
 		_logger.info("CreditAgency sending back a credit score of " + score);
-		replyMessage.getBody().setContents(Integer.toString(score).getBytes());
+		replyMessage.getBody().setByteArray(Integer.toString(score).getBytes());
 		
 		return replyMessage;
 	}

Modified: labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/actionhandlers/EsbAction2.java
===================================================================
--- labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/actionhandlers/EsbAction2.java	2007-05-11 10:52:13 UTC (rev 11835)
+++ labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/actionhandlers/EsbAction2.java	2007-05-12 06:55:23 UTC (rev 11836)
@@ -147,9 +147,9 @@
 				if(Constants.BODY_CONTENT_VARIABLE_NAME.equals(esbKey))
 				{
 					if (obj instanceof byte[])
-						body.setContents((byte[])obj);
+						body.setByteArray((byte[])obj);
 					else
-						body.setContents(obj.toString().getBytes());
+						body.setByteArray(obj.toString().getBytes());
 				}
 				else
 					body.add(esbKey, obj);
@@ -196,7 +196,7 @@
 			boolean isPrcScope  = (null==processScope) ? gblPrcScope
 					: Boolean.parseBoolean(processScope); 
 			Object obj	= (Constants.BODY_CONTENT_VARIABLE_NAME.equals(esbVar))
-				?body.getContents()
+				?body.getByteArray()
 				:body.get(esbVar);
 			Object oldVal = (isPrcScope) ? ctxInstance.getVariable(jbpmVar)
 							: ctxInstance.getVariable(jbpmVar,_token);

Modified: labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/actionhandlers/EsbActionHandler.java
===================================================================
--- labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/actionhandlers/EsbActionHandler.java	2007-05-11 10:52:13 UTC (rev 11835)
+++ labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/actionhandlers/EsbActionHandler.java	2007-05-12 06:55:23 UTC (rev 11836)
@@ -175,9 +175,9 @@
 				if(Constants.BODY_CONTENT_VARIABLE_NAME.equals(esbKey))
 				{
 					if (obj instanceof byte[])
-						body.setContents((byte[])obj);
+						body.setByteArray((byte[])obj);
 					else
-						body.setContents(obj.toString().getBytes());
+						body.setByteArray(obj.toString().getBytes());
 				}
 				else
 					body.add(esbKey, obj);
@@ -224,7 +224,7 @@
 		for (String curr: esbNames)
 		{
 			Object obj	= (Constants.BODY_CONTENT_VARIABLE_NAME.equals(curr))
-				?body.getContents()
+				?body.getByteArray()
 				:body.get(curr);
 			String jbpmVar = jbpmNames[index];
 			Object oldVal = (global) ? ctxInstance.getVariable(jbpmVar)

Modified: labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/actions/impl/facades/FacadeUtil.java
===================================================================
--- labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/actions/impl/facades/FacadeUtil.java	2007-05-11 10:52:13 UTC (rev 11835)
+++ labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/actions/impl/facades/FacadeUtil.java	2007-05-12 06:55:23 UTC (rev 11836)
@@ -179,9 +179,9 @@
 				if (Constants.BODY_CONTENT_VARIABLE_NAME.equals(keyInMsg))
 				{
 					if (value instanceof byte[])
-						body.setContents((byte[])value);
+						body.setByteArray((byte[])value);
 					else 
-						body.setContents(value.toString().getBytes());
+						body.setByteArray(value.toString().getBytes());
 				}
 				else
 					body.add(keyInMsg, value);
@@ -202,7 +202,7 @@
 			String jbpmName = mapping.getJbpmName(esbName);
 			Object value	=
 				Constants.BODY_CONTENT_VARIABLE_NAME.equals(esbName)
-				? body.getContents()
+				? body.getByteArray()
 				: body.get(esbName);
 			// if object not found in body, use default value (from config)
 			if (null==value)

Modified: labs/jbossesb/trunk/product/services/jbpm/src/test/java/org/jboss/soa/esb/services/jbpm/actions/BpmProcessorUnitTest.java
===================================================================
--- labs/jbossesb/trunk/product/services/jbpm/src/test/java/org/jboss/soa/esb/services/jbpm/actions/BpmProcessorUnitTest.java	2007-05-11 10:52:13 UTC (rev 11835)
+++ labs/jbossesb/trunk/product/services/jbpm/src/test/java/org/jboss/soa/esb/services/jbpm/actions/BpmProcessorUnitTest.java	2007-05-12 06:55:23 UTC (rev 11836)
@@ -169,7 +169,7 @@
 			request	= Helper.commandMessageTemplate();
 			Helper.setLongValue(request, Constants.TOKEN_ID, tokenId);
 			String myContent = "My content travels in the message";
-			request.getBody().setContents(myContent.getBytes());
+			request.getBody().setByteArray(myContent.getBytes());
 			response	= command.process(request);
 			_logger.info(JbpmTestUtil.dumpResponse(response, command.getOpCode()));
 			ret = Helper.getStringValue(response, Constants.RETURN_CODE);

Modified: labs/jbossesb/trunk/product/services/jbpm/src/test/java/org/jboss/soa/esb/services/jbpm/actions/JbpmTestUtil.java
===================================================================
--- labs/jbossesb/trunk/product/services/jbpm/src/test/java/org/jboss/soa/esb/services/jbpm/actions/JbpmTestUtil.java	2007-05-11 10:52:13 UTC (rev 11835)
+++ labs/jbossesb/trunk/product/services/jbpm/src/test/java/org/jboss/soa/esb/services/jbpm/actions/JbpmTestUtil.java	2007-05-12 06:55:23 UTC (rev 11836)
@@ -89,7 +89,7 @@
 		Object obj = null;
 		if(Constants.BODY_CONTENT_VARIABLE_NAME.equals(key))
 		{
-			obj = message.getBody().getContents();
+			obj = message.getBody().getByteArray();
 			return "Message body content = "
 				+((null==obj) ? "<null>" : new String((byte[])obj))
 				+"\n";

Modified: labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/actions/AggregatorTest.java
===================================================================
--- labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/actions/AggregatorTest.java	2007-05-11 10:52:13 UTC (rev 11835)
+++ labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/actions/AggregatorTest.java	2007-05-12 06:55:23 UTC (rev 11836)
@@ -121,7 +121,7 @@
 	private static void sendMessage(String body) throws RegistryException, CourierException, MalformedEPRException
 	{
 		Message msg = MessageFactory.getInstance().getMessage();
-		msg.getBody().setContents(body.getBytes());
+		msg.getBody().setByteArray(body.getBytes());
 		
 		Registry registry = RegistryFactory.getRegistry();
 		EPR epr = registry.findEPR(SERVICE_CATEGORY_NAME,

Modified: labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/actions/ContentBasedRouterTest.java
===================================================================
--- labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/actions/ContentBasedRouterTest.java	2007-05-11 10:52:13 UTC (rev 11835)
+++ labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/actions/ContentBasedRouterTest.java	2007-05-12 06:55:23 UTC (rev 11836)
@@ -122,7 +122,7 @@
 	private static void sendMessage(String body) throws RegistryException, CourierException, MalformedEPRException
 	{
 		Message msg = MessageFactory.getInstance().getMessage();
-		msg.getBody().setContents(body.getBytes());
+		msg.getBody().setByteArray(body.getBytes());
 		
 		Registry registry = RegistryFactory.getRegistry();
 		Collection<EPR> eprs = registry.findEPRs(SERVICE_CATEGORY_NAME,

Modified: labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/actions/MessagePersisterTest.java
===================================================================
--- labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/actions/MessagePersisterTest.java	2007-05-11 10:52:13 UTC (rev 11835)
+++ labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/actions/MessagePersisterTest.java	2007-05-12 06:55:23 UTC (rev 11836)
@@ -106,7 +106,7 @@
             Iterator<Message> iter=messages.values().iterator();
             while (iter.hasNext()) {
                 Message message=iter.next();
-                String bodyFromStore = new String(message.getBody().getContents());
+                String bodyFromStore = new String(message.getBody().getByteArray());
                 System.out.println("Body=" + bodyFromStore);
             }
             System.out.println("Getting message for classification TEST:" + messages);
@@ -114,7 +114,7 @@
             
             //Now check if it is the same message
             Message message=messages.values().iterator().next();
-            String bodyFromStore = new String(message.getBody().getContents());
+            String bodyFromStore = new String(message.getBody().getByteArray());
             assertEquals(body, bodyFromStore);
 		}
 		catch (Exception re)
@@ -137,7 +137,7 @@
 	private static void sendMessage(String body) throws RegistryException, CourierException, MalformedEPRException
 	{
 		Message msg = MessageFactory.getInstance().getMessage();
-		msg.getBody().setContents(body.getBytes());
+		msg.getBody().setByteArray(body.getBytes());
 		
 		Registry registry = RegistryFactory.getRegistry();
 		EPR epr = registry.findEPR(SERVICE_CATEGORY_NAME,

Modified: labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/messagestore/MessageStoreClient.java
===================================================================
--- labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/messagestore/MessageStoreClient.java	2007-05-11 10:52:13 UTC (rev 11835)
+++ labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/messagestore/MessageStoreClient.java	2007-05-12 06:55:23 UTC (rev 11836)
@@ -61,7 +61,7 @@
 		// set some content inside the Messages
 		for (int x = 0; x < msg.length; x++)
 		{
-			msg[x].getBody().setContents("TEST BODY".getBytes());
+			msg[x].getBody().setByteArray("TEST BODY".getBytes());
 			msg[x].getProperties().setProperty("prop" + x, "val" + x);
 			msg[x].getAttachment().addItem(new String("TEST ATTACHMENT"));
 		}

Modified: labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/messagestore/MessageStoreTest.java
===================================================================
--- labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/messagestore/MessageStoreTest.java	2007-05-11 10:52:13 UTC (rev 11835)
+++ labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/messagestore/MessageStoreTest.java	2007-05-12 06:55:23 UTC (rev 11836)
@@ -85,7 +85,7 @@
 						 MessageFactory.getInstance().getMessage(MessageType.JAVA_SERIALIZED)};		
 		//set some content inside the Messages
 		for (int x=0; x<msg.length; x++) {
-			msg[x].getBody().setContents("TEST BODY".getBytes());
+			msg[x].getBody().setByteArray("TEST BODY".getBytes());
 			msg[x].getProperties().setProperty("prop"+x, "val"+x);
 			msg[x].getAttachment().addItem(new String("TEST ATTACHMENT"));						
 		}

Modified: labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/server/MyAction.java
===================================================================
--- labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/server/MyAction.java	2007-05-11 10:52:13 UTC (rev 11835)
+++ labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/server/MyAction.java	2007-05-12 06:55:23 UTC (rev 11836)
@@ -48,7 +48,7 @@
    public Message process(Message message) throws ActionProcessingException
    {
       logHeader();
-      System.out.println("Body: " + new String(message.getBody().getContents()));
+      System.out.println("Body: " + new String(message.getBody().getByteArray()));
       logFooter();
       MBeanServer server = MBeanServerLocator.locateJBoss();
       StatsMBean stats ;




More information about the jboss-svn-commits mailing list