[overlord-commits] Overlord SVN: r110 - in cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src: java/org/jboss/tools/overlord/jbossesb/model/actions and 1 other directories.
overlord-commits at lists.jboss.org
overlord-commits at lists.jboss.org
Thu Jul 3 15:06:58 EDT 2008
Author: objectiser
Date: 2008-07-03 15:06:57 -0400 (Thu, 03 Jul 2008)
New Revision: 110
Modified:
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/Messages.properties
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/AbstractESBAction.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/CreateSessionAction.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/Messages.properties
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/ParallelAction.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/CreateSessionActionTest.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/TestESBService.java
Log:
Applied some fixes resulting from sorting out conformance checking problem. Modified create session validation to take into account conversation type specified on referenced business object.
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/Messages.properties
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/Messages.properties 2008-07-03 15:36:42 UTC (rev 109)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/Messages.properties 2008-07-03 19:06:57 UTC (rev 110)
@@ -16,7 +16,6 @@
# * MA 02110-1301, USA.
# */
-_MISMATCH_SESSION_CLASS=Session class mismatch with service descriptor for category '{0}' and name '{1}'
_NOT_FOUND_BUSINESS_OBJECT_TYPE=Business object type '{0}' could not be found
_NOT_FOUND_SERVICE_DESCRIPTOR=Service descriptor for category '{0}' and name '{1}' not found
_NOT_SPECIFIED_PROPERTY=Property '{0}' must be specified
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/AbstractESBAction.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/AbstractESBAction.java 2008-07-03 15:36:42 UTC (rev 109)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/AbstractESBAction.java 2008-07-03 19:06:57 UTC (rev 110)
@@ -168,13 +168,13 @@
new String[]{link.getCategory(),link.getName()}), null);
}
} else if (getService().getSessionName() != null &&
- isPerform() == false &&
+ isPerform() == false && link.isRemote() == false &&
getService().getSessionName().equals(
link.getService().getSessionName()) == false) {
l.error(this, org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.Messages"),
+ "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
"_MISMATCH_SESSION_CLASS",
new String[]{link.getCategory(),link.getName()}), null);
}
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/CreateSessionAction.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/CreateSessionAction.java 2008-07-03 15:36:42 UTC (rev 109)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/CreateSessionAction.java 2008-07-03 19:06:57 UTC (rev 110)
@@ -69,7 +69,7 @@
// If service is root, then need to defined conversation type
if (getService().isRoot() &&
- getPropertyValue(CONVERSATION_TYPE) == null) {
+ getService().getConversationType() == null) {
l.error(this, org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
"org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/Messages.properties
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/Messages.properties 2008-07-03 15:36:42 UTC (rev 109)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/Messages.properties 2008-07-03 19:06:57 UTC (rev 110)
@@ -19,6 +19,7 @@
_CANNOT_INITIATE_NON_ROOT=Cannot 'initiate' non-root service descriptor for category '{0}' and name '{1}'
_CANNOT_SESSION_BASED_ACTIONS_WITH_ROUTER=Cannot define MessageRouterAction with session based actions in service descriptor
_IF_ORDER_WRONG=IfAction must have an 'if' path, followed by zero or more 'elseif' paths and ending with an optional 'else' path
+_MISMATCH_SESSION_CLASS=Session class mismatch with service descriptor for category '{0}' and name '{1}'
_MULTIPLE_JOINS=Action has multiple joins
_MUST_DEFINE_SINGLE_WHILE_PATH=While action must have a single 'while' path
_MUST_DEFINE_SINGLE_WHILE_EXIT=While action must have a single 'exit' path
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/ParallelAction.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/ParallelAction.java 2008-07-03 15:36:42 UTC (rev 109)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/ParallelAction.java 2008-07-03 19:06:57 UTC (rev 110)
@@ -221,16 +221,16 @@
// TODO: Only temporary check while conformance
// check does not handle
- if (block.getContents().size() > 0) {
+ //if (block.getContents().size() > 0) {
parallel.getBlocks().add(block);
- }
+ //}
}
// TODO: Only temporary check while conformance
// check does not handle
- if (parallel.getBlocks().size() == 0) {
- activities.remove(parallel);
- }
+ //if (parallel.getBlocks().size() == 0) {
+ // activities.remove(parallel);
+ //}
if (m_joinService != null) {
m_joinService.convert(activities, context);
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/CreateSessionActionTest.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/CreateSessionActionTest.java 2008-07-03 15:36:42 UTC (rev 109)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/CreateSessionActionTest.java 2008-07-03 19:06:57 UTC (rev 110)
@@ -96,15 +96,22 @@
TestESBService service=new TestESBService();
service.setRoot(true);
+ TestESBLanguageModel model=new TestESBLanguageModel();
+ model.addService(service);
+
java.util.Map<String,String> props=new java.util.Hashtable<String,String>();
props.put("conversationType", "test.Type");
+ service.setConversationType("test.Type");
+
org.w3c.dom.Element elem=ESBActionTestUtil.getAction(null, props, null);
CreateSessionAction action=new CreateSessionAction(service, elem);
service.getActions().add(action);
+ service.setModel(model);
+
TestModelListener l=new TestModelListener();
action.validate(l);
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/TestESBService.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/TestESBService.java 2008-07-03 15:36:42 UTC (rev 109)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/TestESBService.java 2008-07-03 19:06:57 UTC (rev 110)
@@ -48,9 +48,12 @@
return(m_category);
}
+ public void setConversationType(String type) {
+ m_conversationType = type;
+ }
+
public String getConversationType() {
- // TODO Auto-generated method stub
- return null;
+ return(m_conversationType);
}
public void setName(String name) {
@@ -149,5 +152,6 @@
private boolean m_sessionBased=false;
private boolean m_createSession=false;
private Class<?> m_sessionClass=null;
+ private String m_conversationType=null;
private List<Activity> m_contents=new java.util.Vector<Activity>();
}
More information about the overlord-commits
mailing list