Author: objectiser
Date: 2009-01-13 15:01:58 -0500 (Tue, 13 Jan 2009)
New Revision: 462
Modified:
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/DefaultESBService.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/ESBAction.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/ESBService.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/AbstractESBAction.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/stateful/CreateSessionAction.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/stateful/PerformAction.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/stateless/MessageRouterAction.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/change/AbstractESBModelChangeRule.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/DefaultESBServiceTest.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/TestESBAction.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/TestESBService.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/CreateSessionActionTest.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/IfActionTest.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/MessageRouterActionTest.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/ParallelActionTest.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/PerformActionTest.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/ReceiveMessageActionTest.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/RetrieveSessionActionTest.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/ScheduleStateActionTest.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
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/SetMessageActionTest.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/SetStateActionTest.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/SwitchActionTest.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/WhenActionTest.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/WhileActionTest.java
Log:
Refactored some method names to be more meaningful - e.g. isCreateSession - so as not to
get confused with the stateful 'CreateSessionAction', where it can also be used to
indicate the start of a 'session type' even in the stateless approach. Also fixed
some methods that relied on finding a 'stateful' action to be able to get
properties such as conversation type and service description name.
Modified:
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/DefaultESBService.java
===================================================================
---
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/DefaultESBService.java 2009-01-12
21:17:36 UTC (rev 461)
+++
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/DefaultESBService.java 2009-01-13
20:01:58 UTC (rev 462)
@@ -377,7 +377,7 @@
ESBAction action=getFirstSessionBasedAction();
if (action != null) {
- if (action.isCreateSession()) {
+ if (action.isSessionType()) {
String bool=action.getPropertyValue(ROOT_PROPERTY);
if (bool != null) {
ret = bool.equalsIgnoreCase("true");
@@ -412,17 +412,25 @@
}
/**
- * This method determines whether the ESB service descriptor
- * starts with a CreateSessionAction.
+ * This method determines whether the ESB service descriptor represents
+ * a new session type.
*
- * @return Whether the service has a CreateSessionAction
+ * @return Whether the service descriptor represents a new session type
*/
- public boolean isCreateSession() {
+ public boolean isSessionType() {
boolean ret=false;
- ESBAction action=getFirstSessionBasedAction();
+ ESBAction action=null;
+ if (isStateless()) {
+ if (getActions().size() > 0) {
+ action = getActions().get(0);
+ }
+ } else {
+ action = getFirstSessionBasedAction();
+ }
+
if (action != null) {
- ret = action.isCreateSession();
+ ret = action.isSessionType();
}
return(ret);
@@ -508,32 +516,41 @@
*/
public String getServiceDescriptionName() {
String ret=null;
- ESBAction action=getFirstSessionBasedAction();
- if (action != null) {
- if (action.isCreateSession() || (action.getActionClass() != null &&
- action.getActionClass().equals(RETRIEVE_SESSION_ACTION_CLASS))) {
+ if (isStateless()) {
+ ESBAction action=getGatewayAction();
+
+ if (action != null) {
ret = action.getPropertyValue(SERVICE_DESCRIPTION_NAME_PROPERTY);
+ }
+ } else {
+ ESBAction action=getFirstSessionBasedAction();
+
+ if (action != null) {
+ if (action.isSessionType() || (action.getActionClass() != null &&
+ action.getActionClass().equals(RETRIEVE_SESSION_ACTION_CLASS))) {
+ ret = action.getPropertyValue(SERVICE_DESCRIPTION_NAME_PROPERTY);
+
+ if (ret == null) {
+ String session=action.getPropertyValue(BUSINESS_OBJECT_TYPE_PROPERTY);
+
+ java.lang.annotation.Annotation annotation=
+ getServiceAnnotation(session);
- if (ret == null) {
- String session=action.getPropertyValue(BUSINESS_OBJECT_TYPE_PROPERTY);
-
- java.lang.annotation.Annotation annotation=
- getServiceAnnotation(session);
-
- if (annotation != null) {
- try {
- java.lang.reflect.Method method=
- annotation.getClass().getMethod(NAME_ATTR, (Class<?>[])null);
-
- Object val=method.invoke(annotation, (Object[])null);
-
- if (val instanceof String) {
- ret = (String)val;
+ if (annotation != null) {
+ try {
+ java.lang.reflect.Method method=
+ annotation.getClass().getMethod(NAME_ATTR, (Class<?>[])null);
+
+ Object val=method.invoke(annotation, (Object[])null);
+
+ if (val instanceof String) {
+ ret = (String)val;
+ }
+ } catch(Throwable t) {
+ logger.log(java.util.logging.Level.SEVERE,
+ "Failed to get 'name' annotation value", t);
}
- } catch(Throwable t) {
- logger.log(java.util.logging.Level.SEVERE,
- "Failed to get 'name' annotation value", t);
}
}
}
@@ -551,32 +568,41 @@
*/
public String getConversationType() {
String ret=null;
- ESBAction action=getFirstSessionBasedAction();
- if (action != null) {
- if (action.isCreateSession()) {
+ if (isStateless()) {
+ ESBAction action=getGatewayAction();
+
+ if (action != null) {
ret = action.getPropertyValue(CONVERSATION_TYPE_PROPERTY);
+ }
+ } else {
+ ESBAction action=getFirstSessionBasedAction();
+
+ if (action != null) {
+ if (action.isSessionType()) {
+ ret = action.getPropertyValue(CONVERSATION_TYPE_PROPERTY);
+
+ if (ret == null) {
+ String session=action.getPropertyValue(BUSINESS_OBJECT_TYPE_PROPERTY);
+
+ java.lang.annotation.Annotation annotation=
+ getServiceAnnotation(session);
- if (ret == null) {
- String session=action.getPropertyValue(BUSINESS_OBJECT_TYPE_PROPERTY);
-
- java.lang.annotation.Annotation annotation=
- getServiceAnnotation(session);
-
- if (annotation != null) {
- try {
- java.lang.reflect.Method method=
- annotation.getClass().getMethod(CONVERSATION_TYPE_PROPERTY,
- (Class<?>[])null);
-
- Object val=method.invoke(annotation, (Object[])null);
-
- if (val instanceof String) {
- ret = (String)val;
+ if (annotation != null) {
+ try {
+ java.lang.reflect.Method method=
+ annotation.getClass().getMethod(CONVERSATION_TYPE_PROPERTY,
+ (Class<?>[])null);
+
+ Object val=method.invoke(annotation, (Object[])null);
+
+ if (val instanceof String) {
+ ret = (String)val;
+ }
+ } catch(Throwable t) {
+ logger.log(java.util.logging.Level.SEVERE,
+ "Failed to get 'name' annotation value", t);
}
- } catch(Throwable t) {
- logger.log(java.util.logging.Level.SEVERE,
- "Failed to get 'name' annotation value", t);
}
}
}
@@ -656,12 +682,16 @@
public Conversation convert(ConversionContext context) {
Conversation ret=null;
- if (isCreateSession()) {
+ if (isSessionType()) {
ret = new Conversation();
ret.derivedFrom(this);
ret.getBlock().derivedFrom(this);
+ // Determine if conversation is stateless
+ ret.setStateless(isStateless());
+
+ // Configure model name
ModelName modelName=new ModelName();
modelName.setName(getServiceDescriptionName());
Modified:
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/ESBAction.java
===================================================================
---
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/ESBAction.java 2009-01-12
21:17:36 UTC (rev 461)
+++
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/ESBAction.java 2009-01-13
20:01:58 UTC (rev 462)
@@ -58,11 +58,11 @@
/**
* This method determines whether the ESB action represents
- * a CreateSessionAction.
+ * a new session type.
*
- * @return Whether the action is a CreateSessionAction
+ * @return Whether the action represents a new session type
*/
- public boolean isCreateSession();
+ public boolean isSessionType();
/**
* This method determines whether the action is a gateway
Modified:
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/ESBService.java
===================================================================
---
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/ESBService.java 2009-01-12
21:17:36 UTC (rev 461)
+++
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/ESBService.java 2009-01-13
20:01:58 UTC (rev 462)
@@ -111,12 +111,12 @@
public boolean isRoot();
/**
- * This method determines whether the ESB service descriptor
- * starts with a CreateSessionAction.
+ * This method determines whether the ESB service descriptor represents
+ * a new session type.
*
- * @return Whether the service has a CreateSessionAction
+ * @return Whether the service descriptor represents a new session type
*/
- public boolean isCreateSession();
+ public boolean isSessionType();
/**
* This method determines whether the service is a gateway
Modified:
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/AbstractESBAction.java
===================================================================
---
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/AbstractESBAction.java 2009-01-12
21:17:36 UTC (rev 461)
+++
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/AbstractESBAction.java 2009-01-13
20:01:58 UTC (rev 462)
@@ -241,11 +241,11 @@
/**
* This method determines whether the ESB action represents
- * a CreateSessionAction.
+ * a new session type.
*
- * @return Whether the action is a CreateSessionAction
+ * @return Whether the action represents a new session type
*/
- public boolean isCreateSession() {
+ public boolean isSessionType() {
return(false);
}
Modified:
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/stateful/CreateSessionAction.java
===================================================================
---
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/stateful/CreateSessionAction.java 2009-01-12
21:17:36 UTC (rev 461)
+++
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/stateful/CreateSessionAction.java 2009-01-13
20:01:58 UTC (rev 462)
@@ -61,11 +61,12 @@
/**
* This method determines whether the ESB action represents
- * a CreateSessionAction.
+ * a new session type.
*
- * @return Whether the action is a CreateSessionAction
+ * @return Whether the action represents a new session type
*/
- public boolean isCreateSession() {
+ @Override
+ public boolean isSessionType() {
return(true);
}
Modified:
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/stateful/PerformAction.java
===================================================================
---
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/stateful/PerformAction.java 2009-01-12
21:17:36 UTC (rev 461)
+++
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/stateful/PerformAction.java 2009-01-13
20:01:58 UTC (rev 462)
@@ -142,7 +142,7 @@
// Check if performed state starts with a create session action
if (m_service != null &&
- m_service.isCreateSession() == false) {
+ m_service.isSessionType() == false) {
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"),
Modified:
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/stateless/MessageRouterAction.java
===================================================================
---
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/stateless/MessageRouterAction.java 2009-01-12
21:17:36 UTC (rev 461)
+++
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/stateless/MessageRouterAction.java 2009-01-13
20:01:58 UTC (rev 462)
@@ -49,11 +49,8 @@
public static final String PATHS = "paths";
public static final String MESSAGE_ELEMENT="message";
public static final String TYPE_ATTR="type";
+ public static final String CONVERSATION_TYPE = "conversationType";
- public static final String ELSE = "else";
- public static final String ELSEIF = "elseif";
- public static final String IF = "if";
-
/**
* The constructor for the action.
*
@@ -77,16 +74,6 @@
super(service, ESBActionFactory.getConversationAction(
MessageRouterAction.class));
}
-
- /**
- * This method determines whether the action is related to a behavioural
- * session.
- *
- * @return Whether the action is session based
- */
- public boolean isSessionBased() {
- return(false);
- }
/**
* This method determines whether the action is a gateway
@@ -94,9 +81,21 @@
*
* @return Whether the action is a gateway
*/
+ @Override
public boolean isGateway() {
return(true);
}
+
+ /**
+ * This method determines whether the ESB action represents
+ * a new session type.
+ *
+ * @return Whether the action represents a new session type
+ */
+ @Override
+ public boolean isSessionType() {
+ return(true);
+ }
/**
* This method adds a route to the message router action.
@@ -210,6 +209,7 @@
@Override
protected java.util.List<String> getMandatoryProperties() {
java.util.List<String> ret=super.getMandatoryProperties();
+ ret.add(CONVERSATION_TYPE);
ret.add(PATHS);
return(ret);
}
@@ -323,8 +323,7 @@
org.w3c.dom.Node n=nl.item(i);
if (n instanceof org.w3c.dom.Element) {
- if (n.getNodeName().equals(IF) ||
- n.getNodeName().equals(ELSEIF)) {
+ if (n.getNodeName().equals(ROUTE)) {
String category=((org.w3c.dom.Element)n).getAttribute(SERVICE_CATEGORY);
String name=((org.w3c.dom.Element)n).getAttribute(SERVICE_NAME);
@@ -338,18 +337,6 @@
if (service != null) {
service.convert(cond.getContents(), context);
}
- } else if (n.getNodeName().equals(ELSE)) {
- String category=((org.w3c.dom.Element)n).getAttribute(SERVICE_CATEGORY);
- String name=((org.w3c.dom.Element)n).getAttribute(SERVICE_NAME);
-
- Block block=new Block();
- choice.setElseBlock(block);
-
- ESBService service=getService().getModel().getService(category, name);
-
- if (service != null) {
- service.convert(block.getContents(), context);
- }
}
}
}
Modified:
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/change/AbstractESBModelChangeRule.java
===================================================================
---
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/change/AbstractESBModelChangeRule.java 2009-01-12
21:17:36 UTC (rev 461)
+++
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/change/AbstractESBModelChangeRule.java 2009-01-13
20:01:58 UTC (rev 462)
@@ -113,7 +113,7 @@
for (int i=0; ret == false && i < pos; i++) {
ESBAction action=service.getActions().get(i);
- if (action.isSessionBased() && !action.isCreateSession()) {
+ if (action.isSessionBased() && !action.isSessionType()) {
ret = true;
}
}
Modified:
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/DefaultESBServiceTest.java
===================================================================
---
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/DefaultESBServiceTest.java 2009-01-12
21:17:36 UTC (rev 461)
+++
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/DefaultESBServiceTest.java 2009-01-13
20:01:58 UTC (rev 462)
@@ -148,7 +148,7 @@
service.getActions().add(act1);
- if (service.isCreateSession() == false) {
+ if (service.isSessionType() == false) {
fail("Service should be 'create session'");
}
}
@@ -160,7 +160,7 @@
service.getActions().add(act1);
- if (service.isCreateSession()) {
+ if (service.isSessionType()) {
fail("Service should NOT be 'create session'");
}
}
Modified:
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/TestESBAction.java
===================================================================
---
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/TestESBAction.java 2009-01-12
21:17:36 UTC (rev 461)
+++
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/TestESBAction.java 2009-01-13
20:01:58 UTC (rev 462)
@@ -84,7 +84,7 @@
m_sessionBased = bool;
}
- public boolean isCreateSession() {
+ public boolean isSessionType() {
return(m_createSession);
}
Modified:
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/TestESBService.java
===================================================================
---
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/TestESBService.java 2009-01-12
21:17:36 UTC (rev 461)
+++
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/TestESBService.java 2009-01-13
20:01:58 UTC (rev 462)
@@ -152,7 +152,7 @@
m_createSession = bool;
}
- public boolean isCreateSession() {
+ public boolean isSessionType() {
return(m_createSession);
}
Modified:
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/CreateSessionActionTest.java
===================================================================
---
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/CreateSessionActionTest.java 2009-01-12
21:17:36 UTC (rev 461)
+++
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/CreateSessionActionTest.java 2009-01-13
20:01:58 UTC (rev 462)
@@ -172,7 +172,7 @@
CreateSessionAction action=new CreateSessionAction(service, null);
- if (action.isCreateSession() == false) {
+ if (action.isSessionType() == false) {
fail("Action is not flagged as a 'CreateSession'");
}
}
Modified:
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/IfActionTest.java
===================================================================
---
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/IfActionTest.java 2009-01-12
21:17:36 UTC (rev 461)
+++
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/IfActionTest.java 2009-01-13
20:01:58 UTC (rev 462)
@@ -613,7 +613,7 @@
IfAction action=new IfAction(service, null);
- if (action.isCreateSession() == true) {
+ if (action.isSessionType() == true) {
fail("Action is flagged as a 'CreateSession'");
}
}
Modified:
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/MessageRouterActionTest.java
===================================================================
---
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/MessageRouterActionTest.java 2009-01-12
21:17:36 UTC (rev 461)
+++
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/MessageRouterActionTest.java 2009-01-13
20:01:58 UTC (rev 462)
@@ -255,7 +255,7 @@
MessageRouterAction action=new MessageRouterAction(service, null);
- if (action.isCreateSession() == true) {
+ if (action.isSessionType() == true) {
fail("Action is flagged as a 'CreateSession'");
}
}
Modified:
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/ParallelActionTest.java
===================================================================
---
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/ParallelActionTest.java 2009-01-12
21:17:36 UTC (rev 461)
+++
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/ParallelActionTest.java 2009-01-13
20:01:58 UTC (rev 462)
@@ -509,7 +509,7 @@
ParallelAction action=new ParallelAction(service, null);
- if (action.isCreateSession() == true) {
+ if (action.isSessionType() == true) {
fail("Action is flagged as a 'CreateSession'");
}
}
Modified:
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/PerformActionTest.java
===================================================================
---
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/PerformActionTest.java 2009-01-12
21:17:36 UTC (rev 461)
+++
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/PerformActionTest.java 2009-01-13
20:01:58 UTC (rev 462)
@@ -742,7 +742,7 @@
PerformAction action=new PerformAction(service, null);
- if (action.isCreateSession() == true) {
+ if (action.isSessionType() == true) {
fail("Action is flagged as a 'CreateSession'");
}
}
Modified:
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/ReceiveMessageActionTest.java
===================================================================
---
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/ReceiveMessageActionTest.java 2009-01-12
21:17:36 UTC (rev 461)
+++
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/ReceiveMessageActionTest.java 2009-01-13
20:01:58 UTC (rev 462)
@@ -270,7 +270,7 @@
ReceiveMessageAction action=new ReceiveMessageAction(service, null);
- if (action.isCreateSession() == true) {
+ if (action.isSessionType() == true) {
fail("Action is flagged as a 'CreateSession'");
}
}
Modified:
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/RetrieveSessionActionTest.java
===================================================================
---
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/RetrieveSessionActionTest.java 2009-01-12
21:17:36 UTC (rev 461)
+++
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/RetrieveSessionActionTest.java 2009-01-13
20:01:58 UTC (rev 462)
@@ -111,7 +111,7 @@
RetrieveSessionAction action=new RetrieveSessionAction(service, null);
- if (action.isCreateSession() == true) {
+ if (action.isSessionType() == true) {
fail("Action is flagged as a 'CreateSession'");
}
}
Modified:
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/ScheduleStateActionTest.java
===================================================================
---
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/ScheduleStateActionTest.java 2009-01-12
21:17:36 UTC (rev 461)
+++
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/ScheduleStateActionTest.java 2009-01-13
20:01:58 UTC (rev 462)
@@ -240,7 +240,7 @@
ScheduleStateAction action=new ScheduleStateAction(service, null);
- if (action.isCreateSession() == true) {
+ if (action.isSessionType() == true) {
fail("Action is flagged as a 'CreateSession'");
}
}
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-12
21:17:36 UTC (rev 461)
+++
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-13
20:01:58 UTC (rev 462)
@@ -346,7 +346,7 @@
SendMessageAction action=new SendMessageAction(service, null);
- if (action.isCreateSession() == true) {
+ if (action.isSessionType() == true) {
fail("Action is flagged as a 'CreateSession'");
}
}
Modified:
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/SetMessageActionTest.java
===================================================================
---
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/SetMessageActionTest.java 2009-01-12
21:17:36 UTC (rev 461)
+++
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/SetMessageActionTest.java 2009-01-13
20:01:58 UTC (rev 462)
@@ -57,7 +57,7 @@
SetMessageAction action=new SetMessageAction(service, null);
- if (action.isCreateSession() == true) {
+ if (action.isSessionType() == true) {
fail("Action is flagged as a 'CreateSession'");
}
}
Modified:
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/SetStateActionTest.java
===================================================================
---
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/SetStateActionTest.java 2009-01-12
21:17:36 UTC (rev 461)
+++
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/SetStateActionTest.java 2009-01-13
20:01:58 UTC (rev 462)
@@ -312,7 +312,7 @@
SetStateAction action=new SetStateAction(service, null);
- if (action.isCreateSession() == true) {
+ if (action.isSessionType() == true) {
fail("Action is flagged as a 'CreateSession'");
}
}
Modified:
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/SwitchActionTest.java
===================================================================
---
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/SwitchActionTest.java 2009-01-12
21:17:36 UTC (rev 461)
+++
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/SwitchActionTest.java 2009-01-13
20:01:58 UTC (rev 462)
@@ -365,7 +365,7 @@
SwitchAction action=new SwitchAction(service, null);
- if (action.isCreateSession() == true) {
+ if (action.isSessionType() == true) {
fail("Action is flagged as a 'CreateSession'");
}
}
Modified:
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/WhenActionTest.java
===================================================================
---
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/WhenActionTest.java 2009-01-12
21:17:36 UTC (rev 461)
+++
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/WhenActionTest.java 2009-01-13
20:01:58 UTC (rev 462)
@@ -357,7 +357,7 @@
WhenAction action=new WhenAction(service, null);
- if (action.isCreateSession() == true) {
+ if (action.isSessionType() == true) {
fail("Action is flagged as a 'CreateSession'");
}
}
Modified:
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/WhileActionTest.java
===================================================================
---
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/WhileActionTest.java 2009-01-12
21:17:36 UTC (rev 461)
+++
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/WhileActionTest.java 2009-01-13
20:01:58 UTC (rev 462)
@@ -548,7 +548,7 @@
WhileAction action=new WhileAction(service, null);
- if (action.isCreateSession() == true) {
+ if (action.isSessionType() == true) {
fail("Action is flagged as a 'CreateSession'");
}
}