[overlord-commits] Overlord SVN: r154 - in cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src: test/org/jboss/tools/overlord/jbossesb/model/actions and 1 other directory.

[overlord-commits at lists.jboss.org]

Author: objectiser
Date: 2008-07-14 10:21:06 -0400 (Mon, 14 Jul 2008)
New Revision: 154

Modified:
   cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/SendMessageAction.java
   cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/SetMessageAction.java
   cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/SetMessageActionTest.java
Log:
Changed property on SetMessageAction from 'expression' to 'stateExpression' to match SetStateAction. Also added properties on SendMessageAction to cope with using expressions to derive the target service category/name.

Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/SendMessageAction.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/SendMessageAction.java	2008-07-14 14:19:10 UTC (rev 153)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/SendMessageAction.java	2008-07-14 14:21:06 UTC (rev 154)
@@ -34,6 +34,8 @@
 	private static final String RESPONSE_SERVICE_CATEGORY = "responseServiceCategory";
 	private static final String SERVICE_NAME = "serviceName";
 	private static final String SERVICE_CATEGORY = "serviceCategory";
+	private static final String SERVICE_NAME_EXPRESSION = "serviceNameExpression";
+	private static final String SERVICE_CATEGORY_EXPRESSION = "serviceCategoryExpression";
 	private static final String MESSAGE_TYPE = "messageType";
 	private static final String OPERATION = "operation";
 
@@ -106,6 +108,11 @@
 				getPropertyValue(SERVICE_NAME) != null) {
 			// Sending a request
 			
+		} else if (getPropertyValue(SERVICE_CATEGORY_EXPRESSION) != null &&
+					getPropertyValue(SERVICE_NAME_EXPRESSION) != null) {
+			// Sending a request to service derived from expression
+			// on the pojo state
+				
 		} else if (getPropertyValue(CLIENT_EPR) != null) {
 			// Sending a response
 			

Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/SetMessageAction.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/SetMessageAction.java	2008-07-14 14:19:10 UTC (rev 153)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/SetMessageAction.java	2008-07-14 14:21:06 UTC (rev 154)
@@ -27,7 +27,7 @@
  */
 public class SetMessageAction extends AbstractESBAction {
 
-	public static final String EXPRESSION = "expression";
+	public static final String STATE_EXPRESSION = "stateExpression";
 
 	/**
 	 * The constructor for the action.
@@ -48,7 +48,7 @@
 	 */
 	@Override
 	protected String[] getMandatoryProperties() {
-		return(new String[]{EXPRESSION});
+		return(new String[]{STATE_EXPRESSION});
 	}	
 
 	/**

Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/SetMessageActionTest.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/SetMessageActionTest.java	2008-07-14 14:19:10 UTC (rev 153)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/SetMessageActionTest.java	2008-07-14 14:21:06 UTC (rev 154)
@@ -41,7 +41,7 @@
 				java.util.PropertyResourceBundle.getBundle(
 				"org.jboss.tools.overlord.jbossesb.model.Messages"),
 					"_NOT_SPECIFIED_PROPERTY",
-					new String[]{SetMessageAction.EXPRESSION}));
+					new String[]{SetMessageAction.STATE_EXPRESSION}));
 		
 		action.validate(l);