Author: objectiser Date: 2009-01-27 17:55:48 -0500 (Tue, 27 Jan 2009) New Revision: 471 Added: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/stateless/Messages.properties Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/stateful/AbstractInteractionMessageAction.java cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/stateless/AbstractInteractionMessageAction.java cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/stateless/IfAction.java cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/stateless/ReceiveMessageAction.java cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/stateless/SendMessageAction.java cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/stateless/SwitchAction.java cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/change/stateless/ConversationInteractionModelChangeRule.java cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/SendMessageActionTest.java Log: Fixing service category/name properties on the stateless send actions. Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/stateful/AbstractInteractionMessageAction.java =================================================================== --- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/stateful/AbstractInteractionMessageAction.java 2009-01-25 21:17:53 UTC (rev 470) +++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/stateful/AbstractInteractionMessageAction.java 2009-01-27 22:55:48 UTC (rev 471) @@ -27,6 +27,8 @@ */ public abstract class AbstractInteractionMessageAction extends AbstractStatefulESBAction { + private static final long serialVersionUID = -55542892082426466L; + public static final String IDENTITIES = "identities"; public static final String MESSAGE_TYPE = "messageType"; public static final String OPERATION = "operation"; Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/stateless/AbstractInteractionMessageAction.java =================================================================== --- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/stateless/AbstractInteractionMessageAction.java 2009-01-25 21:17:53 UTC (rev 470) +++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/stateless/AbstractInteractionMessageAction.java 2009-01-27 22:55:48 UTC (rev 471) @@ -28,9 +28,11 @@ */ public abstract class AbstractInteractionMessageAction extends AbstractESBAction { + private static final long serialVersionUID = 3272234577154434603L; + public static final String MESSAGE_TYPE = "messageType"; public static final String OPERATION = "operation"; - public static final String CLIENT_EPR = "clientEPR"; + public static final String CLIENT_ROLE = "clientRole"; /** * The constructor for the action. @@ -73,7 +75,7 @@ protected java.util.List<String> getOptionalProperties() { java.util.List<String> ret=super.getOptionalProperties(); ret.add(OPERATION); - ret.add(CLIENT_EPR); + ret.add(CLIENT_ROLE); return(ret); } @@ -133,7 +135,7 @@ */ public void setClientEPR(String epr) { - org.w3c.dom.Element prop=getPropertyElement(CLIENT_EPR); + org.w3c.dom.Element prop=getPropertyElement(CLIENT_ROLE); if (prop != null) { prop.setAttribute(VALUE_ATTR, epr); Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/stateless/IfAction.java =================================================================== --- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/stateless/IfAction.java 2009-01-25 21:17:53 UTC (rev 470) +++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/stateless/IfAction.java 2009-01-27 22:55:48 UTC (rev 471) @@ -31,9 +31,10 @@ */ public class IfAction extends AbstractESBAction { + private static final long serialVersionUID = 9005791673502330699L; + public static final String SERVICE_NAME = "service-name"; public static final String SERVICE_CATEGORY = "service-category"; - public static final String IMMEDIATE = "immediate"; public static final String EXPRESSION = "expression"; // ??? public static final String ELSE = "else"; public static final String ELSEIF = "elseif"; @@ -90,12 +91,9 @@ // Lookup service associated with category and name ESBService service=getService().getModel().getService(category, name); - String immediate=((org.w3c.dom.Element)n).getAttribute(IMMEDIATE); - // Initialize link, even if service is null - this will be // reported as a validation error later - getLinks().add(new ESBLink(category, name, service, - (immediate != null && immediate.equalsIgnoreCase("true")))); + getLinks().add(new ESBLink(category, name, service, true)); } } } @@ -128,7 +126,6 @@ boolean f_else=false; boolean f_orderWrong=false; boolean f_serviceDetailsMissing=false; - boolean f_immediateInvalid=false; for (int i=0; nl != null && i < nl.getLength(); i++) { @@ -147,13 +144,6 @@ f_serviceDetailsMissing = true; } - String immediate=((org.w3c.dom.Element)n).getAttribute(IMMEDIATE); - - if (((org.w3c.dom.Element)n).hasAttribute(IMMEDIATE) && - immediate.equalsIgnoreCase("true") == false && - immediate.equalsIgnoreCase("false") == false) { - f_immediateInvalid = true; - } } else if (n.getNodeName().equals(ELSEIF)) { if (f_if == false || f_else) { @@ -165,13 +155,6 @@ f_serviceDetailsMissing = true; } - String immediate=((org.w3c.dom.Element)n).getAttribute(IMMEDIATE); - - if (((org.w3c.dom.Element)n).hasAttribute(IMMEDIATE) && - immediate.equalsIgnoreCase("true") == false && - immediate.equalsIgnoreCase("false") == false) { - f_immediateInvalid = true; - } } else if (n.getNodeName().equals(ELSE)) { if (f_if == false || f_else) { @@ -184,14 +167,6 @@ ((org.w3c.dom.Element)n).hasAttribute(SERVICE_NAME) == false) { f_serviceDetailsMissing = true; } - - String immediate=((org.w3c.dom.Element)n).getAttribute(IMMEDIATE); - - if (((org.w3c.dom.Element)n).hasAttribute(IMMEDIATE) && - immediate.equalsIgnoreCase("true") == false && - immediate.equalsIgnoreCase("false") == false) { - f_immediateInvalid = true; - } } } } @@ -200,7 +175,7 @@ if (nl != null && (f_if == false || f_orderWrong)) { l.error(new ModelIssue(this, org.scribble.util.MessageUtil.format( java.util.PropertyResourceBundle.getBundle( - "org.jboss.tools.overlord.cdl.runtime.jbossesb.model.actions.stateful.Messages"), + "org.jboss.tools.overlord.cdl.runtime.jbossesb.model.actions.stateless.Messages"), "_IF_ORDER_WRONG", new String[]{}))); } @@ -208,18 +183,10 @@ if (f_serviceDetailsMissing) { l.error(new ModelIssue(this, org.scribble.util.MessageUtil.format( java.util.PropertyResourceBundle.getBundle( - "org.jboss.tools.overlord.cdl.runtime.jbossesb.model.actions.stateful.Messages"), + "org.jboss.tools.overlord.cdl.runtime.jbossesb.model.actions.stateless.Messages"), "_PATH_SERVICE_DETAILS_MISSING", new String[]{}))); } - - if (f_immediateInvalid) { - l.error(new ModelIssue(this, org.scribble.util.MessageUtil.format( - java.util.PropertyResourceBundle.getBundle( - "org.jboss.tools.overlord.cdl.runtime.jbossesb.model.actions.stateful.Messages"), - "_BOOLEAN", - new String[]{IMMEDIATE}))); - } } /** @@ -314,7 +281,6 @@ org.w3c.dom.Element path=getAction().getOwnerDocument().createElement(type); path.setAttribute(SERVICE_CATEGORY, category); path.setAttribute(SERVICE_NAME, name); - path.setAttribute(IMMEDIATE, ""+immediate); if (expr != null && (type == IF || type == ELSEIF)) { path.setAttribute(EXPRESSION, expr); Added: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/stateless/Messages.properties =================================================================== --- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/stateless/Messages.properties (rev 0) +++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/stateless/Messages.properties 2009-01-27 22:55:48 UTC (rev 471) @@ -0,0 +1,23 @@ +# /* +# * JBoss, Home of Professional Open Source +# * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated +# * by the @authors tag. All rights reserved. +# * See the copyright.txt in the distribution for a +# * full listing of individual contributors. +# * This copyrighted material is made available to anyone wishing to use, +# * modify, copy, or redistribute it subject to the terms and conditions +# * of the GNU Lesser General Public License, v. 2.1. +# * This program is distributed in the hope that it will be useful, but WITHOUT A +# * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. +# * You should have received a copy of the GNU Lesser General Public License, +# * v.2.1 along with this distribution; if not, write to the Free Software +# * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, +# * MA 02110-1301, USA. +# */ + +_IF_ORDER_WRONG=IfAction must have an 'if' path, followed by zero or more 'elseif' paths and ending with an optional 'else' path +_NOT_SPECIFIED_SERVICE_DETAILS=Send does not provide service category and name +_NOT_SPECIFIED_SERVICE_OR_CLIENT_EPR=Send does not contain request service category/name or response client EPR +_PATH_SERVICE_DETAILS_MISSING=One or more paths are missing the service cateogry and/or name +_SWITCH_ONE_OR_MORE_PATHS=Switch action must specify atleast one case Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/stateless/ReceiveMessageAction.java =================================================================== --- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/stateless/ReceiveMessageAction.java 2009-01-25 21:17:53 UTC (rev 470) +++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/stateless/ReceiveMessageAction.java 2009-01-27 22:55:48 UTC (rev 471) @@ -28,6 +28,8 @@ */ public class ReceiveMessageAction extends AbstractInteractionMessageAction { + private static final long serialVersionUID = -4957103938232460319L; + /** * The constructor for the action. * Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/stateless/SendMessageAction.java =================================================================== --- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/stateless/SendMessageAction.java 2009-01-25 21:17:53 UTC (rev 470) +++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/stateless/SendMessageAction.java 2009-01-27 22:55:48 UTC (rev 471) @@ -30,10 +30,10 @@ */ public class SendMessageAction extends AbstractInteractionMessageAction { + private static final long serialVersionUID = 2714230118722655345L; + public static final String SERVICE_NAME = "serviceName"; public static final String SERVICE_CATEGORY = "serviceCategory"; - public static final String SERVICE_NAME_EXPRESSION = "serviceNameExpression"; - public static final String SERVICE_CATEGORY_EXPRESSION = "serviceCategoryExpression"; /** * The constructor for the action. @@ -67,13 +67,10 @@ @Override protected java.util.List<String> getOptionalProperties() { java.util.List<String> ret=super.getOptionalProperties(); + ret.add(SERVICE_NAME); ret.add(SERVICE_CATEGORY); - // TODO: Not sure about whether expressions can be - // used as no state? - ret.add(SERVICE_NAME_EXPRESSION); - ret.add(SERVICE_CATEGORY_EXPRESSION); return(ret); } @@ -94,12 +91,17 @@ 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) { + // Check if values have been provided + if (getPropertyValue(SERVICE_CATEGORY).trim().length() == 0 || + getPropertyValue(SERVICE_NAME).trim().length() == 0) { + l.error(new ModelIssue(this, org.scribble.util.MessageUtil.format( + java.util.PropertyResourceBundle.getBundle( + "org.jboss.tools.overlord.cdl.runtime.jbossesb.model.actions.stateless.Messages"), + "_NOT_SPECIFIED_SERVICE_DETAILS", + new String[]{}))); + } + + } else if (getPropertyValue(CLIENT_ROLE) != null) { // Sending a response // TODO: Validate that the client EPR has been sent on @@ -107,8 +109,8 @@ } else { l.error(new ModelIssue(this, org.scribble.util.MessageUtil.format( java.util.PropertyResourceBundle.getBundle( - "org.jboss.tools.overlord.cdl.runtime.jbossesb.model.actions.stateful.Messages"), - "_NOT_SPECIFIED_REQ_RESP_EPR", + "org.jboss.tools.overlord.cdl.runtime.jbossesb.model.actions.stateless.Messages"), + "_NOT_SPECIFIED_SERVICE_OR_CLIENT_ROLE", new String[]{}))); } } @@ -187,27 +189,4 @@ prop.setAttribute(VALUE_ATTR, name); } } - - /** - * This method sets the destination expressions for the - * service descriptor properties. - * - * @param categoryExpr The category expression - * @param nameExpr The name expression - */ - public void setDestinationExpression(String categoryExpr, - String nameExpr) { - - org.w3c.dom.Element prop=getPropertyElement(SERVICE_CATEGORY_EXPRESSION); - - if (prop != null) { - prop.setAttribute(VALUE_ATTR, categoryExpr); - } - - prop = getPropertyElement(SERVICE_NAME_EXPRESSION); - - if (prop != null) { - prop.setAttribute(VALUE_ATTR, nameExpr); - } - } } Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/stateless/SwitchAction.java =================================================================== --- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/stateless/SwitchAction.java 2009-01-25 21:17:53 UTC (rev 470) +++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/stateless/SwitchAction.java 2009-01-27 22:55:48 UTC (rev 471) @@ -32,6 +32,8 @@ */ public class SwitchAction extends AbstractESBAction { + private static final long serialVersionUID = 3765702614644769281L; + public static final String TYPE_ATTR = "type"; public static final String MESSAGE_ELEMENT = "message"; private static final String SERVICE_NAME = "service-name"; @@ -109,6 +111,18 @@ } /** + * This method returns the optional property names. + * + * @return The optional property names + */ + @Override + protected java.util.List<String> getOptionalProperties() { + java.util.List<String> ret=super.getOptionalProperties(); + ret.add(CONVERSATION_TYPE); + return(ret); + } + + /** * This method validates the ESB action and reports warnings or * errors to the supplied model listener. * @@ -142,7 +156,7 @@ if (nl != null && pathCount < 1) { l.error(new ModelIssue(this, org.scribble.util.MessageUtil.format( java.util.PropertyResourceBundle.getBundle( - "org.jboss.tools.overlord.cdl.runtime.jbossesb.model.actions.stateful.Messages"), + "org.jboss.tools.overlord.cdl.runtime.jbossesb.model.actions.stateless.Messages"), "_SWITCH_ONE_OR_MORE_PATHS", new String[]{}))); } @@ -150,7 +164,7 @@ if (f_serviceDetailsMissing) { l.error(new ModelIssue(this, org.scribble.util.MessageUtil.format( java.util.PropertyResourceBundle.getBundle( - "org.jboss.tools.overlord.cdl.runtime.jbossesb.model.actions.stateful.Messages"), + "org.jboss.tools.overlord.cdl.runtime.jbossesb.model.actions.stateless.Messages"), "_PATH_SERVICE_DETAILS_MISSING", new String[]{}))); } Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/change/stateless/ConversationInteractionModelChangeRule.java =================================================================== --- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/change/stateless/ConversationInteractionModelChangeRule.java 2009-01-25 21:17:53 UTC (rev 470) +++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/change/stateless/ConversationInteractionModelChangeRule.java 2009-01-27 22:55:48 UTC (rev 471) @@ -146,6 +146,17 @@ ((Conversation)interaction.getEnclosingDefinition()))); } + if (interaction.getReplyToLabel() != null) { + + if (interaction.getToRole() != null) { + action.setClientEPR(interaction.getToRole().getName()); + } else { + action.setClientEPR("client"); + } + } else { + action.setDestination("", ""); + } + /* IS REQUIRED?? if (interaction.getRequestLabel() != null) { Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/SendMessageActionTest.java =================================================================== --- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/SendMessageActionTest.java 2009-01-25 21:17:53 UTC (rev 470) +++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/SendMessageActionTest.java 2009-01-27 22:55:48 UTC (rev 471) @@ -66,7 +66,7 @@ java.util.Map<String,String> props=new java.util.Hashtable<String,String>(); props.put("messageType", ""); - props.put("clientEPR", ""); + props.put("clientRole", ""); org.w3c.dom.Element elem=ESBActionTestUtil.getAction(null, props, null);