Author: objectiser Date: 2008-07-31 12:34:40 -0400 (Thu, 31 Jul 2008) New Revision: 211 Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/DefaultESBService.java cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/ESBService.java cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/change/IfModelChangeRule.java cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/TestESBService.java Log: Added check to make sure Switch only added to message router if it is the first session based action in the service descriptor. Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/DefaultESBService.java =================================================================== --- cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/DefaultESBService.java 2008-07-31 16:26:56 UTC (rev 210) +++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/DefaultESBService.java 2008-07-31 16:34:40 UTC (rev 211) @@ -456,7 +456,7 @@ * * @return The first session based action, or null if none exist */ - protected ESBAction getFirstSessionBasedAction() { + public ESBAction getFirstSessionBasedAction() { ESBAction ret=null; for (int i=0; ret == null && i < m_actions.size(); i++) { Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/ESBService.java =================================================================== --- cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/ESBService.java 2008-07-31 16:26:56 UTC (rev 210) +++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/ESBService.java 2008-07-31 16:34:40 UTC (rev 211) @@ -174,6 +174,14 @@ public boolean isSessionBased(); /** + * This method returns the first session based action in the + * service descriptor. + * + * @return The first session based action, or null if none exist + */ + public ESBAction getFirstSessionBasedAction(); + + /** * This method converts the actions associated with the ESB service into * activities that can be checked for conformance against a conversation * type. Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/change/IfModelChangeRule.java =================================================================== --- cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/change/IfModelChangeRule.java 2008-07-31 16:26:56 UTC (rev 210) +++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/change/IfModelChangeRule.java 2008-07-31 16:34:40 UTC (rev 211) @@ -236,7 +236,11 @@ } } - if (messageTypes.size() > 0) { + // Only record message router 'routes' if the switch + // receives request interactions, and it is the first + // session based action in the service + if (messageTypes.size() > 0 && + service.getFirstSessionBasedAction() == switchAction) { ESBService gwService= esbModel.getGatewayService(); Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/TestESBService.java =================================================================== --- cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/TestESBService.java 2008-07-31 16:26:56 UTC (rev 210) +++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/TestESBService.java 2008-07-31 16:34:40 UTC (rev 211) @@ -155,6 +155,11 @@ return(m_sessionBased); } + public ESBAction getFirstSessionBasedAction() { + // TODO Auto-generated method stub + return null; + } + public boolean isGateway() { // TODO Auto-generated method stub return false;